v2.4.1

Change default download folder to Home folder (installer), App folder (portable)

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [2.4.1] - 2019-11-26
+### Changed
+- Increase attempts for establishing ws connection between front and back end
+- Change default download folder to Home folder (installer), App folder (portable)
+
+## [2.4.0] - 2019-11-23
+### Changed
+- Pimpandhost Host support
+
+## [2.3.2] - 2019-11-23
+### Changed
+- Fix a bug with the scan component
+
 ## [2.3.1] - 2019-11-22
 ### Changed
 - Fix connexion reset issue

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>tn.mnlr</groupId>
     <artifactId>vripper</artifactId>
-    <version>2.3.1</version>
+    <version>2.4.1</version>
     <packaging>pom</packaging>
     <parent>
         <groupId>org.springframework.boot</groupId>

vripper-electron/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "vripper-electron",
-  "version": "2.3.1",
+  "version": "2.4.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

vripper-electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vripper-electron",
-  "version": "2.3.1",
+  "version": "2.4.1",
   "description": "A ripper for vipergirls.to built using web technolgies",
   "main": "main.js",
   "author": "death-claw <53543762+death-claw@users.noreply.github.com>",

vripper-electron/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>tn.mnlr</groupId>
     <artifactId>vripper</artifactId>
-    <version>2.3.1</version>
+    <version>2.4.1</version>
   </parent>
   <artifactId>vripper-electron</artifactId>
   <name>vripper-electron</name>

vripper-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>tn.mnlr</groupId>
         <artifactId>vripper</artifactId>
-        <version>2.3.1</version>
+        <version>2.4.1</version>
     </parent>
     <artifactId>vripper-server</artifactId>
     <name>vripper-server</name>

vripper-server/src/main/java/tn/mnlr/vripper/host/Host.java

@@ -27,6 +27,8 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.util.Iterator;
 
@@ -196,6 +198,20 @@ abstract public class Host {
         }
     }
 
+    protected String appendUri(String uri, String appendQuery) throws URISyntaxException {
+        URI oldUri = new URI(uri);
+
+        String newQuery = oldUri.getQuery();
+        if (newQuery == null) {
+            newQuery = appendQuery;
+        } else {
+            newQuery += "&" + appendQuery;
+        }
+
+        return new URI(oldUri.getScheme(), oldUri.getAuthority(),
+                oldUri.getPath(), newQuery, oldUri.getFragment()).toString();
+    }
+
     private void setImageRequest(final ImageFileData imageFileData) {
         HttpGet httpGet = cm.buildHttpGet(imageFileData.getImageUrl());
         httpGet.addHeader("Referer", imageFileData.getPageUrl());

vripper-server/src/main/java/tn/mnlr/vripper/host/PimpandhostHost.java

@@ -0,0 +1,68 @@
+package tn.mnlr.vripper.host;
+
+import org.apache.http.client.protocol.HttpClientContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import tn.mnlr.vripper.exception.HostException;
+import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.q.ImageFileData;
+import tn.mnlr.vripper.services.ConnectionManager;
+
+@Service
+public class PimpandhostHost extends Host {
+
+    private static final Logger logger = LoggerFactory.getLogger(PimpandhostHost.class);
+
+    private static final String host = "pimpandhost.com";
+    private static final String IMG_XPATH = "//img[contains(@class, 'original')]";
+
+    @Autowired
+    private ConnectionManager cm;
+
+    @Override
+    public String getHost() {
+        return host;
+    }
+
+    @Override
+    public String getLookup() {
+        return host;
+    }
+
+    @Override
+    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+
+        String url;
+        try {
+            url = appendUri(_url.replace("http://", "https://"), "size=original");
+        } catch (Exception e) {
+            throw new HostException(e);
+        }
+
+        Response resp = getResponse(url, context);
+        Document doc = resp.getDocument();
+
+        Node imgNode;
+        try {
+            logger.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+            imgNode = xpathService.getAsNode(doc, IMG_XPATH);
+        } catch (XpathException e) {
+            throw new HostException(e);
+        }
+
+        try {
+            logger.debug(String.format("Resolving name and image url for %s", url));
+            String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
+            String imgUrl = "https:" + imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
+
+            imageFileData.setImageUrl(imgUrl);
+            imageFileData.setImageName(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle);
+        } catch (Exception e) {
+            throw new HostException("Unexpected error occurred", e);
+        }
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/services/AppSettingsService.java

@@ -7,6 +7,7 @@ import lombok.Setter;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import tn.mnlr.vripper.exception.ValidationException;
 
@@ -23,6 +24,9 @@ import java.util.prefs.Preferences;
 @Setter
 public class AppSettingsService {
 
+    @Value("${base.dir}")
+    private String defaultDownloadPath;
+
     private static final Logger logger = LoggerFactory.getLogger(AppSettingsService.class);
 
     private Preferences prefs = Preferences.userNodeForPackage(AppSettingsService.class);
@@ -65,7 +69,7 @@ public class AppSettingsService {
 
     public void restore() {
 
-        downloadPath = prefs.get(DOWNLOAD_PATH, System.getProperty("user.dir"));
+        downloadPath = prefs.get(DOWNLOAD_PATH, defaultDownloadPath);
         maxThreads = prefs.getInt(MAX_THREADS, 4);
         autoStart = prefs.getBoolean(AUTO_START, true);
         vLogin = prefs.getBoolean(V_LOGIN, false);

vripper-server/src/main/java/tn/mnlr/vripper/web/restendpoints/PostRestEndpoint.java

@@ -62,7 +62,7 @@ public class PostRestEndpoint {
         if (url.getUrl() == null || url.getUrl().isEmpty()) {
             return new ResponseEntity<>("Failed to process empty request", HttpStatus.BAD_REQUEST);
         } else if (!url.getUrl().startsWith("https://vipergirls.to")) {
-            return new ResponseEntity<>("ViperGirls only links are supported", HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>("ViperGirls links only are supported", HttpStatus.BAD_REQUEST);
         }
 
         String threadId, postId;

vripper-ui/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "vripper-ui",
-  "version": "2.3.1",
+  "version": "2.4.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

vripper-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vripper-ui",
-  "version": "2.3.1",
+  "version": "2.4.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

vripper-ui/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>tn.mnlr</groupId>
     <artifactId>vripper</artifactId>
-    <version>2.3.1</version>
+    <version>2.4.1</version>
   </parent>
   <artifactId>vripper-ui</artifactId>
   <name>vripper-ui</name>

vripper-ui/src/app/multi-post/multi-post.component.ts

@@ -113,18 +113,27 @@ export class MultiPostComponent implements OnInit, OnDestroy, AfterViewInit {
   connect() {
     this.websocketHandlerPromise.then((handler: WsHandler) => {
       console.log('Connecting to thread parsing');
+      let count = 0;
+      let data_0;
       this.subscription = handler.subscribeForThreadParsing(
         (states: Array<VRThreadParseState>, data: Array<VRPostParse>) => {
-          if (data[0].threadId === this.threadId) {
+          if (data.length > 0 && data[0].threadId === this.threadId) {
             this.gridOptions.api.updateRowData({ add: data });
+            count += data.length;
+            data_0 = data[0];
           }
 
           if (states.length > 0 && states[states.length - 1].state === 'END' && states[0].threadId === this.threadId) {
             this.ngZone.run(() => {
               this.loading.emit(false);
-              if (this.gridOptions.api.getDisplayedRowCount() === 1) {
+              if (count === 0) {
+                this._snackBar.open('No posts were found', null, {
+                  duration: 5000
+                });
+                this.done.emit(true);
+              } else if (count === 1) {
                 this.addPosts(
-                  [this.gridOptions.api.getDisplayedRowAtIndex(0).data].map(e => ({
+                  [data_0].map(e => ({
                     threadId: e.threadId,
                     postId: e.postId
                   }))

vripper-ui/src/app/scan/scan.component.ts

@@ -40,8 +40,6 @@ export class ScanComponent implements OnInit, AfterViewInit {
 
   submit(form: NgForm) {
     this.ngZone.run(() => {
-      this.hideScan.emit(true);
-      this.threadId.emit(null);
       this.processUrl(this.input, form);
     });
   }
@@ -55,6 +53,8 @@ export class ScanComponent implements OnInit, AfterViewInit {
   }
 
   processUrl(url: string, form?: NgForm) {
+    this.hideScan.emit(true);
+    this.threadId.emit(null);
     this.httpClient
       .post<{ threadId: string; postId: string }>(this.serverService.baseUrl + '/post', { url: url })
       .pipe(
@@ -89,6 +89,12 @@ export class ScanComponent implements OnInit, AfterViewInit {
           }
           this.threadId.emit(response.threadId);
         });
+      },
+      error => {
+        this.hideScan.emit(false);
+        this._snackBar.open(error.error, null, {
+          duration: 5000
+        });
       });
   }
 

vripper-ui/src/app/ws-connection.service.ts

@@ -15,7 +15,7 @@ export enum WSState {
   OPEN
 }
 
-const maxAttemps = 5;
+const maxAttemps = 15;
 
 @Injectable()
 export class WsConnectionService {