From 329fb4a2899572098ac27baf60d757d25da118b8 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Wed, 13 Dec 2017 21:55:56 +0300 Subject: [PATCH 1/2] =?UTF-8?q?issue=20#30:=20=D0=98=D1=81=D0=BA=D0=BB?= =?UTF-8?q?=D1=8E=D1=87=D0=B8=D1=82=D1=8C=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D1=82=20SimpleBrowser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/browser/SimpleBrowser.java | 99 ------------------- 1 file changed, 99 deletions(-) delete mode 100644 src/main/java/kinosearch/core/browser/SimpleBrowser.java diff --git a/src/main/java/kinosearch/core/browser/SimpleBrowser.java b/src/main/java/kinosearch/core/browser/SimpleBrowser.java deleted file mode 100644 index 0d8077f..0000000 --- a/src/main/java/kinosearch/core/browser/SimpleBrowser.java +++ /dev/null @@ -1,99 +0,0 @@ -package kinosearch.core.browser; - -import java.io.*; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -public class SimpleBrowser implements Browser { - private Map headers = new HashMap<>(); - private String encoding = "UTF-8"; - - @Override - public Browser setHeader(String name, String value) { - headers.put(name, value); - return this; - } - - @Override - public String get(String url) { - String result = ""; - try { - HttpURLConnection connection = create_connection(url); - connection.setRequestMethod("GET"); - - if (connection.getResponseCode() != 200) { - return result; - } - - result = readOutput(connection.getInputStream()); - connection.disconnect(); - } catch (IOException ignore) { - // ignore - } - - return result; - } - - @Override - public String post(String url, String data) { - String result = ""; - try { - HttpURLConnection connection = create_connection(url); - connection.setRequestMethod("POST"); - connection.setRequestProperty("Content-Length", String.valueOf(data.length())); - - connection.setDoOutput(true); - DataOutputStream dos = new DataOutputStream(connection.getOutputStream()); - dos.writeBytes(data); - dos.flush(); - dos.close(); - - if (connection.getResponseCode() != 200) { - return ""; - } - - result = readOutput(connection.getInputStream()); - connection.disconnect(); - } catch (IOException ignore) { - // ignore - } - - return result; - } - - @Override - public void setEncoding(String encoding) { - this.encoding = encoding; - } - - private HttpURLConnection create_connection(String strUrl) throws IOException { - URL url = new URL(strUrl); - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - - connection.setUseCaches(false); //TODO а надо ли? - - connection.setRequestProperty("Connection", "close"); - connection.setRequestProperty("Accept-Encoding", "deflate"); - connection.setRequestProperty("User-Agent", "Mozilla/5.0 (Linux; Android 4.2.2; GT-I9505 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Mobile Safari/537.36"); - - for (Map.Entry entry : headers.entrySet()) { - connection.setRequestProperty(entry.getKey(), entry.getValue()); - } - - return connection; - } - - private String readOutput(InputStream in) throws IOException { - StringBuilder sb = new StringBuilder(); - String str; - BufferedReader br = new BufferedReader(new InputStreamReader(in, encoding)); - while ((str = br.readLine()) != null) { - sb.append(str).append('\n'); - } - br.close(); - - return sb.toString(); - } -} From 99286d8129ac961b8ae628b65121cd0dc06507e1 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Fri, 15 Dec 2017 14:17:38 +0300 Subject: [PATCH 2/2] =?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); } }