From 99286d8129ac961b8ae628b65121cd0dc06507e1 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Fri, 15 Dec 2017 14:17:38 +0300 Subject: [PATCH] =?UTF-8?q?fix:Onlinelife:=20=D0=BC=D0=BD=D0=BE=D0=B6?= =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=B2=D0=BE=20=D0=BE=D0=B7=D0=B2=D1=83=D1=87?= =?UTF-8?q?=D0=B5=D0=BA=20=D1=83=20=D1=81=D0=B5=D1=80=D0=B8=D0=B0=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kinosearch/core/warez/Onlinelife.java | 47 ++++++++++++++----- .../kinosearch/core/warez/TestOnlinelife.java | 1 + 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/src/main/java/kinosearch/core/warez/Onlinelife.java b/src/main/java/kinosearch/core/warez/Onlinelife.java index 4340e60..c8dd579 100644 --- a/src/main/java/kinosearch/core/warez/Onlinelife.java +++ b/src/main/java/kinosearch/core/warez/Onlinelife.java @@ -118,20 +118,45 @@ public class Onlinelife implements KinoWarez { Map> seasons = new LinkedHashMap<>(); for (JsonElement element : jsonArray) { jsonObj = element.getAsJsonObject(); - String titleSeason = jsonObj.get("comment").getAsString(); - ArrayList serials = new ArrayList<>(); JsonArray jsonSerials = jsonObj.get("playlist").getAsJsonArray(); - for (JsonElement elm1 : jsonSerials) { - jsonObj = elm1.getAsJsonObject(); - serials.add(new KinoItem( - jsonObj.get("comment").getAsString(), - jsonObj.get("file").getAsString().replace("http://", "/proxy/onlinelife/") - )); - } + if (jsonSerials.size() > 0) { + if (jsonSerials.get(0).getAsJsonObject().has("file")) { + String titleSeason = jsonObj.get("comment").getAsString(); + ArrayList serials = new ArrayList<>(); - serials.sort(Comparator.comparing(KinoItem::getTitle)); - seasons.put(titleSeason, serials); + for (JsonElement elm1 : jsonSerials) { + jsonObj = elm1.getAsJsonObject(); + serials.add(new KinoItem( + jsonObj.get("comment").getAsString(), + jsonObj.get("file").getAsString().replace("http://", "/proxy/onlinelife/") + )); + } + + serials.sort(Comparator.comparing(KinoItem::getTitle)); + seasons.put(titleSeason, serials); + } else { + // мультиозвучка + for (JsonElement elm1 : jsonSerials) { + jsonObj = elm1.getAsJsonObject(); + JsonArray jsonSerials2 = jsonObj.get("playlist").getAsJsonArray(); + + String titleSeason = jsonObj.get("comment").getAsString(); + ArrayList serials = new ArrayList<>(); + + for (JsonElement elm2 : jsonSerials2) { + jsonObj = elm2.getAsJsonObject(); + serials.add(new KinoItem( + jsonObj.get("comment").getAsString(), + jsonObj.get("file").getAsString().replace("http://", "/proxy/onlinelife/") + )); + } + + serials.sort(Comparator.comparing(KinoItem::getTitle)); + seasons.put(titleSeason, serials); + } + } + } } kinoPlay.setSeasons(seasons); diff --git a/src/test/java/kinosearch/core/warez/TestOnlinelife.java b/src/test/java/kinosearch/core/warez/TestOnlinelife.java index 49d8b19..3a696e3 100644 --- a/src/test/java/kinosearch/core/warez/TestOnlinelife.java +++ b/src/test/java/kinosearch/core/warez/TestOnlinelife.java @@ -48,5 +48,6 @@ public class TestOnlinelife extends KinoWarezTestCase { @Override public void testFoundSeasonSerial() { seasonsSerial("/915-doktor-kto.html", kinoWarez); + seasonsSerial("/11127-moya-geroyskaya-akademiya-2016.html", kinoWarez); } }