Voomra/KinoSearch
0
Fork 0
Code Activity

fix: порядок сезонов

Browse Source 
P.S.: ошибки с возобновлением просмотра не наблюдается
This commit is contained in:
DmitriyMX
2017-01-08 17:02:13 +03:00
parent f261b8120d
commit 9fe1b7f362
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/kinosearch/core/KinoPlay.java
View File

@@ -4,15 +4,15 @@
*/ */
package kinosearch.core; package kinosearch.core;
import java.util.ArrayList; import java.util.List;
import java.util.Map; import java.util.Map;
public class KinoPlay { public class KinoPlay {
private String title; private String title;
private KinoType type = KinoType.UNKNOW; private KinoType type = KinoType.UNKNOW;
private KinoItem oneFilm; private KinoItem oneFilm;
private ArrayList<KinoItem> serials; private List<KinoItem> serials;
private Map<String, ArrayList<KinoItem>> seasons; private Map<String, List<KinoItem>> seasons;
public enum KinoType { public enum KinoType {
UNKNOW, ONE_FILM, SIMPLE_SERIAL, SEASONS_SERIAL UNKNOW, ONE_FILM, SIMPLE_SERIAL, SEASONS_SERIAL
@@ -42,19 +42,19 @@ public class KinoPlay {
this.oneFilm = oneFilm; this.oneFilm = oneFilm;
} }
public ArrayList<KinoItem> getSerials() { public List<KinoItem> getSerials() {
return serials; return serials;
} }
public void setSerials(ArrayList<KinoItem> serials) { public void setSerials(List<KinoItem> serials) {
this.serials = serials; this.serials = serials;
} }
public Map<String, ArrayList<KinoItem>> getSeasons() { public Map<String, List<KinoItem>> getSeasons() {
return seasons; return seasons;
} }
public void setSeasons(Map<String, ArrayList<KinoItem>> seasons) { public void setSeasons(Map<String, List<KinoItem>> seasons) {
this.seasons = seasons; this.seasons = seasons;
} }
} }

4
src/main/java/kinosearch/core/warez/Onlinelife.java
View File

@@ -117,7 +117,7 @@ public class Onlinelife implements KinoWarez {
// сезонный сериал // сезонный сериал
kinoPlay.setType(KinoPlay.KinoType.SEASONS_SERIAL); kinoPlay.setType(KinoPlay.KinoType.SEASONS_SERIAL);
Map<String, ArrayList<KinoItem>> seasons = new HashMap<>(); Map<String, List<KinoItem>> seasons = new LinkedHashMap<>();
for (JsonElement element : jsonArray) { for (JsonElement element : jsonArray) {
jsonObj = element.getAsJsonObject(); jsonObj = element.getAsJsonObject();
String titleSeason = jsonObj.get("comment").getAsString(); String titleSeason = jsonObj.get("comment").getAsString();
@@ -132,6 +132,7 @@ public class Onlinelife implements KinoWarez {
)); ));
} }
serials.sort(Comparator.comparing(KinoItem::getTitle));
seasons.put(titleSeason, serials); seasons.put(titleSeason, serials);
} }
@@ -148,6 +149,7 @@ public class Onlinelife implements KinoWarez {
jsonObj.get("file").getAsString().replace("http://", "/proxy/onlinelife/") jsonObj.get("file").getAsString().replace("http://", "/proxy/onlinelife/")
)); ));
} }
serials.sort(Comparator.comparing(KinoItem::getTitle));
kinoPlay.setSerials(serials); kinoPlay.setSerials(serials);
} }
} }

3
src/main/java/kinosearch/webapp/KinoPlaySerializer.java
View File

@@ -10,6 +10,7 @@ import kinosearch.core.KinoPlay;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import java.util.Map; import java.util.Map;
public class KinoPlaySerializer implements JsonSerializer<KinoPlay> { public class KinoPlaySerializer implements JsonSerializer<KinoPlay> {
@@ -68,7 +69,7 @@ public class KinoPlaySerializer implements JsonSerializer<KinoPlay> {
*/ */
JsonArray jsonSeasons = new JsonArray(); JsonArray jsonSeasons = new JsonArray();
for (Map.Entry<String, ArrayList<KinoItem>> entry : kinoPlay.getSeasons().entrySet()) { for (Map.Entry<String, List<KinoItem>> entry : kinoPlay.getSeasons().entrySet()) {
JsonObject jsonSeason = new JsonObject(); JsonObject jsonSeason = new JsonObject();
jsonSeason.addProperty("title", entry.getKey()); jsonSeason.addProperty("title", entry.getKey());