v3.3.2

Fix a bug with event logs
Change event names and add some icons
2026-08-19 08:35:41 +02:00 · 2021-03-11 19:05:09 +01:00 · 2021-03-11 19:02:01 +01:00 · 2021-02-18 16:04:34 +01:00 · 2021-02-18 16:01:06 +01:00 · 2021-02-16 19:15:58 +01:00
269 changed files with 8867 additions and 6617 deletions
@@ -1,5 +1,100 @@
 # Changelog

+## [3.3.1] - 2021-02-18
+
+### Added
+
+- Add about menu
+
+### Changed
+
+- Fix README.md
+
+## [3.3.0] - 2021-02-16
+
+### Changed
+
+- Add support for proxies
+- Add a Event Logs
+- Fix bugs with the database
+
+## [3.2.3] - 2021-01-13
+
+### Changed
+
+- Finished posts are not cleared from the UI
+
+## [3.2.2] - 2021-01-13
+
+### Changed
+
+- Set total download to max value
+
+## [3.2.1] - 2021-01-12
+### Added
+- Add settings for connection timeout
+- Add settings for maximum attempts
+### Changed
+- Enhance posts rename logic
+- Dependencies update
+- Switch reactive from rx-java to reactor
+
+## [3.2.0] - 2020-11-16
+### Changed
+- Fix build issue
+
+## [3.1.0] - 2020-11-16
+### Changed
+- UI revamp
+- Fix bugs
+
+## [3.0.11] - 2020-10-31
+### Added
+- Support for vipr.im
+
+## [3.0.10] - 2020-10-04
+### Changed
+- Fix bug on settings update
+
+## [3.0.9] - 2020-09-27
+### Changed
+- Revert to appending post id to download folders
+- Fix a bug that lead to adding duplicate posts
+- Remove old unused settings
+ 
+## [3.0.8] - 2020-08-22
+### Changed
+- Bug fix which breaks concurrent downloads
+
+## [3.0.7] - 2020-08-22
+### Changed
+- Fix MacOs build
+
+## [3.0.6] - 2020-08-18
+### Changed
+- Fix TurboImageHost
+
+## [3.0.5] - 2020-08-17
+### Changed
+- Update packages
+- Host class refactoring
+
+## [3.0.4] - 2020-08-16
+### Changed
+- Improve rename UI
+
+## [3.0.3] - 2020-08-16
+### Changed
+- Fix bugs with electron app
+
+## [3.0.2] - 2020-08-15
+### Changed
+- Fix bugs with download queue
+
+## [3.0.1] - 2020-08-03
+### Changed
+- Fix bugs with download queue
+
 ## [3.0.0] - 2020-08-03
 ### Changed
 - Major rewrites
@@ -1,4 +1,4 @@
-# Viper Ripper!
+# VRipper!

 This is my spin for a cross platform gallery ripper app for [vipergirls](https://vipergirls.to) website.
 The purpose of this project is to build a robust and clean application to conveniently download photo galleries using modern web technologies, Java + Spring boot for the back end and angular + electron for the front end.
@@ -15,10 +15,16 @@ Most people will be interested only on the desktop app, however if you have a na
 To build the server app:

    mvn clean install -DskipTests
+
 To build the desktop app:

    mvn clean install -Pelectron -DskipTests

-Maven will automatically handle front end compilation. However, for development, you will need to install a recent version of nodejs on your system.
+Maven will automatically handle front end compilation. However, for development, you will need to install a recent
+version of nodejs on your system.

-[![Donate with PayPal](https://raw.githubusercontent.com/stefan-niedermann/paypal-donate-button/master/paypal-donate-button.png)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=SC7M5LNWZ528Q)
+If you feel generous and want to support me, you can donate some coins, and I would be very grateful 🙏
+
+I accept Bitcoin (BTC) for donations, following is my address
+
+    bc1q9jzzw3st49r9vmxgtylq4vrd67cl7zfclf3lsq
@@ -4,12 +4,12 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>tn.mnlr</groupId>
    <artifactId>vripper</artifactId>
-    <version>3.0.0</version>
+    <version>3.3.2</version>
    <packaging>pom</packaging>
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.0.RELEASE</version>
+        <version>2.4.1</version>
        <relativePath/> <!-- lookup parent from repository -->
    </parent>
    <modules>
@@ -17,4 +17,4 @@
        <module>vripper-ui</module>
        <module>vripper-electron</module>
    </modules>
-</project>
+</project>
@@ -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 = app.getPath('appData');
+        } 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();
        }
    });

@@ -1,6 +1,6 @@
 {
  "name": "vripper-electron",
-  "version": "3.0.0",
+  "version": "3.3.2",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -64,9 +64,9 @@
      "dev": true
    },
    "@types/fs-extra": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.1.tgz",
-      "integrity": "sha512-B42Sxuaz09MhC3DDeW5kubRcQ5by4iuVQ0cRRWM2lggLzAa/KVom0Aft/208NgMvNQQZ86s5rVcqDdn/SH0/mg==",
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.2.tgz",
+      "integrity": "sha512-jp0RI6xfZpi5JL8v7WQwpBEQTq63RqW2kxwTZt+m27LcJqQdPVU1yGnT1ZI4EtCDynQQJtIGyQahkiCGCS7e+A==",
      "dev": true,
      "requires": {
        "@types/node": "*"
@@ -78,9 +78,9 @@
      "integrity": "sha512-V8wj+w2YMNvGuhgl/MA5fmTxgjmVHVoasfIaxMMZJV6Y8Kk+Ydpi1z2whoShDCJ2BuNVoqH/h1hrygnBxkrw/Q=="
    },
    "@types/yargs": {
-      "version": "15.0.5",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-      "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
+      "version": "15.0.9",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.9.tgz",
+      "integrity": "sha512-HmU8SeIRhZCWcnRskCs36Q1Q00KBV6Cqh/ora8WN1+22dY07AZdn6Gel8QZ3t26XYPImtcL8WV/eqjhVmMEw4g==",
      "dev": true,
      "requires": {
        "@types/yargs-parser": "*"
@@ -93,9 +93,9 @@
      "dev": true
    },
    "ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
      "dev": true,
      "requires": {
        "fast-deep-equal": "^3.1.1",
@@ -105,9 +105,9 @@
      }
    },
    "ajv-keywords": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.1.tgz",
-      "integrity": "sha512-KWcq3xN8fDjSB+IMoh2VaXVhRI0BBGxoYp3rx7Pkb6z0cFjYR9Q9l4yZqqals0/zsioCmocC5H6UvsGD4MoIBA==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
      "dev": true
    },
    "ansi-align": {
@@ -148,29 +148,29 @@
      }
    },
    "app-builder-bin": {
-      "version": "3.5.9",
-      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.9.tgz",
-      "integrity": "sha512-NSjtqZ3x2kYiDp3Qezsgukx/AUzKPr3Xgf9by4cYt05ILWGAptepeeu0Uv+7MO+41o6ujhLixTou8979JGg2Kg==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.10.tgz",
+      "integrity": "sha512-Jd+GW68lR0NeetgZDo47PdWBEPdnD+p0jEa7XaxjRC8u6Oo/wgJsfKUkORRgr2NpkD19IFKN50P6JYy04XHFLQ==",
      "dev": true
    },
    "app-builder-lib": {
-      "version": "22.7.0",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.7.0.tgz",
-      "integrity": "sha512-blRKwV8h0ztualXS50ciCTo39tbuDGNS+ldcy8+KLvKXuT6OpYnSJ7M6MSfPT+xWatshMHJV1rJx3Tl+k/Sn/g==",
+      "version": "22.9.1",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.9.1.tgz",
+      "integrity": "sha512-KfXim/fiNwFW2SKffsjEMdAU7RbbEXn62x5YyXle1b4j9X/wEHW9iwox8De6y0hJdR+/kCC/49lI+VgNwLhV7A==",
      "dev": true,
      "requires": {
        "7zip-bin": "~5.0.3",
        "@develar/schema-utils": "~2.6.5",
        "async-exit-hook": "^2.0.1",
        "bluebird-lst": "^1.0.9",
-        "builder-util": "22.7.0",
-        "builder-util-runtime": "8.7.1",
+        "builder-util": "22.9.1",
+        "builder-util-runtime": "8.7.2",
        "chromium-pickle-js": "^0.2.0",
-        "debug": "^4.2.0",
-        "ejs": "^3.1.3",
-        "electron-publish": "22.7.0",
-        "fs-extra": "^9.0.0",
-        "hosted-git-info": "^3.0.4",
+        "debug": "^4.3.0",
+        "ejs": "^3.1.5",
+        "electron-publish": "22.9.1",
+        "fs-extra": "^9.0.1",
+        "hosted-git-info": "^3.0.5",
        "is-ci": "^2.0.0",
        "isbinaryfile": "^4.0.6",
        "js-yaml": "^3.14.0",
@@ -184,9 +184,9 @@
      },
      "dependencies": {
        "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz",
+          "integrity": "sha512-jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg==",
          "dev": true,
          "requires": {
            "ms": "2.1.2"
@@ -205,13 +205,21 @@
          }
        },
        "jsonfile": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
-          "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
          "dev": true,
          "requires": {
            "graceful-fs": "^4.1.6",
-            "universalify": "^1.0.0"
+            "universalify": "^2.0.0"
+          },
+          "dependencies": {
+            "universalify": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+              "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+              "dev": true
+            }
          }
        },
        "universalify": {
@@ -263,11 +271,11 @@
      "dev": true
    },
    "axios": {
-      "version": "0.19.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
-      "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
      "requires": {
-        "follow-redirects": "1.5.10"
+        "follow-redirects": "^1.10.0"
      }
    },
    "balanced-match": {
@@ -358,20 +366,20 @@
      "dev": true
    },
    "builder-util": {
-      "version": "22.7.0",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.7.0.tgz",
-      "integrity": "sha512-UV3MKL0mwjMq2y9JlBf28Cegpj0CrIXcjGkO0TXn+QZ6Yy9rY6lHOuUvpQ19ct2Qh1o+QSwH3Q1nKUf5viJBBg==",
+      "version": "22.9.1",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.9.1.tgz",
+      "integrity": "sha512-5hN/XOaYu4ZQUS6F+5CXE6jTo+NAnVqAxDuKGSaHWb9bejfv/rluChTLoY3/nJh7RFjkoyVjvFJv7zQDB1QmHw==",
      "dev": true,
      "requires": {
        "7zip-bin": "~5.0.3",
        "@types/debug": "^4.1.5",
        "@types/fs-extra": "^9.0.1",
-        "app-builder-bin": "3.5.9",
+        "app-builder-bin": "3.5.10",
        "bluebird-lst": "^1.0.9",
-        "builder-util-runtime": "8.7.1",
-        "chalk": "^4.0.0",
-        "debug": "^4.2.0",
-        "fs-extra": "^9.0.0",
+        "builder-util-runtime": "8.7.2",
+        "chalk": "^4.1.0",
+        "debug": "^4.3.0",
+        "fs-extra": "^9.0.1",
        "is-ci": "^2.0.0",
        "js-yaml": "^3.14.0",
        "source-map-support": "^0.5.19",
@@ -380,9 +388,9 @@
      },
      "dependencies": {
        "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz",
+          "integrity": "sha512-jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg==",
          "dev": true,
          "requires": {
            "ms": "2.1.2"
@@ -401,13 +409,21 @@
          }
        },
        "jsonfile": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
-          "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
          "dev": true,
          "requires": {
            "graceful-fs": "^4.1.6",
-            "universalify": "^1.0.0"
+            "universalify": "^2.0.0"
+          },
+          "dependencies": {
+            "universalify": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+              "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+              "dev": true
+            }
          }
        },
        "universalify": {
@@ -419,24 +435,13 @@
      }
    },
    "builder-util-runtime": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.1.tgz",
-      "integrity": "sha512-uEBH1nAnTvzjcsrh2XI3qOzJ39h0+9kuIuwj+kCc3a07TZNGShfJcai8fFzL3mNgGjEFxoq+XMssR11r+FOFSg==",
+      "version": "8.7.2",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz",
+      "integrity": "sha512-xBqv+8bg6cfnzAQK1k3OGpfaHg+QkPgIgpEkXNhouZ0WiUkyZCftuRc2LYzQrLucFywpa14Xbc6+hTbpq83yRA==",
      "dev": true,
      "requires": {
-        "debug": "^4.2.0",
+        "debug": "^4.1.1",
        "sax": "^1.2.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        }
      }
    },
    "cacheable-request": {
@@ -455,9 +460,9 @@
      },
      "dependencies": {
        "get-stream": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
          "dev": true,
          "requires": {
            "pump": "^3.0.0"
@@ -513,9 +518,9 @@
      "dev": true
    },
    "cli-boxes": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz",
-      "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
+      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
      "dev": true
    },
    "cli-truncate": {
@@ -528,14 +533,14 @@
      }
    },
    "cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.3.tgz",
+      "integrity": "sha512-Gj3QHTkVMPKqwP3f7B4KPkBZRMR9r4rfi5bXFpg1a+Svvj8l7q5CnkBkVQzfxT5DFSsGk2+PascOgL0JYkL2kw==",
      "dev": true,
      "requires": {
        "string-width": "^4.2.0",
        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
+        "wrap-ansi": "^7.0.0"
      },
      "dependencies": {
        "ansi-regex": {
@@ -660,20 +665,14 @@
      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="
    },
    "debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+      "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
      "dev": true,
      "requires": {
-        "ms": "^2.1.1"
+        "ms": "2.1.2"
      }
    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
    "decompress-response": {
      "version": "3.3.0",
      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
@@ -713,15 +712,15 @@
      "optional": true
    },
    "dmg-builder": {
-      "version": "22.7.0",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.7.0.tgz",
-      "integrity": "sha512-5Ea2YEz6zSNbyGzZD+O9/MzmaXb6oa15cSKWo4JQ1xP4rorOpte7IOj2jcwYjtc+Los2gu1lvT314OC1OZIWgg==",
+      "version": "22.9.1",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.9.1.tgz",
+      "integrity": "sha512-jc+DAirqmQrNT6KbDHdfEp8D1kD0DBTnsLhwUR3MX+hMBun5bT134LQzpdK0GKvd22GqF8L1Cz/NOgaVjscAXQ==",
      "dev": true,
      "requires": {
-        "app-builder-lib": "22.7.0",
-        "builder-util": "22.7.0",
-        "fs-extra": "^9.0.0",
-        "iconv-lite": "^0.5.1",
+        "app-builder-lib": "22.9.1",
+        "builder-util": "22.9.1",
+        "fs-extra": "^9.0.1",
+        "iconv-lite": "^0.6.2",
        "js-yaml": "^3.14.0",
        "sanitize-filename": "^1.6.3"
      },
@@ -739,13 +738,21 @@
          }
        },
        "jsonfile": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
-          "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
          "dev": true,
          "requires": {
            "graceful-fs": "^4.1.6",
-            "universalify": "^1.0.0"
+            "universalify": "^2.0.0"
+          },
+          "dependencies": {
+            "universalify": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+              "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+              "dev": true
+            }
          }
        },
        "universalify": {
@@ -788,9 +795,9 @@
      }
    },
    "dot-prop": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz",
-      "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
+      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
      "dev": true,
      "requires": {
        "is-obj": "^2.0.0"
@@ -815,18 +822,18 @@
      "dev": true
    },
    "ejs": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.3.tgz",
-      "integrity": "sha512-wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.5.tgz",
+      "integrity": "sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==",
      "dev": true,
      "requires": {
        "jake": "^10.6.1"
      }
    },
    "electron": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-9.1.0.tgz",
-      "integrity": "sha512-VRAF8KX1m0py9I9sf0kw1kWfeC87mlscfFcbcRdLBsNJ44/GrJhi3+E8rKbpHUeZNQxsPaVA5Zu5Lxb6dV/scQ==",
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-11.1.1.tgz",
+      "integrity": "sha512-tlbex3xosJgfileN6BAQRotevPRXB/wQIq48QeQ08tUJJrXwE72c8smsM/hbHx5eDgnbfJ2G3a60PmRjHU2NhA==",
      "dev": true,
      "requires": {
        "@electron/get": "^1.0.1",
@@ -835,33 +842,33 @@
      },
      "dependencies": {
        "@types/node": {
-          "version": "12.12.50",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.50.tgz",
-          "integrity": "sha512-5ImO01Fb8YsEOYpV+aeyGYztcYcjGsBvN4D7G5r1ef2cuQOpymjWNQi5V0rKHE6PC2ru3HkoUr/Br2/8GUA84w==",
+          "version": "12.19.3",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.3.tgz",
+          "integrity": "sha512-8Jduo8wvvwDzEVJCOvS/G6sgilOLvvhn1eMmK3TW8/T217O7u1jdrK6ImKLv80tVryaPSVeKu6sjDEiFjd4/eg==",
          "dev": true
        }
      }
    },
    "electron-builder": {
-      "version": "22.7.0",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.7.0.tgz",
-      "integrity": "sha512-t6E3oMutpST64YWbZCg7HodEwJOsnjUF1vnDIHm2MW6CFZPX8tlCK6efqaV66LU0E0Nkp/JH6TE5bCqQ1+VdPQ==",
+      "version": "22.9.1",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.9.1.tgz",
+      "integrity": "sha512-GXPt8l5Mxwm1QKYopUM6/Tdh9W3695G6Ax+IFyj5pQ51G4SD5L1uq4/RkPSsOgs3rP7jNSV6g6OfDzdtVufPdA==",
      "dev": true,
      "requires": {
        "@types/yargs": "^15.0.5",
-        "app-builder-lib": "22.7.0",
+        "app-builder-lib": "22.9.1",
        "bluebird-lst": "^1.0.9",
-        "builder-util": "22.7.0",
-        "builder-util-runtime": "8.7.1",
-        "chalk": "^4.0.0",
-        "dmg-builder": "22.7.0",
-        "fs-extra": "^9.0.0",
+        "builder-util": "22.9.1",
+        "builder-util-runtime": "8.7.2",
+        "chalk": "^4.1.0",
+        "dmg-builder": "22.9.1",
+        "fs-extra": "^9.0.1",
        "is-ci": "^2.0.0",
        "lazy-val": "^1.0.4",
        "read-config-file": "6.0.0",
        "sanitize-filename": "^1.6.3",
-        "update-notifier": "^4.1.0",
-        "yargs": "^15.3.1"
+        "update-notifier": "^4.1.1",
+        "yargs": "^16.0.3"
      },
      "dependencies": {
        "fs-extra": {
@@ -877,13 +884,21 @@
          }
        },
        "jsonfile": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
-          "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
          "dev": true,
          "requires": {
            "graceful-fs": "^4.1.6",
-            "universalify": "^1.0.0"
+            "universalify": "^2.0.0"
+          },
+          "dependencies": {
+            "universalify": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+              "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+              "dev": true
+            }
          }
        },
        "universalify": {
@@ -920,19 +935,19 @@
      "integrity": "sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw=="
    },
    "electron-publish": {
-      "version": "22.7.0",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.7.0.tgz",
-      "integrity": "sha512-hmU69xlb6vvAV3QfpHYDlkdZMFdBAgDbptoxbLFrnTq5bOkcL8AaDbvxeoZ4+lvqgs29NwqGpkHo2oN+p/hCfg==",
+      "version": "22.9.1",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.9.1.tgz",
+      "integrity": "sha512-ducLjRJLEeU87FaTCWaUyDjCoLXHkawkltP2zqS/n2PyGke54ZIql0tBuUheht4EpR8AhFbVJ11spSn1gy8r6w==",
      "dev": true,
      "requires": {
        "@types/fs-extra": "^9.0.1",
        "bluebird-lst": "^1.0.9",
-        "builder-util": "22.7.0",
-        "builder-util-runtime": "8.7.1",
-        "chalk": "^4.0.0",
-        "fs-extra": "^9.0.0",
+        "builder-util": "22.9.1",
+        "builder-util-runtime": "8.7.2",
+        "chalk": "^4.1.0",
+        "fs-extra": "^9.0.1",
        "lazy-val": "^1.0.4",
-        "mime": "^2.4.5"
+        "mime": "^2.4.6"
      },
      "dependencies": {
        "fs-extra": {
@@ -948,13 +963,21 @@
          }
        },
        "jsonfile": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
-          "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
          "dev": true,
          "requires": {
            "graceful-fs": "^4.1.6",
-            "universalify": "^1.0.0"
+            "universalify": "^2.0.0"
+          },
+          "dependencies": {
+            "universalify": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+              "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+              "dev": true
+            }
          }
        },
        "universalify": {
@@ -1005,6 +1028,12 @@
      "dev": true,
      "optional": true
    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
    "escape-goat": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
@@ -1099,38 +1128,10 @@
        "minimatch": "^3.0.4"
      }
    },
-    "find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
    "follow-redirects": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
-      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
-      "requires": {
-        "debug": "=3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz",
+      "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="
    },
    "fs-extra": {
      "version": "8.1.0",
@@ -1148,6 +1149,12 @@
      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
    "get-caller-file": {
      "version": "2.0.5",
      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -1254,6 +1261,15 @@
      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
      "dev": true
    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
    "has-flag": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -1267,9 +1283,9 @@
      "dev": true
    },
    "hosted-git-info": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.5.tgz",
-      "integrity": "sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.7.tgz",
+      "integrity": "sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==",
      "dev": true,
      "requires": {
        "lru-cache": "^6.0.0"
@@ -1315,12 +1331,12 @@
      "dev": true
    },
    "iconv-lite": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz",
-      "integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==",
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
+      "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
      "dev": true,
      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
      }
    },
    "import-lazy": {
@@ -1350,9 +1366,9 @@
      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
    },
    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
      "dev": true
    },
    "is-ci": {
@@ -1364,6 +1380,15 @@
        "ci-info": "^2.0.0"
      }
    },
+    "is-core-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz",
+      "integrity": "sha512-jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
    "is-fullwidth-code-point": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@@ -1568,19 +1593,10 @@
      "integrity": "sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==",
      "dev": true
    },
-    "locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^4.1.0"
-      }
-    },
    "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
    },
    "lowercase-keys": {
      "version": "1.0.1",
@@ -1747,30 +1763,6 @@
      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
      "dev": true
    },
-    "p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^2.2.0"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
-    },
    "package-json": {
      "version": "6.5.0",
      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
@@ -1918,9 +1910,9 @@
      }
    },
    "registry-auth-token": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.1.1.tgz",
-      "integrity": "sha512-9bKS7nTl9+/A1s7tnPeGrUpRcVY+LUh7bfFgzpndALdPfXQBfQV77rQVtqgUV3ti4vc/Ik81Ex8UJDWDQ12zQA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz",
+      "integrity": "sha512-P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==",
      "dev": true,
      "requires": {
        "rc": "^1.2.8"
@@ -1941,18 +1933,13 @@
      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
      "dev": true
    },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
    "resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
+      "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
      "dev": true,
      "requires": {
+        "is-core-module": "^2.0.0",
        "path-parse": "^1.0.6"
      }
    },
@@ -1974,13 +1961,13 @@
      }
    },
    "roarr": {
-      "version": "2.15.3",
-      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.3.tgz",
-      "integrity": "sha512-AEjYvmAhlyxOeB9OqPUzQCo3kuAkNfuDk/HqWbZdFsqDFpapkTjiw+p4svNEoRLvuqNTxqfL+s+gtD4eDgZ+CA==",
+      "version": "2.15.4",
+      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
+      "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
      "dev": true,
      "optional": true,
      "requires": {
-        "boolean": "^3.0.0",
+        "boolean": "^3.0.1",
        "detect-node": "^2.0.4",
        "globalthis": "^1.0.1",
        "json-stringify-safe": "^5.0.1",
@@ -2054,12 +2041,6 @@
        "type-fest": "^0.13.1"
      }
    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
    "signal-exit": {
      "version": "3.0.3",
      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
@@ -2142,9 +2123,9 @@
      }
    },
    "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz",
+      "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==",
      "dev": true
    },
    "sprintf-js": {
@@ -2229,9 +2210,9 @@
      }
    },
    "supports-color": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-      "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
      "dev": true,
      "requires": {
        "has-flag": "^4.0.0"
@@ -2248,9 +2229,9 @@
      }
    },
    "term-size": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz",
-      "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
+      "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==",
      "dev": true
    },
    "to-readable-stream": {
@@ -2322,9 +2303,9 @@
      }
    },
    "update-notifier": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz",
-      "integrity": "sha512-w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz",
+      "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==",
      "dev": true,
      "requires": {
        "boxen": "^4.2.0",
@@ -2355,9 +2336,9 @@
      }
    },
    "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
+      "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
      "dev": true,
      "requires": {
        "punycode": "^2.1.0"
@@ -2398,12 +2379,6 @@
        "spdx-expression-parse": "^3.0.0"
      }
    },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
    "widest-line": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
@@ -2414,9 +2389,9 @@
      }
    },
    "wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
      "dev": true,
      "requires": {
        "ansi-styles": "^4.0.0",
@@ -2465,9 +2440,9 @@
      "dev": true
    },
    "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
+      "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==",
      "dev": true
    },
    "yallist": {
@@ -2477,33 +2452,25 @@
      "dev": true
    },
    "yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "version": "16.1.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.1.0.tgz",
+      "integrity": "sha512-upWFJOmDdHN0syLuESuvXDmrRcWd1QafJolHskzaw79uZa7/x53gxQKiR07W59GWY1tFhhU/Th9DrtSfpS782g==",
      "dev": true,
      "requires": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
+        "y18n": "^5.0.2",
+        "yargs-parser": "^20.2.2"
      }
    },
    "yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
+      "version": "20.2.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.3.tgz",
+      "integrity": "sha512-emOFRT9WVHw03QSvN5qor9QQT9+sw5vwxfYweivSMHTcAXPefwVae2FjO7JJjj8hCE4CzPOPeFM83VwT29HCww==",
+      "dev": true
    },
    "yauzl": {
      "version": "2.10.0",
@@ -1,6 +1,6 @@
 {
  "name": "vripper-electron",
-  "version": "3.0.0",
+  "version": "3.3.2",
  "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",
@@ -70,11 +65,11 @@
    "dist": "node pre-build.js && electron-builder"
  },
  "devDependencies": {
-    "electron": "9.1.0",
-    "electron-builder": "22.7.0"
+    "electron": "11.1.1",
+    "electron-builder": "22.9.1"
  },
  "dependencies": {
-    "axios": "0.19.2",
+    "axios": "0.21.1",
    "cheerio": "1.0.0-rc.3",
    "copy-dir": "1.3.0",
    "electron-context-menu": "2.1.0",
@@ -1,77 +1,77 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>tn.mnlr</groupId>
-    <artifactId>vripper</artifactId>
-    <version>3.0.0</version>
-  </parent>
-  <artifactId>vripper-electron</artifactId>
-  <name>vripper-electron</name>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <classifier>${buildClassifier}</classifier>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>electron</id>
-      <properties>
-        <buildClassifier>electron</buildClassifier>
-      </properties>
-      <dependencies>
-        <dependency>
-          <groupId>tn.mnlr</groupId>
-          <artifactId>vripper-server</artifactId>
-          <version>${project.version}</version>
-          <scope>runtime</scope>
-          <classifier>${buildClassifier}</classifier>
-        </dependency>
-      </dependencies>
-      <build>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>tn.mnlr</groupId>
+        <artifactId>vripper</artifactId>
+        <version>3.3.2</version>
+    </parent>
+    <artifactId>vripper-electron</artifactId>
+    <name>vripper-electron</name>
+    <build>
        <plugins>
-          <plugin>
-            <groupId>com.github.eirslett</groupId>
-            <artifactId>frontend-maven-plugin</artifactId>
-            <version>1.3</version>
-            <configuration>
-              <nodeVersion>v12.2.0</nodeVersion>
-              <npmVersion>6.9.0</npmVersion>
-              <workingDirectory>build-dir</workingDirectory>
-            </configuration>
-            <executions>
-              <execution>
-                <id>install node and npm</id>
-                <goals>
-                  <goal>install-node-and-npm</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>npm install</id>
-                <goals>
-                  <goal>npm</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>npm run build</id>
-                <goals>
-                  <goal>npm</goal>
-                </goals>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
                <configuration>
-                  <arguments>run dist</arguments>
+                    <classifier>${buildClassifier}</classifier>
                </configuration>
-                <phase>generate-resources</phase>
-              </execution>
-            </executions>
-          </plugin>
+            </plugin>
        </plugins>
-      </build>
-    </profile>
-  </profiles>
+    </build>
+    <profiles>
+        <profile>
+            <id>electron</id>
+            <properties>
+                <buildClassifier>electron</buildClassifier>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>tn.mnlr</groupId>
+                    <artifactId>vripper-server</artifactId>
+                    <version>${project.version}</version>
+                    <scope>runtime</scope>
+                    <classifier>${buildClassifier}</classifier>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.github.eirslett</groupId>
+                        <artifactId>frontend-maven-plugin</artifactId>
+                        <version>1.3</version>
+                        <configuration>
+                            <nodeVersion>v12.2.0</nodeVersion>
+                            <npmVersion>6.9.0</npmVersion>
+                            <workingDirectory>build-dir</workingDirectory>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>install node and npm</id>
+                                <goals>
+                                    <goal>install-node-and-npm</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>npm install</id>
+                                <goals>
+                                    <goal>npm</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>npm run build</id>
+                                <goals>
+                                    <goal>npm</goal>
+                                </goals>
+                                <configuration>
+                                    <arguments>run dist</arguments>
+                                </configuration>
+                                <phase>generate-resources</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
@@ -2,7 +2,7 @@ const cheerio = require('cheerio');
 const fs = require('fs');
 const rimraf = require("rimraf");
 const copydir = require("copy-dir");
-const { execSync } = require("child_process");
+const {execSync} = require("child_process");

 rimraf.sync('./build/vripper-ui');
 copydir.sync('../vripper-ui/dist/vripper-ui', './build/vripper-ui', {});
@@ -19,7 +19,7 @@ fs.writeFileSync('./build/vripper-ui/index.html', $.html());
 console.log('Building runtime environment');
 rimraf.sync('java-runtime');
 execSync('jlink --no-header-files --no-man-pages --compress=2 --strip-debug --add-modules java.base,java.desktop,java.instrument,java.management,java.naming,java.prefs,java.rmi,java.scripting,java.security.jgss,java.sql,jdk.httpserver,jdk.unsupported,jdk.crypto.ec --output java-runtime');
-if(process.platform === 'linux') {
+if (process.platform === 'linux') {
    console.log('Stripping libjvm.so');
    execSync('strip -p --strip-unneeded java-runtime/lib/server/libjvm.so');
-}
+}
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
@@ -5,7 +5,7 @@
    <parent>
        <groupId>tn.mnlr</groupId>
        <artifactId>vripper</artifactId>
-        <version>3.0.0</version>
+        <version>3.3.2</version>
    </parent>
    <artifactId>vripper-server</artifactId>
    <name>vripper-server</name>
@@ -72,9 +72,8 @@
            <version>2.22</version>
        </dependency>
        <dependency>
-            <groupId>io.reactivex.rxjava2</groupId>
-            <artifactId>rxjava</artifactId>
-            <version>2.2.6</version>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core</artifactId>
        </dependency>
        <dependency>
            <groupId>net.jodah</groupId>
@@ -27,10 +27,7 @@ public class EventListenerBean {

    @EventListener
    public void onApplicationEvent(ContextRefreshedEvent event) {
-        repositorySet.forEach(IRepository::init);
        dataService.setDownloadingToStopped();
        init = true;
    }
-
-
-}
+}
@@ -0,0 +1,23 @@
+package tn.mnlr.vripper;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+@Slf4j
+public class Utils {
+
+    public static String throwableToString(Throwable th) {
+        try (StringWriter stringWriter = new StringWriter(); PrintWriter printWriter = new PrintWriter(stringWriter)) {
+            th.printStackTrace(printWriter);
+            printWriter.flush();
+            stringWriter.flush();
+            return stringWriter.toString();
+        } catch (IOException e) {
+            log.error("Failed to convert throwable to string", e);
+        }
+        return "Cannot display error, please check the log file for details";
+    }
+}
@@ -1,24 +1,13 @@
 package tn.mnlr.vripper;

 import lombok.extern.slf4j.Slf4j;
-import net.jodah.failsafe.RetryPolicy;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

-import java.time.temporal.ChronoUnit;
-import java.util.Collections;
-
@SpringBootApplication
@Slf4j
 public class VripperApplication {

-    public static final RetryPolicy<Object> retryPolicy = new RetryPolicy<>()
-            .handleIf(e -> !(e instanceof InterruptedException))
-            .withDelay(1, 3, ChronoUnit.SECONDS)
-            .withMaxAttempts(5)
-            .abortOn(Collections.singletonList(InterruptedException.class))
-            .onFailedAttempt(e -> log.warn(String.format("#%d tries failed", e.getAttemptCount()), e.getLastFailure()));
-
    public static void main(String[] args) {
        try {
            Runtime.getRuntime().addShutdownHook(new Thread(SpringContext::close));
@@ -27,6 +16,5 @@ public class VripperApplication {
            log.error("Failed to run the application", e);
        }
    }
-
 }

@@ -0,0 +1,277 @@
+package tn.mnlr.vripper.download;
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import net.jodah.failsafe.function.CheckedRunnable;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.AbstractExecutionAwareRequest;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.util.EntityUtils;
+import tn.mnlr.vripper.SpringContext;
+import tn.mnlr.vripper.exception.DownloadException;
+import tn.mnlr.vripper.exception.HostException;
+import tn.mnlr.vripper.jpa.domain.Image;
+import tn.mnlr.vripper.jpa.domain.Post;
+import tn.mnlr.vripper.jpa.domain.enums.Status;
+import tn.mnlr.vripper.services.*;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.*;
+
+@Slf4j
+public class DownloadJob implements CheckedRunnable {
+
+    private static final Object LOCK = new Object();
+    private static final int READ_BUFFER_SIZE = 8192;
+    private final DataService dataService;
+    private final PathService pathService;
+    private final ConnectionService cm;
+    private final VGAuthService authService;
+    private final DownloadSpeedService downloadSpeedService;
+    private final SettingsService settingsService;
+    private final HttpClientContext context;
+    @Getter
+    private final Image image;
+    @Getter
+    private final Post post;
+    private volatile boolean stopped = false;
+    @Getter
+    private boolean finished = false;
+
+    DownloadJob(Post post, Image image) {
+        this.image = image;
+        this.post = post;
+        dataService = SpringContext.getBean(DataService.class);
+        pathService = SpringContext.getBean(PathService.class);
+        cm = SpringContext.getBean(ConnectionService.class);
+        authService = SpringContext.getBean(VGAuthService.class);
+        downloadSpeedService = SpringContext.getBean(DownloadSpeedService.class);
+        settingsService = SpringContext.getBean(SettingsService.class);
+        context = HttpClientContext.create();
+        context.setCookieStore(new BasicCookieStore());
+        context.setAttribute(ContextAttributes.OPEN_CONNECTION.toString(), Collections.synchronizedList(new ArrayList<AbstractExecutionAwareRequest>()));
+    }
+
+    public void download(final Post post, final Image image) throws DownloadException {
+
+        try {
+
+            image.setStatus(Status.DOWNLOADING);
+            image.setCurrent(0);
+            dataService.updateImageStatus(image.getStatus(), image.getId());
+            dataService.updateImageCurrent(image.getCurrent(), image.getId());
+
+            synchronized (LOCK) {
+                if (!post.getStatus().equals(Status.DOWNLOADING) && !post.getStatus().equals(Status.PARTIAL)) {
+                    post.setStatus(Status.DOWNLOADING);
+                    dataService.updatePostStatus(post.getStatus(), post.getId());
+                }
+
+                // The post may be updated and the download directory might be set by another thread
+                Post updatedPost = dataService.findById(post.getId()).orElseThrow();
+                if (updatedPost.getDownloadDirectory() == null) {
+                    pathService.createDefaultPostFolder(updatedPost);
+                }
+                if (settingsService.getSettings().getLeaveThanksOnStart()) {
+                    authService.leaveThanks(updatedPost);
+                }
+            }
+
+            if (stopped) {
+                return;
+            }
+            /*
+             * HOST SPECIFIC
+             */
+            log.debug(String.format("Getting image url and name from %s using %s", image.getUrl(), image.getHost()));
+            HostService.NameUrl nameAndUrl = image.getHost().getNameAndUrl(image.getUrl(), context);
+            log.debug(String.format("Resolved name for %s: %s", image.getUrl(), nameAndUrl.getName()));
+            log.debug(String.format("Resolved image url for %s: %s", image.getUrl(), nameAndUrl.getUrl()));
+            /*
+             * END HOST SPECIFIC
+             */
+
+            if (stopped) {
+                return;
+            }
+            String formatImageFileName = pathService.formatImageFileName(nameAndUrl.getName());
+            log.debug(String.format("Sanitizing image name from %s to %s", nameAndUrl.getName(), formatImageFileName));
+            nameAndUrl = new HostService.NameUrl(formatImageFileName, nameAndUrl.getUrl());
+
+            HttpClient client = cm.getClient().build();
+
+            log.debug(String.format("Downloading %s", nameAndUrl.getUrl()));
+            HttpGet httpGet = cm.buildHttpGet(nameAndUrl.getUrl(), context);
+            httpGet.addHeader("Referer", image.getUrl());
+            try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(httpGet, context)) {
+
+                if (response.getStatusLine().getStatusCode() / 100 != 2) {
+                    EntityUtils.consumeQuietly(response.getEntity());
+                    throw new DownloadException(String.format("Server returned code %d", response.getStatusLine().getStatusCode()));
+                }
+                if (stopped) {
+                    return;
+                }
+                File outputFile = Files.createTempFile("vripper", "tmp").toFile();
+                try (InputStream downloadStream = response.getEntity().getContent(); FileOutputStream fos = new FileOutputStream(outputFile)) {
+
+                    if (stopped) {
+                        return;
+                    }
+
+                    image.setTotal(response.getEntity().getContentLength());
+                    dataService.updateImageTotal(image.getTotal(), image.getId());
+
+                    log.debug(String.format("%s length is %d", nameAndUrl.getUrl(), image.getTotal()));
+                    log.debug(String.format("Starting data transfer for %s", nameAndUrl.getUrl()));
+
+                    byte[] buffer = new byte[READ_BUFFER_SIZE];
+                    int read;
+                    while ((read = downloadStream.read(buffer, 0, READ_BUFFER_SIZE)) != -1 && !stopped) {
+                        fos.write(buffer, 0, read);
+                        image.increase(read);
+                        downloadSpeedService.increase(read);
+                        dataService.updateImageCurrent(image.getCurrent(), image.getId());
+                    }
+                    fos.flush();
+                    EntityUtils.consumeQuietly(response.getEntity());
+                    if (stopped) {
+                        return;
+                    }
+                }
+                checkImageTypeAndRename(dataService.findById(post.getId()).orElseThrow(), outputFile, nameAndUrl.getName(), image.getIndex());
+            }
+        } catch (Exception e) {
+            if (stopped) {
+                return;
+            }
+            throw new DownloadException(e);
+        } finally {
+            if (image.getCurrent() == image.getTotal() && image.getTotal() > 0) {
+                image.setStatus(Status.COMPLETE);
+            } else if (stopped) {
+                image.setStatus(Status.STOPPED);
+            } else {
+                image.setStatus(Status.ERROR);
+            }
+            dataService.updateImageStatus(image.getStatus(), image.getId());
+            finished = true;
+        }
+    }
+
+    private void checkImageTypeAndRename(Post post, File outputFile, String imageName, int index) throws HostException {
+        try (ImageInputStream iis = ImageIO.createImageInputStream(outputFile)) {
+            Iterator<ImageReader> it = ImageIO.getImageReaders(iis);
+            if (!it.hasNext()) {
+                throw new HostException("Image file is not recognized!");
+            }
+            ImageReader reader = it.next();
+            if (reader.getFormatName().equalsIgnoreCase("JPEG")) {
+                String imageNameLC = imageName.toLowerCase();
+                if (!imageNameLC.endsWith("_jpg") && !imageNameLC.endsWith("_jpeg")) {
+                    imageName += ".jpg";
+                } else {
+                    String toReplace = null;
+                    if (imageNameLC.endsWith("_jpg")) {
+                        toReplace = "_jpg";
+                    } else if (imageNameLC.endsWith("_jpeg")) {
+                        toReplace = "_jpeg";
+                    }
+                    if (toReplace != null) {
+                        imageName = imageName.substring(0, imageName.length() - toReplace.length()) + ".jpg";
+                    }
+                }
+            } else if (reader.getFormatName().equalsIgnoreCase("PNG")) {
+                String imageNameLC = imageName.toLowerCase();
+                if (!imageNameLC.endsWith("_png")) {
+                    imageName += ".png";
+                } else {
+                    String toReplace = null;
+                    if (imageNameLC.endsWith("_png")) {
+                        toReplace = "_png";
+                    }
+                    if (toReplace != null) {
+                        imageName = imageName.substring(0, imageName.length() - toReplace.length()) + ".png";
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new HostException("Failed to guess image format", e);
+        }
+        try {
+            pathService.getDirectoryAccess().lock();
+            File downloadDestinationFolder = pathService.calcDownloadDirectory(post);
+            File outImage = new File(downloadDestinationFolder, (settingsService.getSettings().getForceOrder() ? String.format("%03d_", index) : "") + imageName);
+            Files.copy(outputFile.toPath(), outImage.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        } catch (Exception e) {
+            throw new HostException("Failed to rename the image", e);
+        } finally {
+            pathService.getDirectoryAccess().unlock();
+            try {
+                Files.delete(outputFile.toPath());
+            } catch (IOException e) {
+                log.warn(String.format("Failed to delete temporary file %s", outputFile.getAbsolutePath()));
+            }
+        }
+    }
+
+    @Override
+    public void run() throws Exception {
+        if (stopped) {
+            finished = true;
+            return;
+        }
+        log.debug(String.format("Starting downloading %s", image.getUrl()));
+        download(post, image);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DownloadJob that = (DownloadJob) o;
+        return Objects.equals(image, that.image) &&
+                Objects.equals(post, that.post);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(image, post);
+    }
+
+    public void stop() {
+        List<AbstractExecutionAwareRequest> requests = (List<AbstractExecutionAwareRequest>) this.context.getAttribute(ContextAttributes.OPEN_CONNECTION.toString());
+        if (requests != null) {
+            for (AbstractExecutionAwareRequest request : requests) {
+                request.abort();
+            }
+        }
+        this.stopped = true;
+    }
+
+    public enum ContextAttributes {
+        OPEN_CONNECTION("OPEN_CONNECTION");
+
+        private final String value;
+
+        ContextAttributes(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return value;
+        }
+    }
+}
@@ -0,0 +1,54 @@
+package tn.mnlr.vripper.download;
+
+import lombok.extern.slf4j.Slf4j;
+import net.jodah.failsafe.Failsafe;
+import tn.mnlr.vripper.SpringContext;
+import tn.mnlr.vripper.Utils;
+import tn.mnlr.vripper.jpa.domain.Event;
+import tn.mnlr.vripper.jpa.domain.enums.Status;
+import tn.mnlr.vripper.jpa.repositories.IEventRepository;
+import tn.mnlr.vripper.services.ConnectionService;
+import tn.mnlr.vripper.services.DataService;
+
+import java.time.LocalDateTime;
+
+@Slf4j
+public class DownloadRunnable implements Runnable {
+
+    private final DownloadService downloadService;
+    private final DataService dataService;
+    private final ConnectionService connectionService;
+    private final IEventRepository eventRepository;
+
+    private final DownloadJob downloadJob;
+
+    public DownloadRunnable(final DownloadJob downloadJob) {
+        downloadService = SpringContext.getBean(DownloadService.class);
+        dataService = SpringContext.getBean(DataService.class);
+        connectionService = SpringContext.getBean(ConnectionService.class);
+        eventRepository = SpringContext.getBean(IEventRepository.class);
+
+        this.downloadJob = downloadJob;
+    }
+
+    @Override
+    public void run() {
+        Failsafe.with(connectionService.getRetryPolicy())
+                .onFailure(e -> {
+                    try {
+                        Event event = new Event(Event.Type.DOWNLOAD, Event.Status.ERROR, LocalDateTime.now(), String.format("Failed to download %s\n %s", downloadJob.getImage().getUrl(), Utils.throwableToString(e.getFailure())));
+                        eventRepository.save(event);
+                    } catch (Exception exp) {
+                        log.error("Failed to save event", exp);
+                    }
+                    log.error(String.format("Failed to download %s after %d tries", downloadJob.getImage().getUrl(), e.getAttemptCount()), e.getFailure());
+                    downloadJob.getImage().setStatus(Status.ERROR);
+                    dataService.updateImageStatus(downloadJob.getImage().getStatus(), downloadJob.getImage().getId());
+                })
+                .onComplete(e -> {
+                    dataService.afterJobFinish(downloadJob.getImage(), downloadJob.getPost());
+                    downloadService.afterJobFinish(downloadJob);
+                    log.debug(String.format("Finished downloading %s", downloadJob.getImage().getUrl()));
+                }).run(downloadJob);
+    }
+}
@@ -1,4 +1,4 @@
-package tn.mnlr.vripper.q;
+package tn.mnlr.vripper.download;

 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
@@ -8,22 +8,18 @@ import tn.mnlr.vripper.host.Host;
 import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.jpa.domain.Post;
 import tn.mnlr.vripper.jpa.domain.enums.Status;
-import tn.mnlr.vripper.services.AppSettingsService;
 import tn.mnlr.vripper.services.DataService;
-import tn.mnlr.vripper.services.MutexService;
-import tn.mnlr.vripper.services.post.PostService;
+import tn.mnlr.vripper.services.PostService;
+import tn.mnlr.vripper.services.SettingsService;

 import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;

@Service
@Slf4j
-public class ExecutionService {
+public class DownloadService {

    private static final List<Status> FINISHED = Arrays.asList(Status.ERROR, Status.COMPLETE, Status.STOPPED);
    private final int MAX_POOL_SIZE = 12;
@@ -31,26 +27,23 @@ public class ExecutionService {
    private final ConcurrentHashMap<Host, AtomicInteger> threadCount = new ConcurrentHashMap<>();
    private final ExecutorService executor = Executors.newFixedThreadPool(MAX_POOL_SIZE);
    private final BlockingQueue<DownloadJob> executionQueue = new LinkedBlockingQueue<>();
-    private final Map<DownloadJob, Future<?>> futures = new ConcurrentHashMap<>();
-    private final Map<String, AtomicInteger> downloadCount = new ConcurrentHashMap<>();
+    private final List<DownloadJob> executing = Collections.synchronizedList(new ArrayList<>());

-    private final PendingQ pendingQ;
-    private final AppSettingsService settings;
+    private final PendingQueue pendingQueue;
+    private final SettingsService settings;
    private final DataService dataService;
    private final PostService postService;
-    private final MutexService mutexService;

    private boolean pauseQ = false;
    private Thread executionThread;
    private Thread pollThread;

    @Autowired
-    public ExecutionService(PendingQ pendingQ, AppSettingsService settings, DataService dataService, PostService postService, MutexService mutexService) {
-        this.pendingQ = pendingQ;
+    public DownloadService(PendingQueue pendingQueue, SettingsService settings, DataService dataService, PostService postService) {
+        this.pendingQueue = pendingQueue;
        this.settings = settings;
        this.dataService = dataService;
        this.postService = postService;
-        this.mutexService = mutexService;
    }

    @PostConstruct
@@ -61,8 +54,7 @@ public class ExecutionService {
        executionThread.start();
    }

-    @PreDestroy
-    private void destroy() throws InterruptedException {
+    public void destroy() throws Exception {
        log.info("Shutting down ExecutionService");
        executionThread.interrupt();
        pollThread.interrupt();
@@ -71,22 +63,29 @@ public class ExecutionService {
            log.debug(String.format("Stopping download jobs for %s", p));
            this.stopRunning(p.getPostId());
        });
-        executor.awaitTermination(10, TimeUnit.SECONDS);
+        executor.awaitTermination(5, TimeUnit.SECONDS);
    }

    private void stopRunning(@NonNull String postId) {
-        futures
-                .entrySet()
-                .stream()
-                .filter(e -> e.getKey().getImage().getPostId().equals(postId))
-                .forEach(e -> {
-                    e.getValue().cancel(true);
-                    if (e.getKey().getImageFileData().getImageRequest() != null) {
-                        e.getKey().getImageFileData().getImageRequest().abort();
-                    }
-                    e.getKey().getImage().setStatus(Status.STOPPED);
-                    dataService.updateImageStatus(e.getKey().getImage().getStatus(), e.getKey().getImage().getId());
-                });
+        List<DownloadJob> stopping = new ArrayList<>();
+        Iterator<DownloadJob> iterator = executing.iterator();
+        while (iterator.hasNext()) {
+            DownloadJob downloadJob = iterator.next();
+            if (postId.equals(downloadJob.getPost().getPostId())) {
+                downloadJob.stop();
+                iterator.remove();
+                stopping.add(downloadJob);
+            }
+        }
+
+        while (!stopping.isEmpty()) {
+            stopping.removeIf(DownloadJob::isFinished);
+            try {
+                Thread.sleep(500);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
    }

    public void stopAll(List<String> posIds) {
@@ -106,7 +105,7 @@ public class ExecutionService {
    }

    private void restart(@NonNull String postId) {
-        if (isRunning(postId) || isPending(postId)) {
+        if (isPending(postId)) {
            log.warn(String.format("Cannot restart, jobs are currently running for post id %s", postId));
            return;
        }
@@ -120,7 +119,7 @@ public class ExecutionService {
        log.debug(String.format("Restarting %d jobs for post id %s", images.size(), postId));
        for (Image image : images) {
            try {
-                pendingQ.put(post, image);
+                pendingQueue.put(post, image);
            } catch (InterruptedException e) {
                log.warn("Thread was interrupted", e);
                Thread.currentThread().interrupt();
@@ -129,12 +128,7 @@ public class ExecutionService {
    }

    private boolean isPending(String postId) {
-        return pendingQ.isPending(postId);
-    }
-
-    public boolean isRunning(@NonNull final String postId) {
-        AtomicInteger runningCount = downloadCount.get(postId);
-        return runningCount != null && runningCount.get() > 0;
+        return pendingQueue.isPending(postId);
    }

    private void stop(String postId) {
@@ -147,9 +141,10 @@ public class ExecutionService {
            if (FINISHED.contains(post.getStatus())) {
                return;
            }
-            pendingQ.remove(post);
+            pendingQueue.stop(post);
            stopRunning(postId);
            dataService.stopImagesByPostIdAndIsNotCompleted(postId);
+            dataService.finishPost(post);
            postService.stopFetchingMetadata(post);
        } finally {
            pauseQ = false;
@@ -173,11 +168,11 @@ public class ExecutionService {
    private void poll() {
        while (!Thread.interrupted()) {
            try {
-                List<DownloadJob> peek = pendingQ.peek();
+                List<DownloadJob> peek = pendingQueue.peek();
                for (DownloadJob downloadJob : peek) {
                    if (canRun(downloadJob.getImage().getHost())) {
                        executionQueue.offer(downloadJob);
-                        pendingQ.remove(downloadJob);
+                        pendingQueue.remove(downloadJob);
                    }
                }
                synchronized (threadCount) {
@@ -205,37 +200,24 @@ public class ExecutionService {
    }

    private void push(DownloadJob downloadJob) {
-        ExecuteRunnable runnable = new ExecuteRunnable(downloadJob);
        log.debug(String.format("Scheduling a job for %s", downloadJob.getImage().getUrl()));
-        futures.put(downloadJob, executor.submit(runnable));
-    }
-
-    public void beforeJobStart(String postId) {
-        checkKeyRunningPosts(postId);
-        downloadCount.get(postId).incrementAndGet();
-    }
-
-    private synchronized void checkKeyRunningPosts(@NonNull final String postId) {
-        if (!downloadCount.containsKey(postId)) {
-            downloadCount.put(postId, new AtomicInteger(0));
-        }
+        executor.execute(new DownloadRunnable(downloadJob));
+        executing.add(downloadJob);
    }

    public synchronized void afterJobFinish(DownloadJob downloadJob) {
-        int count = downloadCount.get(downloadJob.getPost().getPostId()).decrementAndGet();
-        if (count == 0 && !pendingQ.isPending(downloadJob.getPost().getPostId())) {
-            downloadCount.remove(downloadJob.getPost().getPostId());
+        int count = pendingQueue.decrement(downloadJob.getPost().getPostId());
+        if (count == 0) {
            dataService.finishPost(downloadJob.getPost());
-            mutexService.removePostLock(downloadJob.getPost().getPostId());
        }
        threadCount.get(downloadJob.getImage().getHost()).decrementAndGet();
-        futures.remove(downloadJob);
+        executing.remove(downloadJob);
        synchronized (threadCount) {
            threadCount.notify();
        }
    }

    public int runningCount() {
-        return futures.size();
+        return executing.size();
    }
 }
@@ -1,4 +1,4 @@
-package tn.mnlr.vripper.q;
+package tn.mnlr.vripper.download;

 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -6,29 +6,32 @@ import org.springframework.stereotype.Service;
 import tn.mnlr.vripper.host.Host;
 import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.jpa.domain.Post;
-import tn.mnlr.vripper.services.AppSettingsService;
 import tn.mnlr.vripper.services.DataService;
+import tn.mnlr.vripper.services.SettingsService;

 import javax.annotation.PostConstruct;
 import java.util.*;
 import java.util.concurrent.BlockingDeque;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Predicate;

@Service
@Slf4j
-public class PendingQ {
+public class PendingQueue {

    private final DataService dataService;
-    private final AppSettingsService appSettingsService;
+    private final SettingsService settingsService;
    private final List<Host> hosts;

    private final ConcurrentHashMap<Host, BlockingDeque<DownloadJob>> pendingQ = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, AtomicInteger> toBeExecuted = new ConcurrentHashMap<>();

    @Autowired
-    public PendingQ(DataService dataService, AppSettingsService appSettingsService, List<Host> hosts) {
+    public PendingQueue(DataService dataService, SettingsService settingsService, List<Host> hosts) {
        this.dataService = dataService;
-        this.appSettingsService = appSettingsService;
+        this.settingsService = settingsService;
        this.hosts = hosts;
    }

@@ -44,6 +47,14 @@ public class PendingQ {
        dataService.updateImageCurrent(image.getCurrent(), image.getId());
        DownloadJob downloadJob = new DownloadJob(post, image);
        pendingQ.get(downloadJob.getImage().getHost()).putLast(downloadJob);
+        checkKey(post.getPostId());
+        toBeExecuted.get(post.getPostId()).incrementAndGet();
+    }
+
+    private synchronized void checkKey(String postId) {
+        if (!toBeExecuted.containsKey(postId)) {
+            toBeExecuted.put(postId, new AtomicInteger(0));
+        }
    }

    public void remove(final DownloadJob downloadJob) {
@@ -57,7 +68,7 @@ public class PendingQ {
        }
        for (Host host : hosts) {
            Iterator<DownloadJob> it = pendingQ.get(host).iterator();
-            for (int i = 0; i < appSettingsService.getSettings().getMaxThreads(); i++) {
+            for (int i = 0; i < settingsService.getSettings().getMaxThreads(); i++) {
                DownloadJob downloadJob = it.hasNext() ? it.next() : null;
                if (downloadJob != null) {
                    downloadJobs.add(downloadJob);
@@ -74,17 +85,31 @@ public class PendingQ {
    }

    public int size() {
-        return pendingQ.values().stream().mapToInt(BlockingDeque::size).sum();
+        return toBeExecuted.values().stream().mapToInt(AtomicInteger::get).sum();
    }

-    public void remove(Post post) {
+    public void stop(Post post) {
+        Predicate<DownloadJob> predicate = next -> next.getImage().getPostId().equals(post.getPostId());
        for (Map.Entry<Host, BlockingDeque<DownloadJob>> entry : pendingQ.entrySet()) {
-            entry.getValue().removeIf(next -> next.getImage().getPostId().equals(post.getPostId()));
+            entry.getValue().stream().filter(predicate).forEach(e -> decrement(post.getPostId()));
+            entry.getValue().removeIf(predicate);
+            decrement(post.getPostId());
        }
-        dataService.finishPost(post);
    }

    public boolean isPending(String postId) {
-        return pendingQ.values().stream().flatMap(Collection::stream).anyMatch(e -> e.getPost().getPostId().equals(postId));
+        return toBeExecuted.containsKey(postId);
+    }
+
+    public synchronized int decrement(String postId) {
+        AtomicInteger counter = toBeExecuted.get(postId);
+        if (counter == null) {
+            return 0;
+        }
+        int count = counter.decrementAndGet();
+        if (count == 0) {
+            toBeExecuted.remove(postId);
+        }
+        return count;
    }
 }
@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class EventRemoveEvent extends ApplicationEvent {
+
+    private final Long id;
+
+    public EventRemoveEvent(Object source, Long id) {
+        super(source);
+        this.id = id;
+    }
+}
@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class EventUpdateEvent extends ApplicationEvent {
+
+    private final Long id;
+
+    public EventUpdateEvent(Object source, Long id) {
+        super(source);
+        this.id = id;
+    }
+}
@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class ImageUpdateEvent extends ApplicationEvent {
+
+    private final Long id;
+
+    public ImageUpdateEvent(Object source, Long id) {
+        super(source);
+        this.id = id;
+    }
+}
@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class MetadataUpdateEvent extends ApplicationEvent {
+
+    private final Long postIdRef;
+
+    public MetadataUpdateEvent(Object source, Long postIdRef) {
+        super(source);
+        this.postIdRef = postIdRef;
+    }
+}
@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class PostRemoveEvent extends ApplicationEvent {
+
+    private final String postId;
+
+    public PostRemoveEvent(Object source, String postId) {
+        super(source);
+        this.postId = postId;
+    }
+}
@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class PostUpdateEvent extends ApplicationEvent {
+
+    private final Long id;
+
+    public PostUpdateEvent(Object source, Long id) {
+        super(source);
+        this.id = id;
+    }
+}
@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class QueuedRemoveEvent extends ApplicationEvent {
+
+    private final String threadId;
+
+    public QueuedRemoveEvent(Object source, String threadId) {
+        super(source);
+        this.threadId = threadId;
+    }
+}
@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class QueuedUpdateEvent extends ApplicationEvent {
+
+    private final Long id;
+
+    public QueuedUpdateEvent(Object source, Long id) {
+        super(source);
+        this.id = id;
+    }
+}
@@ -10,6 +10,6 @@ public class HostException extends Exception {
    }

    public HostException(String message, Throwable e) {
-        super(message,e);
+        super(message, e);
    }
 }
@@ -0,0 +1,10 @@
+package tn.mnlr.vripper.exception;
+
+import java.io.IOException;
+
+public class RenameException extends Exception {
+
+    public RenameException(String message, IOException e) {
+        super(message, e);
+    }
+}
@@ -15,8 +15,10 @@ 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;
+import tn.mnlr.vripper.services.ConnectionService;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.HtmlProcessorService;
+import tn.mnlr.vripper.services.XpathService;

 import java.util.ArrayList;
 import java.util.List;
@@ -29,11 +31,18 @@ public class AcidimgHost extends Host {
    private static final String CONTINUE_BUTTON_XPATH = "//input[@id='continuebutton']";
    private static final String IMG_XPATH = "//img[@class='centred']";

-    @Autowired
-    private ConnectionManager cm;
+    private final ConnectionService cm;
+    private final HostService hostService;
+    private final XpathService xpathService;
+    private final HtmlProcessorService htmlProcessorService;

-    public AcidimgHost() {
-        super();
+
+    @Autowired
+    public AcidimgHost(ConnectionService cm, HostService hostService, XpathService xpathService, HtmlProcessorService htmlProcessorService) {
+        this.cm = cm;
+        this.hostService = hostService;
+        this.xpathService = xpathService;
+        this.htmlProcessorService = htmlProcessorService;
    }

    @Override
@@ -47,9 +56,9 @@ public class AcidimgHost extends Host {
    }

    @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException {

-        Document doc = getResponse(url, context).getDocument();
+        Document doc = hostService.getResponse(url, context).getDocument();

        Node contDiv;
        try {
@@ -62,7 +71,7 @@ public class AcidimgHost extends Host {
        if (contDiv != null) {
            log.debug(String.format("Click button found for %s", url));
            HttpClient client = cm.getClient().build();
-            HttpPost httpPost = cm.buildHttpPost(url);
+            HttpPost httpPost = cm.buildHttpPost(url, context);
            httpPost.addHeader("Referer", url);
            List<NameValuePair> params = new ArrayList<>();
            params.add(new BasicNameValuePair("imgContinue", "Continue to your image"));
@@ -99,8 +108,7 @@ public class AcidimgHost extends Host {
            String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();

-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle.isEmpty() ? getDefaultImageName(imgUrl) : imgTitle);
+            return new HostService.NameUrl(imgTitle.isEmpty() ? hostService.getDefaultImageName(imgUrl) : imgTitle, imgUrl);
        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
@@ -1,76 +1,17 @@
 package tn.mnlr.vripper.host;

-import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.Header;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.util.EntityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.w3c.dom.Document;
-import tn.mnlr.vripper.exception.DownloadException;
 import tn.mnlr.vripper.exception.HostException;
-import tn.mnlr.vripper.exception.HtmlProcessorException;
-import tn.mnlr.vripper.jpa.domain.Image;
-import tn.mnlr.vripper.jpa.domain.Post;
-import tn.mnlr.vripper.jpa.domain.enums.Status;
-import tn.mnlr.vripper.q.ImageFileData;
-import tn.mnlr.vripper.services.*;
+import tn.mnlr.vripper.services.HostService;

-import javax.imageio.ImageIO;
-import javax.imageio.ImageReader;
-import javax.imageio.stream.ImageInputStream;
-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.nio.file.StandardCopyOption;
-import java.util.Iterator;
 import java.util.Objects;

@Service
@Slf4j
 abstract public class Host {

-    private static final int READ_BUFFER_SIZE = 8192;
-
-    private static final Byte LOCK = 0;
-
-    @Autowired
-    protected HtmlProcessorService htmlProcessorService;
-
-    @Autowired
-    protected XpathService xpathService;
-
-    @Autowired
-    private AppSettingsService appSettingsService;
-
-    @Autowired
-    private DataService dataService;
-
-    @Autowired
-    private ConnectionManager cm;
-
-    @Autowired
-    private DownloadSpeedService downloadSpeedService;
-
-    @Autowired
-    private PathService pathService;
-
-    @Autowired
-    private VipergirlsAuthService authService;
-
-    protected Host() {
-
-    }
-
    abstract public String getHost();

    abstract public String getLookup();
@@ -79,204 +20,7 @@ abstract public class Host {
        return url.contains(getLookup());
    }

-    public void download(final Post post, final Image image, final ImageFileData imageFileData) throws DownloadException, InterruptedException {
-
-        image.setStatus(Status.DOWNLOADING);
-        image.setCurrent(0);
-        dataService.updateImageStatus(image.getStatus(), image.getId());
-        dataService.updateImageCurrent(image.getCurrent(), image.getId());
-
-        HttpClientContext context = HttpClientContext.create();
-        context.setCookieStore(new BasicCookieStore());
-        try {
-
-            synchronized (LOCK) {
-                if (!post.getStatus().equals(Status.DOWNLOADING) && !post.getStatus().equals(Status.PARTIAL)) {
-                    post.setStatus(Status.DOWNLOADING);
-                    dataService.updatePostStatus(post.getStatus(), post.getId());
-                }
-            }
-
-
-            imageFileData.setPageUrl(image.getUrl());
-
-            /*
-             * HOST SPECIFIC
-             */
-            log.debug(String.format("Getting image url and name from %s using %s", image.getUrl(), this.getHost()));
-            setNameAndUrl(image.getUrl(), imageFileData, context);
-            log.debug(String.format("Resolved name for %s: %s", image.getUrl(), imageFileData.getImageName()));
-            log.debug(String.format("Resolved image url for %s: %s", image.getUrl(), imageFileData.getImageUrl()));
-
-            log.debug(String.format("Building image request for %s", image.getUrl()));
-            setImageRequest(imageFileData);
-            /*
-             * END HOST SPECIFIC
-             */
-
-            String formatImageFileName = pathService.formatImageFileName(imageFileData.getImageName());
-            log.debug(String.format("Sanitizing image name from %s to %s", imageFileData.getImageName(), formatImageFileName));
-            imageFileData.setImageName(formatImageFileName);
-
-            HttpClient client = cm.getClient().build();
-
-            log.debug(String.format("Downloading %s", imageFileData.getImageUrl()));
-            try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(imageFileData.getImageRequest(), context)) {
-
-                if (response.getStatusLine().getStatusCode() / 100 != 2) {
-                    EntityUtils.consumeQuietly(response.getEntity());
-                    throw new DownloadException(String.format("Server returned code %d", response.getStatusLine().getStatusCode()));
-                }
-                File destinationFolder;
-                synchronized (LOCK) {
-                    if (post.getPostFolderName() == null) {
-                        pathService.createDefaultPostFolder(post);
-                    }
-                    destinationFolder = pathService.getDownloadDestinationFolder(post);
-                    authService.leaveThanks(post);
-                }
-                File outputFile = new File(destinationFolder.getPath() + File.separator + String.format("%03d_", image.getIndex()) + imageFileData.getImageName() + ".tmp");
-                try (InputStream downloadStream = response.getEntity().getContent(); FileOutputStream fos = new FileOutputStream(outputFile)) {
-                    image.setTotal(response.getEntity().getContentLength());
-                    dataService.updateImageTotal(image.getTotal(), image.getId());
-
-                    log.debug(String.format("%s length is %d", imageFileData.getImageUrl(), image.getTotal()));
-                    log.debug(String.format("Starting data transfer for %s", imageFileData.getImageUrl()));
-
-                    byte[] buffer = new byte[READ_BUFFER_SIZE];
-                    int read;
-                    while ((read = downloadStream.read(buffer, 0, READ_BUFFER_SIZE)) != -1) {
-                        fos.write(buffer, 0, read);
-                        image.increase(read);
-                        downloadSpeedService.increase(read);
-                        dataService.updateImageCurrent(image.getCurrent(), image.getId());
-                    }
-                    fos.flush();
-                    EntityUtils.consumeQuietly(response.getEntity());
-                } finally {
-                    if (image.getCurrent() == image.getTotal()) {
-                        image.setStatus(Status.COMPLETE);
-                    } else {
-                        image.setStatus(Status.ERROR);
-                    }
-                    dataService.updateImageStatus(image.getStatus(), image.getId());
-                }
-                File finalName = checkImageTypeAndRename(post, outputFile, imageFileData.getImageName(), image.getIndex());
-                imageFileData.setFileName(finalName.getName());
-            }
-        } catch (Exception e) {
-            if (Thread.interrupted() || imageFileData.getImageRequest().isAborted()) {
-                throw new InterruptedException("Download was interrupted");
-            }
-            throw new DownloadException(e);
-        }
-    }
-
-    private File checkImageTypeAndRename(Post post, File outputFile, String imageName, int index) throws HostException {
-        try (ImageInputStream iis = ImageIO.createImageInputStream(outputFile)) {
-            Iterator<ImageReader> it = ImageIO.getImageReaders(iis);
-            if (!it.hasNext()) {
-                throw new HostException("Image file is not recognized!");
-            }
-            ImageReader reader = it.next();
-            if (reader.getFormatName().toUpperCase().equals("JPEG")) {
-                String imageNameLC = imageName.toLowerCase();
-                if (!imageNameLC.endsWith("_jpg") && !imageNameLC.endsWith("_jpeg")) {
-                    imageName += ".jpg";
-                } else {
-                    String toReplace = null;
-                    if (imageNameLC.endsWith("_jpg")) {
-                        toReplace = "_jpg";
-                    } else if (imageNameLC.endsWith("_jpeg")) {
-                        toReplace = "_jpeg";
-                    }
-                    if (toReplace != null) {
-                        imageName = imageName.substring(0, imageName.length() - toReplace.length()) + ".jpg";
-                    }
-                }
-            } else if (reader.getFormatName().toUpperCase().equals("PNG")) {
-                String imageNameLC = imageName.toLowerCase();
-                if (!imageNameLC.endsWith("_png")) {
-                    imageName += ".png";
-                } else {
-                    String toReplace = null;
-                    if (imageNameLC.endsWith("_png")) {
-                        toReplace = "_png";
-                    }
-                    if (toReplace != null) {
-                        imageName = imageName.substring(0, imageName.length() - toReplace.length()) + ".png";
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw new HostException("Failed to guess image format", e);
-        }
-        try {
-            File downloadDestinationFolder = pathService.getDownloadDestinationFolder(post);
-            File outImage = new File(downloadDestinationFolder, (appSettingsService.getSettings().getForceOrder() ? String.format("%03d_", index) : "") + imageName);
-            if (outImage.exists() && outImage.delete()) {
-                log.debug(String.format("%s is deleted", outImage.toString()));
-            }
-            return Files.move(outputFile.toPath(), outImage.toPath(), StandardCopyOption.ATOMIC_MOVE).toFile();
-        } catch (Exception e) {
-            throw new HostException("Failed to rename the image", e);
-        }
-    }
-
-    final String getDefaultImageName(final String imgUrl) {
-        String imageTitle = imgUrl.substring(imgUrl.lastIndexOf('/') + 1);
-        log.debug(String.format("Extracting name from url %s: %s", imgUrl, imageTitle));
-        return imgUrl;
-    }
-
-    final Response getResponse(final String url, final HttpClientContext context) throws HostException {
-        String basePage;
-
-        HttpClient client = cm.getClient().build();
-        HttpGet httpGet = cm.buildHttpGet(url);
-        Header[] headers;
-        log.debug(String.format("Requesting %s", url));
-        try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(httpGet, context)) {
-            if (response.getStatusLine().getStatusCode() / 100 != 2) {
-                throw new HostException(String.format("Unexpected response code: %d", response.getStatusLine().getStatusCode()));
-            }
-            headers = response.getAllHeaders();
-            basePage = EntityUtils.toString(response.getEntity());
-            log.debug(String.format("%s response: %n%s", url, basePage));
-            EntityUtils.consumeQuietly(response.getEntity());
-        } catch (IOException e) {
-            throw new HostException(e);
-        }
-
-        try {
-            log.debug(String.format("Cleaning %s response", url));
-            return new Response(htmlProcessorService.clean(basePage), headers);
-        } catch (HtmlProcessorException e) {
-            throw new HostException(e);
-        }
-    }
-
-    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());
-        imageFileData.setImageRequest(httpGet);
-    }
-
-    protected abstract void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException;
+    public abstract HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException;

    @Override
    public boolean equals(Object o) {
@@ -291,18 +35,6 @@ abstract public class Host {
        return Objects.hash(getHost());
    }

-    @Getter
-    public static class Response {
-
-        protected Response(Document document, Header[] headers) {
-            this.document = document;
-            this.headers = headers;
-        }
-
-        private Document document;
-        private Header[] headers;
-    }
-
    @Override
    public String toString() {
        return getHost();
@@ -13,8 +13,10 @@ import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.HtmlProcessorException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
-import tn.mnlr.vripper.services.ConnectionManager;
+import tn.mnlr.vripper.services.ConnectionService;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.HtmlProcessorService;
+import tn.mnlr.vripper.services.XpathService;

 import java.io.IOException;

@@ -26,11 +28,17 @@ public class ImageBamHost extends Host {
    private static final String CONTINUE_BUTTON_XPATH = "//a[@title='Continue to your image']";
    private static final String IMG_XPATH = "//img[@class='image']";

-    @Autowired
-    private ConnectionManager cm;
+    private final HostService hostService;
+    private final ConnectionService cm;
+    private final XpathService xpathService;
+    private final HtmlProcessorService htmlProcessorService;

-    public ImageBamHost() {
-        super();
+    @Autowired
+    public ImageBamHost(HostService hostService, ConnectionService cm, XpathService xpathService, HtmlProcessorService htmlProcessorService) {
+        this.hostService = hostService;
+        this.cm = cm;
+        this.xpathService = xpathService;
+        this.htmlProcessorService = htmlProcessorService;
    }

    @Override
@@ -44,9 +52,9 @@ public class ImageBamHost extends Host {
    }

    @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException {

-        Response response = getResponse(url, context);
+        HostService.Response response = hostService.getResponse(url, context);
        Document doc = response.getDocument();

        Node contDiv;
@@ -60,7 +68,7 @@ public class ImageBamHost extends Host {
        if (contDiv != null) {
            log.debug(String.format("Click button found for %s", url));
            HttpClient client = cm.getClient().build();
-            HttpGet httpGet = cm.buildHttpGet(url);
+            HttpGet httpGet = cm.buildHttpGet(url, context);
            httpGet.addHeader("Referer", url);
            log.debug(String.format("Requesting %s", httpGet));
            try (CloseableHttpResponse res = (CloseableHttpResponse) client.execute(httpGet, context)) {
@@ -87,8 +95,7 @@ public class ImageBamHost extends Host {
            String imgTitle = imgNode.getAttributes().getNamedItem("id").getTextContent().trim();
            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();

-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle);
+            return new HostService.NameUrl(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
@@ -2,12 +2,14 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+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.HostService;
+import tn.mnlr.vripper.services.XpathService;

 import java.util.Optional;

@@ -18,8 +20,13 @@ public class ImageTwistHost extends Host {
    private static final String IMG_XPATH = "//img[contains(@class, 'img')]";
    private static final String host = "imagetwist.com";

-    public ImageTwistHost() {
-        super();
+    private final HostService hostService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public ImageTwistHost(HostService hostService, XpathService xpathService) {
+        this.hostService = hostService;
+        this.xpathService = xpathService;
    }

    @Override
@@ -33,9 +40,9 @@ public class ImageTwistHost extends Host {
    }

    @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException {

-        Document doc = getResponse(url, context).getDocument();
+        Document doc = hostService.getResponse(url, context).getDocument();

        Node imgNode;
        try {
@@ -50,8 +57,7 @@ public class ImageTwistHost extends Host {
            String imgTitle = Optional.ofNullable(imgNode.getAttributes().getNamedItem("alt")).map(Node::getTextContent).map(String::trim).orElse(null);
            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();

-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle);
+            return new HostService.NameUrl(imgTitle, imgUrl);
        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
@@ -2,12 +2,14 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+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.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
@@ -17,8 +19,13 @@ public class ImageVenueHost extends Host {
    private static final String CONTINUE_BUTTON_XPATH = "//a[@title='Continue to ImageVenue']";
    private static final String IMG_XPATH = "//a[@data-toggle='full']/img";

-    public ImageVenueHost() {
-        super();
+    private final HostService hostService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public ImageVenueHost(HostService hostService, XpathService xpathService) {
+        this.hostService = hostService;
+        this.xpathService = xpathService;
    }

    @Override
@@ -32,18 +39,18 @@ public class ImageVenueHost extends Host {
    }

    @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context) throws HostException {

        String url = _url.replace("http://", "https://");

-        Response resp = getResponse(url, context);
+        HostService.Response resp = hostService.getResponse(url, context);
        Document doc = resp.getDocument();

        try {
            log.debug(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
            if (xpathService.getAsNode(doc, CONTINUE_BUTTON_XPATH) != null) {
                //Button detected. No need to actually click it, just make the call again.
-                resp = getResponse(url, context);
+                resp = hostService.getResponse(url, context);
                doc = resp.getDocument();
            }
        } catch (XpathException e) {
@@ -67,8 +74,7 @@ public class ImageVenueHost extends Host {
            String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();

-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle);
+            return new HostService.NameUrl(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
@@ -2,12 +2,14 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+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.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
@@ -17,8 +19,13 @@ public class ImageZillaHost extends Host {
    private static final String lookup = "imagezilla.net/show";
    private static final String IMG_XPATH = "//img[@id='photo']";

-    public ImageZillaHost() {
-        super();
+    private final HostService hostService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public ImageZillaHost(HostService hostService, XpathService xpathService) {
+        this.hostService = hostService;
+        this.xpathService = xpathService;
    }

    @Override
@@ -32,9 +39,9 @@ public class ImageZillaHost extends Host {
    }

    @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException {

-        Document doc = getResponse(url, context).getDocument();
+        Document doc = hostService.getResponse(url, context).getDocument();

        String title;
        try {
@@ -51,12 +58,11 @@ public class ImageZillaHost extends Host {
        }

        if (title == null || title.isEmpty()) {
-            title = getDefaultImageName(url);
+            title = hostService.getDefaultImageName(url);
        }

        try {
-            imageFileData.setImageUrl(url.replace("show", "images"));
-            imageFileData.setImageName(title);
+            return new HostService.NameUrl(title, url.replace("show", "images"));
        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
@@ -2,12 +2,14 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+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.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
@@ -16,8 +18,13 @@ public class ImgSpiceHost extends Host {
    private static final String host = "imgspice.com";
    private static final String IMG_XPATH = "//img[@id='imgpreview']";

-    public ImgSpiceHost() {
-        super();
+    private final HostService hostService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public ImgSpiceHost(HostService hostService, XpathService xpathService) {
+        this.hostService = hostService;
+        this.xpathService = xpathService;
    }

    @Override
@@ -31,10 +38,10 @@ public class ImgSpiceHost extends Host {
    }

    @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context) throws HostException {

        String url = _url.replace("http://", "https://");
-        Response resp = getResponse(url, context);
+        HostService.Response resp = hostService.getResponse(url, context);
        Document doc = resp.getDocument();

        Node imgNode;
@@ -50,8 +57,7 @@ public class ImgSpiceHost extends Host {
            String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();

-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle);
+            return new HostService.NameUrl(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
@@ -8,8 +8,8 @@ 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;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
@@ -18,11 +18,14 @@ public class ImgboxHost extends Host {
    private static final String host = "imgbox.com";
    private static final String IMG_XPATH = "//img[@id='img']";

-    @Autowired
-    private ConnectionManager cm;
+    private final HostService hostService;
+    private final XpathService xpathService;

-    public ImgboxHost() {
-        super();
+
+    @Autowired
+    public ImgboxHost(HostService hostService, XpathService xpathService) {
+        this.hostService = hostService;
+        this.xpathService = xpathService;
    }

    @Override
@@ -36,9 +39,9 @@ public class ImgboxHost extends Host {
    }

    @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException {

-        Document doc = getResponse(url, context).getDocument();
+        Document doc = hostService.getResponse(url, context).getDocument();

        Node imgNode;
        try {
@@ -53,8 +56,7 @@ public class ImgboxHost extends Host {
            String imgTitle = imgNode.getAttributes().getNamedItem("title").getTextContent().trim();
            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();

-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle);
+            return new HostService.NameUrl(imgTitle, imgUrl);
        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
@@ -16,8 +16,10 @@ import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.HtmlProcessorException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
-import tn.mnlr.vripper.services.ConnectionManager;
+import tn.mnlr.vripper.services.ConnectionService;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.HtmlProcessorService;
+import tn.mnlr.vripper.services.XpathService;

 import java.io.IOException;
 import java.util.ArrayList;
@@ -31,8 +33,18 @@ public class ImxHost extends Host {
    private static final String CONTINUE_BUTTON_XPATH = "//*[@name='imgContinue']";
    private static final String IMG_XPATH = "//img[@class='centred']";

+    private final HostService hostService;
+    private final XpathService xpathService;
+    private final ConnectionService cm;
+    private final HtmlProcessorService htmlProcessorService;
+
    @Autowired
-    private ConnectionManager cm;
+    public ImxHost(HostService hostService, XpathService xpathService, ConnectionService cm, HtmlProcessorService htmlProcessorService) {
+        this.hostService = hostService;
+        this.xpathService = xpathService;
+        this.cm = cm;
+        this.htmlProcessorService = htmlProcessorService;
+    }

    @Override
    public String getHost() {
@@ -45,10 +57,10 @@ public class ImxHost extends Host {
    }

    @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context) throws HostException {

        String url = _url.replace("http://", "https://");
-        Response resp = getResponse(url, context);
+        HostService.Response resp = hostService.getResponse(url, context);
        Document doc = resp.getDocument();

        Node contDiv;
@@ -56,6 +68,9 @@ public class ImxHost extends Host {
        try {
            log.debug(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
            contDiv = xpathService.getAsNode(doc, CONTINUE_BUTTON_XPATH);
+            if (contDiv == null) {
+                throw new HostException(CONTINUE_BUTTON_XPATH + " cannot be found");
+            }
            Node node = contDiv.getAttributes().getNamedItem("value");
            if (node != null) {
                value = node.getTextContent();
@@ -69,7 +84,7 @@ public class ImxHost extends Host {
        }
        log.debug(String.format("Click button found for %s", url));
        HttpClient client = cm.getClient().build();
-        HttpPost httpPost = cm.buildHttpPost(url);
+        HttpPost httpPost = cm.buildHttpPost(url, context);
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("imgContinue", value));
        try {
@@ -99,8 +114,7 @@ public class ImxHost extends Host {
            String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();

-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle);
+            return new HostService.NameUrl(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
@@ -2,12 +2,14 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+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.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
@@ -16,8 +18,14 @@ public class PimpandhostHost extends Host {
    private static final String host = "pimpandhost.com";
    private static final String IMG_XPATH = "//img[contains(@class, 'original')]";

-    public PimpandhostHost() {
+    private final HostService hostService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public PimpandhostHost(HostService hostService, XpathService xpathService) {
        super();
+        this.hostService = hostService;
+        this.xpathService = xpathService;
    }

    @Override
@@ -31,16 +39,16 @@ public class PimpandhostHost extends Host {
    }

    @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context) throws HostException {

        String url;
        try {
-            url = appendUri(_url.replace("http://", "https://"), "size=original");
+            url = hostService.appendUri(_url.replace("http://", "https://"), "size=original");
        } catch (Exception e) {
            throw new HostException(e);
        }

-        Response resp = getResponse(url, context);
+        HostService.Response resp = hostService.getResponse(url, context);
        Document doc = resp.getDocument();

        Node imgNode;
@@ -56,8 +64,10 @@ public class PimpandhostHost extends Host {
            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);
+            return new HostService.NameUrl(
+                    imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle,
+                    imgUrl
+            );
        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
@@ -2,12 +2,14 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+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.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
@@ -16,6 +18,15 @@ public class PixRouteHost extends Host {
    private static final String host = "pixroute.com";
    private static final String IMG_XPATH = "//img[@id='imgpreview']";

+    private final HostService hostService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public PixRouteHost(HostService hostService, XpathService xpathService) {
+        this.hostService = hostService;
+        this.xpathService = xpathService;
+    }
+
    @Override
    public String getHost() {
        return host;
@@ -27,10 +38,10 @@ public class PixRouteHost extends Host {
    }

    @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context) throws HostException {

        String url = _url.replace("http://", "https://");
-        Document doc = getResponse(url, context).getDocument();
+        Document doc = hostService.getResponse(url, context).getDocument();

        Node imgNode;
        try {
@@ -47,8 +58,10 @@ public class PixRouteHost extends Host {
        try {
            log.debug(String.format("Resolving name and image url for %s", url));

-            imageFileData.setImageUrl(imgNode.getAttributes().getNamedItem("src").getTextContent().trim());
-            imageFileData.setImageName(imgNode.getAttributes().getNamedItem("alt").getTextContent().trim());
+            return new HostService.NameUrl(
+                    imgNode.getAttributes().getNamedItem("alt").getTextContent().trim(),
+                    imgNode.getAttributes().getNamedItem("src").getTextContent().trim()
+            );
        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
@@ -2,12 +2,14 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+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.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
@@ -17,8 +19,13 @@ public class PixhostHost extends Host {
    private static final String lookup = "pixhost.to/show";
    private static final String IMG_XPATH = "//img[@id='image']";

-    public PixhostHost() {
-        super();
+    private final HostService hostService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public PixhostHost(HostService hostService, XpathService xpathService) {
+        this.hostService = hostService;
+        this.xpathService = xpathService;
    }

    @Override
@@ -32,9 +39,9 @@ public class PixhostHost extends Host {
    }

    @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException {

-        Document doc = getResponse(url, context).getDocument();
+        Document doc = hostService.getResponse(url, context).getDocument();

        Node imgNode;
        try {
@@ -49,8 +56,7 @@ public class PixhostHost extends Host {
            String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();

-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle.substring(imgTitle.indexOf('_') + 1));
+            return new HostService.NameUrl(imgTitle.substring(imgTitle.indexOf('_') + 1), imgUrl);
        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
@@ -2,12 +2,14 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+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.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
@@ -17,8 +19,13 @@ public class PixxxelsHost extends Host {
    private static final String IMG_XPATH = "//*[@id='download']";
    private static final String TITLE_XPATH = "//*[contains(@class,'imagename')]";

-    public PixxxelsHost() {
-        super();
+    private final HostService hostService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public PixxxelsHost(HostService hostService, XpathService xpathService) {
+        this.hostService = hostService;
+        this.xpathService = xpathService;
    }

    @Override
@@ -32,10 +39,10 @@ public class PixxxelsHost extends Host {
    }

    @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context) throws HostException {

        String url = _url.replace("http://", "https://");
-        Response resp = getResponse(url, context);
+        HostService.Response resp = hostService.getResponse(url, context);
        Document doc = resp.getDocument();

        Node imgNode, titleNode;
@@ -55,8 +62,7 @@ public class PixxxelsHost extends Host {
            String imgTitle = titleNode.getTextContent().trim();
            String imgUrl = imgNode.getAttributes().getNamedItem("href").getTextContent().trim();

-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle);
+            return new HostService.NameUrl(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
@@ -2,12 +2,14 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+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.HostService;
+import tn.mnlr.vripper.services.XpathService;

 import java.util.Optional;

@@ -19,8 +21,13 @@ public class PostImgHost extends Host {
    private static final String TITLE_XPATH = "//span[contains(@class,'imagename')]";
    private static final String IMG_XPATH = "//a[@id='download']";

-    public PostImgHost() {
-        super();
+    private final HostService hostService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public PostImgHost(HostService hostService, XpathService xpathService) {
+        this.hostService = hostService;
+        this.xpathService = xpathService;
    }

    @Override
@@ -34,10 +41,10 @@ public class PostImgHost extends Host {
    }

    @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context) throws HostException {

        String url = _url.replace("http://", "https://");
-        Document doc = getResponse(url, context).getDocument();
+        Document doc = hostService.getResponse(url, context).getDocument();

        Node urlNode, titleNode;
        try {
@@ -52,10 +59,9 @@ public class PostImgHost extends Host {

        try {
            log.debug(String.format("Resolving name and image url for %s", url));
-            String imgTitle = Optional.ofNullable(titleNode).map(node -> node.getTextContent().trim()).orElseGet(() -> getDefaultImageName(url));
+            String imgTitle = Optional.ofNullable(titleNode).map(node -> node.getTextContent().trim()).orElseGet(() -> hostService.getDefaultImageName(url));

-            imageFileData.setImageUrl(urlNode.getAttributes().getNamedItem("href").getTextContent().trim());
-            imageFileData.setImageName(imgTitle);
+            return new HostService.NameUrl(imgTitle, urlNode.getAttributes().getNamedItem("href").getTextContent().trim());
        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
@@ -2,12 +2,14 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+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.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
@@ -15,10 +17,15 @@ public class TurboImageHost extends Host {

    private static final String host = "turboimagehost.com";
    private static final String TITLE_XPATH = "//div[contains(@class,'titleFullS')]/h1";
-    private static final String IMG_XPATH = "//img[@id='uImage']";
+    private static final String IMG_XPATH = "//img[@id='imageid']";

-    public TurboImageHost() {
-        super();
+    private final HostService hostService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public TurboImageHost(HostService hostService, XpathService xpathService) {
+        this.hostService = hostService;
+        this.xpathService = xpathService;
    }

    @Override
@@ -32,9 +39,9 @@ public class TurboImageHost extends Host {
    }

    @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException {

-        Document doc = getResponse(url, context).getDocument();
+        Document doc = hostService.getResponse(url, context).getDocument();

        String title;
        try {
@@ -51,13 +58,12 @@ public class TurboImageHost extends Host {
        }

        if (title == null || title.isEmpty()) {
-            title = getDefaultImageName(url);
+            title = hostService.getDefaultImageName(url);
        }

        try {
            Node urlNode = xpathService.getAsNode(doc, IMG_XPATH);
-            imageFileData.setImageUrl(urlNode.getAttributes().getNamedItem("src").getTextContent().trim());
-            imageFileData.setImageName(title);
+            return new HostService.NameUrl(title, urlNode.getAttributes().getNamedItem("src").getTextContent().trim());
        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
@@ -0,0 +1,65 @@
+package tn.mnlr.vripper.host;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.client.protocol.HttpClientContext;
+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.services.HostService;
+import tn.mnlr.vripper.services.XpathService;
+
+import java.util.Optional;
+
+@Service
+@Slf4j
+public class ViprImHost extends Host {
+
+    private static final String IMG_XPATH = "//img[contains(@class, 'img')]";
+    private static final String host = "vipr.im";
+
+    private final HostService hostService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public ViprImHost(HostService hostService, XpathService xpathService) {
+        this.hostService = hostService;
+        this.xpathService = xpathService;
+    }
+
+    @Override
+    public String getHost() {
+        return host;
+    }
+
+    @Override
+    public String getLookup() {
+        return host;
+    }
+
+    @Override
+    public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException {
+
+        Document doc = hostService.getResponse(url, context).getDocument();
+
+        Node imgNode;
+        try {
+            log.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 {
+            log.debug(String.format("Resolving name and image url for %s", url));
+            String imgTitle = Optional.ofNullable(imgNode.getAttributes().getNamedItem("alt")).map(Node::getTextContent).map(String::trim).orElse(null);
+            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
+
+            return new HostService.NameUrl(imgTitle, imgUrl);
+        } catch (Exception e) {
+            throw new HostException("Unexpected error occurred", e);
+        }
+    }
+}
@@ -1,13 +1,15 @@
 package tn.mnlr.vripper.jpa;

-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import tn.mnlr.vripper.download.DownloadService;
+import tn.mnlr.vripper.services.ThreadPoolService;

 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import java.io.File;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -25,11 +27,26 @@ public class Management {

    private final JdbcTemplate jdbcTemplate;
    private final String backupFolder;
+    private final ThreadPoolService threadPoolService;
+    private final DownloadService downloadService;

-    @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, ThreadPoolService threadPoolService, DownloadService downloadService) {
        this.jdbcTemplate = jdbcTemplate;
-        this.backupFolder = baseDir + File.separator + ".vripper" + File.separator + "backup";
+        this.threadPoolService = threadPoolService;
+        this.downloadService = downloadService;
+        this.backupFolder = baseDir + File.separator + baseDirName + File.separator + "backup";
+    }
+
+    @PreDestroy
+    public void destroy() {
+
+        try {
+            threadPoolService.destroy();
+            downloadService.destroy();
+            this.jdbcTemplate.execute("SHUTDOWN");
+        } catch (Exception ignored) {
+            Thread.currentThread().interrupt();
+        }
    }

    @PostConstruct
@@ -0,0 +1,64 @@
+package tn.mnlr.vripper.jpa.domain;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class Event {
+
+    private Long id;
+    private Type type;
+    private Status status;
+    @JsonSerialize(using = DateTimeSerializer.class)
+    private LocalDateTime time;
+    private String message;
+
+    public Event(Type type, Status status, LocalDateTime time, String message) {
+        this.type = type;
+        this.status = status;
+        this.time = time;
+        this.message = message;
+    }
+
+    public enum Type {
+        POST,
+        QUEUED,
+        THANKS,
+        METADATA,
+        SCAN,
+        DOWNLOAD,
+        METADATA_CACHE_MISS,
+        QUEUED_CACHE_MISS
+    }
+
+    public enum Status {
+        PENDING, PROCESSING, DONE, ERROR
+    }
+}
+
+class DateTimeSerializer extends StdSerializer<LocalDateTime> {
+
+    private final static DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss.SSS");
+
+    protected DateTimeSerializer() {
+        super(LocalDateTime.class);
+    }
+
+    @Override
+    public void serialize(LocalDateTime value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+        gen.writeString(value.format(DATE_TIME_FORMATTER));
+    }
+}
@@ -1,6 +1,5 @@
 package tn.mnlr.vripper.jpa.domain;

-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -13,12 +12,11 @@ import java.util.List;
@NoArgsConstructor
 public class Metadata {

-    @JsonIgnore
-    private Long id;
+    private Long postIdRef;

-    private List<String> resolvedNames = Collections.emptyList();
+    private String PostId;

    private String postedBy;

-    private Long postIdRef;
+    private List<String> resolvedNames = Collections.emptyList();
 }
@@ -44,7 +44,7 @@ public class Post {
    private String securityToken;

    @JsonIgnore
-    private String postFolderName;
+    private String downloadDirectory;

    private boolean thanked;

@@ -0,0 +1,21 @@
+package tn.mnlr.vripper.jpa.repositories;
+
+import tn.mnlr.vripper.jpa.domain.Event;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface IEventRepository extends IRepository {
+
+    Event save(Event event);
+
+    Event update(Event event);
+
+    List<Event> findAll();
+
+    Optional<Event> findById(Long id);
+
+    void delete(Long id);
+
+    void deleteAll();
+}
@@ -14,8 +14,6 @@ public interface IImageRepository extends IRepository {

    List<Image> findByPostId(String postId);

-    Integer countRemaining();
-
    Integer countError();

    List<Image> findByPostIdAndIsNotCompleted(String postId);
@@ -8,8 +8,6 @@ public interface IMetadataRepository extends IRepository {

    Metadata save(Metadata metadata);

-    Optional<Metadata> findById(Long id);
-
    Optional<Metadata> findByPostId(String postId);

    int deleteByPostId(String postId);
@@ -10,14 +10,12 @@ public interface IPostRepository extends IRepository {

    Post save(Post post);

-    int delete(Long id);
-
    Optional<Post> findByPostId(String postId);

-    List<String> findCompleted();
-
    Optional<Post> findById(Long id);

+    List<String> findCompleted();
+
    List<Post> findAll();

    boolean existByPostId(String postId);
@@ -15,4 +15,6 @@ public interface IQueuedRepository extends IRepository {
    Optional<Queued> findById(Long id);

    int deleteByThreadId(String threadId);
+
+    void deleteAll();
 }
@@ -1,6 +1,4 @@
 package tn.mnlr.vripper.jpa.repositories;

 public interface IRepository {
-
-    public void init();
 }
@@ -0,0 +1,117 @@
+package tn.mnlr.vripper.jpa.repositories.impl;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.ApplicationEventPublisherAware;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.lang.NonNull;
+import org.springframework.stereotype.Service;
+import tn.mnlr.vripper.event.EventRemoveEvent;
+import tn.mnlr.vripper.event.EventUpdateEvent;
+import tn.mnlr.vripper.jpa.domain.Event;
+import tn.mnlr.vripper.jpa.repositories.IEventRepository;
+import tn.mnlr.vripper.services.SettingsService;
+
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Optional;
+
+@Service
+@Slf4j
+public class EventRepository implements IEventRepository, ApplicationEventPublisherAware {
+
+    private final JdbcTemplate jdbcTemplate;
+    private final SettingsService settingsService;
+    private ApplicationEventPublisher applicationEventPublisher;
+
+    public EventRepository(JdbcTemplate jdbcTemplate, SettingsService settingsService) {
+        this.jdbcTemplate = jdbcTemplate;
+        this.settingsService = settingsService;
+    }
+
+    private synchronized Long nextId() {
+        return jdbcTemplate.queryForObject(
+                "CALL NEXT VALUE FOR SEQ_EVENT",
+                Long.class);
+    }
+
+    @Override
+    public synchronized Event save(@NonNull Event event) {
+
+        int maxRecords = settingsService.getSettings().getMaxEventLog() - 1;
+
+        Long count = jdbcTemplate.queryForObject("SELECT COUNT(*) FROM EVENT", Long.class);
+        if (count > maxRecords) {
+            List<Long> idList = jdbcTemplate.queryForList("SELECT ID FROM EVENT ORDER BY TIME ASC LIMIT ?", Long.class, count - maxRecords);
+            idList.forEach(this::delete);
+        }
+
+        long id = nextId();
+        jdbcTemplate.update(
+                "INSERT INTO EVENT (ID, TYPE, STATUS, TIME, MESSAGE) VALUES (?,?,?,?,?)",
+                id,
+                event.getType().name(),
+                event.getStatus().name(),
+                event.getTime().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
+                event.getMessage()
+        );
+        event.setId(id);
+        applicationEventPublisher.publishEvent(new EventUpdateEvent(EventRepository.class, id));
+        return event;
+    }
+
+    @Override
+    public Event update(@NonNull Event event) {
+        if (event.getId() == null) {
+            log.warn("Cannot update entity with null id");
+            return event;
+        }
+
+        jdbcTemplate.update(
+                "UPDATE EVENT SET TYPE = ?, STATUS = ?, TIME = ?, MESSAGE = ? WHERE ID = ?",
+                event.getType().name(),
+                event.getStatus().name(),
+                event.getTime().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
+                event.getMessage(),
+                event.getId()
+        );
+        applicationEventPublisher.publishEvent(new EventUpdateEvent(EventRepository.class, event.getId()));
+        return event;
+    }
+
+    @Override
+    public Optional<Event> findById(Long id) {
+        List<Event> events = jdbcTemplate.query(
+                "SELECT * FROM EVENT WHERE ID = ?",
+                new EventRowMapper(),
+                id);
+        if (events.isEmpty()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(events.get(0));
+        }
+    }
+
+    @Override
+    public List<Event> findAll() {
+        return jdbcTemplate.query(
+                "SELECT * FROM EVENT",
+                new EventRowMapper());
+    }
+
+    @Override
+    public void delete(Long id) {
+        jdbcTemplate.update("DELETE FROM EVENT WHERE ID = ?", id);
+        applicationEventPublisher.publishEvent(new EventRemoveEvent(EventRepository.class, id));
+    }
+
+    @Override
+    public void deleteAll() {
+        jdbcTemplate.update("DELETE FROM EVENT");
+    }
+
+    @Override
+    public void setApplicationEventPublisher(@NonNull ApplicationEventPublisher applicationEventPublisher) {
+        this.applicationEventPublisher = applicationEventPublisher;
+    }
+}
@@ -0,0 +1,23 @@
+package tn.mnlr.vripper.jpa.repositories.impl;
+
+import org.springframework.jdbc.core.RowMapper;
+import tn.mnlr.vripper.jpa.domain.Event;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+public class EventRowMapper implements RowMapper<Event> {
+
+    @Override
+    public Event mapRow(ResultSet rs, int rowNum) throws SQLException {
+        Event event = new Event();
+        event.setId(rs.getLong("ID"));
+        event.setType(Event.Type.valueOf(rs.getString("TYPE")));
+        event.setStatus(Event.Status.valueOf(rs.getString("STATUS")));
+        event.setTime(LocalDateTime.parse(rs.getString("TIME"), DateTimeFormatter.ISO_LOCAL_DATE_TIME));
+        event.setMessage(rs.getString("MESSAGE"));
+        return event;
+    }
+}
@@ -1,42 +1,39 @@
 package tn.mnlr.vripper.jpa.repositories.impl;

 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Service;
+import tn.mnlr.vripper.event.ImageUpdateEvent;
 import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.jpa.domain.enums.Status;
 import tn.mnlr.vripper.jpa.repositories.IImageRepository;

 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicLong;

@Service
-public class ImageRepository implements IImageRepository {
+public class ImageRepository implements IImageRepository, ApplicationEventPublisherAware {

    private final JdbcTemplate jdbcTemplate;
-    private final AtomicLong counter = new AtomicLong(0);
+    private ApplicationEventPublisher applicationEventPublisher;

    @Autowired
    public ImageRepository(JdbcTemplate jdbcTemplate) {
        this.jdbcTemplate = jdbcTemplate;
    }

-    @Override
-    public void init() {
-        Long maxId = jdbcTemplate.queryForObject(
-                "SELECT MAX(ID) FROM IMAGE",
-                Long.class
-        );
-        if (maxId == null) {
-            maxId = 0L;
-        }
-        counter.set(maxId);
+    private synchronized Long nextId() {
+        return jdbcTemplate.queryForObject(
+                "CALL NEXT VALUE FOR SEQ_IMAGE",
+                Long.class);
    }

    @Override
    public Image save(Image image) {
-        long id = counter.incrementAndGet();
+        long id = nextId();
        jdbcTemplate.update(
                "INSERT INTO IMAGE (ID, CURRENT, HOST, INDEX, POST_ID, STATUS, TOTAL, URL, POST_ID_REF) VALUES (?,?,?,?,?,?,?,?,?)",
                id,
@@ -50,6 +47,7 @@ public class ImageRepository implements IImageRepository {
                image.getPostIdRef()
        );
        image.setId(id);
+        applicationEventPublisher.publishEvent(new ImageUpdateEvent(ImageRepository.class, id));
        return image;
    }

@@ -62,17 +60,8 @@ public class ImageRepository implements IImageRepository {
    public List<Image> findByPostId(String postId) {
        return jdbcTemplate.query(
                "SELECT * FROM IMAGE WHERE POST_ID = ?",
-                new Object[]{postId},
-                new ImageRowMapper()
-        );
-    }
-
-    @Override
-    public Integer countRemaining() {
-        return jdbcTemplate.queryForObject(
-                "SELECT COUNT(*) FROM IMAGE AS image WHERE image.TOTAL = 0 OR image.TOTAL <> image.CURRENT",
-                Integer.class
-        );
+                new ImageRowMapper(),
+                postId);
    }

    @Override
@@ -87,9 +76,8 @@ public class ImageRepository implements IImageRepository {
    public List<Image> findByPostIdAndIsNotCompleted(String postId) {
        return jdbcTemplate.query(
                "SELECT * FROM IMAGE AS image WHERE image.POST_ID = ? AND image.STATUS <> 'COMPLETE'",
-                new Object[]{postId},
-                new ImageRowMapper()
-        );
+                new ImageRowMapper(),
+                postId);
    }

    @Override
@@ -104,18 +92,16 @@ public class ImageRepository implements IImageRepository {
    public List<Image> findByPostIdAndIsError(String postId) {
        return jdbcTemplate.query(
                "SELECT * FROM IMAGE AS image WHERE image.POST_ID = ? AND image.STATUS = 'ERROR'",
-                new Object[]{postId},
-                new ImageRowMapper()
-        );
+                new ImageRowMapper(),
+                postId);
    }

    @Override
    public Optional<Image> findById(Long id) {
        List<Image> images = jdbcTemplate.query(
                "SELECT * FROM IMAGE AS image WHERE image.ID = ?",
-                new Object[]{id},
-                new ImageRowMapper()
-        );
+                new ImageRowMapper(),
+                id);
        if (images.isEmpty()) {
            return Optional.empty();
        } else {
@@ -125,25 +111,36 @@ public class ImageRepository implements IImageRepository {

    @Override
    public int updateStatus(Status status, Long id) {
-        return jdbcTemplate.update(
+        int mutationCount = jdbcTemplate.update(
                "UPDATE IMAGE AS image SET image.STATUS = ? WHERE image.ID = ?",
                status.name(), id
        );
+        applicationEventPublisher.publishEvent(new ImageUpdateEvent(ImageRepository.class, id));
+        return mutationCount;
    }

    @Override
    public int updateCurrent(long current, Long id) {
-        return jdbcTemplate.update(
+        int mutationCount = jdbcTemplate.update(
                "UPDATE IMAGE AS image SET image.CURRENT = ? WHERE image.ID = ?",
                current, id
        );
+        applicationEventPublisher.publishEvent(new ImageUpdateEvent(ImageRepository.class, id));
+        return mutationCount;
    }

    @Override
    public int updateTotal(long total, Long id) {
-        return jdbcTemplate.update(
+        int mutationCount = jdbcTemplate.update(
                "UPDATE IMAGE AS image SET image.TOTAL = ? WHERE image.ID = ?",
                total, id
        );
+        applicationEventPublisher.publishEvent(new ImageUpdateEvent(ImageRepository.class, id));
+        return mutationCount;
+    }
+
+    @Override
+    public void setApplicationEventPublisher(@NonNull ApplicationEventPublisher applicationEventPublisher) {
+        this.applicationEventPublisher = applicationEventPublisher;
    }
 }
@@ -1,72 +1,47 @@
 package tn.mnlr.vripper.jpa.repositories.impl;

 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
+import tn.mnlr.vripper.event.MetadataUpdateEvent;
 import tn.mnlr.vripper.jpa.domain.Metadata;
 import tn.mnlr.vripper.jpa.repositories.IMetadataRepository;

 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicLong;

@Service
-public class MetadataRepository implements IMetadataRepository {
+public class MetadataRepository implements IMetadataRepository, ApplicationEventPublisherAware {

    private final JdbcTemplate jdbcTemplate;
-    private final AtomicLong counter = new AtomicLong(0);
+    private ApplicationEventPublisher applicationEventPublisher;

    @Autowired
    public MetadataRepository(JdbcTemplate jdbcTemplate) {
        this.jdbcTemplate = jdbcTemplate;
    }

-    @Override
-    public void init() {
-        Long maxId = jdbcTemplate.queryForObject(
-                "SELECT MAX(ID) FROM IMAGE",
-                Long.class
-        );
-        if (maxId == null) {
-            maxId = 0L;
-        }
-        counter.set(maxId);
-    }
-
    @Override
    public Metadata save(Metadata metadata) {
-        long id = counter.incrementAndGet();
        jdbcTemplate.update(
-                "INSERT INTO METADATA (ID, POSTED_BY, RESOLVED_NAMES, POST_ID_REF) VALUES (?,?,?,?)",
-                id,
+                "INSERT INTO METADATA (POST_ID_REF, POST_ID, POSTED_BY, RESOLVED_NAMES) VALUES (?,?,?,?)",
+                metadata.getPostIdRef(),
+                metadata.getPostId(),
                metadata.getPostedBy(),
-                String.join("%sep%", metadata.getResolvedNames()),
-                metadata.getPostIdRef()
+                String.join("%sep%", metadata.getResolvedNames())
        );
-        metadata.setId(id);
+        applicationEventPublisher.publishEvent(new MetadataUpdateEvent(MetadataRepository.class, metadata.getPostIdRef()));
        return metadata;
    }

-    @Override
-    public Optional<Metadata> findById(Long id) {
-        List<Metadata> metadata = jdbcTemplate.query(
-                "SELECT * FROM METADATA AS metadata WHERE metadata.ID = ?",
-                new Object[]{id},
-                new MetadataRowMapper()
-        );
-        if (metadata.isEmpty()) {
-            return Optional.empty();
-        } else {
-            return Optional.of(metadata.get(0));
-        }
-    }
-
    @Override
    public Optional<Metadata> findByPostId(String postId) {
        List<Metadata> metadata = jdbcTemplate.query(
-                "SELECT metadata.* FROM METADATA AS metadata INNER JOIN POST post ON post.ID = metadata.POST_ID_REF WHERE post.POST_ID = ?",
-                new Object[]{postId},
-                new MetadataRowMapper()
+                "SELECT metadata.* FROM METADATA AS metadata WHERE metadata.POST_ID = ?",
+                new MetadataRowMapper(),
+                postId
        );
        if (metadata.isEmpty()) {
            return Optional.empty();
@@ -78,8 +53,13 @@ public class MetadataRepository implements IMetadataRepository {
    @Override
    public int deleteByPostId(String postId) {
        return jdbcTemplate.update(
-                "DELETE FROM METADATA WHERE POST_ID_REF = (SELECT post.ID FROM POST AS post INNER JOIN METADATA metadata ON post.ID = metadata.POST_ID_REF WHERE post.POST_ID = ?)",
+                "DELETE FROM METADATA AS metadata WHERE metadata.POST_ID = ?",
                postId
        );
    }
+
+    @Override
+    public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
+        this.applicationEventPublisher = applicationEventPublisher;
+    }
 }
@@ -12,13 +12,13 @@ public class MetadataRowMapper implements RowMapper<Metadata> {
    @Override
    public Metadata mapRow(ResultSet rs, int rowNum) throws SQLException {
        Metadata metadata = new Metadata();
-        metadata.setId(rs.getLong("ID"));
+        metadata.setPostIdRef(rs.getLong("POST_ID_REF"));
+        metadata.setPostId(rs.getString("POST_ID"));
        metadata.setPostedBy(rs.getString("POSTED_BY"));
        String resolvedNames = rs.getString("RESOLVED_NAMES");
        if (resolvedNames != null && !resolvedNames.isBlank()) {
            metadata.setResolvedNames(List.of(resolvedNames.split("%sep%")));
        }
-        metadata.setPostIdRef(rs.getLong("POST_ID_REF"));
        return metadata;
    }
 }
@@ -1,21 +1,25 @@
 package tn.mnlr.vripper.jpa.repositories.impl;

 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Service;
+import tn.mnlr.vripper.event.PostRemoveEvent;
+import tn.mnlr.vripper.event.PostUpdateEvent;
 import tn.mnlr.vripper.jpa.domain.Post;
 import tn.mnlr.vripper.jpa.domain.enums.Status;
 import tn.mnlr.vripper.jpa.repositories.IPostRepository;

 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicLong;

@Service
-public class PostRepository implements IPostRepository {
+public class PostRepository implements IPostRepository, ApplicationEventPublisherAware {

    private final JdbcTemplate jdbcTemplate;
-    private final AtomicLong counter = new AtomicLong(0);
+    private ApplicationEventPublisher applicationEventPublisher;

    @Autowired
    public PostRepository(JdbcTemplate jdbcTemplate) {
@@ -23,28 +27,22 @@ public class PostRepository implements IPostRepository {

    }

-    @Override
-    public void init() {
-        Long maxId = jdbcTemplate.queryForObject(
-                "SELECT MAX(ID) FROM POST",
-                Long.class
-        );
-        if (maxId == null) {
-            maxId = 0L;
-        }
-        counter.set(maxId);
+    private synchronized Long nextId() {
+        return jdbcTemplate.queryForObject(
+                "CALL NEXT VALUE FOR SEQ_POST",
+                Long.class);
    }

    @Override
    public Post save(Post post) {
-        long id = counter.incrementAndGet();
+        long id = nextId();
        jdbcTemplate.update(
                "INSERT INTO POST (ID, DONE, FORUM, HOSTS, POST_FOLDER_NAME, POST_ID, PREVIEWS, SECURITY_TOKEN, STATUS, THANKED, THREAD_ID, THREAD_TITLE, TITLE, TOTAL, URL) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
                id,
                post.getDone(),
                post.getForum(),
                String.join(";", post.getHosts()),
-                post.getPostFolderName(),
+                post.getDownloadDirectory(),
                post.getPostId(),
                String.join(";", post.getPreviews()),
                post.getSecurityToken(),
@@ -57,24 +55,16 @@ public class PostRepository implements IPostRepository {
                post.getUrl()
        );
        post.setId(id);
-        return null;
-    }
-
-    @Override
-    public int delete(Long id) {
-        return jdbcTemplate.update(
-                "DELETE FROM POST AS post WHERE post.ID = ?",
-                id
-        );
+        applicationEventPublisher.publishEvent(new PostUpdateEvent(PostRepository.class, id));
+        return post;
    }

    @Override
    public Optional<Post> findByPostId(String postId) {
        List<Post> posts = jdbcTemplate.query(
-                "SELECT metadata.*,post.* FROM METADATA metadata FULL JOIN POST post ON metadata.POST_ID_REF = post.ID WHERE POST_ID = ?",
-                new Object[]{postId},
-                new PostRowMapper()
-        );
+                "SELECT metadata.*,post.* FROM METADATA metadata FULL JOIN POST post ON metadata.POST_ID_REF = post.ID WHERE post.POST_ID = ?",
+                new PostRowMapper(),
+                postId);
        if (posts.isEmpty()) {
            return Optional.empty();
        } else {
@@ -85,7 +75,7 @@ public class PostRepository implements IPostRepository {
    @Override
    public List<String> findCompleted() {
        return jdbcTemplate.query(
-                "SELECT POST_ID FROM POST WHERE status = 'COMPLETE' AND done >= total",
+                "SELECT POST_ID FROM POST AS post WHERE status = 'COMPLETE' AND done >= total",
                ((rs, rowNum) -> rs.getString("POST_ID"))
        );
    }
@@ -94,9 +84,8 @@ public class PostRepository implements IPostRepository {
    public Optional<Post> findById(Long id) {
        List<Post> posts = jdbcTemplate.query(
                "SELECT metadata.*,post.* FROM METADATA metadata FULL JOIN POST post ON metadata.POST_ID_REF = post.ID WHERE post.ID = ?",
-                new Object[]{id},
-                new PostRowMapper()
-        );
+                new PostRowMapper(),
+                id);
        if (posts.isEmpty()) {
            return Optional.empty();
        } else {
@@ -116,9 +105,8 @@ public class PostRepository implements IPostRepository {
    public boolean existByPostId(String postId) {
        Integer count = jdbcTemplate.queryForObject(
                "SELECT COUNT(*) FROM POST AS post WHERE post.POST_ID = ?",
-                new Object[]{postId},
-                Integer.class
-        );
+                Integer.class,
+                postId);
        if (count == null) {
            return false;
        } else {
@@ -135,49 +123,66 @@ public class PostRepository implements IPostRepository {

    @Override
    public int deleteByPostId(String postId) {
-        return jdbcTemplate.update(
+        int mutationCount = jdbcTemplate.update(
                "DELETE FROM POST AS post WHERE post.POST_ID = ?",
                postId
        );
+        applicationEventPublisher.publishEvent(new PostRemoveEvent(PostRepository.class, postId));
+        return mutationCount;
    }

    @Override
    public int updateStatus(Status status, Long id) {
-        return jdbcTemplate.update(
+        int mutationCount = jdbcTemplate.update(
                "UPDATE POST AS post SET post.STATUS = ? WHERE post.ID = ?",
                status.name(), id
        );
+        applicationEventPublisher.publishEvent(new PostUpdateEvent(PostRepository.class, id));
+        return mutationCount;
    }

    @Override
    public int updateDone(int done, Long id) {
-        return jdbcTemplate.update(
+        int mutationCount = jdbcTemplate.update(
                "UPDATE POST AS post SET post.DONE = ? WHERE post.ID = ?",
                done, id
        );
+        applicationEventPublisher.publishEvent(new PostUpdateEvent(PostRepository.class, id));
+        return mutationCount;
    }

    @Override
    public int updateFolderName(String postFolderName, Long id) {
-        return jdbcTemplate.update(
+        int mutationCount = jdbcTemplate.update(
                "UPDATE POST AS post SET post.POST_FOLDER_NAME = ? WHERE post.ID = ?",
                postFolderName, id
        );
+        applicationEventPublisher.publishEvent(new PostUpdateEvent(PostRepository.class, id));
+        return mutationCount;
    }

    @Override
    public int updateTitle(String title, Long id) {
-        return jdbcTemplate.update(
+        int mutationCount = jdbcTemplate.update(
                "UPDATE POST AS post SET post.TITLE = ? WHERE post.ID = ?",
                title, id
        );
+        applicationEventPublisher.publishEvent(new PostUpdateEvent(PostRepository.class, id));
+        return mutationCount;
    }

    @Override
    public int updateThanked(boolean thanked, Long id) {
-        return jdbcTemplate.update(
+        int mutationCount = jdbcTemplate.update(
                "UPDATE POST AS post SET post.THANKED = ? WHERE post.ID = ?",
                thanked, id
        );
+        applicationEventPublisher.publishEvent(new PostUpdateEvent(PostRepository.class, id));
+        return mutationCount;
+    }
+
+    @Override
+    public void setApplicationEventPublisher(@NonNull ApplicationEventPublisher applicationEventPublisher) {
+        this.applicationEventPublisher = applicationEventPublisher;
    }
 }
@@ -19,34 +19,34 @@ public class PostRowMapper implements RowMapper<Post> {

        Post post = new Post();
        post.setId(rs.getLong("post.ID"));
-        post.setStatus(Status.valueOf(rs.getString("STATUS")));
-        post.setPostId(rs.getString("POST_ID"));
-        post.setThreadTitle(rs.getString("THREAD_TITLE"));
-        post.setThreadId(rs.getString("THREAD_ID"));
-        post.setTitle(rs.getString("TITLE"));
-        post.setUrl(rs.getString("URL"));
-        post.setDone(rs.getInt("DONE"));
-        post.setTotal(rs.getInt("TOTAL"));
-        post.setHosts(Set.of(rs.getString("HOSTS").split(DELIMITER)));
-        post.setForum(rs.getString("FORUM"));
-        post.setSecurityToken(rs.getString("SECURITY_TOKEN"));
-        post.setPostFolderName(rs.getString("POST_FOLDER_NAME"));
-        post.setThanked(rs.getBoolean("THANKED"));
+        post.setStatus(Status.valueOf(rs.getString("post.STATUS")));
+        post.setPostId(rs.getString("post.POST_ID"));
+        post.setThreadTitle(rs.getString("post.THREAD_TITLE"));
+        post.setThreadId(rs.getString("post.THREAD_ID"));
+        post.setTitle(rs.getString("post.TITLE"));
+        post.setUrl(rs.getString("post.URL"));
+        post.setDone(rs.getInt("post.DONE"));
+        post.setTotal(rs.getInt("post.TOTAL"));
+        post.setHosts(Set.of(rs.getString("post.HOSTS").split(DELIMITER)));
+        post.setForum(rs.getString("post.FORUM"));
+        post.setSecurityToken(rs.getString("post.SECURITY_TOKEN"));
+        post.setDownloadDirectory(rs.getString("post.POST_FOLDER_NAME"));
+        post.setThanked(rs.getBoolean("post.THANKED"));
        String previews;
-        if ((previews = rs.getString("PREVIEWS")) != null) {
+        if ((previews = rs.getString("post.PREVIEWS")) != null) {
            post.setPreviews(Set.of(previews.split(DELIMITER)));
        }

-        Long metadataId = rs.getLong("metadata.ID");
+        Long metadataId = rs.getLong("metadata.POST_ID_REF");
        if (!rs.wasNull()) {
            Metadata metadata = new Metadata();
-            metadata.setId(metadataId);
-            metadata.setPostIdRef(rs.getLong("POST_ID_REF"));
-            String resolvedNames = rs.getString("RESOLVED_NAMES");
+            metadata.setPostIdRef(metadataId);
+            metadata.setPostId(rs.getString("metadata.POST_ID"));
+            String resolvedNames = rs.getString("metadata.RESOLVED_NAMES");
            if (resolvedNames != null && !resolvedNames.isBlank()) {
                metadata.setResolvedNames(List.of(resolvedNames.split("%sep%")));
            }
-            metadata.setPostedBy(rs.getString("POSTED_BY"));
+            metadata.setPostedBy(rs.getString("metadata.POSTED_BY"));
            post.setMetadata(metadata);
        }

@@ -1,41 +1,38 @@
 package tn.mnlr.vripper.jpa.repositories.impl;

 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
+import tn.mnlr.vripper.event.QueuedRemoveEvent;
+import tn.mnlr.vripper.event.QueuedUpdateEvent;
 import tn.mnlr.vripper.jpa.domain.Queued;
 import tn.mnlr.vripper.jpa.repositories.IQueuedRepository;

 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicLong;

@Service
-public class QueuedRepository implements IQueuedRepository {
+public class QueuedRepository implements IQueuedRepository, ApplicationEventPublisherAware {

    private final JdbcTemplate jdbcTemplate;
-    private final AtomicLong counter = new AtomicLong(0);
+    private ApplicationEventPublisher applicationEventPublisher;

    @Autowired
    public QueuedRepository(JdbcTemplate jdbcTemplate) {
        this.jdbcTemplate = jdbcTemplate;
    }

-    @Override
-    public void init() {
-        Long maxId = jdbcTemplate.queryForObject(
-                "SELECT MAX(ID) FROM QUEUED",
-                Long.class
-        );
-        if (maxId == null) {
-            maxId = 0L;
-        }
-        counter.set(maxId);
+    private synchronized Long nextId() {
+        return jdbcTemplate.queryForObject(
+                "CALL NEXT VALUE FOR SEQ_QUEUED",
+                Long.class);
    }

    @Override
    public Queued save(Queued queued) {
-        long id = counter.incrementAndGet();
+        long id = nextId();
        jdbcTemplate.update(
                "INSERT INTO QUEUED (ID, TOTAL, LINK, LOADING, POST_ID, THREAD_ID) values (?,?,?,?,?,?)",
                id,
@@ -46,6 +43,7 @@ public class QueuedRepository implements IQueuedRepository {
                queued.getThreadId()
        );
        queued.setId(id);
+        applicationEventPublisher.publishEvent(new QueuedUpdateEvent(QueuedRepository.class, id));
        return queued;
    }

@@ -87,9 +85,21 @@ public class QueuedRepository implements IQueuedRepository {

    @Override
    public int deleteByThreadId(String threadId) {
-        return jdbcTemplate.update(
+        int mutationCount = jdbcTemplate.update(
                "DELETE FROM QUEUED AS queued WHERE THREAD_ID = ?",
                threadId
        );
+        applicationEventPublisher.publishEvent(new QueuedRemoveEvent(QueuedRepository.class, threadId));
+        return mutationCount;
+    }
+
+    @Override
+    public void deleteAll() {
+        jdbcTemplate.update("DELETE FROM QUEUED");
+    }
+
+    @Override
+    public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
+        this.applicationEventPublisher = applicationEventPublisher;
    }
 }
@@ -0,0 +1,7 @@
+package tn.mnlr.vripper.listener;
+
+import reactor.core.publisher.Flux;
+
+public interface DataEventListener<T> {
+    Flux<T> getDataFlux();
+}
@@ -0,0 +1,7 @@
+package tn.mnlr.vripper.listener;
+
+import reactor.core.publisher.Sinks.EmitFailureHandler;
+
+public class EmitHandler {
+    public static final EmitFailureHandler RETRY = (signalType, emitResult) -> true;
+}
@@ -0,0 +1,32 @@
+package tn.mnlr.vripper.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.event.EventRemoveEvent;
+
+import javax.annotation.PreDestroy;
+
+@Component
+@Slf4j
+public class EventRemoveEventListener implements ApplicationListener<EventRemoveEvent>, DataEventListener<EventRemoveEvent> {
+
+    private final Sinks.Many<EventRemoveEvent> sink = Sinks.many().multicast().onBackpressureBuffer();
+
+    @Override
+    public void onApplicationEvent(EventRemoveEvent event) {
+        sink.emitNext(event, EmitHandler.RETRY);
+    }
+
+    @Override
+    public Flux<EventRemoveEvent> getDataFlux() {
+        return sink.asFlux();
+    }
+
+    @PreDestroy
+    private void destroy() {
+        sink.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+    }
+}
@@ -0,0 +1,33 @@
+package tn.mnlr.vripper.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.lang.NonNull;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.event.EventUpdateEvent;
+
+import javax.annotation.PreDestroy;
+
+@Component
+@Slf4j
+public class EventUpdateEventListener implements ApplicationListener<EventUpdateEvent>, DataEventListener<EventUpdateEvent> {
+
+    private final Sinks.Many<EventUpdateEvent> sink = Sinks.many().multicast().onBackpressureBuffer();
+
+    @Override
+    public void onApplicationEvent(@NonNull EventUpdateEvent event) {
+        sink.emitNext(event, EmitHandler.RETRY);
+    }
+
+    @Override
+    public Flux<EventUpdateEvent> getDataFlux() {
+        return sink.asFlux();
+    }
+
+    @PreDestroy
+    private void destroy() {
+        sink.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+    }
+}
@@ -0,0 +1,32 @@
+package tn.mnlr.vripper.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.event.ImageUpdateEvent;
+
+import javax.annotation.PreDestroy;
+
+@Component
+@Slf4j
+public class ImageUpdateEventListener implements ApplicationListener<ImageUpdateEvent>, DataEventListener<ImageUpdateEvent> {
+
+    private final Sinks.Many<ImageUpdateEvent> sink = Sinks.many().multicast().onBackpressureBuffer();
+
+    @Override
+    public void onApplicationEvent(ImageUpdateEvent event) {
+        sink.emitNext(event, EmitHandler.RETRY);
+    }
+
+    @Override
+    public Flux<ImageUpdateEvent> getDataFlux() {
+        return sink.asFlux();
+    }
+
+    @PreDestroy
+    private void destroy() {
+        sink.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+    }
+}
@@ -0,0 +1,32 @@
+package tn.mnlr.vripper.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.event.MetadataUpdateEvent;
+
+import javax.annotation.PreDestroy;
+
+@Component
+@Slf4j
+public class MetadataUpdateEventListener implements ApplicationListener<MetadataUpdateEvent>, DataEventListener<MetadataUpdateEvent> {
+
+    private final Sinks.Many<MetadataUpdateEvent> sink = Sinks.many().multicast().onBackpressureBuffer();
+
+    @Override
+    public void onApplicationEvent(MetadataUpdateEvent event) {
+        sink.emitNext(event, (signalType, emitResult) -> true);
+    }
+
+    @Override
+    public Flux<MetadataUpdateEvent> getDataFlux() {
+        return sink.asFlux();
+    }
+
+    @PreDestroy
+    private void destroy() {
+        sink.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+    }
+}
@@ -0,0 +1,32 @@
+package tn.mnlr.vripper.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.event.PostRemoveEvent;
+
+import javax.annotation.PreDestroy;
+
+@Component
+@Slf4j
+public class PostRemoveEventListener implements ApplicationListener<PostRemoveEvent>, DataEventListener<PostRemoveEvent> {
+
+    private final Sinks.Many<PostRemoveEvent> sink = Sinks.many().multicast().onBackpressureBuffer();
+
+    @Override
+    public void onApplicationEvent(PostRemoveEvent event) {
+        sink.emitNext(event, EmitHandler.RETRY);
+    }
+
+    @Override
+    public Flux<PostRemoveEvent> getDataFlux() {
+        return sink.asFlux();
+    }
+
+    @PreDestroy
+    private void destroy() {
+        sink.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+    }
+}
@@ -0,0 +1,32 @@
+package tn.mnlr.vripper.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.event.PostUpdateEvent;
+
+import javax.annotation.PreDestroy;
+
+@Component
+@Slf4j
+public class PostUpdateEventListener implements ApplicationListener<PostUpdateEvent>, DataEventListener<PostUpdateEvent> {
+
+    private final Sinks.Many<PostUpdateEvent> sink = Sinks.many().multicast().onBackpressureBuffer();
+
+    @Override
+    public void onApplicationEvent(PostUpdateEvent event) {
+        sink.emitNext(event, EmitHandler.RETRY);
+    }
+
+    @Override
+    public Flux<PostUpdateEvent> getDataFlux() {
+        return sink.asFlux();
+    }
+
+    @PreDestroy
+    private void destroy() {
+        sink.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+    }
+}
@@ -0,0 +1,32 @@
+package tn.mnlr.vripper.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.event.QueuedRemoveEvent;
+
+import javax.annotation.PreDestroy;
+
+@Component
+@Slf4j
+public class QueuedRemoveEventListener implements ApplicationListener<QueuedRemoveEvent>, DataEventListener<QueuedRemoveEvent> {
+
+    private final Sinks.Many<QueuedRemoveEvent> sink = Sinks.many().multicast().onBackpressureBuffer();
+
+    @Override
+    public void onApplicationEvent(QueuedRemoveEvent event) {
+        sink.emitNext(event, (signalType, emitResult) -> true);
+    }
+
+    @Override
+    public Flux<QueuedRemoveEvent> getDataFlux() {
+        return sink.asFlux();
+    }
+
+    @PreDestroy
+    private void destroy() {
+        sink.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+    }
+}
@@ -0,0 +1,32 @@
+package tn.mnlr.vripper.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.event.QueuedUpdateEvent;
+
+import javax.annotation.PreDestroy;
+
+@Component
+@Slf4j
+public class QueuedUpdateEventListener implements ApplicationListener<QueuedUpdateEvent>, DataEventListener<QueuedUpdateEvent> {
+
+    private final Sinks.Many<QueuedUpdateEvent> sink = Sinks.many().multicast().onBackpressureBuffer();
+
+    @Override
+    public void onApplicationEvent(QueuedUpdateEvent event) {
+        sink.emitNext(event, (signalType, emitResult) -> true);
+    }
+
+    @Override
+    public Flux<QueuedUpdateEvent> getDataFlux() {
+        return sink.asFlux();
+    }
+
+    @PreDestroy
+    private void destroy() {
+        sink.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+    }
+}
@@ -1,58 +0,0 @@
-package tn.mnlr.vripper.q;
-
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-import net.jodah.failsafe.function.CheckedRunnable;
-import tn.mnlr.vripper.SpringContext;
-import tn.mnlr.vripper.jpa.domain.Image;
-import tn.mnlr.vripper.jpa.domain.Post;
-import tn.mnlr.vripper.services.DataService;
-
-import java.util.Objects;
-
-@Slf4j
-public class DownloadJob implements CheckedRunnable {
-
-    private final DataService dataService;
-
-    @Getter
-    private Image image;
-
-    @Getter
-    private Post post;
-
-    @Getter
-    private final ImageFileData imageFileData = new ImageFileData();
-
-    DownloadJob(Post post, Image image) {
-        this.image = image;
-        this.post = post;
-        dataService = SpringContext.getBean(DataService.class);
-    }
-
-    @Override
-    public void run() throws Exception {
-        log.debug(String.format("Starting downloading %s", image.getUrl()));
-        image.getHost().download(post, image, imageFileData);
-
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        DownloadJob that = (DownloadJob) o;
-        return Objects.equals(image, that.image) &&
-                Objects.equals(post, that.post);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(image, post);
-    }
-
-    public void refresh() {
-        post = dataService.findPostById(post.getId()).orElseThrow();
-        image = dataService.findImageById(image.getId()).orElseThrow();
-    }
-}
@@ -1,54 +0,0 @@
-package tn.mnlr.vripper.q;
-
-import lombok.extern.slf4j.Slf4j;
-import net.jodah.failsafe.Failsafe;
-import tn.mnlr.vripper.SpringContext;
-import tn.mnlr.vripper.VripperApplication;
-import tn.mnlr.vripper.jpa.domain.enums.Status;
-import tn.mnlr.vripper.services.DataService;
-import tn.mnlr.vripper.services.MutexService;
-
-import java.util.concurrent.locks.ReentrantLock;
-
-@Slf4j
-public class ExecuteRunnable implements Runnable {
-
-    private final ExecutionService executionService;
-    private final DataService dataService;
-    private final MutexService mutexService;
-
-    private final DownloadJob downloadJob;
-
-    public ExecuteRunnable(final DownloadJob downloadJob) {
-        executionService = SpringContext.getBean(ExecutionService.class);
-        dataService = SpringContext.getBean(DataService.class);
-        mutexService = SpringContext.getBean(MutexService.class);
-        this.downloadJob = downloadJob;
-    }
-
-    @Override
-    public void run() {
-
-        mutexService.createPostLock(downloadJob.getPost().getPostId());
-        ReentrantLock mutex = mutexService.getPostLock(downloadJob.getPost().getPostId());
-        mutex.lock();
-        downloadJob.refresh();
-        executionService.beforeJobStart(downloadJob.getPost().getPostId());
-        Failsafe.with(VripperApplication.retryPolicy)
-                .onFailure(e -> {
-                    if (e.getFailure() instanceof InterruptedException || e.getFailure().getCause() instanceof InterruptedException) {
-                        log.debug("Job successfully interrupted");
-                        return;
-                    }
-                    log.error(String.format("Failed to download %s after %d tries", downloadJob.getImage().getUrl(), e.getAttemptCount()), e.getFailure());
-                    downloadJob.getImage().setStatus(Status.ERROR);
-                    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()));
-                }).run(downloadJob);
-    }
-}
@@ -1,16 +0,0 @@
-package tn.mnlr.vripper.q;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.http.client.methods.HttpUriRequest;
-
-@Getter
-@Setter
-public class ImageFileData {
-
-    private String pageUrl;
-    private String imageName;
-    private String fileName;
-    private String imageUrl;
-    private HttpUriRequest imageRequest;
-}
@@ -1,29 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import io.reactivex.Scheduler;
-import io.reactivex.schedulers.Schedulers;
-import lombok.Getter;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.PreDestroy;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-@Service
-public class CommonExecutor {
-    @Getter
-    private final ExecutorService generalExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
-    private final ExecutorService schedulerExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
-
-    @Getter
-    private final Scheduler scheduler = Schedulers.from(schedulerExecutor);
-
-    @PreDestroy
-    private void destroy() throws InterruptedException {
-        generalExecutor.shutdown();
-        generalExecutor.awaitTermination(10, TimeUnit.SECONDS);
-        schedulerExecutor.shutdown();
-        schedulerExecutor.awaitTermination(10, TimeUnit.SECONDS);
-    }
-}
@@ -1,73 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import org.apache.http.client.config.CookieSpecs;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.client.LaxRedirectStrategy;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-
-import java.net.URI;
-import java.util.concurrent.TimeUnit;
-
-@Service
-@EnableScheduling
-public class ConnectionManager {
-
-    private ConnectionManager() {
-        buildConnectionPool();
-    }
-
-    private PoolingHttpClientConnectionManager pcm;
-
-    private RequestConfig rc = RequestConfig.custom()
-            .setConnectionRequestTimeout(5_000)
-            .setConnectTimeout(5_000)
-            .setSocketTimeout(5_000)
-            .setCookieSpec(CookieSpecs.STANDARD)
-            .build();
-
-    private void buildConnectionPool() {
-
-        pcm = new PoolingHttpClientConnectionManager();
-        pcm.setMaxTotal(50);
-        pcm.setDefaultMaxPerRoute(4);
-    }
-
-    @Scheduled(fixedDelay = 1000)
-    private void idleConnectionMonitoring() {
-        pcm.closeExpiredConnections();
-        pcm.closeIdleConnections(30, TimeUnit.SECONDS);
-    }
-
-    public HttpClientBuilder getClient() {
-        return HttpClients.custom()
-                .setConnectionManager(pcm)
-                .setRedirectStrategy(new LaxRedirectStrategy())
-                .disableAutomaticRetries()
-                .setDefaultRequestConfig(rc);
-    }
-
-    public HttpGet buildHttpGet(String url) {
-        HttpGet httpGet = new HttpGet(url.replace(" ", "+"));
-        httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36");
-        return httpGet;
-    }
-
-    public HttpPost buildHttpPost(String url) {
-        HttpPost httpPost = new HttpPost(url.replace(" ", "+"));
-        httpPost.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36");
-        return httpPost;
-    }
-
-    public HttpGet buildHttpGet(URI uri) {
-        HttpGet httpGet = new HttpGet(uri);
-        httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36");
-        return httpGet;
-    }
-}
@@ -0,0 +1,134 @@
+package tn.mnlr.vripper.services;
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import net.jodah.failsafe.RetryPolicy;
+import org.apache.http.client.config.CookieSpecs;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.AbstractExecutionAwareRequest;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.client.LaxRedirectStrategy;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import reactor.core.Disposable;
+import reactor.core.publisher.Flux;
+import tn.mnlr.vripper.download.DownloadJob;
+
+import javax.annotation.PreDestroy;
+import java.net.URI;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+@Service
+@EnableScheduling
+@Slf4j
+public class ConnectionService {
+
+    private final Disposable disposable;
+    private PoolingHttpClientConnectionManager pcm;
+    private RequestConfig rc;
+
+    @Getter
+    private RetryPolicy<Object> retryPolicy;
+
+    private int connectionTimeout;
+    private int maxAttempts;
+
+    public ConnectionService(SettingsService settingsService) {
+        connectionTimeout = settingsService.getSettings().getConnectionTimeout();
+        maxAttempts = settingsService.getSettings().getMaxAttempts();
+        Flux<SettingsService.Settings> settingsFlux = settingsService.getSettingsFlux();
+        disposable = settingsFlux.subscribe(settings -> {
+            if (connectionTimeout != settings.getConnectionTimeout()) {
+                connectionTimeout = settings.getConnectionTimeout();
+                buildRequestConfig();
+            }
+            if (maxAttempts != settings.getMaxAttempts()) {
+                maxAttempts = settings.getMaxAttempts();
+                buildRetryPolicy();
+            }
+        });
+
+        buildRequestConfig();
+        buildRetryPolicy();
+        buildConnectionPool();
+    }
+
+    @PreDestroy
+    private void destroy() {
+        disposable.dispose();
+    }
+
+    private void buildRetryPolicy() {
+        retryPolicy = new RetryPolicy<>()
+                .withDelay(2, 5, ChronoUnit.SECONDS)
+                .withMaxAttempts(maxAttempts)
+                .onFailedAttempt(e -> log.warn(String.format("#%d tries failed", e.getAttemptCount()), e.getLastFailure()));
+    }
+
+    private void buildConnectionPool() {
+        pcm = new PoolingHttpClientConnectionManager();
+        pcm.setMaxTotal(Integer.MAX_VALUE);
+        pcm.setDefaultMaxPerRoute(Integer.MAX_VALUE);
+    }
+
+    private void buildRequestConfig() {
+        rc = RequestConfig.custom()
+                .setConnectionRequestTimeout(connectionTimeout * 1000)
+                .setConnectTimeout(connectionTimeout * 1000)
+                .setSocketTimeout(connectionTimeout * 1000)
+                .setCookieSpec(CookieSpecs.STANDARD)
+                .build();
+    }
+
+    @Scheduled(fixedDelay = 5_000)
+    private void idleConnectionMonitoring() {
+        pcm.closeExpiredConnections();
+        pcm.closeIdleConnections(30, TimeUnit.SECONDS);
+    }
+
+    public HttpClientBuilder getClient() {
+        return HttpClients.custom()
+                .setConnectionManager(pcm)
+                .setRedirectStrategy(new LaxRedirectStrategy())
+                .disableAutomaticRetries()
+                .setDefaultRequestConfig(rc);
+    }
+
+    public HttpGet buildHttpGet(String url, final HttpClientContext context) {
+        HttpGet httpGet = new HttpGet(url.replace(" ", "+"));
+        httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36");
+        addToContext(context, httpGet);
+        return httpGet;
+    }
+
+    public HttpPost buildHttpPost(String url, final HttpClientContext context) {
+        HttpPost httpPost = new HttpPost(url.replace(" ", "+"));
+        httpPost.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36");
+        addToContext(context, httpPost);
+        return httpPost;
+    }
+
+    public HttpGet buildHttpGet(URI uri, final HttpClientContext context) {
+        HttpGet httpGet = new HttpGet(uri);
+        httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36");
+        addToContext(context, httpGet);
+        return httpGet;
+    }
+
+    public void addToContext(HttpClientContext context, AbstractExecutionAwareRequest request) {
+        if (context != null) {
+            List<AbstractExecutionAwareRequest> requests = (List<AbstractExecutionAwareRequest>) context.getAttribute(DownloadJob.ContextAttributes.OPEN_CONNECTION.toString());
+            if (requests != null) {
+                requests.add(request);
+            }
+        }
+    }
+}
@@ -1,21 +1,17 @@
 package tn.mnlr.vripper.services;

-import io.reactivex.Observable;
-import io.reactivex.processors.PublishProcessor;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import tn.mnlr.vripper.jpa.domain.Image;
-import tn.mnlr.vripper.jpa.domain.Metadata;
-import tn.mnlr.vripper.jpa.domain.Post;
-import tn.mnlr.vripper.jpa.domain.Queued;
+import tn.mnlr.vripper.jpa.domain.*;
 import tn.mnlr.vripper.jpa.domain.enums.Status;
 import tn.mnlr.vripper.jpa.repositories.IImageRepository;
 import tn.mnlr.vripper.jpa.repositories.IMetadataRepository;
 import tn.mnlr.vripper.jpa.repositories.IPostRepository;
 import tn.mnlr.vripper.jpa.repositories.IQueuedRepository;
+import tn.mnlr.vripper.jpa.repositories.impl.EventRepository;

 import java.util.Collection;
 import java.util.List;
@@ -30,57 +26,29 @@ public class DataService {
    private final IImageRepository imageRepository;
    private final IQueuedRepository queuedRepository;
    private final IMetadataRepository metadataRepository;
-    private final AppSettingsService appSettingsService;
-
-    private final PublishProcessor<Long> liveGrabQueue = PublishProcessor.create();
-    private final PublishProcessor<Long> liveImageUpdates = PublishProcessor.create();
-    private final PublishProcessor<Long> livePostsState = PublishProcessor.create();
-
-    private final PublishProcessor<String> postRemove = PublishProcessor.create();
-    private final PublishProcessor<String> queueRemove = PublishProcessor.create();
-
-    public Observable<Long> liveQueue() {
-        return liveGrabQueue.toObservable();
-    }
-
-    public Observable<Long> livePost() {
-        return livePostsState.toObservable();
-    }
-
-    public Observable<Long> liveImage() {
-        return liveImageUpdates.toObservable();
-    }
-
-    public Observable<String> queueRemove() {
-        return queueRemove.toObservable();
-    }
-
-    public Observable<String> postRemove() {
-        return postRemove.toObservable();
-    }
+    private final SettingsService settingsService;
+    private final EventRepository eventRepository;

    @Autowired
-    public DataService(IPostRepository postRepository, IImageRepository imageRepository, IQueuedRepository queuedRepository, IMetadataRepository metadataRepository, AppSettingsService appSettingsService) {
+    public DataService(IPostRepository postRepository, IImageRepository imageRepository, IQueuedRepository queuedRepository, IMetadataRepository metadataRepository, SettingsService settingsService, EventRepository eventRepository) {
        this.postRepository = postRepository;
        this.imageRepository = imageRepository;
        this.queuedRepository = queuedRepository;
        this.metadataRepository = metadataRepository;
-        this.appSettingsService = appSettingsService;
+        this.settingsService = settingsService;
+        this.eventRepository = eventRepository;
    }

    private void save(Post post) {
        postRepository.save(post);
-        livePostsState.onNext(post.getId());
    }

    private void save(Queued queued) {
        queuedRepository.save(queued);
-        liveGrabQueue.onNext(queued.getId());
    }

    private void save(Image image) {
        imageRepository.save(image);
-        liveImageUpdates.onNext(image.getId());
    }

    public boolean exists(String postId) {
@@ -110,7 +78,6 @@ public class DataService {
    }

    private void updatePostDone(int done, Long id) {
-        livePostsState.onNext(id);
        postRepository.updateDone(done, id);
    }

@@ -125,7 +92,7 @@ public class DataService {
            } else {
                post.setStatus(Status.COMPLETE);
                updatePostStatus(post.getStatus(), post.getId());
-                if (appSettingsService.getSettings().getClearCompleted()) {
+                if (settingsService.getSettings().getClearCompleted()) {
                    remove(post.getPostId());
                }
            }
@@ -136,7 +103,6 @@ public class DataService {
        imageRepository.deleteAllByPostId(postId);
        metadataRepository.deleteByPostId(postId);
        postRepository.deleteByPostId(postId);
-        postRemove.onNext(postId);
    }

    public void newQueueLink(@NonNull final Queued queued) {
@@ -145,7 +111,6 @@ public class DataService {

    public void removeQueueLink(@NonNull final String threadId) {
        queuedRepository.deleteByThreadId(threadId);
-        queueRemove.onNext(threadId);
    }

    public List<String> clearCompleted() {
@@ -169,10 +134,6 @@ public class DataService {

    }

-    public long countRemainingImages() {
-        return imageRepository.countRemaining();
-    }
-
    public long countErrorImages() {
        return imageRepository.countError();
    }
@@ -181,7 +142,7 @@ public class DataService {
        return imageRepository.findByPostId(postId);
    }

-    public Iterable<Post> findAllPosts() {
+    public List<Post> findAllPosts() {
        return postRepository.findAll();
    }

@@ -197,11 +158,11 @@ public class DataService {
        return queuedRepository.findByThreadId(threadId);
    }

-    public Iterable<Queued> findAllQueued() {
+    public List<Queued> findAllQueued() {
        return queuedRepository.findAll();
    }

-    public Optional<Post> findPostById(Long aLong) {
+    public Optional<Post> findById(Long aLong) {
        return postRepository.findById(aLong);
    }

@@ -213,10 +174,11 @@ public class DataService {
        return queuedRepository.findById(aLong);
    }

-    public void setMetadata(Post post, Metadata metadata) {
-        metadata.setPostIdRef(post.getId());
-        metadataRepository.save(metadata);
-        livePostsState.onNext(post.getId());
+    public synchronized void setMetadata(Post post, Metadata metadata) {
+        if (metadataRepository.findByPostId(post.getPostId()).isEmpty()) {
+            metadata.setPostIdRef(post.getId());
+            metadataRepository.save(metadata);
+        }
    }

    public Optional<Metadata> findMetadataByPostId(String postId) {
@@ -225,36 +187,41 @@ public class DataService {

    public void updateImageStatus(Status status, Long id) {
        imageRepository.updateStatus(status, id);
-        liveImageUpdates.onNext(id);
    }

    public void updateImageCurrent(long current, Long id) {
        imageRepository.updateCurrent(current, id);
-        liveImageUpdates.onNext(id);
    }

    public void updateImageTotal(long total, Long id) {
        imageRepository.updateTotal(total, id);
-        liveImageUpdates.onNext(id);
    }

    public void updatePostStatus(Status status, Long id) {
        postRepository.updateStatus(status, id);
-        livePostsState.onNext(id);
    }

-    public void updatePostFolderName(String postFolderName, Long id) {
+    public void updateDownloadDirectory(String postFolderName, Long id) {
        postRepository.updateFolderName(postFolderName, id);
-        livePostsState.onNext(id);
    }

    public void updatePostTitle(String title, Long id) {
        postRepository.updateTitle(title, id);
-        livePostsState.onNext(id);
    }

    public void updatePostThanked(boolean thanked, Long id) {
        postRepository.updateThanked(thanked, id);
-        livePostsState.onNext(id);
+    }
+
+    public Optional<Event> findEventById(Long id) {
+        return eventRepository.findById(id);
+    }
+
+    public List<Event> findAllEvents() {
+        return eventRepository.findAll();
+    }
+
+    public void clearQueueLinks() {
+        queuedRepository.deleteAll();
    }
 }
@@ -1,27 +1,30 @@
 package tn.mnlr.vripper.services;

-import io.reactivex.processors.PublishProcessor;
 import lombok.Getter;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.listener.EmitHandler;

+import javax.annotation.PreDestroy;
 import java.util.concurrent.atomic.AtomicLong;

@Service
@EnableScheduling
 public class DownloadSpeedService {

-    private AtomicLong read = new AtomicLong(0);
-
+    private final AtomicLong read = new AtomicLong(0);
+    private final Sinks.Many<Long> sink = Sinks.many().multicast().onBackpressureBuffer();
    @Getter
    private long currentValue;
-
-    @Getter
-    private final PublishProcessor<Long> readBytesPerSecond = PublishProcessor.create();
-
    private boolean allowWrite = false;

+    public Flux<Long> getReadBytesPerSecond() {
+        return sink.asFlux();
+    }
+
    public void increase(long read) {
        if (allowWrite) {
            this.read.addAndGet(read);
@@ -34,8 +37,13 @@ public class DownloadSpeedService {
        long newValue = read.getAndSet(0);
        if (newValue != currentValue) {
            currentValue = newValue;
-            readBytesPerSecond.onNext(currentValue);
+            sink.emitNext(currentValue, EmitHandler.RETRY);
        }
        allowWrite = true;
    }
+
+    @PreDestroy
+    private void destroy() {
+        sink.emitComplete(EmitHandler.RETRY);
+    }
 }
@@ -1,45 +1,55 @@
 package tn.mnlr.vripper.services;

-import io.reactivex.processors.PublishProcessor;
 import lombok.Getter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
-import tn.mnlr.vripper.q.ExecutionService;
-import tn.mnlr.vripper.q.PendingQ;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.download.DownloadService;
+import tn.mnlr.vripper.download.PendingQueue;
+import tn.mnlr.vripper.listener.EmitHandler;
+import tn.mnlr.vripper.services.domain.GlobalState;
+
+import javax.annotation.PreDestroy;

@Service
@EnableScheduling
 public class GlobalStateService {

-    private final PendingQ pendingQ;
-    private final ExecutionService executionService;
+    private final PendingQueue pendingQueue;
+    private final DownloadService downloadService;
    private final DataService dataService;
-
+    private final Sinks.Many<GlobalState> sink = Sinks.many().multicast().onBackpressureBuffer();
    @Getter
    private GlobalState currentState;

-    @Getter
-    private final PublishProcessor<GlobalState> liveGlobalState = PublishProcessor.create();
-
    @Autowired
-    public GlobalStateService(PendingQ pendingQ, ExecutionService executionService, DataService dataService) {
-        this.pendingQ = pendingQ;
-        this.executionService = executionService;
+    public GlobalStateService(PendingQueue pendingQueue, DownloadService downloadService, DataService dataService) {
+        this.pendingQueue = pendingQueue;
+        this.downloadService = downloadService;
        this.dataService = dataService;
    }

+    public Flux<GlobalState> getGlobalState() {
+        return sink.asFlux();
+    }
+
    @Scheduled(fixedDelay = 3000)
    private void interval() {
        GlobalState newGlobalState = new GlobalState(
-                executionService.runningCount(),
-                pendingQ.size(),
-                dataService.countRemainingImages(),
+                downloadService.runningCount(),
+                pendingQueue.size(),
                dataService.countErrorImages());
        if (!newGlobalState.equals(currentState)) {
            currentState = newGlobalState;
-            liveGlobalState.onNext(currentState);
+            sink.emitNext(currentState, EmitHandler.RETRY);
        }
    }
+
+    @PreDestroy
+    private void destroy() {
+        sink.emitComplete(EmitHandler.RETRY);
+    }
 }
@@ -0,0 +1,104 @@
+package tn.mnlr.vripper.services;
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.Header;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.w3c.dom.Document;
+import tn.mnlr.vripper.exception.HostException;
+import tn.mnlr.vripper.exception.HtmlProcessorException;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+@Service
+@Slf4j
+public class HostService {
+
+    private final ConnectionService cm;
+    private final HtmlProcessorService htmlProcessorService;
+
+    @Autowired
+    public HostService(ConnectionService cm, HtmlProcessorService htmlProcessorService) {
+        this.cm = cm;
+        this.htmlProcessorService = htmlProcessorService;
+    }
+
+    public Response getResponse(final String url, final HttpClientContext context) throws HostException {
+        String basePage;
+
+        HttpClient client = cm.getClient().build();
+        HttpGet httpGet = cm.buildHttpGet(url, context);
+        Header[] headers;
+        log.debug(String.format("Requesting %s", url));
+        try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(httpGet, context)) {
+            if (response.getStatusLine().getStatusCode() / 100 != 2) {
+                throw new HostException(String.format("Unexpected response code: %d", response.getStatusLine().getStatusCode()));
+            }
+            headers = response.getAllHeaders();
+            basePage = EntityUtils.toString(response.getEntity());
+            log.debug(String.format("%s response: %n%s", url, basePage));
+            EntityUtils.consumeQuietly(response.getEntity());
+        } catch (IOException e) {
+            throw new HostException(e);
+        }
+
+        try {
+            log.debug(String.format("Cleaning %s response", url));
+            return new Response(htmlProcessorService.clean(basePage), headers);
+        } catch (HtmlProcessorException e) {
+            throw new HostException(e);
+        }
+    }
+
+    public 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();
+    }
+
+    public String getDefaultImageName(final String imgUrl) {
+        String imageTitle = imgUrl.substring(imgUrl.lastIndexOf('/') + 1);
+        log.debug(String.format("Extracting name from url %s: %s", imgUrl, imageTitle));
+        return imgUrl;
+    }
+
+    @Getter
+    public static class Response {
+
+        private final Document document;
+        private final Header[] headers;
+
+        protected Response(Document document, Header[] headers) {
+            this.document = document;
+            this.headers = headers;
+        }
+    }
+
+    @Getter
+    public static class NameUrl {
+
+        private final String name;
+        private final String url;
+
+        public NameUrl(String name, String url) {
+            this.name = name;
+            this.url = url;
+        }
+    }
+}
@@ -1,10 +1,9 @@
-package tn.mnlr.vripper.services.post;
+package tn.mnlr.vripper.services;

 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import lombok.Getter;
-import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import net.jodah.failsafe.Failsafe;
 import org.apache.http.client.HttpClient;
@@ -12,72 +11,48 @@ import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
-import tn.mnlr.vripper.VripperApplication;
+import tn.mnlr.vripper.Utils;
 import tn.mnlr.vripper.exception.DownloadException;
 import tn.mnlr.vripper.exception.PostParseException;
+import tn.mnlr.vripper.jpa.domain.Event;
 import tn.mnlr.vripper.jpa.domain.Metadata;
 import tn.mnlr.vripper.jpa.domain.Post;
-import tn.mnlr.vripper.services.ConnectionManager;
-import tn.mnlr.vripper.services.HtmlProcessorService;
-import tn.mnlr.vripper.services.VipergirlsAuthService;
-import tn.mnlr.vripper.services.XpathService;
+import tn.mnlr.vripper.jpa.repositories.IEventRepository;
+import tn.mnlr.vripper.services.domain.tasks.MetadataRunnable;

-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.ExecutionException;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;

@Slf4j
@Service
-public class MetadataCache {
-
-    @Getter
-    static class Key {
-        private final String postId;
-        private final String threadId;
-        private final String url;
-
-        Key(String postId, String threadId, String url) {
-            this.postId = postId;
-            this.threadId = threadId;
-            this.url = url;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Key key = (Key) o;
-            return Objects.equals(postId, key.postId);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(postId);
-        }
-    }
+public class MetadataService {

    private static final List<String> dictionary = Arrays.asList("download", "link", "rapidgator", "filefactory", "filefox");
-
    private final LoadingCache<Key, Metadata> cache;
-    private final ConnectionManager cm;
-    private final VipergirlsAuthService vipergirlsAuthService;
+    private final ConnectionService cm;
+    private final VGAuthService VGAuthService;
    private final HtmlProcessorService htmlProcessorService;
    private final XpathService xpathService;
+    private final Map<String, MetadataRunnable> fetchingMetadata = new ConcurrentHashMap<>();
+    private final ThreadPoolService threadPoolService;
+    private final IEventRepository eventRepository;

    @Autowired
-    public MetadataCache(ConnectionManager cm, VipergirlsAuthService vipergirlsAuthService, HtmlProcessorService htmlProcessorService, XpathService xpathService) {
+    public MetadataService(ConnectionService cm, VGAuthService VGAuthService, HtmlProcessorService htmlProcessorService, XpathService xpathService, ThreadPoolService threadPoolService, IEventRepository eventRepository) {
        this.cm = cm;
-        this.vipergirlsAuthService = vipergirlsAuthService;
+        this.VGAuthService = VGAuthService;
        this.htmlProcessorService = htmlProcessorService;
        this.xpathService = xpathService;
+        this.threadPoolService = threadPoolService;
+        this.eventRepository = eventRepository;

        CacheLoader<Key, Metadata> loader = new CacheLoader<>() {
            @Override
@@ -90,18 +65,51 @@ public class MetadataCache {
                .build(loader);
    }

-    public Metadata get(Post post) throws ExecutionException {
+    public Metadata get(Post post) {
        Metadata metadata = new Metadata();
-        Metadata cachedMetadata = cache.get(new Key(post.getPostId(), post.getThreadId(), post.getUrl()));
+        Key key = new Key(post.getPostId(), post.getThreadId(), post.getUrl());
+        Metadata cachedMetadata = cache.getIfPresent(key);
+        if (cachedMetadata == null) {
+            Event event = new Event(Event.Type.METADATA_CACHE_MISS, Event.Status.PROCESSING, LocalDateTime.now(), "Loading metadata for " + post.getUrl());
+            eventRepository.save(event);
+            try {
+                cachedMetadata = cache.get(key);
+                event.setStatus(Event.Status.DONE);
+                eventRepository.update(event);
+            } catch (Exception e) {
+                String error = "Failed to load metadata for " + post.getUrl();
+                log.error(error, e);
+                event.setStatus(Event.Status.ERROR);
+                event.setMessage(error + "\n" + Utils.throwableToString(e));
+                eventRepository.update(event);
+                return null;
+            }
+        }
        metadata.setPostedBy(cachedMetadata.getPostedBy());
+        metadata.setPostId(cachedMetadata.getPostId());
        metadata.setResolvedNames(List.copyOf(cachedMetadata.getResolvedNames()));
        return metadata;
    }

+    public void startFetchingMetadata(Post post) {
+        MetadataRunnable runnable = new MetadataRunnable(post);
+        threadPoolService.getGeneralExecutor().submit(runnable);
+        fetchingMetadata.put(post.getPostId(), runnable);
+    }
+
+    public void stopFetchingMetadata(Post post) {
+        this.fetchingMetadata.forEach((k, v) -> {
+            if (k.equals(post.getPostId())) {
+                v.setInterrupted(true);
+            }
+        });
+        fetchingMetadata.remove(post.getPostId());
+    }
+
    private Metadata fetchMetadata(Key key) {
-        HttpGet httpGet = cm.buildHttpGet(key.getUrl());
+        HttpGet httpGet = cm.buildHttpGet(key.getUrl(), null);
        Metadata metadata = new Metadata();
-        Failsafe.with(VripperApplication.retryPolicy)
+        Failsafe.with(cm.getRetryPolicy())
                .onFailure(e -> {
                    if (e.getFailure() instanceof InterruptedException || e.getFailure().getCause() instanceof InterruptedException) {
                        log.debug("Fetching interrupted");
@@ -111,7 +119,7 @@ public class MetadataCache {
                })
                .run(() -> {
                    HttpClient connection = cm.getClient().build();
-                    try (CloseableHttpResponse response = (CloseableHttpResponse) connection.execute(httpGet, vipergirlsAuthService.getContext())) {
+                    try (CloseableHttpResponse response = (CloseableHttpResponse) connection.execute(httpGet, VGAuthService.getContext())) {
                        if (response.getStatusLine().getStatusCode() / 100 != 2) {
                            throw new DownloadException(String.format("Unexpected response code '%d' for %s", response.getStatusLine().getStatusCode(), httpGet));
                        }
@@ -126,6 +134,8 @@ public class MetadataCache {

                            Node node = xpathService.getAsNode(document, String.format("//div[@id='post_message_%s']", key.getPostId()));
                            metadata.setResolvedNames(findTitleInContent(node));
+
+                            metadata.setPostId(key.getPostId());
                        } catch (Exception e) {
                            throw new PostParseException(String.format("Failed to parse thread %s, post %s", key.getThreadId(), key.getPostId()), e);
                        } finally {
@@ -166,4 +176,30 @@ public class MetadataCache {
            }
        }
    }
+
+    @Getter
+    static class Key {
+        private final String postId;
+        private final String threadId;
+        private final String url;
+
+        Key(String postId, String threadId, String url) {
+            this.postId = postId;
+            this.threadId = threadId;
+            this.url = url;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Key key = (Key) o;
+            return Objects.equals(postId, key.postId);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(postId);
+        }
+    }
 }
@@ -1,27 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.ReentrantLock;
-
-@Service
-public class MutexService {
-
-    private final Map<String, ReentrantLock> postLock = new ConcurrentHashMap<>();
-
-    public synchronized void createPostLock(String postId) {
-        if (!postLock.containsKey(postId)) {
-            postLock.put(postId, new ReentrantLock());
-        }
-    }
-
-    public void removePostLock(String postId) {
-        postLock.remove(postId);
-    }
-
-    public ReentrantLock getPostLock(String postId) {
-        return postLock.get(postId);
-    }
-}
@@ -1,106 +1,82 @@
 package tn.mnlr.vripper.services;

+import lombok.Getter;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import tn.mnlr.vripper.exception.RenameException;
 import tn.mnlr.vripper.jpa.domain.Post;

 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.locks.ReentrantLock;
-import java.util.stream.Collectors;

@Service
@Slf4j
 public class PathService {

-    private final AppSettingsService appSettingsService;
+    private final SettingsService settingsService;
    private final DataService dataService;
-    private final MutexService mutexService;

-    private final CommonExecutor commonExecutor;
+    @Getter
+    private final ReentrantLock directoryAccess = new ReentrantLock();

-    @Autowired
-    public PathService(AppSettingsService appSettingsService, DataService dataService, MutexService mutexService, CommonExecutor commonExecutor) {
-        this.appSettingsService = appSettingsService;
+    public PathService(SettingsService settingsService, DataService dataService) {
+        this.settingsService = settingsService;
        this.dataService = dataService;
-        this.mutexService = mutexService;
-        this.commonExecutor = commonExecutor;
    }

-    public final File getDownloadDestinationFolder(Post post) {
-        return _getDownloadDestinationFolder(post.getForum(), post.getThreadTitle(), post.getPostFolderName());
+    public final File calcDownloadDirectory(Post post) {
+        return new File(settingsService.getSettings().getDownloadPath(), post.getDownloadDirectory());
    }

-    private File _getDownloadDestinationFolder(@NonNull String forum, @NonNull String threadTitle, @NonNull String title) {
-        File sourceFolder = appSettingsService.getSettings().getSubLocation() ? new File(appSettingsService.getSettings().getDownloadPath(), sanitize(forum)) : new File(appSettingsService.getSettings().getDownloadPath());
-        sourceFolder = appSettingsService.getSettings().getThreadSubLocation() ? new File(sourceFolder, threadTitle) : sourceFolder;
-        return new File(sourceFolder, title);
+    private File getRootFolder(@NonNull String forum, @NonNull String threadTitle) {
+        File sourceFolder = settingsService.getSettings().getSubLocation() ? new File(settingsService.getSettings().getDownloadPath(), sanitize(forum)) : new File(settingsService.getSettings().getDownloadPath());
+        return settingsService.getSettings().getThreadSubLocation() ? new File(sourceFolder, threadTitle) : sourceFolder;
    }

    public final void createDefaultPostFolder(Post post) {
-        File sourceFolder = _getDownloadDestinationFolder(post.getForum(), post.getThreadTitle(), sanitize(post.getTitle()));
-        File destFolder = makeDirs(sourceFolder);
-        post.setPostFolderName(destFolder.getName());
-        dataService.updatePostFolderName(post.getPostFolderName(), post.getId());
+        File downloadDirectory = getRootFolder(post.getForum(), post.getThreadTitle());
+        downloadDirectory = new File(downloadDirectory, settingsService.getSettings().getAppendPostId() ? sanitize(post.getTitle()) + "_" + post.getPostId() : sanitize(post.getTitle()));
+        downloadDirectory = makeDir(downloadDirectory);
+        post.setDownloadDirectory(downloadDirectory.getAbsolutePath().replace(settingsService.getSettings().getDownloadPath(), ""));
+        dataService.updateDownloadDirectory(post.getDownloadDirectory(), post.getId());
    }

-    public final void rename(@NonNull String postId, @NonNull String altName) {
-        commonExecutor.getGeneralExecutor().submit(() -> {
+    public final void rename(@NonNull String postId, @NonNull String altName) throws RenameException {
+        Post post = dataService.findPostByPostId(postId).orElseThrow();
+        if (altName.equals(post.getTitle())) {
+            return;
+        }

-            ReentrantLock postLock = mutexService.getPostLock(postId);
-            if (postLock != null) {
-                postLock.lock();
-            }
+        // Download have not started yet
+        if (post.getDownloadDirectory() == null) {
+            post.setTitle(altName);
+            dataService.updatePostTitle(post.getTitle(), post.getId());
+            return;
+        }

-            try {
-                Optional<Post> _post = dataService.findPostByPostId(postId);
-                if (_post.isEmpty()) {
-                    return;
-                }
-                Post post = _post.get();
-                if (altName.equals(post.getTitle())) {
-                    return;
-                }
-                post.setTitle(altName);
-                dataService.updatePostTitle(post.getTitle(), post.getId());
-                if (post.getPostFolderName() == null) {
-                    return;
-                }
-                File newDestFolder = makeDirs(_getDownloadDestinationFolder(post.getForum(), post.getThreadTitle(), sanitize(altName)));
-                File currentDesFolder = getDownloadDestinationFolder(post);
-                post.setPostFolderName(newDestFolder.getName());
-                dataService.updatePostFolderName(post.getPostFolderName(), post.getId());
+        File newDownloadDirectory = getRootFolder(post.getForum(), post.getThreadTitle());
+        newDownloadDirectory = new File(newDownloadDirectory, sanitize(altName));
+        File currentDownloadDirectory = calcDownloadDirectory(post);
+        try {
+            directoryAccess.lock();
+            Files.move(currentDownloadDirectory.toPath(), newDownloadDirectory.toPath(), StandardCopyOption.ATOMIC_MOVE);
+            post.setDownloadDirectory(newDownloadDirectory.getAbsolutePath().replace(settingsService.getSettings().getDownloadPath(), ""));
+            dataService.updateDownloadDirectory(post.getDownloadDirectory(), post.getId());

-                List<File> files = Optional.ofNullable(currentDesFolder.listFiles()).stream().flatMap(Arrays::stream).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);
-                    } catch (IOException e) {
-                        log.error(String.format("Failed to move files from %s to %s", currentDesFolder.toString(), newDestFolder.toString()), e);
-                        return;
-                    }
-                }
-
-                if (!currentDesFolder.delete()) {
-                    log.warn(String.format("Failed to remove %s", currentDesFolder.toString()));
-                }
-            } finally {
-                if (postLock != null) {
-                    postLock.unlock();
-                }
-            }
-        });
+            post.setTitle(altName);
+            dataService.updatePostTitle(post.getTitle(), post.getId());
+        } catch (IOException e) {
+            throw new RenameException(String.format("Failed to move files from %s to %s", currentDownloadDirectory.toString(), newDownloadDirectory.toString()), e);
+        } finally {
+            directoryAccess.unlock();
+        }
    }

-    private File makeDirs(@NonNull final File sourceFolder) {
+    private File makeDir(@NonNull final File sourceFolder) {
        int counter = 1;
        File folder = sourceFolder;

@@ -0,0 +1,96 @@
+package tn.mnlr.vripper.services;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.lang.NonNull;
+import org.springframework.stereotype.Service;
+import tn.mnlr.vripper.Utils;
+import tn.mnlr.vripper.jpa.domain.Event;
+import tn.mnlr.vripper.jpa.domain.Post;
+import tn.mnlr.vripper.jpa.domain.Queued;
+import tn.mnlr.vripper.jpa.repositories.IEventRepository;
+import tn.mnlr.vripper.services.domain.ApiThreadParser;
+import tn.mnlr.vripper.services.domain.MultiPostItem;
+import tn.mnlr.vripper.services.domain.tasks.AddPostRunnable;
+import tn.mnlr.vripper.services.domain.tasks.AddQueuedRunnable;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static tn.mnlr.vripper.jpa.domain.Event.Status.DONE;
+import static tn.mnlr.vripper.jpa.domain.Event.Status.PROCESSING;
+
+@Service
+@Slf4j
+public class PostService {
+
+    private final DataService dataService;
+    private final ThreadPoolService threadPoolService;
+    private final MetadataService metadataService;
+    private final IEventRepository eventRepository;
+    private final LoadingCache<Queued, List<MultiPostItem>> cache;
+
+    @Autowired
+    public PostService(DataService dataService, ThreadPoolService threadPoolService, MetadataService metadataService, IEventRepository eventRepository) {
+        this.dataService = dataService;
+        this.threadPoolService = threadPoolService;
+        this.metadataService = metadataService;
+        this.eventRepository = eventRepository;
+
+        CacheLoader<Queued, List<MultiPostItem>> loader = new CacheLoader<>() {
+            @Override
+            public List<MultiPostItem> load(@NonNull Queued multiPostItem) throws Exception {
+                return new ApiThreadParser(multiPostItem).parse();
+            }
+        };
+
+        cache = CacheBuilder.newBuilder()
+                .expireAfterWrite(30, TimeUnit.MINUTES)
+                .build(loader);
+    }
+
+    public void stopFetchingMetadata(Post post) {
+        metadataService.stopFetchingMetadata(post);
+    }
+
+    public void processMultiPost(List<Queued> queuedList) {
+        for (Queued queued : queuedList) {
+            if (queued.getPostId() != null) {
+                threadPoolService.getGeneralExecutor().submit(new AddPostRunnable(queued.getPostId(), queued.getThreadId()));
+            } else {
+                threadPoolService.getGeneralExecutor().submit(new AddQueuedRunnable(queued));
+            }
+        }
+    }
+
+    public List<MultiPostItem> get(Queued queued) {
+        List<MultiPostItem> multiPostItems;
+        multiPostItems = cache.getIfPresent(queued);
+        if (multiPostItems == null) {
+            Event event = new Event(Event.Type.QUEUED_CACHE_MISS, PROCESSING, LocalDateTime.now(), "Loading posts from " + queued.getLink());
+            eventRepository.save(event);
+            try {
+                multiPostItems = cache.get(queued);
+                event.setStatus(DONE);
+                event.setMessage("Loaded " + multiPostItems.size() + " posts from " + queued.getLink());
+                eventRepository.update(event);
+            } catch (Exception e) {
+                String error = String.format("Failed to parse link %s", queued.getLink());
+                log.error(error, e);
+                event.setStatus(Event.Status.ERROR);
+                event.setMessage(error + "\n" + Utils.throwableToString(e));
+                eventRepository.update(event);
+                return null;
+            }
+        }
+        return multiPostItems;
+    }
+
+    public void remove(String threadId) {
+        dataService.removeQueueLink(threadId);
+    }
+}
@@ -2,6 +2,7 @@ package tn.mnlr.vripper.services;

 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Getter;
@@ -10,69 +11,119 @@ import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
 import tn.mnlr.vripper.SpringContext;
 import tn.mnlr.vripper.exception.ValidationException;
+import tn.mnlr.vripper.listener.EmitHandler;

 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
+import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;

 import static java.nio.file.StandardOpenOption.*;

@Service
-@Getter
@Setter
@Slf4j
-public class AppSettingsService {
-
-    private final String MAX_TOTAL_THREADS = "MAX_TOTAL_THREADS";
-    private final String baseDir;
+public class SettingsService {

    private final Path configPath;
+    private final Path customProxiesPath;
    private final ObjectMapper om = new ObjectMapper();

-    private Settings settings = new Settings();
+    private final Set<String> proxies = new HashSet<>();

-    public AppSettingsService(@Value("${base.dir}") String baseDir) {
-        this.baseDir = baseDir;
-        this.configPath = Paths.get(baseDir, ".vripper", "config.json");
+    private Sinks.Many<Settings> sink = Sinks.many().multicast().onBackpressureBuffer();
+
+    @Getter
+    private Settings settings = new Settings();
+    @Value("classpath:proxies.json")
+    private Resource defaultProxies;
+
+    public SettingsService(@Value("${base.dir}") String baseDir, @Value("${base.dir.name}") String baseDirName) {
+        this.configPath = Paths.get(baseDir, baseDirName, "config.json");
+        this.customProxiesPath = Paths.get(baseDir, baseDirName, "proxies.json");
        om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
    }

    @PostConstruct
    private void init() {
+        loadViperProxies();
        restore();
+        sink.emitNext(settings, EmitHandler.RETRY);
+    }
+
+    private void loadViperProxies() {
+        try (InputStream defaultProxiesIs = defaultProxies.getInputStream()) {
+            List<String> defaultProxies = om.readValue(defaultProxiesIs, new TypeReference<>() {
+            });
+            List<String> customProxies = new ArrayList<>();
+            if (customProxiesPath.toFile().exists() && customProxiesPath.toFile().isFile()) {
+                customProxies = om.readValue(customProxiesPath.toFile(), new TypeReference<>() {
+                });
+            } else {
+                if (!customProxiesPath.toFile().createNewFile()) {
+                    log.warn("Unable to create " + customProxiesPath.toFile().getAbsolutePath());
+                } else {
+                    try (FileWriter fw = new FileWriter(customProxiesPath.toFile())) {
+                        fw.append("[]").append(System.lineSeparator());
+                        fw.flush();
+                    } catch (IOException e) {
+                        log.warn("Unable to create " + customProxiesPath.toFile().getAbsolutePath(), e);
+                    }
+                }
+            }
+            proxies.addAll(customProxies);
+            proxies.addAll(defaultProxies);
+        } catch (IOException e) {
+            log.error("Failed to load vipergirls proxies list", e);
+        }
+        proxies.add("https://vipergirls.to");
+    }
+
+    Flux<Settings> getSettingsFlux() {
+        return sink.asFlux();
+    }
+
+    public List<String> getProxies() {
+        return new ArrayList<>(proxies);
    }

    public void newSettings(Settings settings) {

-        if (settings.getVLogin()) {
+        if (settings.getVLogin() != null && settings.getVLogin()) {
            if (!this.settings.getVPassword().equals(settings.getVPassword())) {
-                settings.setVPassword(settings.getVPassword());
+                settings.setVPassword(DigestUtils.md5Hex(settings.getVPassword()));
            }
        } else {
            settings.setVUsername("");
            settings.setVPassword("");
            settings.setVThanks(false);
+            settings.setVLogin(false);
        }
        this.settings = settings;

        save();
+        sink.emitNext(settings, EmitHandler.RETRY);
    }

    public void restore() {
        try {
-            settings = om.readValue(configPath.toFile(), Settings.class);
-            try {
-                check(this.settings);
-            } catch (ValidationException e) {
-                log.error(String.format("Your settings are invalid, either remove %s, or fix it", configPath.toString()), e);
-                SpringContext.close();
+            if (configPath.toFile().exists()) {
+                settings = om.readValue(configPath.toFile(), Settings.class);
            }
        } catch (IOException e) {
            log.error("Failed restore user settings", e);
@@ -80,7 +131,7 @@ public class AppSettingsService {
        }

        if (settings.getDownloadPath() == null) {
-            settings.setDownloadPath(baseDir);
+            settings.setDownloadPath(System.getProperty("user.home"));
        }

        if (settings.getMaxThreads() == null) {
@@ -135,30 +186,55 @@ public class AppSettingsService {
            settings.setDarkTheme(false);
        }

-        if (settings.getViewPhotos() == null) {
-            settings.setViewPhotos(false);
+        if (settings.getAppendPostId() == null) {
+            settings.setAppendPostId(true);
        }

-        if (settings.getNotification() == null) {
-            settings.setNotification(false);
+        if (settings.getLeaveThanksOnStart() == null) {
+            settings.setLeaveThanksOnStart(false);
        }

+        if (settings.getConnectionTimeout() == null) {
+            settings.setConnectionTimeout(30);
+        }
+
+        if (settings.getMaxAttempts() == null) {
+            settings.setMaxAttempts(5);
+        }
+
+        if (settings.getVProxy() == null || !proxies.contains(settings.getVProxy())) {
+            settings.setVProxy("https://vipergirls.to");
+        }
+
+        if (settings.getMaxEventLog() == null) {
+            settings.setMaxEventLog(1000);
+        }
+
+        try {
+            check(this.settings);
+        } catch (ValidationException e) {
+            log.error(String.format("Your settings are invalid, either remove %s, or fix it", configPath.toString()), e);
+            SpringContext.close();
+        }

        save();
    }

-    @PreDestroy
+
    public void save() {
        try {
-            // force disable gallery
-            settings.setViewPhotos(false);
-
            Files.write(configPath, om.writeValueAsBytes(settings), CREATE, WRITE, TRUNCATE_EXISTING, SYNC);
        } catch (IOException e) {
            log.error("Failed to store user settings", e);
        }
    }

+    @PreDestroy
+    private void destroy() {
+        save();
+        sink.emitComplete(EmitHandler.RETRY);
+    }
+
    public void check(Settings settings) throws ValidationException {

        Path path;
@@ -180,6 +256,18 @@ public class AppSettingsService {
        if (settings.getMaxThreads() < 1 || settings.getMaxThreads() > 4) {
            throw new ValidationException(String.format("Invalid max concurrent download settings, values must be in [%d,%d]", 1, 4));
        }
+
+        if (settings.getConnectionTimeout() < 1 || settings.getConnectionTimeout() > 300) {
+            throw new ValidationException(String.format("Invalid connection timeout settings, values must be in [%d,%d]", 1, 300));
+        }
+
+        if (settings.getMaxAttempts() < 1 || settings.getMaxAttempts() > 10) {
+            throw new ValidationException(String.format("Invalid maximum attempts settings, values must be in [%d,%d]", 1, 10));
+        }
+
+        if (settings.getMaxEventLog() < 100 || settings.getMaxEventLog() > 10_000) {
+            throw new ValidationException(String.format("Invalid maximum event log record settings, values must be in [%d,%d]", 100, 10_000));
+        }
    }

    public Theme getTheme() {
@@ -211,43 +299,63 @@ public class AppSettingsService {

        @JsonProperty("downloadPath")
        private String downloadPath;
+
        @JsonProperty("maxThreads")
        private Integer maxThreads;
+
        @JsonProperty("maxTotalThreads")
        private Integer maxTotalThreads;
+
        @JsonProperty("autoStart")
        private Boolean autoStart;
+
        @JsonProperty("vLogin")
        private Boolean vLogin;
+
        @JsonProperty("vUsername")
        private String vUsername;
+
        @JsonProperty("vPassword")
        private String vPassword;
+
        @JsonProperty("vThanks")
        private Boolean vThanks;
+
        @JsonProperty("desktopClipboard")
        private Boolean desktopClipboard;
+
        @JsonProperty("forceOrder")
        private Boolean forceOrder;
+
        @JsonProperty("subLocation")
        private Boolean subLocation;
+
        @JsonProperty("threadSubLocation")
        private Boolean threadSubLocation;
+
        @JsonProperty("clearCompleted")
        private Boolean clearCompleted;
-        @JsonProperty("viewPhotos")
-        private Boolean viewPhotos;
-        @JsonProperty("notification")
-        private Boolean notification;
+
        @JsonProperty("darkTheme")
        private Boolean darkTheme;

-        public void setVPassword(String vPassword) {
-            if (vPassword == null || vPassword.isEmpty()) {
-                this.vPassword = "";
-            } else {
-                this.vPassword = DigestUtils.md5Hex(vPassword);
-            }
-        }
+        @JsonProperty("appendPostId")
+        private Boolean appendPostId;
+
+        @JsonProperty("leaveThanksOnStart")
+        private Boolean leaveThanksOnStart;
+
+        @JsonProperty("connectionTimeout")
+        private Integer connectionTimeout;
+
+        @JsonProperty("maxAttempts")
+        private Integer maxAttempts;
+
+        @JsonProperty("vProxy")
+        private String vProxy;
+
+        @JsonProperty("maxEventLog")
+        private Integer maxEventLog;
+
    }
 }
@@ -0,0 +1,19 @@
+package tn.mnlr.vripper.services;
+
+import lombok.Getter;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+@Service
+public class ThreadPoolService {
+    @Getter
+    private final ExecutorService generalExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
+
+    public void destroy() throws Exception {
+        generalExecutor.shutdown();
+        generalExecutor.awaitTermination(5, TimeUnit.SECONDS);
+    }
+}
@@ -0,0 +1,146 @@
+package tn.mnlr.vripper.services;
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.cookie.Cookie;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import reactor.core.Disposable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.exception.VripperException;
+import tn.mnlr.vripper.jpa.domain.Post;
+import tn.mnlr.vripper.listener.EmitHandler;
+import tn.mnlr.vripper.services.domain.tasks.LeaveThanksRunnable;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@Slf4j
+public class VGAuthService {
+
+    private final ConnectionService cm;
+    private final SettingsService settingsService;
+    private final ThreadPoolService threadPoolService;
+
+    private final Disposable disposable;
+
+    @Getter
+    private final HttpClientContext context = HttpClientContext.create();
+    private final Sinks.Many<String> sink = Sinks.many().multicast().onBackpressureBuffer();
+    @Getter
+    private boolean authenticated = false;
+    @Getter
+    private String loggedUser = "";
+
+    @Autowired
+    public VGAuthService(ConnectionService cm, SettingsService settingsService, ThreadPoolService threadPoolService) {
+        this.cm = cm;
+        this.settingsService = settingsService;
+        this.threadPoolService = threadPoolService;
+        disposable = settingsService.getSettingsFlux().subscribe(settings -> this.authenticate());
+    }
+
+    @PostConstruct
+    private void init() {
+        context.setCookieStore(new BasicCookieStore());
+        authenticate();
+    }
+
+    @PreDestroy
+    private void destroy() {
+        sink.emitComplete(EmitHandler.RETRY);
+        disposable.dispose();
+    }
+
+    public Flux<String> getLoggedInUser() {
+        return sink.asFlux();
+    }
+
+    public void authenticate() {
+
+        log.info("Authenticating using ViperGirls credentials");
+        authenticated = false;
+
+        if (!settingsService.getSettings().getVLogin()) {
+            log.debug("Authentication option is disabled");
+            context.getCookieStore().clear();
+            loggedUser = "";
+            sink.emitNext(loggedUser, EmitHandler.RETRY);
+            return;
+        }
+
+        String username = settingsService.getSettings().getVUsername();
+        String password = settingsService.getSettings().getVPassword();
+
+        if (username == null || password == null || username.isEmpty() || password.isEmpty()) {
+            log.error("Cannot authenticate with ViperGirls credentials, username or password is empty");
+            context.getCookieStore().clear();
+            loggedUser = "";
+            sink.emitNext(loggedUser, EmitHandler.RETRY);
+            return;
+        }
+
+        HttpPost postAuth = cm.buildHttpPost(settingsService.getSettings().getVProxy() + "/login.php?do=login", null);
+        List<NameValuePair> params = new ArrayList<>();
+        params.add(new BasicNameValuePair("vb_login_username", username));
+
+        params.add(new BasicNameValuePair("cookieuser", "1"));
+        params.add(new BasicNameValuePair("do", "login"));
+        params.add(new BasicNameValuePair("vb_login_md5password", password));
+        try {
+            postAuth.setEntity(new UrlEncodedFormEntity(params));
+        } catch (Exception e) {
+            context.getCookieStore().clear();
+            loggedUser = "";
+            sink.emitNext(loggedUser, EmitHandler.RETRY);
+            log.error("Failed to authenticate user with " + settingsService.getSettings().getVProxy(), e);
+            return;
+        }
+
+        postAuth.addHeader("Referer", settingsService.getSettings().getVProxy());
+        postAuth.addHeader("Host", settingsService.getSettings().getVProxy().replace("https://", "").replace("http://", ""));
+
+        CloseableHttpClient client = cm.getClient().build();
+
+        try (CloseableHttpResponse response = client.execute(postAuth, context)) {
+
+            if (response.getStatusLine().getStatusCode() / 100 != 2) {
+                throw new VripperException(String.format("Unexpected response code returned %s", response.getStatusLine().getStatusCode()));
+            }
+            String responseBody = EntityUtils.toString(response.getEntity());
+            log.debug(String.format("Authentication with ViperGirls response body:%n%s", responseBody));
+            EntityUtils.consumeQuietly(response.getEntity());
+            if (context.getCookieStore().getCookies().stream().map(Cookie::getName).noneMatch(e -> e.equals("vg_userid"))) {
+                log.error(String.format("Failed to authenticate user with %s, missing vg_userid cookie", settingsService.getSettings().getVProxy()));
+                return;
+            }
+        } catch (Exception e) {
+            context.getCookieStore().clear();
+            loggedUser = "";
+            sink.emitNext(loggedUser, EmitHandler.RETRY);
+            log.error("Failed to authenticate user with " + settingsService.getSettings().getVProxy(), e);
+            return;
+        }
+        authenticated = true;
+        loggedUser = username;
+        log.info(String.format("Authenticated: %s", username));
+        sink.emitNext(loggedUser, EmitHandler.RETRY);
+    }
+
+    public void leaveThanks(Post post) {
+        threadPoolService.getGeneralExecutor().submit(new LeaveThanksRunnable(post, authenticated, context));
+    }
+}
@@ -1,86 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import tn.mnlr.vripper.exception.PostParseException;
-import tn.mnlr.vripper.jpa.domain.Queued;
-import tn.mnlr.vripper.services.post.CachedPost;
-import tn.mnlr.vripper.services.post.PostService;
-
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-@Service
-@Slf4j
-public class VGHandler {
-
-    private final DataService dataService;
-    private final PostService postService;
-    private final CommonExecutor commonExecutor;
-
-    @Getter
-    private final LoadingCache<Queued, List<CachedPost>> cache;
-
-    @Autowired
-    public VGHandler(DataService dataService, PostService postService, CommonExecutor commonExecutor) {
-        this.dataService = dataService;
-        this.postService = postService;
-        this.commonExecutor = commonExecutor;
-
-        CacheLoader<Queued, List<CachedPost>> loader = new CacheLoader<>() {
-            @Override
-            public List<CachedPost> load(@NonNull Queued queuedVGLink) throws Exception {
-                VRThreadParser vrThreadParser = new VRThreadParser(queuedVGLink);
-                return vrThreadParser.parse();
-            }
-        };
-
-        cache = CacheBuilder.newBuilder()
-                .expireAfterWrite(30, TimeUnit.MINUTES)
-                .build(loader);
-    }
-
-    public void handle(List<Queued> queuedList) throws Exception {
-        for (Queued queued : queuedList) {
-            if (queued.getPostId() != null) {
-                postService.addPost(queued.getPostId(), queued.getThreadId());
-            } else {
-                Runnable runnable = () -> {
-                    List<CachedPost> cachedPosts;
-                    try {
-                        cachedPosts = cache.get(queued);
-                    } catch (ExecutionException e) {
-                        log.error(String.format("Failed to add post with thread id %s, postId %s", queued.getThreadId(), queued.getPostId()), e);
-                        return;
-                    }
-                    queued.setTotal(cachedPosts.size());
-                    queued.done();
-                    log.debug(String.format("%d found for %s", cachedPosts.size(), queued.getLink()));
-                    if (cachedPosts.size() == 1) {
-                        try {
-                            postService.addPost(cachedPosts.get(0).getPostId(), cachedPosts.get(0).getThreadId());
-                        } catch (PostParseException e) {
-                            log.error(String.format("Failed to add post with postId %s", cachedPosts.get(0).getPostId()), e);
-                            return;
-                        }
-                        log.debug(String.format("threadId %s, postId %s is added automatically for download", queued.getThreadId(), queued.getPostId()));
-                    } else {
-                        dataService.newQueueLink(queued);
-                    }
-                };
-                commonExecutor.getGeneralExecutor().submit(runnable);
-            }
-        }
-    }
-
-    public void remove(String threadId) {
-        dataService.removeQueueLink(threadId);
-    }
-}
@@ -1,163 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-import net.jodah.failsafe.Failsafe;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.util.EntityUtils;
-import org.xml.sax.Attributes;
-import org.xml.sax.helpers.DefaultHandler;
-import tn.mnlr.vripper.SpringContext;
-import tn.mnlr.vripper.VripperApplication;
-import tn.mnlr.vripper.exception.DownloadException;
-import tn.mnlr.vripper.exception.PostParseException;
-import tn.mnlr.vripper.host.Host;
-import tn.mnlr.vripper.jpa.domain.Queued;
-import tn.mnlr.vripper.services.post.CachedPost;
-
-import javax.xml.parsers.SAXParserFactory;
-import java.io.BufferedInputStream;
-import java.net.URISyntaxException;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
-
-@Slf4j
-public class VRThreadParser {
-
-    private static final String VR_API = "https://vipergirls.to/vr.php";
-
-    private static final SAXParserFactory factory = SAXParserFactory.newInstance();
-    private final Queued queued;
-    private final ConnectionManager cm;
-    private final VipergirlsAuthService vipergirlsAuthService;
-
-    VRThreadParser(Queued queued) {
-        this.queued = queued;
-        this.cm = SpringContext.getBean(ConnectionManager.class);
-        this.vipergirlsAuthService = SpringContext.getBean(VipergirlsAuthService.class);
-    }
-
-    public List<CachedPost> parse() throws PostParseException {
-
-        log.debug(String.format("Parsing thread %s", queued));
-        HttpGet httpGet;
-        try {
-            URIBuilder uriBuilder = new URIBuilder(VR_API);
-            uriBuilder.setParameter("t", queued.getThreadId());
-            httpGet = cm.buildHttpGet(uriBuilder.build());
-        } catch (URISyntaxException e) {
-            throw new PostParseException(e);
-        }
-
-        VRThreadHandler handler = new VRThreadHandler(queued);
-        AtomicReference<Throwable> thr = new AtomicReference<>();
-        log.debug(String.format("Requesting %s", httpGet));
-        List<CachedPost> posts = Failsafe.with(VripperApplication.retryPolicy)
-                .onFailure(e -> thr.set(e.getFailure()))
-                .get(() -> {
-                    HttpClient connection = cm.getClient().build();
-                    try (CloseableHttpResponse response = (CloseableHttpResponse) connection.execute(httpGet, vipergirlsAuthService.getContext())) {
-                        if (response.getStatusLine().getStatusCode() / 100 != 2) {
-                            throw new DownloadException(String.format("Unexpected response code '%d' for %s", response.getStatusLine().getStatusCode(), httpGet));
-                        }
-
-                        try {
-                            factory.newSAXParser().parse(new BufferedInputStream(response.getEntity().getContent()), handler);
-                            return handler.getPosts();
-                        } catch (Exception e) {
-                            throw new PostParseException(String.format("Failed to parse thread %s", queued), e);
-                        } finally {
-                            EntityUtils.consumeQuietly(response.getEntity());
-                        }
-                    }
-                });
-        if (thr.get() != null) {
-            log.error(String.format("parsing failed for thread %s", queued), thr.get());
-            throw new PostParseException(thr.get());
-        }
-        return posts;
-    }
-}
-
-class VRThreadHandler extends DefaultHandler {
-
-    private final Queued queued;
-    private final Collection<Host> supportedHosts;
-    private final Map<Host, AtomicInteger> hostMap = new HashMap<>();
-    private List<String> previews = new ArrayList<>();
-    private String threadTitle;
-    private String postId;
-    private String postTitle;
-    private int imageCount;
-    private int postCounter;
-    private int previewCounter = 0;
-
-    @Getter
-    private List<CachedPost> posts = new ArrayList<>();
-
-    VRThreadHandler(Queued queued) {
-        this.queued = queued;
-        this.supportedHosts = SpringContext.getBeansOfType(Host.class).values();
-    }
-
-    @Override
-    public void startDocument() {
-    }
-
-    @Override
-    public void startElement(String uri, String localName, String qName, Attributes attributes) {
-
-        switch (qName.toLowerCase()) {
-            case "thread":
-                threadTitle = attributes.getValue("title").trim();
-                break;
-            case "post":
-                imageCount = Integer.parseInt(attributes.getValue("imagecount").trim());
-                postId = attributes.getValue("id").trim();
-                postCounter = Integer.parseInt(attributes.getValue("number").trim());
-                postTitle = Optional.ofNullable(attributes.getValue("title")).map(e -> e.trim().isEmpty() ? null : e.trim()).orElse(threadTitle);
-                break;
-            case "image":
-                Optional.ofNullable(attributes.getValue("main_url"))
-                        .map(String::trim)
-                        .flatMap(mainUrl -> supportedHosts.stream().filter(host -> host.isSupported(mainUrl)).findFirst())
-                        .ifPresent(host -> Optional.ofNullable(hostMap.get(host)).ifPresentOrElse(AtomicInteger::incrementAndGet, () -> hostMap.put(host, new AtomicInteger(0))));
-                if (previewCounter++ < 4) {
-                    Optional.ofNullable(attributes.getValue("thumb_url")).map(String::trim).ifPresent(previews::add);
-                }
-                break;
-        }
-    }
-
-    @Override
-    public void endElement(String uri, String localName, String qName) {
-        if ("post".equals(qName.toLowerCase())) {
-            if (imageCount != 0) {
-                posts.add(new CachedPost(
-                        queued.getThreadId(),
-                        postId,
-                        postCounter,
-                        postTitle,
-                        imageCount,
-                        String.format("https://vipergirls.to/threads/?p=%s&viewfull=1#post%s", postId, postId),
-                        previews,
-                        hostMap.entrySet().stream().filter(v -> v.getValue().get() > 0).map(e -> e.getKey().getHost() + " (" + e.getValue().get() + ")").collect(Collectors.joining(", "))
-                ));
-                queued.increment();
-            }
-            previewCounter = 0;
-            previews = new ArrayList<>();
-            hostMap.clear();
-        }
-    }
-
-    @Override
-    public void endDocument() {
-        queued.done();
-    }
-}
@@ -1,195 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import io.reactivex.processors.PublishProcessor;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import tn.mnlr.vripper.exception.VripperException;
-import tn.mnlr.vripper.jpa.domain.Post;
-
-import javax.annotation.PostConstruct;
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-@Slf4j
-public class VipergirlsAuthService {
-
-    private final ConnectionManager cm;
-    private final AppSettingsService appSettingsService;
-    private final CommonExecutor commonExecutor;
-    private final DataService dataService;
-
-    @Getter
-    private final HttpClientContext context = HttpClientContext.create();
-
-    @Getter
-    private boolean authenticated = false;
-
-    @Getter
-    private String loggedUser = "";
-
-    @Getter
-    private final PublishProcessor<String> loggedInUser = PublishProcessor.create();
-
-    @Autowired
-    public VipergirlsAuthService(ConnectionManager cm, AppSettingsService appSettingsService, CommonExecutor commonExecutor, DataService dataService) {
-        this.cm = cm;
-        this.appSettingsService = appSettingsService;
-        this.commonExecutor = commonExecutor;
-        this.dataService = dataService;
-    }
-
-    @PostConstruct
-    private void init() {
-        context.setCookieStore(new BasicCookieStore());
-        try {
-            authenticate();
-        } catch (VripperException e) {
-            log.error("Cannot authenticate user with ViperGirls", e);
-        }
-    }
-
-    public void authenticate() throws VripperException {
-
-        log.info("Authenticating using ViperGirls credentials");
-        authenticated = false;
-
-        if (!appSettingsService.getSettings().getVLogin()) {
-            log.debug("Authentication option is disabled");
-            context.getCookieStore().clear();
-            loggedUser = "";
-            loggedInUser.onNext(loggedUser);
-            return;
-        }
-
-        String username = appSettingsService.getSettings().getVUsername();
-        String password = appSettingsService.getSettings().getVPassword();
-
-        if (username == null || password == null || username.isEmpty() || password.isEmpty()) {
-            log.error("Cannot authenticate with ViperGirls credentials, username or password is empty");
-            context.getCookieStore().clear();
-            loggedUser = "";
-            loggedInUser.onNext(loggedUser);
-            return;
-        }
-
-        HttpPost postAuth = cm.buildHttpPost("https://vipergirls.to/login.php?do=login");
-        List<NameValuePair> params = new ArrayList<>();
-        params.add(new BasicNameValuePair("vb_login_username", username));
-
-        params.add(new BasicNameValuePair("cookieuser", "1"));
-        params.add(new BasicNameValuePair("do", "login"));
-        params.add(new BasicNameValuePair("vb_login_md5password", password));
-        try {
-            postAuth.setEntity(new UrlEncodedFormEntity(params));
-        } catch (Exception e) {
-            context.getCookieStore().clear();
-            loggedUser = "";
-            loggedInUser.onNext(loggedUser);
-            throw new VripperException(e);
-        }
-
-        postAuth.addHeader("Referer", "https://vipergirls.to/");
-        postAuth.addHeader("Host", "vipergirls.to");
-
-        CloseableHttpClient client = cm.getClient().build();
-
-        try (CloseableHttpResponse response = client.execute(postAuth, context)) {
-
-            if (response.getStatusLine().getStatusCode() / 100 != 2) {
-                throw new VripperException(String.format("Unexpected response code returned %s", response.getStatusLine().getStatusCode()));
-            }
-            String responseBody = EntityUtils.toString(response.getEntity());
-            log.debug(String.format("Authentication with ViperGirls response body:%n%s", responseBody));
-            EntityUtils.consumeQuietly(response.getEntity());
-            if (context.getCookieStore().getCookies().stream().map(Cookie::getName).noneMatch(e -> e.equals("vg_userid"))) {
-                throw new VripperException("Failed to authenticate user with ViperRipper");
-            }
-        } catch (Exception e) {
-            context.getCookieStore().clear();
-            loggedUser = "";
-            loggedInUser.onNext(loggedUser);
-            if (e instanceof VripperException) {
-                throw (VripperException) e;
-            } else {
-                throw new VripperException(e);
-            }
-        }
-        authenticated = true;
-        loggedUser = username;
-        log.info(String.format("Authenticated: %s", username));
-        loggedInUser.onNext(loggedUser);
-    }
-
-    public void leaveThanks(Post post) {
-        if (!appSettingsService.getSettings().getVLogin()) {
-            log.debug("Authentication with ViperGirls option is disabled");
-            return;
-        }
-        if (!appSettingsService.getSettings().getVThanks()) {
-            log.debug("Leave thanks option is disabled");
-            return;
-        }
-        if (!authenticated) {
-            log.error("You are not authenticated");
-            return;
-        }
-        if (post.isThanked()) {
-            log.debug("Already left a thanks");
-            return;
-        }
-        commonExecutor.getGeneralExecutor().submit(() -> {
-            try {
-                postThanks(post);
-            } catch (Exception e) {
-                log.error(String.format("Failed to leave a thanks for url %s, post id %s", post.getUrl(), post.getPostId()), e);
-            }
-        });
-    }
-
-    private void postThanks(Post post) throws VripperException {
-
-        HttpPost postThanks = cm.buildHttpPost("https://vipergirls.to/post_thanks.php");
-        List<NameValuePair> params = new ArrayList<>();
-        params.add(new BasicNameValuePair("do", "post_thanks_add"));
-        params.add(new BasicNameValuePair("using_ajax", "1"));
-        params.add(new BasicNameValuePair("p", post.getPostId()));
-        params.add(new BasicNameValuePair("securitytoken", post.getSecurityToken()));
-        try {
-            postThanks.setEntity(new UrlEncodedFormEntity(params));
-        } catch (Exception e) {
-            throw new VripperException(e);
-        }
-
-        postThanks.addHeader("Referer", "https://vipergirls.to/");
-        postThanks.addHeader("Host", "vipergirls.to");
-
-        CloseableHttpClient client = cm.getClient().build();
-
-        try (CloseableHttpResponse response = client.execute(postThanks, context)) {
-            if (response.getStatusLine().getStatusCode() / 100 == 2) {
-                post.setThanked(true);
-                dataService.updatePostThanked(post.isThanked(), post.getId());
-            }
-            EntityUtils.consumeQuietly(response.getEntity());
-        } catch (Exception e) {
-            throw new VripperException(e);
-        }
-
-        if (!post.isThanked()) {
-            throw new VripperException("Failed to leave");
-        }
-    }
-}
@@ -12,7 +12,7 @@ import javax.xml.xpath.XPathFactory;
@Service
 public class XpathService {

-    private XPath xpath = XPathFactory.newInstance().newXPath();
+    private final XPath xpath = XPathFactory.newInstance().newXPath();

    public Node getAsNode(Node source, String xpathExpression) throws XpathException {
        try {
@@ -1,4 +1,4 @@
-package tn.mnlr.vripper.services.post;
+package tn.mnlr.vripper.services.domain;

 import lombok.Getter;
 import tn.mnlr.vripper.jpa.domain.Image;
@@ -7,14 +7,14 @@ import tn.mnlr.vripper.jpa.domain.Post;
 import java.util.Optional;
 import java.util.Set;

-public class ParseResult {
+public class ApiPost {

    private final Post post;

    @Getter
    private final Set<Image> images;

-    ParseResult(Post post, Set<Image> images) {
+    public ApiPost(Post post, Set<Image> images) {
        this.post = post;
        this.images = images;
    }
@@ -22,4 +22,4 @@ public class ParseResult {
    public Optional<Post> getPost() {
        return Optional.ofNullable(post);
    }
-}
+}
@@ -1,4 +1,4 @@
-package tn.mnlr.vripper.services.post;
+package tn.mnlr.vripper.services.domain;

 import lombok.extern.slf4j.Slf4j;
 import org.xml.sax.Attributes;
@@ -7,6 +7,7 @@ import tn.mnlr.vripper.SpringContext;
 import tn.mnlr.vripper.host.Host;
 import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.jpa.domain.Post;
+import tn.mnlr.vripper.services.SettingsService;

 import java.util.Collection;
 import java.util.HashSet;
@@ -15,7 +16,7 @@ import java.util.Set;
 import java.util.stream.Collectors;

@Slf4j
-class VRApiPostHandler extends DefaultHandler {
+class ApiPostHandler extends DefaultHandler {

    private final Collection<Host> supportedHosts;

@@ -25,23 +26,23 @@ class VRApiPostHandler extends DefaultHandler {
    private final Set<Image> images = new HashSet<>();
    private Set<String> previews = new HashSet<>();
    private String threadTitle;
-    private String postTitle;
    private String forum;
    private String userHash;
    private int index = 0;

    private Post parsedPost;

-    VRApiPostHandler(String threadId, String postId) {
+    ApiPostHandler(String threadId, String postId) {
        this.threadId = threadId;
        this.postId = postId;
-        this.postUrl = String.format("https://vipergirls.to/threads/%s/?p=%s&viewfull=1#post%s", this.threadId, this.postId, this.postId);
-        this.supportedHosts = SpringContext.getBeansOfType(Host.class).values();
+        supportedHosts = SpringContext.getBeansOfType(Host.class).values();
+        SettingsService settingsService = SpringContext.getBean(SettingsService.class);
+        postUrl = String.format("%s/threads/%s/?p=%s&viewfull=1#post%s", settingsService.getSettings().getVProxy(), this.threadId, this.postId, this.postId);
    }


-    public ParseResult getParsedPost() {
-        return new ParseResult(parsedPost, images);
+    public ApiPost getParsedPost() {
+        return new ApiPost(parsedPost, images);
    }

    @Override
@@ -62,7 +63,7 @@ class VRApiPostHandler extends DefaultHandler {
                threadTitle = attributes.getValue("title").trim();
                break;
            case "post":
-                postTitle = Optional.ofNullable(attributes.getValue("title")).map(e -> e.trim().isEmpty() ? null : e.trim()).orElse(threadTitle);
+                String postTitle = Optional.ofNullable(attributes.getValue("title")).map(e -> e.trim().isEmpty() ? null : e.trim()).orElse(threadTitle);
                parsedPost = new Post(
                        postTitle,
                        postUrl,
@@ -95,7 +96,7 @@ class VRApiPostHandler extends DefaultHandler {

    @Override
    public void endElement(String uri, String localName, String qName) {
-        if ("post".equals(qName.toLowerCase())) {
+        if ("post".equalsIgnoreCase(qName)) {
            parsedPost.setTotal(images.size());
            if (!previews.isEmpty()) {
                parsedPost.setPreviews(previews);
@@ -105,4 +106,4 @@ class VRApiPostHandler extends DefaultHandler {
            previews = new HashSet<>();
        }
    }
-}
+}
@@ -1,4 +1,4 @@
-package tn.mnlr.vripper.services.post;
+package tn.mnlr.vripper.services.domain;

 import lombok.extern.slf4j.Slf4j;
 import net.jodah.failsafe.Failsafe;
@@ -8,51 +8,51 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.util.EntityUtils;
 import tn.mnlr.vripper.SpringContext;
-import tn.mnlr.vripper.VripperApplication;
 import tn.mnlr.vripper.exception.DownloadException;
 import tn.mnlr.vripper.exception.PostParseException;
-import tn.mnlr.vripper.services.ConnectionManager;
-import tn.mnlr.vripper.services.VipergirlsAuthService;
+import tn.mnlr.vripper.services.ConnectionService;
+import tn.mnlr.vripper.services.SettingsService;
+import tn.mnlr.vripper.services.VGAuthService;

 import javax.xml.parsers.SAXParserFactory;
 import java.net.URISyntaxException;
 import java.util.concurrent.atomic.AtomicReference;

@Slf4j
-public class VRPostParser {
-
-    private static final String VR_API = "https://vipergirls.to/vr.php";
+public class ApiPostParser {

    private static final SAXParserFactory factory = SAXParserFactory.newInstance();

    private final String threadId;
    private final String postId;
-    private final ConnectionManager cm;
-    private final VipergirlsAuthService vipergirlsAuthService;
+    private final ConnectionService cm;
+    private final VGAuthService VGAuthService;
+    private final SettingsService settingsService;

-    public VRPostParser(String threadId, String postId) {
+    public ApiPostParser(String threadId, String postId) {
        this.threadId = threadId;
        this.postId = postId;
-        this.cm = SpringContext.getBean(ConnectionManager.class);
-        this.vipergirlsAuthService = SpringContext.getBean(VipergirlsAuthService.class);
+        cm = SpringContext.getBean(ConnectionService.class);
+        VGAuthService = SpringContext.getBean(VGAuthService.class);
+        settingsService = SpringContext.getBean(SettingsService.class);
    }

-    public ParseResult parse() throws PostParseException {
+    public ApiPost parse() throws PostParseException {

        log.debug(String.format("Parsing post %s", postId));
        HttpGet httpGet;
        try {
-            URIBuilder uriBuilder = new URIBuilder(VR_API);
+            URIBuilder uriBuilder = new URIBuilder(settingsService.getSettings().getVProxy() + "/vr.php");
            uriBuilder.setParameter("p", postId);
-            httpGet = cm.buildHttpGet(uriBuilder.build());
+            httpGet = cm.buildHttpGet(uriBuilder.build(), null);
        } catch (URISyntaxException e) {
            throw new PostParseException(e);
        }

        AtomicReference<Throwable> thr = new AtomicReference<>();
-        VRApiPostHandler handler = new VRApiPostHandler(threadId, postId);
+        ApiPostHandler apiPostHandler = new ApiPostHandler(threadId, postId);
        log.debug(String.format("Requesting %s", httpGet));
-        ParseResult post = getPost(httpGet, handler, thr);
+        ApiPost post = getPost(httpGet, apiPostHandler, thr);
        if (thr.get() != null) {
            log.error(String.format("parsing failed for thread %s, post %s", threadId, postId), thr.get());
            throw new PostParseException(thr.get());
@@ -60,19 +60,19 @@ public class VRPostParser {
        return post;
    }

-    private ParseResult getPost(HttpGet httpGet, VRApiPostHandler handler, AtomicReference<Throwable> thr) {
-        return Failsafe.with(VripperApplication.retryPolicy)
+    private ApiPost getPost(HttpGet httpGet, ApiPostHandler apiPostHandler, AtomicReference<Throwable> thr) {
+        return Failsafe.with(cm.getRetryPolicy())
                .onFailure(e -> thr.set(e.getFailure()))
                .get(() -> {
                    HttpClient connection = cm.getClient().build();
-                    try (CloseableHttpResponse response = (CloseableHttpResponse) connection.execute(httpGet, vipergirlsAuthService.getContext())) {
+                    try (CloseableHttpResponse response = (CloseableHttpResponse) connection.execute(httpGet, VGAuthService.getContext())) {
                        if (response.getStatusLine().getStatusCode() / 100 != 2) {
                            throw new DownloadException(String.format("Unexpected response code '%d' for %s", response.getStatusLine().getStatusCode(), httpGet));
                        }

-                        factory.newSAXParser().parse(response.getEntity().getContent(), handler);
+                        factory.newSAXParser().parse(response.getEntity().getContent(), apiPostHandler);
                        EntityUtils.consumeQuietly(response.getEntity());
-                        return handler.getParsedPost();
+                        return apiPostHandler.getParsedPost();
                    }
                });
    }
@@ -0,0 +1,92 @@
+package tn.mnlr.vripper.services.domain;
+
+import lombok.Getter;
+import org.xml.sax.Attributes;
+import org.xml.sax.helpers.DefaultHandler;
+import tn.mnlr.vripper.SpringContext;
+import tn.mnlr.vripper.host.Host;
+import tn.mnlr.vripper.jpa.domain.Queued;
+import tn.mnlr.vripper.services.SettingsService;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+public class ApiThreadHandler extends DefaultHandler {
+
+    private final Queued queued;
+    private final Collection<Host> supportedHosts;
+    private final SettingsService settingsService;
+    private final Map<Host, AtomicInteger> hostMap = new HashMap<>();
+    @Getter
+    private final List<MultiPostItem> posts = new ArrayList<>();
+    private List<String> previews = new ArrayList<>();
+    private String threadTitle;
+    private String postId;
+    private String postTitle;
+    private int imageCount;
+    private int postCounter;
+    private int previewCounter = 0;
+
+    public ApiThreadHandler(Queued queued) {
+        this.queued = queued;
+        supportedHosts = SpringContext.getBeansOfType(Host.class).values();
+        settingsService = SpringContext.getBean(SettingsService.class);
+    }
+
+    @Override
+    public void startDocument() {
+    }
+
+    @Override
+    public void startElement(String uri, String localName, String qName, Attributes attributes) {
+
+        switch (qName.toLowerCase()) {
+            case "thread":
+                threadTitle = attributes.getValue("title").trim();
+                break;
+            case "post":
+                imageCount = Integer.parseInt(attributes.getValue("imagecount").trim());
+                postId = attributes.getValue("id").trim();
+                postCounter = Integer.parseInt(attributes.getValue("number").trim());
+                postTitle = Optional.ofNullable(attributes.getValue("title")).map(e -> e.trim().isEmpty() ? null : e.trim()).orElse(threadTitle);
+                break;
+            case "image":
+                Optional.ofNullable(attributes.getValue("main_url"))
+                        .map(String::trim)
+                        .flatMap(mainUrl -> supportedHosts.stream().filter(host -> host.isSupported(mainUrl)).findFirst())
+                        .ifPresent(host -> Optional.ofNullable(hostMap.get(host)).ifPresentOrElse(AtomicInteger::incrementAndGet, () -> hostMap.put(host, new AtomicInteger(1))));
+                if (previewCounter++ < 4) {
+                    Optional.ofNullable(attributes.getValue("thumb_url")).map(String::trim).ifPresent(previews::add);
+                }
+                break;
+        }
+    }
+
+    @Override
+    public void endElement(String uri, String localName, String qName) {
+        if ("post".equalsIgnoreCase(qName)) {
+            if (imageCount != 0) {
+                posts.add(new MultiPostItem(
+                        queued.getThreadId(),
+                        postId,
+                        postCounter,
+                        postTitle,
+                        imageCount,
+                        String.format("%s/threads/?p=%s&viewfull=1#post%s", settingsService.getSettings().getVProxy(), postId, postId),
+                        previews,
+                        hostMap.entrySet().stream().filter(v -> v.getValue().get() > 0).map(e -> e.getKey().getHost() + " (" + e.getValue().get() + ")").collect(Collectors.joining(", "))
+                ));
+                queued.increment();
+            }
+            previewCounter = 0;
+            previews = new ArrayList<>();
+            hostMap.clear();
+        }
+    }
+
+    @Override
+    public void endDocument() {
+        queued.done();
+    }
+}
@@ -0,0 +1,80 @@
+package tn.mnlr.vripper.services.domain;
+
+import lombok.extern.slf4j.Slf4j;
+import net.jodah.failsafe.Failsafe;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.util.EntityUtils;
+import tn.mnlr.vripper.SpringContext;
+import tn.mnlr.vripper.exception.DownloadException;
+import tn.mnlr.vripper.exception.PostParseException;
+import tn.mnlr.vripper.jpa.domain.Queued;
+import tn.mnlr.vripper.services.ConnectionService;
+import tn.mnlr.vripper.services.SettingsService;
+import tn.mnlr.vripper.services.VGAuthService;
+
+import javax.xml.parsers.SAXParserFactory;
+import java.io.BufferedInputStream;
+import java.net.URISyntaxException;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+@Slf4j
+public class ApiThreadParser {
+
+    private static final SAXParserFactory factory = SAXParserFactory.newInstance();
+    private final Queued queued;
+    private final ConnectionService cm;
+    private final VGAuthService VGAuthService;
+    private final SettingsService settingsService;
+
+    public ApiThreadParser(Queued queued) {
+        this.queued = queued;
+        cm = SpringContext.getBean(ConnectionService.class);
+        VGAuthService = SpringContext.getBean(VGAuthService.class);
+        settingsService = SpringContext.getBean(SettingsService.class);
+    }
+
+    public List<MultiPostItem> parse() throws PostParseException {
+
+        log.debug(String.format("Parsing thread %s", queued));
+        HttpGet httpGet;
+        try {
+            URIBuilder uriBuilder = new URIBuilder(settingsService.getSettings().getVProxy() + "/vr.php");
+            uriBuilder.setParameter("t", queued.getThreadId());
+            httpGet = cm.buildHttpGet(uriBuilder.build(), null);
+        } catch (URISyntaxException e) {
+            throw new PostParseException(e);
+        }
+
+        ApiThreadHandler apiThreadHandler = new ApiThreadHandler(queued);
+        AtomicReference<Throwable> thr = new AtomicReference<>();
+        log.debug(String.format("Requesting %s", httpGet));
+        List<MultiPostItem> posts = Failsafe.with(cm.getRetryPolicy())
+                .onFailure(e -> thr.set(e.getFailure()))
+                .get(() -> {
+                    HttpClient connection = cm.getClient().build();
+                    try (CloseableHttpResponse response = (CloseableHttpResponse) connection.execute(httpGet, VGAuthService.getContext())) {
+                        if (response.getStatusLine().getStatusCode() / 100 != 2) {
+                            throw new DownloadException(String.format("Unexpected response code '%d' for %s", response.getStatusLine().getStatusCode(), httpGet));
+                        }
+
+                        try {
+                            factory.newSAXParser().parse(new BufferedInputStream(response.getEntity().getContent()), apiThreadHandler);
+                            return apiThreadHandler.getPosts();
+                        } catch (Exception e) {
+                            throw new PostParseException(String.format("Failed to parse thread %s", queued), e);
+                        } finally {
+                            EntityUtils.consumeQuietly(response.getEntity());
+                        }
+                    }
+                });
+        if (thr.get() != null) {
+            log.error(String.format("parsing failed for thread %s", queued), thr.get());
+            throw new PostParseException(thr.get());
+        }
+        return posts;
+    }
+}
@@ -1,4 +1,4 @@
-package tn.mnlr.vripper.services;
+package tn.mnlr.vripper.services.domain;

 import lombok.Getter;

@@ -1,4 +1,4 @@
-package tn.mnlr.vripper.services;
+package tn.mnlr.vripper.services.domain;

 import lombok.Getter;

@@ -8,13 +8,11 @@ import java.util.Objects;
 public class GlobalState {

    private final long running;
-    private final long queued;
    private final long remaining;
    private final long error;

-    GlobalState(long running, long queued, long remaining, long error) {
+    public GlobalState(long running, long remaining, long error) {
        this.running = running;
-        this.queued = queued;
        this.remaining = remaining;
        this.error = error;
    }
@@ -24,11 +22,11 @@ public class GlobalState {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        GlobalState that = (GlobalState) o;
-        return running == that.running && queued == that.queued && remaining == that.remaining && error == that.error;
+        return running == that.running && remaining == that.remaining && error == that.error;
    }

    @Override
    public int hashCode() {
-        return Objects.hash(running, queued, remaining, error);
+        return Objects.hash(running, remaining, error);
    }
 }
@@ -1,12 +1,11 @@
-package tn.mnlr.vripper.services.post;
+package tn.mnlr.vripper.services.domain;

 import lombok.Getter;

 import java.util.List;

@Getter
-public class CachedPost {
-    private final String type = "postParse";
+public class MultiPostItem {
    private final String threadId;
    private final String postId;
    private final int number;
@@ -16,7 +15,7 @@ public class CachedPost {
    private final List<String> previews;
    private final String hosts;

-    public CachedPost(String threadId, String postId, int number, String title, int imageCount, String url, List<String> previews, String hosts) {
+    public MultiPostItem(String threadId, String postId, int number, String title, int imageCount, String url, List<String> previews, String hosts) {
        this.threadId = threadId;
        this.postId = postId;
        this.number = number;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
death-claw	1c5b8a0397	v3.3.2	2021-03-11 19:05:09 +01:00
death-claw	cc2ce9482d	Fix a bug with event logs Change event names and add some icons	2021-03-11 19:02:01 +01:00
death-claw	41f1775360	v3.3.1	2021-02-18 16:04:34 +01:00
death-claw	733f1a08ac	Add about menu Fix README.md	2021-02-18 16:01:06 +01:00
death-claw	0cb0ee0100	v3.3.0	2021-02-16 19:15:58 +01:00
death-claw	cb88e39c83	Add support for proxies Add a Event Logs Fix bugs with the database	2021-02-16 19:13:02 +01:00
death-claw	6375c0aed6	v3.2.3	2021-01-13 20:15:13 +01:00
death-claw	40ca4cf86b	Finished posts are not cleared from the UI	2021-01-13 20:11:47 +01:00
death-clawandGitHub	b3a798388b	Update README.md	2021-01-13 12:54:51 +01:00
death-claw	6e69b2bce8	v3.2.2	2021-01-13 09:51:56 +01:00
death-claw	bb6dcd77b9	Set total download to max value	2021-01-13 09:49:38 +01:00
death-claw	42e1aa73e2	v3.2.1	2021-01-12 20:02:17 +01:00
death-claw	26fde22af2	Code reformat	2021-01-12 19:37:12 +01:00
death-claw	798f39d54f	Add settings for connection timeout Add settings for maximum attempts Enhance posts rename logic Dependencies update Switch reactive from rx-java to reactor	2021-01-12 19:32:43 +01:00
death-claw	3a21dfac38	Remove unused font	2021-01-06 14:55:49 +01:00
death-claw	e8355b88b9	v3.2	2020-11-16 19:40:36 +01:00
death-claw	379660236d	Commit missing files	2020-11-16 19:31:59 +01:00
death-claw	c86ee91c27	v3.1.0	2020-11-16 16:44:26 +01:00
death-claw	ff9d253242	UI revamp Fix bugs	2020-11-16 16:42:30 +01:00
death-claw	53b45e00ba	v3.0.11	2020-10-31 15:09:19 +01:00
death-claw	247b12a525	Add support for vipr.im	2020-10-31 15:06:26 +01:00
death-claw	7a8d332e6e	v3.0.10	2020-10-04 16:31:57 +01:00
death-claw	749a6f18d2	Fix bug on settings update	2020-10-04 16:27:26 +01:00
death-claw	4107048f12	v3.0.9	2020-09-27 10:14:08 +01:00
death-claw	f5d9ab85a2	Revert to appending post id to download folders Fix a bug that lead to adding duplicate posts Remove old unused settings	2020-09-27 10:12:29 +01:00
death-claw	b82ee7b494	v3.0.8	2020-08-22 19:01:08 +01:00
death-claw	8a31dfc012	Bug fix which breaks concurrent downloads	2020-08-22 18:59:44 +01:00
death-claw	734c1b72c7	v3.0.7	2020-08-22 16:45:43 +01:00
death-claw	7abb7df1f6	Fix MacOs build	2020-08-22 16:44:24 +01:00
death-claw	0a7fa99a64	v3.0.6	2020-08-18 08:33:57 +01:00
death-claw	691026c8a9	Fix TurboImageHost	2020-08-18 08:32:33 +01:00
death-claw	3ef004b947	v3.0.5	2020-08-17 20:06:12 +01:00
death-claw	1b22a93e28	Update packages Host class refactoring	2020-08-17 20:04:39 +01:00
death-claw	2639df0aaa	Update packages Host class refactoring	2020-08-17 20:04:23 +01:00
death-claw	d5ae5d57d1	v3.0.4	2020-08-16 16:11:11 +01:00
death-claw	537d76d7be	Improve rename UI	2020-08-16 16:06:17 +01:00
death-claw	c1247faacc	v3.0.3	2020-08-16 11:29:01 +01:00
death-claw	efcc685f30	Remove notification feature	2020-08-16 11:26:57 +01:00
death-claw	c825b22ce4	Fix some bugs with MacOS	2020-08-16 10:58:19 +01:00
death-claw	6ef5d5474f	Fix some bugs with MacOS	2020-08-16 10:20:56 +01:00
death-claw	bd25801c6c	Fix base dir configuration for MacOS	2020-08-16 00:18:18 +01:00
death-claw	377b93c1ac	Fix base dir configuration for AppImage	2020-08-16 00:02:18 +01:00
death-claw	d498d20f6b	Set default download path to user's home	2020-08-15 23:23:43 +01:00
death-claw	d18544d414	Fix bin location for mac	2020-08-15 23:10:58 +01:00
death-claw	3c872b79bd	Update app data configuration	2020-08-15 23:00:48 +01:00
death-claw	37900cac49	v3.0.2	2020-08-15 15:38:53 +01:00
death-claw	be57c76d93	Fix bugs with download queue	2020-08-15 15:36:47 +01:00
death-claw	8b52ad7858	v3.0.1	2020-08-03 18:48:45 +01:00
death-claw	a0976bde02	Fix bugs with download queue	2020-08-03 18:43:42 +01:00