mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-09-02 18:33:13 +02:00
Code Issues Releases Wiki Activity

update versions, make it work with java-20

Browse Source
This commit is contained in:
soloturn
2023-06-11 02:30:11 +02:00
parent 830e22e155
commit b109a34de9
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
build.gradle.kts
View File

@@ -17,19 +17,19 @@ repositories {
dependencies { dependencies {
implementation("com.lmax:disruptor:3.4.4") implementation("com.lmax:disruptor:3.4.4")
implementation("org.java-websocket:Java-WebSocket:1.5.2") implementation("org.java-websocket:Java-WebSocket:1.5.3")
implementation("org.jsoup:jsoup:1.14.3") implementation("org.jsoup:jsoup:1.16.1")
implementation("org.json:json:20211205") implementation("org.json:json:20211205")
implementation("com.j2html:j2html:1.5.0") implementation("com.j2html:j2html:1.6.0")
implementation("commons-configuration:commons-configuration:1.10") implementation("commons-configuration:commons-configuration:1.10")
implementation("commons-cli:commons-cli:1.5.0") implementation("commons-cli:commons-cli:1.5.0")
implementation("commons-io:commons-io:2.11.0") implementation("commons-io:commons-io:2.13.0")
implementation("org.apache.httpcomponents:httpclient:4.5.13") implementation("org.apache.httpcomponents:httpclient:4.5.14")
implementation("org.apache.httpcomponents:httpmime:4.5.13") implementation("org.apache.httpcomponents:httpmime:4.5.14")
implementation("org.apache.logging.log4j:log4j-api:2.17.1") implementation("org.apache.logging.log4j:log4j-api:2.20.0")
implementation("org.apache.logging.log4j:log4j-core:2.17.1") implementation("org.apache.logging.log4j:log4j-core:2.20.0")
implementation("org.graalvm.js:js:22.0.0.2") implementation("org.graalvm.js:js:22.3.2")
testImplementation(enforcedPlatform("org.junit:junit-bom:5.8.2")) testImplementation(enforcedPlatform("org.junit:junit-bom:5.9.3"))
testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.junit.jupiter:junit-jupiter")
} }
@@ -37,6 +37,10 @@ group = "com.rarchives.ripme"
version = "1.7.94" version = "1.7.94"
description = "ripme" description = "ripme"
jacoco {
toolVersion = "0.8.10"
}
jgitver { jgitver {
gitCommitIDLength = 8 gitCommitIDLength = 8
nonQualifierBranches = "main,master" nonQualifierBranches = "main,master"

4
src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java
View File

@@ -20,7 +20,7 @@ import org.jsoup.Connection.Response;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element; import org.jsoup.nodes.Element;
import org.jsoup.safety.Whitelist; import org.jsoup.safety.Safelist;
import org.jsoup.select.Elements; import org.jsoup.select.Elements;
import com.rarchives.ripme.ripper.AbstractHTMLRipper; import com.rarchives.ripme.ripper.AbstractHTMLRipper;
@@ -167,7 +167,7 @@ public class FuraffinityRipper extends AbstractHTMLRipper {
ele.select("br").append("\\n"); ele.select("br").append("\\n");
ele.select("p").prepend("\\n\\n"); ele.select("p").prepend("\\n\\n");
LOGGER.debug("Returning description at " + page); LOGGER.debug("Returning description at " + page);
String tempPage = Jsoup.clean(ele.html().replaceAll("\\\\n", System.getProperty("line.separator")), "", Whitelist.none(), new Document.OutputSettings().prettyPrint(false)); String tempPage = Jsoup.clean(ele.html().replaceAll("\\\\n", System.getProperty("line.separator")), "", Safelist.none(), new Document.OutputSettings().prettyPrint(false));
return documentz.select("meta[property=og:title]").attr("content") + "\n" + tempPage; // Overridden saveText takes first line and makes it the file name. return documentz.select("meta[property=og:title]").attr("content") + "\n" + tempPage; // Overridden saveText takes first line and makes it the file name.
} catch (IOException ioe) { } catch (IOException ioe) {
LOGGER.info("Failed to get description " + page + " : '" + ioe.getMessage() + "'"); LOGGER.info("Failed to get description " + page + " : '" + ioe.getMessage() + "'");

6
src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java
View File

@@ -16,7 +16,7 @@ import org.json.JSONObject;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element; import org.jsoup.nodes.Element;
import org.jsoup.safety.Whitelist; import org.jsoup.safety.Safelist;
import org.jsoup.select.Elements; import org.jsoup.select.Elements;
import com.rarchives.ripme.ripper.AlbumRipper; import com.rarchives.ripme.ripper.AlbumRipper;
@@ -256,10 +256,10 @@ public class ImgurRipper extends AlbumRipper {
LOGGER.info(" Retrieving " + strUrl); LOGGER.info(" Retrieving " + strUrl);
Document doc = getAlbumData("https://api.imgur.com/3/album/" + strUrl.split("/a/")[1]); Document doc = getAlbumData("https://api.imgur.com/3/album/" + strUrl.split("/a/")[1]);
// Try to use embedded JSON to retrieve images // Try to use embedded JSON to retrieve images
LOGGER.info(Jsoup.clean(doc.body().toString(), Whitelist.none())); LOGGER.info(Jsoup.clean(doc.body().toString(), Safelist.none()));
try { try {
JSONObject json = new JSONObject(Jsoup.clean(doc.body().toString(), Whitelist.none())); JSONObject json = new JSONObject(Jsoup.clean(doc.body().toString(), Safelist.none()));
JSONArray jsonImages = json.getJSONObject("data").getJSONArray("images"); JSONArray jsonImages = json.getJSONObject("data").getJSONArray("images");
return createImgurAlbumFromJsonArray(url, jsonImages); return createImgurAlbumFromJsonArray(url, jsonImages);
} catch (JSONException e) { } catch (JSONException e) {