v3.0.3

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [3.0.3] - 2020-08-16
+### Changed
+- Fix bugs with electron app
+
 ## [3.0.2] - 2020-08-15
 ### Changed
 - Fix bugs with download queue

pom.xml

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

vripper-electron/main.js

@@ -1,13 +1,16 @@
 require('v8-compile-cache');
-const { app, BrowserWindow } = require("electron");
+const {app, BrowserWindow} = require("electron");
 const path = require("path");
 const url = require("url");
 const getPort = require("get-port");
-const { spawn } = require("child_process");
-const { ipcMain } = require("electron");
-const { dialog } = require("electron");
+const {spawn} = require("child_process");
+const {ipcMain} = require("electron");
+const {dialog} = require("electron");
 const axios = require('axios');
-const appDir = process.env.APPDIR;
+
+// non null value when it is an AppImage
+const appImageDir = process.env.APPDIR;
+const appImagePath = process.env.APPIMAGE;
 
 let win;
 let vripperServer;
@@ -23,14 +26,14 @@ process.on("uncaughtException", err => {
     process.exit(1);
 });
 
-function createWindow() {
+createWindow = () => {
 
     if (process.platform === 'win32') {
         app.setAppUserModelId("tn.mnlr.vripper");
     }
 
     let icon;
-    if(process.platform === "win32") {
+    if (process.platform === "win32") {
         icon = __dirname + '/icon.ico';
     } else {
         icon = __dirname + '/icon.png';
@@ -66,6 +69,33 @@ function createWindow() {
     });
 }
 
+shutdownServer = () => {
+    axios.post('http://localhost:' + serverPort + '/actuator/shutdown', {}, {
+        headers: {'content-type': 'application/json'},
+    }).then((response) => {
+        terminationInteval = setInterval(() => {
+            terminationAttemps++;
+            if (terminated) {
+                console.log('viper server terminated');
+                clearInterval(terminationInteval);
+                app.quit();
+            } else if (terminationAttemps > maxTerminationAttemps) {
+                console.log('viper server is not terminated');
+                console.log('Proceed to kill');
+                vripperServer.kill('SIGKILL');
+                clearInterval(terminationInteval);
+                app.quit();
+            }
+        }, 1000);
+    }).catch((error) => {
+        // Terminate immediately
+        console.log(error);
+        vripperServer.kill('SIGKILL');
+        terminated = true;
+        app.quit();
+    });
+}
+
 const gotTheLock = app.requestSingleInstanceLock();
 
 if (!gotTheLock) {
@@ -76,29 +106,30 @@ if (!gotTheLock) {
         ipcMain.on("get-port", event => {
             event.reply("port", port);
         });
-        let javaBinPath;
-        if(appDir !== undefined) {
-            javaBinPath = path.join(appDir, "java-runtime/bin/java");
+
+        const appPath = path.join(app.getAppPath(), '../../');
+        let javaBinPath, jarPath, baseDir;
+        if (appImageDir !== undefined && process.platform === 'linux') {
+            javaBinPath = path.join(appImageDir, "java-runtime/bin/java");
+            jarPath = path.join(appImageDir, "bin/vripper-server.jar");
+            baseDir = path.join(appImagePath, '..');
+        } else if (process.platform === 'darwin') {
+            javaBinPath = path.join(appPath, "java-runtime/bin/java");
+            jarPath = path.join(appPath, "bin/vripper-server.jar");
+            baseDir = path.join(appPath, '../..');
+        } else if (process.platform === 'win32') {
+            javaBinPath = path.join(appPath, "java-runtime/bin/java");
+            jarPath = path.join(appPath, "bin/vripper-server.jar");
+            baseDir = appPath;
         } else {
-            if(process.platform === 'darwin') {
-                javaBinPath = path.join(app.getPath('exe'), "../../java-runtime/bin/java");
-            } else {
-                javaBinPath = path.join(app.getPath('exe'), "../java-runtime/bin/java");
-            }
-        }
-        let jarPath;
-        if(appDir !== undefined) {
-            jarPath = path.join(appDir, "bin/vripper-server.jar");
-        } else {
-            if(process.platform === 'darwin') {
-                jarPath = path.join(app.getPath('exe'), "../../bin/vripper-server.jar");
-            } else {
-                jarPath = path.join(app.getPath('exe'), "../bin/vripper-server.jar");
-            }
+            console.error(`Unknown platform ${process.platform}`);
+            app.quit();
         }
+
         vripperServer = spawn(javaBinPath, [
             "-Xms256m",
             "-Dvripper.server.port=" + port,
+            "-Dbase.dir=" + baseDir,
             "-jar",
             jarPath
         ], {
@@ -122,31 +153,13 @@ if (!gotTheLock) {
 
     app.on("window-all-closed", () => {
         if (process.platform !== "darwin") {
-            axios.post('http://localhost:' + serverPort + '/actuator/shutdown', {}, {
-                headers: { 'content-type': 'application/json' },
-            }).then((response) => {
-                terminationInteval=  setInterval(() => {
-                    terminationAttemps++;
-                    if(terminated) {
-                        console.log('viper server terminated');
-                        clearInterval(terminationInteval);
-                        app.quit();
-                    } else if(terminationAttemps > maxTerminationAttemps) {
-                        console.log('viper server is not terminated');
-                        console.log('Proceed to kill');
-                        vripperServer.kill('SIGKILL');
-                        clearInterval(terminationInteval);
-                        app.quit();
-                    }
-                }, 1000);
-            })
-                .catch((error) => {
-                    // Terminate immediately
-                    console.log(error);
-                    vripperServer.kill('SIGKILL');
-                    terminated = true;
-                    app.quit();
-                });
+            shutdownServer();
+        }
+    });
+
+    app.on("will-quit", () => {
+        if (process.platform === "darwin") {
+            shutdownServer();
         }
     });
 

vripper-electron/package-lock.json

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

vripper-electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vripper-electron",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "A ripper for vipergirls.to built using web technolgies",
   "main": "main.js",
   "author": "death-claw <53543762+death-claw@users.noreply.github.com>",
@@ -40,14 +40,9 @@
     "win": {
       "icon": "icon.ico",
       "target": [
-        "nsis"
+        "dir"
       ]
     },
-    "nsis": {
-      "createDesktopShortcut": "always",
-      "oneClick": false,
-      "perMachine": false
-    },
     "linux": {
       "synopsis": "vipergirls.to ripper",
       "category": "Utility",
@@ -60,7 +55,7 @@
     "mac": {
       "category": "public.app-category.utilities",
       "target": [
-        "dmg"
+        "dir"
       ],
       "icon": "icon.icns"
     }

vripper-electron/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>tn.mnlr</groupId>
     <artifactId>vripper</artifactId>
-    <version>3.0.2</version>
+    <version>3.0.3</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>3.0.2</version>
+        <version>3.0.3</version>
     </parent>
     <artifactId>vripper-server</artifactId>
     <name>vripper-server</name>

vripper-server/src/main/java/tn/mnlr/vripper/jpa/Management.java

@@ -27,9 +27,9 @@ public class Management {
     private final String backupFolder;
 
     @Autowired
-    public Management(JdbcTemplate jdbcTemplate, @Value("${base.dir}") String baseDir) {
+    public Management(JdbcTemplate jdbcTemplate, @Value("${base.dir}") String baseDir, @Value("${base.dir.name}") String baseDirName) {
         this.jdbcTemplate = jdbcTemplate;
-        this.backupFolder = baseDir + File.separator + ".vripper" + File.separator + "backup";
+        this.backupFolder = baseDir + File.separator + baseDirName + File.separator + "backup";
     }
 
     @PostConstruct

vripper-server/src/main/java/tn/mnlr/vripper/q/ExecuteRunnable.java

@@ -38,10 +38,10 @@ public class ExecuteRunnable implements Runnable {
                     dataService.updateImageStatus(downloadJob.getImage().getStatus(), downloadJob.getImage().getId());
                 })
                 .onComplete(e -> {
-                    mutex.unlock();
                     dataService.afterJobFinish(downloadJob.getImage(), downloadJob.getPost());
                     executionService.afterJobFinish(downloadJob);
                     log.debug(String.format("Finished downloading %s", downloadJob.getImage().getUrl()));
+                    mutex.unlock();
                 }).run(downloadJob);
     }
 }

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

@@ -38,9 +38,9 @@ public class AppSettingsService {
 
     private Settings settings = new Settings();
 
-    public AppSettingsService(@Value("${base.dir}") String baseDir) {
+    public AppSettingsService(@Value("${base.dir}") String baseDir, @Value("${base.dir.name}") String baseDirName) {
         this.baseDir = baseDir;
-        this.configPath = Paths.get(baseDir, ".vripper", "config.json");
+        this.configPath = Paths.get(baseDir, baseDirName, "config.json");
         om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     }
 
@@ -80,7 +80,7 @@ public class AppSettingsService {
         }
 
         if (settings.getDownloadPath() == null) {
-            settings.setDownloadPath(baseDir);
+            settings.setDownloadPath(System.getProperty("user.home"));
         }
 
         if (settings.getMaxThreads() == null) {
@@ -139,11 +139,6 @@ public class AppSettingsService {
             settings.setViewPhotos(false);
         }
 
-        if (settings.getNotification() == null) {
-            settings.setNotification(false);
-        }
-
-
         save();
     }
 
@@ -237,8 +232,6 @@ public class AppSettingsService {
         private Boolean clearCompleted;
         @JsonProperty("viewPhotos")
         private Boolean viewPhotos;
-        @JsonProperty("notification")
-        private Boolean notification;
         @JsonProperty("darkTheme")
         private Boolean darkTheme;
 

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

@@ -13,6 +13,7 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
@@ -79,7 +80,7 @@ public class PathService {
                 post.setPostFolderName(newDestFolder.getName());
                 dataService.updatePostFolderName(post.getPostFolderName(), post.getId());
 
-                List<File> files = Optional.ofNullable(currentDesFolder.listFiles()).stream().flatMap(Arrays::stream).filter(e -> !e.getName().endsWith(".tmp")).collect(Collectors.toList());
+                List<File> files = Arrays.stream(Objects.requireNonNull(currentDesFolder.listFiles())).filter(e -> !e.getName().endsWith(".tmp")).collect(Collectors.toList());
                 for (File f : files) {
                     try {
                         Files.move(f.toPath(), Paths.get(newDestFolder.toString(), f.toPath().getFileName().toString()), StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
@@ -89,6 +90,12 @@ public class PathService {
                     }
                 }
 
+                for (File file : Objects.requireNonNull(currentDesFolder.listFiles())) {
+                    if (!file.delete()) {
+                        log.warn(String.format("Failed to remove %s", file.toString()));
+                    }
+                }
+
                 if (!currentDesFolder.delete()) {
                     log.warn(String.format("Failed to remove %s", currentDesFolder.toString()));
                 }

vripper-server/src/main/resources/application-installer.properties

@@ -1 +0,0 @@
-base.dir=${user.home}

vripper-server/src/main/resources/application-portable.properties

@@ -1 +0,0 @@
-base.dir=${user.dir}

vripper-server/src/main/resources/application.properties

@@ -2,15 +2,15 @@ logging.level.org.springframework.web=INFO
 logging.level.root=INFO
 logging.level.org.apache.http=INFO
 logging.level.org.springframework.web.socket.config.WebSocketMessageBrokerStats=ERROR
-logging.file.name=${base.dir}/.vripper/vripper.log
+logging.file.name=${base.dir}/${base.dir.name}/vripper.log
 server.port=${vripper.server.port:8080}
 management.endpoints.web.exposure.include=shutdown
 management.endpoint.shutdown.enabled=true
 server.error.include-message=always
 spring.liquibase.change-log=classpath:db/changelog/db.changelog-master.xml
-spring.datasource.url=jdbc:hsqldb:file:${base.dir}/.vripper/db/xparty
+spring.datasource.url=jdbc:hsqldb:file:${base.dir}/${base.dir.name}/db/xparty;hsqldb.lock_file=false
 spring.datasource.username=SA
 spring.datasource.password=lEtmEIn
 spring.datasource.driver-class-name=org.hsqldb.jdbc.JDBCDriver
-spring.profiles.active=portable
-#spring.profiles.active=installer
+base.dir=${user.dir}
+base.dir.name=${vripper.base.dir.name:vripper}

vripper-ui/package-lock.json

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

vripper-ui/package.json

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

vripper-ui/pom.xml

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

vripper-ui/src/app/clipboard.service.ts

@@ -38,7 +38,7 @@ export class ClipboardService {
 
   _init(settings: Settings) {
     if (!this.electronService.isElectronApp) {
-      console.log('Clipboard deactive, not an electron app');
+      console.log('Clipboard deactivated, not an electron app');
       return;
     }
     if (this.interval != null) {

vripper-ui/src/app/domain/settings.model.ts

@@ -9,6 +9,5 @@ export interface Settings {
   vThanks: boolean;
   desktopClipboard: boolean;
   viewPhotos: boolean;
-  notification: boolean;
   resolveTitle: boolean;
 }

vripper-ui/src/app/grab-queue/grab-queue.component.ts

@@ -1,10 +1,9 @@
-import {LinkCollectorService} from './../link-collector.service';
+import {LinkCollectorService} from '../link-collector.service';
 import {UrlGrabRendererComponent} from './renderer/url-renderer.component';
 import {GrabQueueDataSource} from './grab-queue.datasource';
 import {ChangeDetectionStrategy, Component, NgZone, OnInit} from '@angular/core';
 import {GridOptions} from 'ag-grid-community';
 import {WsConnectionService} from '../ws-connection.service';
-import {NotificationService} from '../notification.service';
 
 @Component({
   selector: 'app-grab-queue',
@@ -16,8 +15,7 @@ export class GrabQueueComponent implements OnInit {
   constructor(
     private wsConnection: WsConnectionService,
     private zone: NgZone,
-    private linkCollectorService: LinkCollectorService,
-    private notificationService: NotificationService) {
+    private linkCollectorService: LinkCollectorService) {
     this.gridOptions = <GridOptions>{
       columnDefs: [
         {
@@ -40,7 +38,7 @@ export class GrabQueueComponent implements OnInit {
       getRowNodeId: data => data['threadId'],
       onGridReady: () => {
         this.gridOptions.api.sizeColumnsToFit();
-        this.dataSource = new GrabQueueDataSource(this.wsConnection, this.gridOptions, this.zone, this.notificationService);
+        this.dataSource = new GrabQueueDataSource(this.wsConnection, this.gridOptions, this.zone);
         this.dataSource.connect();
       },
       onGridSizeChanged: () => this.gridOptions.api.sizeColumnsToFit(),

vripper-ui/src/app/grab-queue/grab-queue.datasource.ts

@@ -1,7 +1,6 @@
 import {GrabQueueState} from '../domain/grab-queue.model';
 import {Subscription} from 'rxjs';
 import {WsConnectionService} from '../ws-connection.service';
-import {NotificationService} from '../notification.service';
 import {GridOptions, RowNode} from 'ag-grid-community';
 import {NgZone} from '@angular/core';
 
@@ -9,8 +8,7 @@ export class GrabQueueDataSource {
   constructor(
     private ws: WsConnectionService,
     private gridOptions: GridOptions,
-    private zone: NgZone,
-    private notificationService: NotificationService
+    private zone: NgZone
   ) {
   }
 
@@ -30,13 +28,6 @@ export class GrabQueueDataSource {
           }
         });
         this.gridOptions.api.applyTransaction({update: toUpdate, add: toAdd});
-        const count = this.gridOptions.api.getDisplayedRowCount();
-        if (count > 0 && toAdd.length > 0) {
-          this.notificationService.notifyFromGrabQueue(
-            'Link Collector',
-            `You have ${count} ${count > 1 ? 'threads' : 'thread'} waiting in the link collector`
-          );
-        }
       });
     }));
 

vripper-ui/src/app/notification.service.ts

@@ -1,26 +0,0 @@
-import { Injectable } from '@angular/core';
-import { AppService } from './app.service';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class NotificationService {
-  constructor(private appService: AppService) {}
-
-  notifyFromGrabQueue(title: string, body: string) {
-    if (!this.appService.settings.notification) {
-      return;
-    }
-    if (!('Notification' in window)) {
-      return;
-    } else if (Notification.permission === 'granted') {
-      const notification = new Notification(title, { body: body, icon: 'assets/icon.png' });
-    } else if (Notification.permission !== 'denied') {
-      Notification.requestPermission().then(function(permission) {
-        if (permission === 'granted') {
-          const notification = new Notification(title, { body: body, icon: 'assets/icon.png' });
-        }
-      });
-    }
-  }
-}

vripper-ui/src/app/settings/settings.component.html

@@ -110,11 +110,6 @@
             >Monitor Clipboard
             </mat-checkbox
             >
-
-            <mat-checkbox color="primary" formControlName="notification" name="notification"
-            >Enable system notifications
-            </mat-checkbox
-            >
           </form>
         </mat-tab>
       </mat-tab-group>

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

@@ -46,8 +46,7 @@ export class SettingsComponent implements OnInit {
   });
 
   desktopSettingsForm = new FormGroup({
-    desktopClipboard: new FormControl(false),
-    notification: new FormControl(false)
+    desktopClipboard: new FormControl(false)
   });
 
   darkTheme = false;

vripper-ui/src/environments/environment.prod.ts

@@ -2,5 +2,5 @@ export const environment = {
   production: true,
   localhost: `${window.location.protocol}//${window.location.host}`,
   ws: `${window.location.protocol === 'http:' ? 'ws:' : 'wss:'}//${window.location.host}`,
-  version: '3.0.2'
+  version: '3.0.3'
 };

vripper-ui/src/environments/environment.ts

@@ -6,7 +6,7 @@ export const environment = {
   production: false,
   localhost: 'http://localhost:8080',
   ws: 'ws://localhost:8080',
-  version: '3.0.2'
+  version: '3.0.3'
 };
 
 /*