diff options
Diffstat (limited to 'src')
8 files changed, 53 insertions, 34 deletions
diff --git a/src/main/java/files/Anime.java b/src/main/java/com/mavlonerkinboev/animarfo/anime/Anime.java index f6cccff..bf39e77 100644 --- a/src/main/java/files/Anime.java +++ b/src/main/java/com/mavlonerkinboev/animarfo/anime/Anime.java @@ -1,4 +1,4 @@ -package files; +package com.mavlonerkinboev.animarfo.anime; public class Anime { private final String name; @@ -10,10 +10,10 @@ public class Anime { public final String image; private final String url; public static String dub; - public static String typeOfAnime; + public static String type; public static Anime[] list; - public static byte indexOfAnime = 0; - public static String searchedAnime; + public static byte index = 0; + public static String searched; public static byte size; public static boolean isSearching; @@ -78,20 +78,20 @@ public class Anime { return this.url; } - public static void setIndexOfAnime(byte indexOfAnime) { - Anime.indexOfAnime = indexOfAnime; + public static void setIndex(byte index) { + Anime.index = index; } public static void decreaseIndexOfAnime() { - indexOfAnime--; + index--; } public static void increaseIndexOfAnime() { - indexOfAnime++; + index++; } - public static void setSearchedAnime(String searchedAnime) { - Anime.searchedAnime = searchedAnime.replace(' ', '+'); + public static void setSearched(String searched) { + Anime.searched = searched.replace(' ', '+'); } public static void setList(Anime[] list) { diff --git a/src/main/java/files/Database.java b/src/main/java/com/mavlonerkinboev/animarfo/database/Database.java index 2d35c2d..028c21f 100644 --- a/src/main/java/files/Database.java +++ b/src/main/java/com/mavlonerkinboev/animarfo/database/Database.java @@ -1,5 +1,7 @@ -package files; +package com.mavlonerkinboev.animarfo.database; +import com.mavlonerkinboev.animarfo.telegram.bot.Bot; +import com.mavlonerkinboev.animarfo.telegram.user.TelegramUser; import com.mongodb.MongoClient; import com.mongodb.MongoClientSettings; import com.mongodb.MongoClientURI; diff --git a/src/main/java/files/Parser.java b/src/main/java/com/mavlonerkinboev/animarfo/parser/Parser.java index 75faa00..ab4f948 100644 --- a/src/main/java/files/Parser.java +++ b/src/main/java/com/mavlonerkinboev/animarfo/parser/Parser.java @@ -1,5 +1,6 @@ -package files; +package com.mavlonerkinboev.animarfo.parser; +import com.mavlonerkinboev.animarfo.anime.Anime; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -23,7 +24,7 @@ public class Parser { } public static Anime[] getAnime(String page) throws IOException { - String typeOfAnime = Anime.typeOfAnime; + String typeOfAnime = Anime.type; Element animeList = Parser.getPage(page).select("div[id=dle-content]").first(); assert animeList != null; diff --git a/src/main/java/files/Bot.java b/src/main/java/com/mavlonerkinboev/animarfo/telegram/bot/Bot.java index 15baa1c..95a3881 100644 --- a/src/main/java/files/Bot.java +++ b/src/main/java/com/mavlonerkinboev/animarfo/telegram/bot/Bot.java @@ -1,5 +1,11 @@ -package files; +package com.mavlonerkinboev.animarfo.telegram.bot; +import com.mavlonerkinboev.animarfo.anime.Anime; +import com.mavlonerkinboev.animarfo.parser.Parser; +import com.mavlonerkinboev.animarfo.telegram.user.TelegramUser; +import com.mavlonerkinboev.animarfo.telegram.user.callbackquery.UserCallbackQuery; +import com.mavlonerkinboev.animarfo.telegram.user.keyboard.UserKeyboard; +import com.mavlonerkinboev.animarfo.telegram.user.message.UserMessage; import com.pengrad.telegrambot.TelegramBot; import com.pengrad.telegrambot.UpdatesListener; import com.pengrad.telegrambot.model.User; @@ -59,7 +65,7 @@ public class Bot { public static void sendAnime(String url) { Anime[] anime = new Anime[28]; - byte index = Anime.indexOfAnime; + byte index = Anime.index; try { anime = Parser.getAnime(url); } catch (IOException e) { @@ -71,13 +77,13 @@ public class Bot { public static void sendAnimeByCallBackQuery() { Anime[] anime = Anime.list; - byte index = Anime.indexOfAnime; + byte index = Anime.index; TELEGRAM_BOT.execute(new SendPhoto(UserCallbackQuery.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(UserKeyboard.getCarousel())); } public static void sendSearchedAnime() throws IOException { - String searchedAnime = Anime.searchedAnime; - byte index = Anime.indexOfAnime; + String searchedAnime = Anime.searched; + byte index = Anime.index; byte animeAtSearchSize = Parser.getSizeOfSearchedAnime("https://anime.anidub.life/?do=search&mode=advanced&subaction=search&titleonly=3&story=" + searchedAnime); if (animeAtSearchSize > 0) { Anime[] anime = new Anime[animeAtSearchSize]; diff --git a/src/main/java/files/TelegramUser.java b/src/main/java/com/mavlonerkinboev/animarfo/telegram/user/TelegramUser.java index 31e96f1..0bc9e93 100644 --- a/src/main/java/files/TelegramUser.java +++ b/src/main/java/com/mavlonerkinboev/animarfo/telegram/user/TelegramUser.java @@ -1,4 +1,4 @@ -package files; +package com.mavlonerkinboev.animarfo.telegram.user; public class TelegramUser { private long id; diff --git a/src/main/java/files/UserCallbackQuery.java b/src/main/java/com/mavlonerkinboev/animarfo/telegram/user/callbackquery/UserCallbackQuery.java index bff02e2..195029a 100644 --- a/src/main/java/files/UserCallbackQuery.java +++ b/src/main/java/com/mavlonerkinboev/animarfo/telegram/user/callbackquery/UserCallbackQuery.java @@ -1,5 +1,9 @@ -package files; +package com.mavlonerkinboev.animarfo.telegram.user.callbackquery; +import com.mavlonerkinboev.animarfo.anime.Anime; +import com.mavlonerkinboev.animarfo.telegram.bot.Bot; +import com.mavlonerkinboev.animarfo.telegram.user.keyboard.UserKeyboard; +import com.mavlonerkinboev.animarfo.telegram.user.message.UserMessage; import com.pengrad.telegrambot.model.CallbackQuery; import com.pengrad.telegrambot.model.User; import com.pengrad.telegrambot.model.request.Keyboard; @@ -32,16 +36,16 @@ public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQue switch (data) { case "previous" -> { - if (Anime.indexOfAnime == 0) { - Anime.setIndexOfAnime((byte) (Anime.size-1)); + if (Anime.index == 0) { + Anime.setIndex((byte) (Anime.size-1)); } else { Anime.decreaseIndexOfAnime(); } Bot.sendAnimeByCallBackQuery(); } case "next" -> { - if (Anime.indexOfAnime == Anime.size-1) { - Anime.setIndexOfAnime((byte) 0); + if (Anime.index == Anime.size-1) { + Anime.setIndex((byte) 0); } else { Anime.increaseIndexOfAnime(); } @@ -49,7 +53,7 @@ public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQue } case "watchOrDownload" -> { Anime[] anime = Anime.list; - byte index = Anime.indexOfAnime; + byte index = Anime.index; Keyboard anidub = UserKeyboard.getAnidub(); if (UserKeyboard.seriesSize > 0) { Bot.TELEGRAM_BOT.execute(new SendPhoto(UserMessage.chatId, anime[index].getImage()).caption(anime[index].showInfo()).parseMode(ParseMode.HTML).replyMarkup(anidub)); @@ -60,20 +64,20 @@ public class UserCallbackQuery extends com.pengrad.telegrambot.model.CallbackQue case "anidub" -> { Anime.dub = "Anidub"; String url = null; - if (Anime.typeOfAnime != null) { - switch (Anime.typeOfAnime) { + if (Anime.type != null) { + switch (Anime.type) { case "Ongoing" -> url = "https://online.anidub.com/anime/anime_ongoing/"; case "Serials" -> url = "https://online.anidub.com/anime/full/"; case "Films" -> url = "https://online.anidub.com/anime_movie/"; } } - Anime.setIndexOfAnime((byte) 0); + Anime.setIndex((byte) 0); if (!Anime.isSearching) { Bot.sendAnime(url); } else { Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, "Введи название аниме")); } - Anime.typeOfAnime = null; + Anime.type = null; } } diff --git a/src/main/java/files/UserKeyboard.java b/src/main/java/com/mavlonerkinboev/animarfo/telegram/user/keyboard/UserKeyboard.java index c5f2b82..0db27c1 100644 --- a/src/main/java/files/UserKeyboard.java +++ b/src/main/java/com/mavlonerkinboev/animarfo/telegram/user/keyboard/UserKeyboard.java @@ -1,5 +1,7 @@ -package files; +package com.mavlonerkinboev.animarfo.telegram.user.keyboard; +import com.mavlonerkinboev.animarfo.anime.Anime; +import com.mavlonerkinboev.animarfo.parser.Parser; import com.pengrad.telegrambot.model.request.Keyboard; import com.pengrad.telegrambot.model.request.InlineKeyboardButton; import com.pengrad.telegrambot.model.request.InlineKeyboardMarkup; @@ -40,7 +42,7 @@ public class UserKeyboard { public static Keyboard getAnidub() throws IOException { Anime[] anime = Anime.list; - Anime thisAnime = anime[Anime.indexOfAnime]; + Anime thisAnime = anime[Anime.index]; Elements seriesList = Parser.getPage(thisAnime.getUrl()).select("div[class=tabs-b video-box]").next().select("span"); ArrayList<String> series = new ArrayList<>(); diff --git a/src/main/java/files/UserMessage.java b/src/main/java/com/mavlonerkinboev/animarfo/telegram/user/message/UserMessage.java index ea3abea..08ece74 100644 --- a/src/main/java/files/UserMessage.java +++ b/src/main/java/com/mavlonerkinboev/animarfo/telegram/user/message/UserMessage.java @@ -1,5 +1,9 @@ -package files; +package com.mavlonerkinboev.animarfo.telegram.user.message; +import com.mavlonerkinboev.animarfo.anime.Anime; +import com.mavlonerkinboev.animarfo.telegram.user.keyboard.UserKeyboard; +import com.mavlonerkinboev.animarfo.database.Database; +import com.mavlonerkinboev.animarfo.telegram.bot.Bot; import com.pengrad.telegrambot.model.Message; import com.pengrad.telegrambot.request.SendMessage; @@ -32,7 +36,7 @@ public class UserMessage { Anime.isSearching = true; } else { Anime.isSearching = false; - Anime.typeOfAnime = animeTypes.get(UserMessage.text); + Anime.type = animeTypes.get(UserMessage.text); } Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, "В какой озвучке будем смотреть?").replyMarkup(UserKeyboard.getDub())); } else if (UserMessage.text.equals("/start")) { @@ -40,7 +44,7 @@ public class UserMessage { Bot.TELEGRAM_BOT.execute(new SendMessage(UserMessage.chatId, ("Приветики, меня звать AniMarfo!\nЯ помогу тебе найти аниме, скачать его или же смотреть прямо тут.")).replyMarkup(UserKeyboard.getMain())); } else { if (Anime.isSearching && Anime.dub != null) { - Anime.setSearchedAnime(UserMessage.text); + Anime.setSearched(UserMessage.text); try { Bot.sendSearchedAnime(); } catch (IOException e) { |