diff options
3 files changed, 42 insertions, 10 deletions
diff --git a/src/main/java/com/mavlonerkinboev/animarfo/parser/Parser.java b/src/main/java/com/mavlonerkinboev/animarfo/parser/Parser.java index ab4f948..c621f4f 100644 --- a/src/main/java/com/mavlonerkinboev/animarfo/parser/Parser.java +++ b/src/main/java/com/mavlonerkinboev/animarfo/parser/Parser.java @@ -10,20 +10,31 @@ import java.io.IOException; import java.net.URL; import java.util.ArrayList; import java.util.Objects; +import java.util.logging.Level; +import java.util.logging.Logger; public class Parser { + private static final Logger LOGGER = Logger.getLogger(Parser.class.getName()); + + static { + LOGGER.setLevel(Level.ALL); + } + public static Document getPage(String url) throws IOException { return Jsoup.parse(new URL(url), 5000); } public static byte getSizeOfSearchedAnime(String page) throws IOException { + LOGGER.info("Getting size of searched anime"); Element animeList = Parser.getPage(page).select("div[id=dle-content]").first(); if (animeList == null) return 0; Elements anime = animeList.select("div[class=th-item]"); + LOGGER.fine("Got size of searched anime"); return (byte) anime.size(); } public static Anime[] getAnime(String page) throws IOException { + LOGGER.info("Parsing an anime"); String typeOfAnime = Anime.type; Element animeList = Parser.getPage(page).select("div[id=dle-content]").first(); @@ -40,6 +51,7 @@ public class Parser { Elements ratingsTemp = animeList.select("div[class=th-rating]"); Elements imagesTemp = animeList.select("div[class=th-img img-resp-vert img-fit]"); Elements urlsTemp = animeList.select("div[class=th-itemb]").select("a[class=th-in]"); + LOGGER.fine("Got all required data"); byte countOfAnime = (byte) namesTemp.size(); Anime.size = countOfAnime; @@ -72,14 +84,16 @@ public class Parser { } ArrayList<String> genres = new ArrayList<>(); - for (Element oneGenres : genresTemp) { - Element genre = oneGenres.child(2); - String text = Jsoup.parse(String.valueOf(genre)).text(); - int start = 6; - int end = text.length(); - char[] dst = new char[end - start]; - text.getChars(start, end, dst, 0); - genres.add(String.valueOf(dst)); + if (!Anime.isSearching) { + for (Element oneGenres : genresTemp) { + Element genre = oneGenres.child(2); + String text = Jsoup.parse(String.valueOf(genre)).text(); + int start = 6; + int end = text.length(); + char[] dst = new char[end - start]; + text.getChars(start, end, dst, 0); + genres.add(String.valueOf(dst)); + } } ArrayList<String> series = new ArrayList<>(); @@ -119,16 +133,18 @@ public class Parser { urls.add(String.valueOf(dst)); } + LOGGER.fine("Sorted all data"); + Anime[] anime = new Anime[countOfAnime]; for (int i = 0; i < countOfAnime; i++) { if (typeOfAnime != null && typeOfAnime.equals("Films")) { - anime[i] = new Anime(names.get(i), descriptions.get(i), genres.get(i), years.get(i), ratings.get(i), images.get(i), urls.get(i)); + anime[i] = new Anime(names.get(i), descriptions.get(i), genres.get(i), years.get(i), null, ratings.get(i), images.get(i), urls.get(i)); } else if (typeOfAnime != null && typeOfAnime.equals("Ongoing")) { anime[i] = new Anime(names.get(i), descriptions.get(i), genres.get(i), null, series.get(i), ratings.get(i), images.get(i), urls.get(i)); } else if (typeOfAnime != null && typeOfAnime.equals("Serials")) { anime[i] = new Anime(names.get(i), descriptions.get(i), genres.get(i), years.get(i), series.get(i), ratings.get(i), images.get(i), urls.get(i)); } else if (Anime.isSearching) { - anime[i] = new Anime(names.get(i), descriptions.get(i), genres.get(i), null, null, ratings.get(i), images.get(i), urls.get(i)); + anime[i] = new Anime(names.get(i), descriptions.get(i), null, null, null, ratings.get(i), images.get(i), urls.get(i)); } } diff --git a/src/main/java/com/mavlonerkinboev/animarfo/telegram/user/callbackquery/UserCallbackQuery.java b/src/main/java/com/mavlonerkinboev/animarfo/telegram/user/callbackquery/UserCallbackQuery.java index 195029a..0589f50 100644 --- a/src/main/java/com/mavlonerkinboev/animarfo/telegram/user/callbackquery/UserCallbackQuery.java +++ b/src/main/java/com/mavlonerkinboev/animarfo/telegram/user/callbackquery/UserCallbackQuery.java @@ -13,6 +13,8 @@ import com.pengrad.telegrambot.request.SendMessage; import com.pengrad.telegrambot.request.SendPhoto; import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQuery { public static CallbackQuery callbackQuery; @@ -21,6 +23,11 @@ public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQue public static long userId; public static int messageId; public static long chatId; + private static final Logger LOGGER = Logger.getLogger(UserCallbackQuery.class.getName()); + + static { + LOGGER.setLevel(Level.ALL); + } public static void setInformation(CallbackQuery _callbackQuery) { callbackQuery = _callbackQuery; @@ -83,5 +90,6 @@ public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQue DeleteMessage deleteMessage = new DeleteMessage(chatId, messageId); Bot.TELEGRAM_BOT.execute(deleteMessage); + LOGGER.fine("CallbackQuery is executed"); } } diff --git a/src/main/java/com/mavlonerkinboev/animarfo/telegram/user/message/UserMessage.java b/src/main/java/com/mavlonerkinboev/animarfo/telegram/user/message/UserMessage.java index c4e07d4..b37a475 100644 --- a/src/main/java/com/mavlonerkinboev/animarfo/telegram/user/message/UserMessage.java +++ b/src/main/java/com/mavlonerkinboev/animarfo/telegram/user/message/UserMessage.java @@ -9,12 +9,19 @@ import com.pengrad.telegrambot.request.SendMessage; import java.io.IOException; import java.util.HashMap; +import java.util.logging.Level; +import java.util.logging.Logger; public class UserMessage { public static Message message; public static String text; public static long chatId; private static final HashMap<String, String> animeTypes = new HashMap<>(); + private static final Logger LOGGER = Logger.getLogger(UserMessage.class.getName()); + + static { + LOGGER.setLevel(Level.ALL); + } static { animeTypes.put("Онгоинги", "Ongoing"); @@ -56,6 +63,7 @@ public class UserMessage { Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, "Прости, но я тебя не понимаю, воспользуйся командами на твоей клавиатуре.").replyMarkup(UserKeyboard.getMain())); } } + LOGGER.fine("Message is executed"); Database.saveUser(Bot.telegramUser); } |