From c2997300b2c117cba71434ddb40489b4d837ff92 Mon Sep 17 00:00:00 2001 From: NekoInverter <42698724+NekoInverter@users.noreply.github.com> Date: Tue, 26 May 2020 20:19:34 +0800 Subject: [PATCH] Fix torrent parser --- app/build.gradle | 4 ++-- .../com/hippo/ehviewer/client/parser/GalleryDetailParser.java | 2 +- build.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ede3d3ed1..6087b1d64 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -75,12 +75,12 @@ tasks.withType(JavaCompile) { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'androidx.appcompat:appcompat:1.2.0-alpha03' + implementation 'androidx.appcompat:appcompat:1.2.0-rc01' implementation 'androidx.biometric:biometric:1.0.1' implementation "androidx.browser:browser:1.2.0" implementation 'androidx.cardview:cardview:1.0.0' implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0' - implementation 'com.google.android.material:material:1.2.0-alpha05' + implementation 'com.google.android.material:material:1.2.0-alpha06' implementation 'com.getkeepsafe.relinker:relinker:1.4.1' implementation 'com.github.amlcurran.showcaseview:library:5.4.3' implementation 'com.github.seven332.a7zip:extract-lite:1b21783' diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java index 32b0f310b..0766e17c0 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java +++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java @@ -62,7 +62,7 @@ public class GalleryDetailParser { private static final Pattern PATTERN_ERROR = Pattern.compile("
\n

([^<]+)

"); private static final Pattern PATTERN_DETAIL = Pattern.compile("var gid = (\\d+);.+?var token = \"([a-f0-9]+)\";.+?var apiuid = ([\\-\\d]+);.+?var apikey = \"([a-f0-9]+)\";", Pattern.DOTALL); - private static final Pattern PATTERN_TORRENT = Pattern.compile("]*onclick=\"return popUp\\('([^']+)'[^)]+\\)\">Torrent Download \\( (\\d+) \\)"); + private static final Pattern PATTERN_TORRENT = Pattern.compile("]*onclick=\"return popUp\\('([^']+)'[^)]+\\)\">Torrent Download \\((\\d+)\\)"); private static final Pattern PATTERN_ARCHIVE = Pattern.compile("]*onclick=\"return popUp\\('([^']+)'[^)]+\\)\">Archive Download"); private static final Pattern PATTERN_COVER = Pattern.compile("width:(\\d+)px; height:(\\d+)px.+?url\\((.+?)\\)"); private static final Pattern PATTERN_TAG_GROUP = Pattern.compile("]+>([\\w\\s]+):(?:]+>]+>[\\w\\s]+
)+"); diff --git a/build.gradle b/build.gradle index 3e59f4746..2bbf48270 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0-beta05' + classpath 'com.android.tools.build:gradle:4.0.0-rc01' classpath 'com.google.android.gms:oss-licenses-plugin:0.10.2' // NOTE: Do not place your application dependencies here; they belong