1 files changed, 41 insertions, 45 deletions

diff --git a/src/main/java/files/Anime.java b/src/main/java/files/Anime.java
index 1b039ed..4f60149 100644
--- a/src/main/java/files/Anime.java
+++ b/src/main/java/files/Anime.java
@@ -1,24 +1,29 @@
 package files;
 
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
-
-import java.io.IOException;
-
 public class Anime {
     private final String name;
-    private String description;
+    private final String description;
     private final String[] genres;
     private final String year;
-    private final String series;
+    private String series;
     private final String rating;
     public final String image;
     private final String url;
-    private static Anime[] list;
-    private static byte indexOfAnime = 0;
-    private static String searchedAnime;
-    private static byte searchedAnimeSize;
-    private static boolean isSearchingAnAnime;
+    public static Anime[] list;
+    public static byte indexOfAnime = 0;
+    public static String searchedAnime;
+    public static byte searchedAnimeSize;
+    public static boolean isSearchingAnAnime;
+
+    public Anime(String name, String description, String[] genres, String year, String rating, String image, String url) {
+        this.name = name;
+        this.description = description;
+        this.genres = genres;
+        this.year = year;
+        this.rating = rating;
+        this.image = image;
+        this.url = url;
+    }
 
     public Anime(String name, String description, String[] genres, String year, String series, String rating, String image, String url) {
         this.name = name;
@@ -31,22 +36,33 @@ public class Anime {
         this.url = url;
     }
 
-    public String getDescription() throws IOException {
-        if (this.description == null) {
-            parseDescription();
-        }
-        return description;
+    public String showInfo() {
+        return "<b>Название:</b> " + this.name + System.lineSeparator() +
+                getYear() +
+                getSeries() +
+                "<b>Рейтинг:</b> " + this.rating + " / 10" + System.lineSeparator() +
+                "<b>Описание:</b> " + this.description;
     }
 
-    public void parseDescription() throws IOException {
-        Element descriptionTemp = Parser.getPage(this.url).select("div[class=fdesc clr full-text clearfix]").first();
-        this.description = Jsoup.parse(String.valueOf(descriptionTemp)).text();
+    public String showInfo(String dub) {
+        return "<b>Название:</b> " + this.name + System.lineSeparator() +
+                getYear() +
+                getSeries() +
+                "<b>Рейтинг:</b> " + this.rating + " / 10" + System.lineSeparator() +
+                "<b>Озвучка:</b> " + dub + System.lineSeparator() +
+                "<b>Описание:</b> " + this.description;
     }
 
-    public String showInfo() {
-        return "Имя: " + this.name + System.lineSeparator() +
-                "Серий: " + this.series + System.lineSeparator() +
-                "Рейтинг: " + this.rating;
+    public String getName() {
+        return name;
+    }
+
+    public String getYear() {
+        return (year != null) ? ("<b>Год выхода:</b> " + this.year + System.lineSeparator()) : "";
+    }
+
+    public String getSeries() {
+        return (series != null) ? ("<b>Всего серий:</b> " + this.series + System.lineSeparator()) : "";
     }
 
     public String getImage() {
@@ -54,11 +70,7 @@ public class Anime {
     }
 
     public String getUrl() {
-        return url;
-    }
-
-    public static byte getIndexOfAnime() {
-        return indexOfAnime;
+        return this.url;
     }
 
     public static void setIndexOfAnime(byte indexOfAnime) {
@@ -73,18 +85,10 @@ public class Anime {
         indexOfAnime++;
     }
 
-    public static String getSearchedAnime() {
-        return searchedAnime;
-    }
-
     public static void setSearchedAnime(String searchedAnime) {
         Anime.searchedAnime = searchedAnime.replace(' ', '+');
     }
 
-    public static boolean getIsSearchingAnAnime() {
-        return isSearchingAnAnime;
-    }
-
     public static void setIsSearchingAnAnime(boolean isSearchingAnAnime) {
         Anime.isSearchingAnAnime = isSearchingAnAnime;
     }
@@ -93,14 +97,6 @@ public class Anime {
         Anime.searchedAnimeSize = searchedAnimeSize;
     }
 
-    public static byte getSearchedAnimeSize() {
-        return Anime.searchedAnimeSize;
-    }
-
-    public static Anime[] getList() {
-        return list;
-    }
-
     public static void setList(Anime[] list) {
         Anime.list = list;
     }