diff options
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/files/Anime.java | 6 | ||||
-rw-r--r-- | src/main/java/files/App.java | 1 | ||||
-rw-r--r-- | src/main/java/files/Parser.java | 35 |
3 files changed, 8 insertions, 34 deletions
diff --git a/src/main/java/files/Anime.java b/src/main/java/files/Anime.java index 1611a9a..ddca1a0 100644 --- a/src/main/java/files/Anime.java +++ b/src/main/java/files/Anime.java @@ -20,10 +20,8 @@ public class Anime { } public String showInfo() { - return new String( - "**Имя:** " + this.name + System.lineSeparator() + + return "Имя: " + this.name + System.lineSeparator() + "Описание: " + this.description + System.lineSeparator() + - "Год: " + this.year + System.lineSeparator() - ); + "Год: " + this.year + System.lineSeparator(); } } diff --git a/src/main/java/files/App.java b/src/main/java/files/App.java index b07431d..d84bf9c 100644 --- a/src/main/java/files/App.java +++ b/src/main/java/files/App.java @@ -2,7 +2,6 @@ package files; import com.pengrad.telegrambot.TelegramBot; import com.pengrad.telegrambot.UpdatesListener; -import com.pengrad.telegrambot.model.Message; import com.pengrad.telegrambot.request.SendMessage; import com.pengrad.telegrambot.request.SendPhoto; diff --git a/src/main/java/files/Parser.java b/src/main/java/files/Parser.java index 6ed7e77..3ec2231 100644 --- a/src/main/java/files/Parser.java +++ b/src/main/java/files/Parser.java @@ -28,36 +28,17 @@ public class Parser { ArrayList<String> names = new ArrayList<String>(); for (Element name : namesTemp) { - String text = name.toString(); - int start = text.indexOf(">") + 1; - int end = text.indexOf("</a>"); - char[] dst = new char[end - start]; - text.getChars(start, end, dst, 0); - names.add(String.valueOf(dst)); + names.add(Jsoup.parse(String.valueOf(name)).text()); } ArrayList<String> descriptions = new ArrayList<String>(); for (Element description : descriptionsTemp) { - String text = description.toString(); - if (text.length() <= 49) { - descriptions.add(""); - continue; - } - int start = text.indexOf("\n") + 3; - int end = text.indexOf("\n</div>"); - char[] dst = new char[end - start]; - text.getChars(start, end, dst, 0); - descriptions.add(String.valueOf(dst)); + descriptions.add(Jsoup.parse(String.valueOf(description)).text()); } ArrayList<String> years = new ArrayList<String>(); for (Element year : yearsTemp) { - String text = year.toString(); - int start = text.indexOf(">") + 1; - int end = text.indexOf("</a>"); - char[] dst = new char[end - start]; - text.getChars(start, end, dst, 0); - years.add(String.valueOf(dst)); + years.add(Jsoup.parse(String.valueOf(year)).text()); } ArrayList<String> images = new ArrayList<String>(); @@ -70,15 +51,11 @@ public class Parser { images.add(String.valueOf(dst)); } - Anime[] animes = new Anime[countOfAnime]; + Anime[] anime = new Anime[countOfAnime]; for (int i = 0; i < countOfAnime; i++) { - animes[i] = new Anime(names.get(i), descriptions.get(i), null, years.get(i), images.get(i)); + anime[i] = new Anime(names.get(i), descriptions.get(i), null, years.get(i), images.get(i)); } - return animes; + return anime; } - -// public static String[] getAnimeNames() throws IOException { -// -// } } |