v3.2

Commit missing files
v3.1.0
2026-08-19 08:35:41 +02:00 · 2020-11-16 19:40:36 +01:00 · 2020-11-16 19:31:59 +01:00 · 2020-11-16 16:44:26 +01:00 · 2020-11-16 16:42:30 +01:00 · 2020-10-31 15:09:19 +01:00
274 changed files with 18431 additions and 13057 deletions
@@ -3,4 +3,5 @@
 /**/*/target
 /**/*/build-dir
 /**/*/java-runtime
-.idea
+.idea
+.vripper
@@ -1,5 +1,252 @@
 # Changelog

+## [3.2] - 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
+- Introducing a proper database for persistence
+
+## [2.12.1] - 2020-05-22
+### Changed
+- Fix alternative name bug
+
+## [2.12.0] - 2020-05-21
+### Changed
+- Use new user hash from the api
+
+## [2.11.7] - 2020-05-08
+### Changed
+- Fix bug with paths creation
+- Move Open Link button
+- Rename rename all title
+
+## [2.11.6] - 2020-05-04
+### Changed
+- PNG filenames are now correctly named
+- Fix issue with special characters in post titles
+
+## [2.11.5] - 2020-05-03
+### Changed
+- Reduce rows buffer size
+
+## [2.11.4] - 2020-05-03
+### Changed
+- Code cleanup
+- Dependencies update
+
+## [2.11.3] - 2020-04-30
+### Changed
+- Source code restructure
+- UI fixes and enhancements
+### Added
+- Add menu entry to rename a gallery to first alternative title
+- Add menu on toolbar for massive rename to first alternative title
+
+## [2.11.2] - 2020-04-26
+### Changed
+- Bug fixes
+
+## [2.11.1] - 2020-04-25
+### Changed
+- Code source maintenance
+### Added
+- Added option to rename gallery
+
+## [2.11.0] - 2020-03-29
+### Changed
+- Upgrade Electron to v8
+- Upgrade Angular to v9
+- App settings are now portable in a json file
+- General code source maintenance
+### Added
+- Added Support for pixroute.com
+- Added grab post title from thread option
+
+## [2.10.8] - 2020-01-25
+### Changed
+- Fix app url
+
+## [2.10.7] - 2020-01-25
+### Changed
+- Drop SockJs and switch to WebSocket
+- Autoreconnect front to back
+
+## [2.10.6] - 2020-01-19
+### Changed
+- Limit cache size
+
+## [2.10.5] - 2020-01-18
+### Changed
+- Bug fixes
+
+## [2.10.4] - 2020-01-18
+### Changed
+- Zero value for total max download will disable the limit
+- Add system notification
+- Bug fixes
+
+## [2.10.3] - 2020-01-16
+### Changed
+- Some bug fixes
+- Enhance download queue logic
+- Clear cache button
+- Fix the partial status
+- Sanitize URLs with spaces
+### Added
+- Support for Postimg host
+- Support for Imagevenue host
+
+## [2.10.2] - 2019-12-29
+### Changed
+- Upgrade electron to v7
+- Bug fix
+
+## [2.10.1] - 2019-12-27
+### Changed
+- Bug fix
+
+## [2.10.0] - 2019-12-27
+### Changed
+- Fix spring dependency bug
+### Added
+- Add support for imgspice
+
+## [2.9.0] - 2019-12-27
+### Changed
+- Fix build issue
+
+## [2.9.0] - 2019-12-27
+### Changed
+- Decrease timeout for fast fail
+### Added
+- Allow many hosts to run at the same time
+- Add title to gallery
+- Add global concurrent downloads
+- Add counter badge in link collector
+
+## [2.8.1] - 2019-12-24
+### Changed
+- Fix issue with path creation
+
+## [2.8.0] - 2019-12-24
+### Added
+- Photo gallery feature
+
+## [2.7.1] - 2019-12-21
+### Added
+- Add version to title bar
+
+## [2.7.0] - 2019-12-21
+### Changed
+- Add missing icon
+### Added
+- Add support for pixxxels
+
+## [2.6.0] - 2019-12-21
+### Changed
+- Disable download button when nothing selected in Link collector grab menu
+- Better quality app icon
+- Implement context menu on download tab
+- Add stop remove and start button to context menu
+- Link will not be removed automatically from link collector tab
+- Some UI fixes
+
+## [2.5.1] - 2019-12-09
+### Changed
+- Disable download button when nothing selected in Link collector grab menu
+### Added
+- Add hosts column in Link collector grab menu
+
+## [2.5.0] - 2019-12-08
+### Changed
+- Change loading screen
+- UI Fixes
+- Fix bug with previews
+### Added
+- Add link collector feature
+- Add support for multiple links at a time
+
+## [2.4.1] - 2019-11-26
+### Changed
+- Increase attempts for establishing ws connection between front and back end
+- Change default download folder to Home folder (installer), App folder (portable)
+
+## [2.4.0] - 2019-11-23
+### Changed
+- Pimpandhost Host support
+
+## [2.3.2] - 2019-11-23
+### Changed
+- Fix a bug with the scan component
+
+## [2.3.1] - 2019-11-22
+### Changed
+- Fix connexion reset issue
+- Fix Post Status when autostart option is selected
+- Add stop all button
+
+## [2.3.0] - 2019-11-21
+### Changed
+- UI enhancements and overhaul
+- Stability fixes with HTTP connections
+- MacOS official support
+- Use local sockjs and material icons font
+
 ## [2.2.5] - 2019-11-09
 ### Changed
 - Exclude thumbs download for imagezilla and pixhost
@@ -187,4 +434,4 @@
 - Add real time communication for progress updates via websocket (SockJS)
 - Add settings for download path, max concurrent download, enable/disable integration with vipergirls
 - Add integration with vipergitls.to (possibility to auto leave thanks after grab post)
- Add support for acidimg.cc, imagezilla.net, imgbox.com, imx.to, pixhost.to, turboimagehost.com
+- Add support for acidimg.cc, imagezilla.net, imgbox.com, imx.to, pixhost.to, turboimagehost.com
@@ -1,26 +1,24 @@
 # Viper Ripper!

-This is my spin for a gallery ripper app for [vipergirls](https://vipergirls.to) website.
+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.

 ## How to build
 You need a recent version of maven 3.6.1+.

 The application support 2 build modes:
- - Desktop app (*Partially cross platform): Self contained app, built with electron, depends on Java runtimes.
- - Server app (Fully cross platform): Depends on Java runtimes, you need a web browser to access the app UI.
+ - Desktop app: Self contained app, built with electron includes Java runtimes.
+ - Server app: Depends on Java runtimes, you need a web browser to access the app UI.

 Most people will be interested only on the desktop app, however if you have a nas or a server, the server app is there for you.

 To build the server app:

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

-    mvn clean install -Pelectron
+    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.

-*Partially cross platform:
-Technically cross platform, but the Desktop app relies on electron builder to make appropriate binaries for each platform. mac binaries can only be generated on a mac, and i don't own one. So i can only provide binaries for windows and linux.
-The Server app however depends only on Java, so it will work just fine on a mac, you only need a browser to access it.
+[![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)
@@ -4,12 +4,12 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>tn.mnlr</groupId>
    <artifactId>vripper</artifactId>
-    <version>2.2.5</version>
+    <version>3.2.0</version>
    <packaging>pom</packaging>
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.3.0.RELEASE</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 @@
-const { app, BrowserWindow } = require("electron");
+require('v8-compile-cache');
+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 commandExists = require("command-exists").sync;
-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;
@@ -19,142 +22,150 @@ let terminationInteval;
 let terminated = false;

 process.on("uncaughtException", err => {
-  dialog.showErrorBox(err.message, err.stack);
-  process.exit(1);
+    dialog.showErrorBox(err.message, err.stack);
+    process.exit(1);
 });

-if (!commandExists("java")) {
-  dialog.showErrorBox(
-    "Java command is missing",
-    "Java cannot be found on your PATH, make sure to install java before running Viper Ripper"
-  );
-  process.exit(1);
+createWindow = () => {
+
+    if (process.platform === 'win32') {
+        app.setAppUserModelId("tn.mnlr.vripper");
+    }
+
+    let icon;
+    if (process.platform === "win32") {
+        icon = __dirname + '/icon.ico';
+    } else {
+        icon = __dirname + '/icon.png';
+    }
+    win = new BrowserWindow({
+        width: 1024,
+        height: 800,
+        minWidth: 800,
+        minHeight: 600,
+        webPreferences: {
+            nodeIntegration: true,
+            enableRemoteModule: true
+        },
+        icon: icon
+    });
+
+    win.removeMenu();
+    win.setMenu(null);
+    win.setMenuBarVisibility(false);
+
+    win.loadURL(
+        url.format({
+            pathname: path.join(__dirname, `vripper-ui/index.html`),
+            protocol: "file:",
+            slashes: true
+        })
+    );
+
+    // win.webContents.openDevTools();
+
+    win.on("closed", () => {
+        win = null;
+    });
 }

-function createWindow() {
-  let icon;
-  if(process.platform === "win32") {
-    icon = __dirname + '/icon.ico';
-  } else {
-    icon = __dirname + '/icon.png';
-  }
-  win = new BrowserWindow({
-    width: 1024,
-    height: 800,
-    minWidth: 800,
-    minHeight: 600,
-    webPreferences: {
-      nodeIntegration: true
-    },
-    icon: icon
-  });
-
-  win.removeMenu();
-  win.setMenu(null);
-  win.setMenuBarVisibility(false);
-
-  win.loadURL(
-    url.format({
-      pathname: path.join(__dirname, `vripper-ui/index.html`),
-      protocol: "file:",
-      slashes: true
-    })
-  );
-
-  // win.webContents.openDevTools();
-
-  win.on("closed", () => {
-    win = null;
-  });
+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();
+    });
 }

-getPort().then(port => {
-  serverPort = port;
-  ipcMain.on("get-port", event => {
-    event.reply("port", port);
-  });
-  let javaBinPath;
-  if(appDir !== undefined) {
-    javaBinPath = path.join(appDir, "java-runtime/bin/java");
-  } 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");
-    }
-  }
-  vripperServer = spawn(javaBinPath, [
-    "-Xms256m",
-    "-Xmx1024m",
-    "-Dvripper.server.port=" + port,
-    "-jar",
-    jarPath
-  ], {
-    stdio: 'ignore'
-  });
-  vripperServer.on('exit', (code, signal) => {
-    console.log(`vripper server terminated, code = ${code}, signal = ${signal}`);
-    terminated = true;
-    app.quit();
-  });
-});
-
 const gotTheLock = app.requestSingleInstanceLock();

 if (!gotTheLock) {
-  app.quit();
+    app.quit();
 } else {
-  app.on("second-instance", (event, commandLine, workingDirectory) => {
-    if (win) {
-      if (win.isMinimized()) win.restore();
-      win.focus();
-    }
-  });
+    getPort().then(port => {
+        serverPort = port;
+        ipcMain.on("get-port", event => {
+            event.reply("port", port);
+        });

-  app.on("ready", createWindow);
-
-  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);
+        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 {
+            console.error(`Unknown platform ${process.platform}`);
            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
-        vripperServer.kill('SIGKILL');
-        terminated = true;
-        app.quit();
-      });
-    }
-  });
+        }

-  app.on("activate", () => {
-    if (win === null) {
-      createWindow();
-    }
-  });
+        vripperServer = spawn(javaBinPath, [
+            "-Xms256m",
+            "-Dvripper.server.port=" + port,
+            "-Dbase.dir=" + baseDir,
+            "-jar",
+            jarPath
+        ], {
+            stdio: 'ignore'
+        });
+        vripperServer.on('exit', (code, signal) => {
+            console.log(`vripper server terminated, code = ${code}, signal = ${signal}`);
+            terminated = true;
+            app.quit();
+        });
+    });
+
+    app.on("second-instance", (event, commandLine, workingDirectory) => {
+        if (win) {
+            if (win.isMinimized()) win.restore();
+            win.focus();
+        }
+    });
+
+    app.on("ready", createWindow);
+
+    app.on("window-all-closed", () => {
+        if (process.platform !== "darwin") {
+            shutdownServer();
+        }
+    });
+
+    app.on("will-quit", () => {
+        if (process.platform === "darwin") {
+            shutdownServer();
+        }
+    });
+
+    app.on("activate", () => {
+        if (win === null) {
+            createWindow();
+        }
+    });
 }
@@ -1,6 +1,6 @@
 {
  "name": "vripper-electron",
-  "version": "2.2.5",
+  "version": "3.2.0",
  "description": "A ripper for vipergirls.to built using web technolgies",
  "main": "main.js",
  "author": "death-claw <53543762+death-claw@users.noreply.github.com>",
@@ -8,7 +8,7 @@
  "license": "ISC",
  "build": {
    "appId": "tn.mnlr.vripper",
-    "productName": "vripper",
+    "productName": "VRipper",
    "files": [
      "**/*",
      "!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme}",
@@ -38,42 +38,26 @@
      }
    ],
    "win": {
-      "icon": "icon.png",
+      "icon": "icon.ico",
      "target": [
-        "nsis"
+        "dir"
      ]
    },
-    "nsis": {
-      "createDesktopShortcut": "always",
-      "oneClick": false,
-      "perMachine": false
-    },
    "linux": {
      "synopsis": "vipergirls.to ripper",
      "category": "Utility",
      "packageCategory": "Utility",
      "icon": "icons",
      "target": [
-        "deb",
        "AppImage"
      ]
    },
-    "deb": {
-      "depends": [
-        "gconf2",
-        "gconf-service",
-        "libnotify4",
-        "libappindicator1",
-        "libxtst6",
-        "libnss3"
-      ]
-    },
    "mac": {
      "category": "public.app-category.utilities",
      "target": [
        "dmg"
      ],
-      "icon": "icon.png"
+      "icon": "icon.icns"
    }
  },
  "scripts": {
@@ -81,17 +65,16 @@
    "dist": "node pre-build.js && electron-builder"
  },
  "devDependencies": {
-    "electron": "^6.0.9",
-    "electron-builder": "^21.2.0"
+    "electron": "10.1.5",
+    "electron-builder": "22.9.1"
  },
  "dependencies": {
-    "axios": "^0.19.0",
-    "cheerio": "^1.0.0-rc.3",
-    "command-exists": "^1.2.8",
-    "copy-dir": "^1.1.0",
-    "custom-electron-titlebar": "^3.0.10",
-    "electron-context-menu": "^0.13.0",
-    "get-port": "^5.0.0",
-    "rimraf": "^2.6.3"
+    "axios": "0.19.2",
+    "cheerio": "1.0.0-rc.3",
+    "copy-dir": "1.3.0",
+    "electron-context-menu": "2.1.0",
+    "get-port": "5.1.1",
+    "rimraf": "3.0.2",
+    "v8-compile-cache": "2.1.1"
  }
 }
@@ -5,7 +5,7 @@
  <parent>
    <groupId>tn.mnlr</groupId>
    <artifactId>vripper</artifactId>
-    <version>2.2.5</version>
+    <version>3.2.0</version>
  </parent>
  <artifactId>vripper-electron</artifactId>
  <name>vripper-electron</name>
@@ -5,7 +5,7 @@
    <parent>
        <groupId>tn.mnlr</groupId>
        <artifactId>vripper</artifactId>
-        <version>2.2.5</version>
+        <version>3.2.0</version>
    </parent>
    <artifactId>vripper-server</artifactId>
    <name>vripper-server</name>
@@ -32,6 +32,20 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>2.5.1</version>
+            <scope>runtime</scope>
+        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
@@ -67,6 +81,11 @@
            <artifactId>failsafe</artifactId>
            <version>2.0.1</version>
        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>28.1-jre</version>
+        </dependency>
        <dependency>
            <groupId>tn.mnlr</groupId>
            <artifactId>vripper-ui</artifactId>
@@ -0,0 +1,36 @@
+package tn.mnlr.vripper;
+
+import lombok.Getter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+import tn.mnlr.vripper.jpa.repositories.IRepository;
+import tn.mnlr.vripper.services.DataService;
+
+import java.util.Set;
+
+@Component
+public class EventListenerBean {
+
+    @Getter
+    private static boolean init = false;
+
+    private final DataService dataService;
+    private final Set<IRepository> repositorySet;
+
+    @Autowired
+    public EventListenerBean(DataService dataService, Set<IRepository> repositorySet) {
+        this.dataService = dataService;
+        this.repositorySet = repositorySet;
+    }
+
+    @EventListener
+    public void onApplicationEvent(ContextRefreshedEvent event) {
+        repositorySet.forEach(IRepository::init);
+        dataService.setDownloadingToStopped();
+        init = true;
+    }
+
+
+}
@@ -1,7 +1,6 @@
 package tn.mnlr.vripper;

-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -11,30 +10,24 @@ import org.springframework.stereotype.Component;
 import java.util.Map;

@Component
+@Slf4j
 public class SpringContext implements ApplicationContextAware {

-    private static final Logger logger = LoggerFactory.getLogger(SpringContext.class);
-
    private static ConfigurableApplicationContext context;

-    /**
-     * Returns the Spring managed bean instance of the given class type (if it exists).
-     * Returns null otherwise.
-     *
-     * @param beanClass
-     * @return
-     */
-    public static <T extends Object> T getBean(Class<T> beanClass) {
+    public static <T> T getBean(Class<T> beanClass) {
        return context.getBean(beanClass);
    }

-    public static <T extends Object> Map<String, T> getBeansOfType(Class<T> beanClass) {
+    public static <T> Map<String, T> getBeansOfType(Class<T> beanClass) {
        return context.getBeansOfType(beanClass);
    }

    public static void close() {
-        logger.info("Application terminating...");
-        context.close();
+        log.info("Application terminating...");
+        if (context != null) {
+            context.close();
+        }

    }

@@ -1,81 +1,28 @@
 package tn.mnlr.vripper;

-import lombok.Getter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.CommandLineRunner;
+import lombok.extern.slf4j.Slf4j;
+import net.jodah.failsafe.RetryPolicy;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.stereotype.Component;
-import tn.mnlr.vripper.exception.VripperException;
-import tn.mnlr.vripper.services.AppSettingsService;
-import tn.mnlr.vripper.services.PersistenceService;
-import tn.mnlr.vripper.services.VipergirlsAuthService;

-import javax.annotation.PostConstruct;
-import java.io.File;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.time.temporal.ChronoUnit;

@SpringBootApplication
+@Slf4j
 public class VripperApplication {

-    private static final Logger logger = LoggerFactory.getLogger(VripperApplication.class);
-
-//    public static final String dataPath = System.getProperty("user.home", ".") + File.separator + ".vripper" + File.separator + "data.json";
-
-    public static final ExecutorService commonExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
+    public static final RetryPolicy<Object> retryPolicy = new RetryPolicy<>()
+            .withDelay(1, 3, ChronoUnit.SECONDS)
+            .withMaxAttempts(5)
+            .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));
            SpringApplication.run(VripperApplication.class, args);
        } catch (Exception e) {
-            logger.error("Failed to run the application", e);
-        }
-    }
-
-    @Component
-    public class AppCommandRunner implements CommandLineRunner {
-
-        @Autowired
-        private VipergirlsAuthService authService;
-
-        @Autowired
-        private PersistenceService persistenceService;
-
-        @Autowired
-        private AppSettingsService appSettingsService;
-
-        @Value("${base.dir}")
-        private String baseDir;
-
-        @Getter
-        private String dataPath;
-
-        @PostConstruct
-        public void init() {
-            dataPath = baseDir + File.separator + ".vripper" + File.separator + "data.json";
-        }
-
-        @Override
-        public void run(String... args) {
-
-            persistenceService.restore();
-            appSettingsService.restore();
-            registerShutdownHook();
-
-            try {
-                authService.authenticate();
-            } catch (VripperException e) {
-                logger.error("Cannot authenticate user with ViperGirls", e);
-            }
-        }
-
-        private void registerShutdownHook() {
-            Runtime.getRuntime().addShutdownHook(new Thread(SpringContext::close));
+            log.error("Failed to run the application", e);
        }
    }
 }
+
@@ -0,0 +1,288 @@
+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.InputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.*;
+import java.util.concurrent.locks.ReentrantLock;
+
+@Slf4j
+public class DownloadJob implements CheckedRunnable {
+
+    public enum ContextAttributes {
+        OPEN_CONNECTION("OPEN_CONNECTION");
+
+        private final String value;
+
+        ContextAttributes(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return value;
+        }
+    }
+
+    private static final ReentrantLock LOCK = new ReentrantLock();
+    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 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());
+
+            try {
+                LOCK.lock();
+                if (!post.getStatus().equals(Status.DOWNLOADING) && !post.getStatus().equals(Status.PARTIAL)) {
+                    post.setStatus(Status.DOWNLOADING);
+                    dataService.updatePostStatus(post.getStatus(), post.getId());
+                }
+            } finally {
+                LOCK.unlock();
+            }
+
+
+            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 destinationFolder, outputFile;
+                try {
+                    LOCK.lock();
+                    Post updatedPost = dataService.findPostById(post.getId()).orElseThrow();
+                    if (updatedPost.getPostFolderName() == null) {
+                        pathService.createDefaultPostFolder(updatedPost);
+                    }
+                    destinationFolder = pathService.getDownloadDestinationFolder(updatedPost);
+                    if (settingsService.getSettings().getLeaveThanksOnStart()) {
+                        authService.leaveThanks(updatedPost);
+                    }
+                    outputFile = new File(destinationFolder.getPath() + File.separator + String.format("%03d_", image.getIndex()) + nameAndUrl.getName() + ".tmp");
+                    outputFile.getParentFile().mkdirs();
+                } finally {
+                    LOCK.unlock();
+                }
+                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.findPostById(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().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, (settingsService.getSettings().getForceOrder() ? String.format("%03d_", index) : "") + imageName);
+            if (outImage.exists() && outImage.delete()) {
+                log.debug(String.format("%s is deleted", outImage.toString()));
+            }
+            Files.move(outputFile.toPath(), outImage.toPath(), StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
+        } catch (Exception e) {
+            throw new HostException("Failed to rename the image", e);
+        }
+    }
+
+    @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;
+    }
+}
@@ -0,0 +1,38 @@
+package tn.mnlr.vripper.download;
+
+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;
+
+@Slf4j
+public class DownloadRunnable implements Runnable {
+
+    private final DownloadService downloadService;
+    private final DataService dataService;
+
+    private final DownloadJob downloadJob;
+
+    public DownloadRunnable(final DownloadJob downloadJob) {
+        downloadService = SpringContext.getBean(DownloadService.class);
+        dataService = SpringContext.getBean(DataService.class);
+        this.downloadJob = downloadJob;
+    }
+
+    @Override
+    public void run() {
+        Failsafe.with(VripperApplication.retryPolicy)
+                .onFailure(e -> {
+                    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);
+    }
+}
@@ -0,0 +1,224 @@
+package tn.mnlr.vripper.download;
+
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+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.jpa.domain.enums.Status;
+import tn.mnlr.vripper.services.SettingsService;
+import tn.mnlr.vripper.services.DataService;
+import tn.mnlr.vripper.services.PostService;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Service
+@Slf4j
+public class DownloadService {
+
+    private static final List<Status> FINISHED = Arrays.asList(Status.ERROR, Status.COMPLETE, Status.STOPPED);
+    private final int MAX_POOL_SIZE = 12;
+
+    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 List<DownloadJob> executing = Collections.synchronizedList(new ArrayList<>());
+
+    private final PendingQueue pendingQueue;
+    private final SettingsService settings;
+    private final DataService dataService;
+    private final PostService postService;
+
+    private boolean pauseQ = false;
+    private Thread executionThread;
+    private Thread pollThread;
+
+    @Autowired
+    public DownloadService(PendingQueue pendingQueue, SettingsService settings, DataService dataService, PostService postService) {
+        this.pendingQueue = pendingQueue;
+        this.settings = settings;
+        this.dataService = dataService;
+        this.postService = postService;
+    }
+
+    @PostConstruct
+    private void init() {
+        executionThread = new Thread(this::start, "Executor thread");
+        pollThread = new Thread(this::poll, "Polling thread");
+        pollThread.start();
+        executionThread.start();
+    }
+
+    public void destroy() throws Exception {
+        log.info("Shutting down ExecutionService");
+        executionThread.interrupt();
+        pollThread.interrupt();
+        executor.shutdown();
+        dataService.findAllPosts().forEach(p -> {
+            log.debug(String.format("Stopping download jobs for %s", p));
+            this.stopRunning(p.getPostId());
+        });
+        executor.awaitTermination(5, TimeUnit.SECONDS);
+    }
+
+    private void stopRunning(@NonNull String postId) {
+        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) {
+        if (posIds != null) {
+            posIds.forEach(this::stop);
+        } else {
+            dataService.findAllPosts().forEach(p -> this.stop(p.getPostId()));
+        }
+    }
+
+    public void restartAll(List<String> posIds) {
+        if (posIds != null) {
+            posIds.forEach(this::restart);
+        } else {
+            dataService.findAllPosts().forEach(p -> this.restart(p.getPostId()));
+        }
+    }
+
+    private void restart(@NonNull String postId) {
+        if (isPending(postId)) {
+            log.warn(String.format("Cannot restart, jobs are currently running for post id %s", postId));
+            return;
+        }
+        List<Image> images = dataService.findByPostIdAndIsNotCompleted(postId);
+        if (images.isEmpty()) {
+            return;
+        }
+        Post post = dataService.findPostByPostId(postId).orElseThrow();
+        post.setStatus(Status.PENDING);
+        dataService.updatePostStatus(post.getStatus(), post.getId());
+        log.debug(String.format("Restarting %d jobs for post id %s", images.size(), postId));
+        for (Image image : images) {
+            try {
+                pendingQueue.put(post, image);
+            } catch (InterruptedException e) {
+                log.warn("Thread was interrupted", e);
+                Thread.currentThread().interrupt();
+            }
+        }
+    }
+
+    private boolean isPending(String postId) {
+        return pendingQueue.isPending(postId);
+    }
+
+    private void stop(String postId) {
+        try {
+            pauseQ = true;
+            final Post post = dataService.findPostByPostId(postId).orElseThrow();
+            if (post == null) {
+                return;
+            }
+            if (FINISHED.contains(post.getStatus())) {
+                return;
+            }
+            pendingQueue.stop(post);
+            stopRunning(postId);
+            dataService.stopImagesByPostIdAndIsNotCompleted(postId);
+            dataService.finishPost(post);
+            postService.stopFetchingMetadata(post);
+        } finally {
+            pauseQ = false;
+        }
+    }
+
+    private boolean canRun(Host host) {
+        boolean canRun;
+        AtomicInteger count = threadCount.get(host);
+        if (count == null) {
+            threadCount.put(host, new AtomicInteger(0));
+        }
+        canRun = threadCount.get(host).get() < settings.getSettings().getMaxThreads() && (settings.getSettings().getMaxTotalThreads() == 0 ? threadCount.values().stream().mapToInt(AtomicInteger::get).sum() < MAX_POOL_SIZE : threadCount.values().stream().mapToInt(AtomicInteger::get).sum() < settings.getSettings().getMaxTotalThreads());
+        if (canRun && !pauseQ) {
+            threadCount.get(host).incrementAndGet();
+            return true;
+        }
+        return false;
+    }
+
+    private void poll() {
+        while (!Thread.interrupted()) {
+            try {
+                List<DownloadJob> peek = pendingQueue.peek();
+                for (DownloadJob downloadJob : peek) {
+                    if (canRun(downloadJob.getImage().getHost())) {
+                        executionQueue.offer(downloadJob);
+                        pendingQueue.remove(downloadJob);
+                    }
+                }
+                synchronized (threadCount) {
+                    threadCount.wait(2_000);
+                }
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                break;
+            }
+        }
+    }
+
+    private void start() {
+        while (!Thread.interrupted()) {
+            try {
+                push(executionQueue.take());
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                break;
+            } catch (Exception e) {
+                log.error("Execution Service failed", e);
+                break;
+            }
+        }
+    }
+
+    private void push(DownloadJob downloadJob) {
+        log.debug(String.format("Scheduling a job for %s", downloadJob.getImage().getUrl()));
+        executor.execute(new DownloadRunnable(downloadJob));
+        executing.add(downloadJob);
+    }
+
+    public synchronized void afterJobFinish(DownloadJob downloadJob) {
+        int count = pendingQueue.decrement(downloadJob.getPost().getPostId());
+        if (count == 0) {
+            dataService.finishPost(downloadJob.getPost());
+        }
+        threadCount.get(downloadJob.getImage().getHost()).decrementAndGet();
+        executing.remove(downloadJob);
+        synchronized (threadCount) {
+            threadCount.notify();
+        }
+    }
+
+    public int runningCount() {
+        return executing.size();
+    }
+}
@@ -0,0 +1,115 @@
+package tn.mnlr.vripper.download;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+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.SettingsService;
+import tn.mnlr.vripper.services.DataService;
+
+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 PendingQueue {
+
+    private final DataService dataService;
+    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 PendingQueue(DataService dataService, SettingsService settingsService, List<Host> hosts) {
+        this.dataService = dataService;
+        this.settingsService = settingsService;
+        this.hosts = hosts;
+    }
+
+    @PostConstruct
+    private void init() {
+        hosts.forEach(host -> pendingQ.put(host, new LinkedBlockingDeque<>()));
+    }
+
+    public void put(Post post, Image image) throws InterruptedException {
+        log.debug(String.format("Enqueuing a job for %s", image.getUrl()));
+        image.init();
+        dataService.updateImageStatus(image.getStatus(), image.getId());
+        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) {
+        pendingQ.get(downloadJob.getImage().getHost()).remove(downloadJob);
+    }
+
+    public List<DownloadJob> peek() {
+        List<DownloadJob> downloadJobs = new ArrayList<>();
+        if (hosts.size() == 0) {
+            return downloadJobs;
+        }
+        for (Host host : hosts) {
+            Iterator<DownloadJob> it = pendingQ.get(host).iterator();
+            for (int i = 0; i < settingsService.getSettings().getMaxThreads(); i++) {
+                DownloadJob downloadJob = it.hasNext() ? it.next() : null;
+                if (downloadJob != null) {
+                    downloadJobs.add(downloadJob);
+                }
+            }
+        }
+        return downloadJobs;
+    }
+
+    public void enqueue(Post post, Set<Image> images) throws InterruptedException {
+        for (Image image : images) {
+            put(post, image);
+        }
+    }
+
+    public int size() {
+        return toBeExecuted.values().stream().mapToInt(AtomicInteger::get).sum();
+    }
+
+    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().stream().filter(predicate).forEach(e -> decrement(post.getPostId()));
+            entry.getValue().removeIf(predicate);
+            decrement(post.getPostId());
+        }
+    }
+
+    public boolean isPending(String 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;
+    }
+}
@@ -1,134 +0,0 @@
-package tn.mnlr.vripper.entities;
-
-import io.reactivex.disposables.Disposable;
-import io.reactivex.processors.BehaviorProcessor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import tn.mnlr.vripper.host.Host;
-import tn.mnlr.vripper.services.AppStateService;
-
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicLong;
-
-@Getter
-@NoArgsConstructor
-public class Image {
-
-    private static final Logger logger = LoggerFactory.getLogger(Image.class);
-
-    private AppStateService appStateService;
-
-    private Disposable subscription;
-
-    private final String type = "img";
-
-    private String postId;
-
-    private String postName;
-
-    private Host host;
-
-    private String url;
-
-    private int index;
-
-    private AtomicLong current = new AtomicLong(0);
-    private Status status;
-    private BehaviorProcessor<Image> imageStateProcessor;
-
-    @Setter
-    private long total = 0;
-
-    public Image(String url, String postId, String postName, Host host, int index) {
-        this.url = url;
-        this.postId = postId;
-        this.postName = postName;
-        this.host = host;
-        this.index = index;
-        status = Status.PENDING;
-        imageStateProcessor = BehaviorProcessor.create();
-    }
-
-    public void setAppStateService(AppStateService appStateService) {
-        this.appStateService = appStateService;
-        appStateService.getCurrentImages().put(this.url, this);
-        appStateService.getLiveImageUpdates().onNext(this);
-    }
-
-    public void setStatus(Status status) {
-        this.status = status;
-        update();
-    }
-
-    public boolean isCompleted() {
-        return status.equals(Status.COMPLETE);
-    }
-
-    public void init() {
-        if (appStateService == null) {
-            logger.warn("Attempting to init the image whilst the App State is null, unexpected behaviour could occur from this");
-            return;
-        }
-        cleanup();
-        imageStateProcessor = BehaviorProcessor.create();
-        subscription = imageStateProcessor
-                .onBackpressureLatest()
-                .doOnNext(appStateService::onImageUpdate)
-                .subscribe();
-
-        current.set(0);
-        status = Status.PENDING;
-        imageStateProcessor.onNext(this);
-    }
-
-    public void cleanup() {
-        if (imageStateProcessor != null) {
-            imageStateProcessor.onComplete();
-        }
-        if (subscription != null) {
-            subscription.dispose();
-        }
-    }
-
-    public void setCurrent(int current) {
-        this.current.set(current);
-        update();
-    }
-
-    public void increase(int read) {
-        current.addAndGet(read);
-        update();
-    }
-
-    private void update() {
-        if(imageStateProcessor == null) {
-            return;
-        }
-        imageStateProcessor.onNext(this);
-        if (isCompleted()) {
-            imageStateProcessor.onComplete();
-            subscription.dispose();
-            imageStateProcessor = null;
-        }
-    }
-
-    public enum Status {
-        PENDING, DOWNLOADING, COMPLETE, ERROR, STOPPED
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        Image image = (Image) o;
-        return url.equals(image.url);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(url);
-    }
-}
@@ -1,109 +0,0 @@
-package tn.mnlr.vripper.entities;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-import tn.mnlr.vripper.host.Host;
-import tn.mnlr.vripper.services.AppStateService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-@Getter
-@ToString
-@NoArgsConstructor
-public class Post {
-
-    private AppStateService appStateService;
-
-    private Status status;
-
-    private final String type = "post";
-
-    private String postId;
-
-    private String threadTitle;
-
-    private String threadId;
-
-    private String title;
-
-    private String url;
-
-    private List<Image> images;
-
-    private Map<String, Object> metadata;
-
-    private AtomicInteger done = new AtomicInteger(0);
-
-    private int total;
-
-    private Set<String> hosts;
-
-    private boolean removed = false;
-
-    private String forum;
-
-    public Post(String title, String url, List<Image> images, Map<String, Object> metadata, String postId, String threadId, String threadTitle, String forum) {
-        this.title = title;
-        this.url = url;
-        this.images = images;
-        this.metadata = metadata;
-        this.postId = postId;
-        this.forum = forum;
-        this.threadId = threadId;
-        this.threadTitle = threadTitle;
-        this.images.stream().map(e -> e.getHost()).map(Host::getHost).collect(Collectors.toSet());
-        this.hosts = this.images.stream().map(e -> e.getHost()).map(Host::getHost).collect(Collectors.toSet());
-        total = images.size();
-        status = Status.PENDING;
-    }
-
-    public void setAppStateService(AppStateService appStateService) {
-        this.appStateService = appStateService;
-        this.appStateService.getCurrentPosts().put(postId, this);
-        this.appStateService.getLivePostsState().onNext(this);
-    }
-
-    public void setRemoved(boolean removed) {
-        this.removed = removed;
-        updateNotification();
-    }
-
-    public void increase() {
-        done.incrementAndGet();
-        updateNotification();
-    }
-
-    public void setStatus(Status status) {
-        this.status = status;
-        updateNotification();
-    }
-
-    private void updateNotification() {
-        if (appStateService != null) {
-            appStateService.getLivePostsState().onNext(this);
-        }
-    }
-
-    public enum Status {
-        PENDING, DOWNLOADING, COMPLETE, ERROR, PARTIAL, STOPPED
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        Post post = (Post) o;
-        return postId.equals(post.postId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(postId);
-    }
-}
@@ -1,12 +0,0 @@
-package tn.mnlr.vripper.entities.mixin.persistance;
-
-import com.fasterxml.jackson.databind.util.StdConverter;
-import tn.mnlr.vripper.host.Host;
-
-public class HostToString extends StdConverter<Host, String> {
-
-    @Override
-    public String convert(Host value) {
-        return value.getClass().getSimpleName();
-    }
-}
@@ -1,32 +0,0 @@
-package tn.mnlr.vripper.entities.mixin.persistance;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.processors.BehaviorProcessor;
-import tn.mnlr.vripper.entities.Image;
-import tn.mnlr.vripper.host.Host;
-import tn.mnlr.vripper.services.AppStateService;
-
-public abstract class ImagePersistanceMixin {
-
-    @JsonSerialize(converter = HostToString.class)
-    @JsonDeserialize(converter = StringToHost.class)
-    private Host host;
-
-    @JsonIgnore
-    private BehaviorProcessor<Image> imageStateProcessor;
-
-    @JsonIgnore
-    private Disposable subscription;
-
-    @JsonIgnore
-    private String type;
-
-    @JsonIgnore
-    public abstract boolean isCompleted();
-
-    @JsonIgnore
-    private AppStateService appStateService;
-}
@@ -1,17 +0,0 @@
-package tn.mnlr.vripper.entities.mixin.persistance;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import tn.mnlr.vripper.services.AppStateService;
-
-public abstract class PostPersistanceMixin {
-
-    @JsonIgnore
-    private String type;
-
-    @JsonIgnore
-    private AppStateService appStateService;
-
-
-    @JsonIgnore
-    private boolean removed;
-}
@@ -1,17 +0,0 @@
-package tn.mnlr.vripper.entities.mixin.persistance;
-
-import com.fasterxml.jackson.databind.util.StdConverter;
-import tn.mnlr.vripper.SpringContext;
-import tn.mnlr.vripper.host.Host;
-
-import java.util.Collection;
-
-public class StringToHost extends StdConverter<String, Host> {
-
-    private Collection<Host> hosts = SpringContext.getBeansOfType(Host.class).values();
-
-    @Override
-    public Host convert(String value) {
-        return hosts.stream().filter(e -> e.getClass().getSimpleName().equals(value)).findAny().orElse(null);
-    }
-}
@@ -1,23 +0,0 @@
-package tn.mnlr.vripper.entities.mixin.ui;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.processors.BehaviorProcessor;
-import tn.mnlr.vripper.entities.Image;
-import tn.mnlr.vripper.host.Host;
-import tn.mnlr.vripper.services.AppStateService;
-
-public abstract class ImageUIMixin {
-
-    @JsonIgnore
-    private Host host;
-
-    @JsonIgnore
-    private BehaviorProcessor<Image> imageStateProcessor;
-
-    @JsonIgnore
-    private Disposable subscription;
-
-    @JsonIgnore
-    private AppStateService appStateService;
-}
@@ -1,16 +0,0 @@
-package tn.mnlr.vripper.entities.mixin.ui;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import tn.mnlr.vripper.entities.Image;
-import tn.mnlr.vripper.services.AppStateService;
-
-import java.util.List;
-
-public abstract class PostUIMixin {
-
-    @JsonIgnore
-    private List<Image> images;
-
-    @JsonIgnore
-    private AppStateService appStateService;
-}
@@ -0,0 +1,16 @@
+package tn.mnlr.vripper.exception;
+
+public class QueueException extends Exception {
+
+    public QueueException(String message) {
+        super(message);
+    }
+
+    public QueueException(String message, Throwable e) {
+        super(message, e);
+    }
+
+    public QueueException(Throwable e) {
+        super(e);
+    }
+}
@@ -1,37 +1,49 @@
 package tn.mnlr.vripper.host;

+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.HttpClient;
 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.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
-import tn.mnlr.vripper.services.ConnectionManager;
+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;

@Service
+@Slf4j
 public class AcidimgHost extends Host {

-    private static final Logger logger = LoggerFactory.getLogger(AcidimgHost.class);
-
    private static final String host = "acidimg.cc";
    private static final String CONTINUE_BUTTON_XPATH = "//input[@id='continuebutton']";
-    public static final String IMG_XPATH = "//img[@class='centred']";
+    private static final String IMG_XPATH = "//img[@class='centred']";
+
+    private final ConnectionService cm;
+    private final HostService hostService;
+    private final XpathService xpathService;
+    private final HtmlProcessorService htmlProcessorService;
+

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

    @Override
    public String getHost() {
@@ -44,22 +56,22 @@ public class AcidimgHost extends Host {
    }

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

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

        Node contDiv;
        try {
-            logger.info(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
+            log.debug(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
            contDiv = xpathService.getAsNode(doc, CONTINUE_BUTTON_XPATH);
        } catch (XpathException e) {
            throw new HostException(e);
        }

        if (contDiv != null) {
-            logger.info(String.format("Click button found for %s", url));
+            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"));
@@ -69,9 +81,9 @@ public class AcidimgHost extends Host {
                throw new HostException(e);
            }

-            logger.info(String.format("Requesting %s", httpPost));
-            try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(httpPost)) {
-                logger.info(String.format("Cleaning response for %s", httpPost));
+            log.debug(String.format("Requesting %s", httpPost));
+            try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(httpPost, context)) {
+                log.debug(String.format("Cleaning response for %s", httpPost));
                doc = htmlProcessorService.clean(EntityUtils.toString(response.getEntity()));
                EntityUtils.consumeQuietly(response.getEntity());
            } catch (Exception e) {
@@ -81,23 +93,22 @@ public class AcidimgHost extends Host {

        Node imgNode;
        try {
-            logger.info(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+            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);
        }

-        if(imgNode == null) {
+        if (imgNode == null) {
            throw new HostException("Cannot find the image node");
        }

        try {
-            logger.info(String.format("Resolving name and image url for %s", url));
+            log.debug(String.format("Resolving name and image url for %s", url));
            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,62 +1,17 @@
 package tn.mnlr.vripper.host;

-import lombok.Getter;
-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.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.client.protocol.HttpClientContext;
 import org.springframework.stereotype.Service;
-import org.w3c.dom.Document;
-import tn.mnlr.vripper.entities.Image;
-import tn.mnlr.vripper.exception.DownloadException;
 import tn.mnlr.vripper.exception.HostException;
-import tn.mnlr.vripper.exception.HtmlProcessorException;
-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.nio.file.Files;
-import java.util.Iterator;
-import java.util.Random;
+import java.util.Objects;

@Service
+@Slf4j
 abstract public class Host {

-    private static final Logger logger = LoggerFactory.getLogger(Host.class);
-
-    private static final int READ_BUFFER_SIZE = 8192;
-
-    @Autowired
-    protected HtmlProcessorService htmlProcessorService;
-
-    @Autowired
-    protected XpathService xpathService;
-
-    @Autowired
-    private AppSettingsService appSettingsService;
-
-    @Autowired
-    private AppStateService appStateService;
-
-    @Autowired
-    private ConnectionManager cm;
-
-    @Autowired
-    private DownloadSpeedService downloadSpeedService;
-
-    @Autowired
-    private PathService pathService;
-
    abstract public String getHost();

    abstract public String getLookup();
@@ -65,169 +20,19 @@ abstract public class Host {
        return url.contains(getLookup());
    }

-    public void download(Image image, ImageFileData imageFileData) throws DownloadException, InterruptedException {
+    public abstract HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException;

-        try {
-
-            appStateService.postDownloadingUpdate(image.getPostId());
-
-            imageFileData.setPageUrl(image.getUrl());
-
-            /**
-             * HOST SPECIFIC
-             */
-            logger.info(String.format("Getting image url and name from %s using %s", image.getUrl(), this.getHost()));
-            setNameAndUrl(image.getUrl(), imageFileData);
-            logger.info(String.format("Resolved name for %s: %s", image.getUrl(), imageFileData.getImageName()));
-            logger.info(String.format("Resolved image url for %s: %s", image.getUrl(), imageFileData.getImageUrl()));
-
-            logger.info(String.format("Building image request for %s", image.getUrl()));
-            setImageRequest(imageFileData);
-            /**
-             * END HOST SPECIFIC
-             */
-
-            String formatImageFileName = pathService.formatImageFileName(imageFileData.getImageName());
-            logger.info(String.format("Sanitizing image name from %s to %s", imageFileData.getImageName(), formatImageFileName));
-            imageFileData.setImageName(formatImageFileName);
-            File destinationFolder = pathService.getDownloadDestinationFolder(image.getPostId());
-            logger.info(String.format("Saving to %s", destinationFolder.getPath()));
-            if (!destinationFolder.exists()) {
-                logger.info(String.format("Creating %s", destinationFolder.getPath()));
-                destinationFolder.mkdirs();
-            }
-
-            HttpClient client = cm.getClient().build();
-
-            logger.info(String.format("Downloading %s", imageFileData.getImageUrl()));
-            try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(imageFileData.getImageRequest())) {
-
-                if(response.getStatusLine().getStatusCode() / 100 != 2) {
-                    EntityUtils.consumeQuietly(response.getEntity());
-                    throw new DownloadException(String.format("Server returned code %d", response.getStatusLine().getStatusCode()));
-                }
-
-                File outputFile = new File(destinationFolder.getPath() + File.separator + imageFileData.getImageName() + ".tmp");
-                InputStream downloadStream = response.getEntity().getContent();
-                FileOutputStream fos = new FileOutputStream(outputFile);
-                try {
-                    image.setTotal(response.getEntity().getContentLength());
-                    logger.info(String.format("%s length is %d", imageFileData.getImageUrl(), image.getTotal()));
-                    logger.info(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);
-                    }
-                    EntityUtils.consumeQuietly(response.getEntity());
-                } finally {
-                    if (downloadStream != null) {
-                        downloadStream.close();
-                    }
-                    if (fos != null) {
-                        fos.close();
-                    }
-                }
-                checkImageTypeAndRename(outputFile, imageFileData.getImageName(), image.getIndex());
-            }
-        } catch (Exception e) {
-            if(Thread.interrupted()) {
-                throw new InterruptedException("Download was interrupted");
-            }
-            throw new DownloadException(e);
-        }
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Host host = (Host) o;
+        return Objects.equals(getHost(), host.getHost());
    }

-    private void checkImageTypeAndRename(File outputFile, String imageName, int index) throws HostException {
-        String formatName;
-        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();
-            formatName = reader.getFormatName();
-            if (formatName.toUpperCase().equals("JPEG")) {
-                formatName = "jpg";
-            }
-        } catch (Exception e) {
-            throw new HostException("Failed to guess image format", e);
-        }
-        try {
-            File outImage = new File(outputFile.getParent(), (appSettingsService.isForceOrder() ? String.format("%03d_", index) : "") + imageName + "." + formatName.toLowerCase());
-            if (outImage.exists()) {
-                outImage.delete();
-            }
-            Files.move(outputFile.toPath(), outImage.toPath());
-        } catch (Exception e) {
-            throw new HostException("Failed to rename the image", e);
-        }
-    }
-
-    /**
-     * Just for testing, you may ignore
-     * @throws Exception
-     */
-    private void randomFail() throws Exception {
-        Random random = new Random();
-        int i = random.nextInt(100);
-        if (i < 50) {
-            throw new Exception("Purpose error");
-        }
-    }
-
-    protected final String getDefaultImageName(final String imgUrl) {
-        String imageTitle  = imgUrl.substring(imgUrl.lastIndexOf('/') + 1);
-        logger.debug(String.format("Extracting name from url %s: %s", imgUrl, imageTitle));
-        return imgUrl;
-    }
-
-    protected final Response getResponse(final String url) throws HostException {
-        String basePage;
-
-        HttpClient client = cm.getClient().build();
-        HttpGet httpGet = cm.buildHttpGet(url);
-        Header[] headers;
-        logger.info(String.format("Requesting %s", url));
-        try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(httpGet)) {
-            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());
-            logger.debug(String.format("%s response: %n%s", url, basePage));
-            EntityUtils.consumeQuietly(response.getEntity());
-        } catch (IOException e) {
-            throw new HostException(e);
-        }
-
-        try {
-            logger.info(String.format("Cleaning %s response", url));
-            return new Response(htmlProcessorService.clean(basePage), headers);
-        } catch (HtmlProcessorException e) {
-            throw new HostException(e);
-        }
-    }
-
-    protected 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) throws HostException;
-
-    @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 int hashCode() {
+        return Objects.hash(getHost());
    }

    @Override
@@ -1,12 +1,11 @@
 package tn.mnlr.vripper.host;

-import org.apache.http.Header;
+import lombok.extern.slf4j.Slf4j;
 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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
@@ -14,24 +13,33 @@ 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.Arrays;
-import java.util.stream.Collectors;

@Service
+@Slf4j
 public class ImageBamHost extends Host {

-    private static final Logger logger = LoggerFactory.getLogger(ImageBamHost.class);
-
    private static final String host = "imagebam.com";
-    public static final String CONTINUE_BUTTON_XPATH = "//a[@title='Continue to your image']";
-    public static final String IMG_XPATH = "//img[@class='image']";
+    private static final String CONTINUE_BUTTON_XPATH = "//a[@title='Continue to your image']";
+    private static final String IMG_XPATH = "//img[@class='image']";
+
+    private final HostService hostService;
+    private final ConnectionService cm;
+    private final XpathService xpathService;
+    private final HtmlProcessorService htmlProcessorService;

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

    @Override
    public String getHost() {
@@ -44,37 +52,29 @@ public class ImageBamHost extends Host {
    }

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

-        Response response = getResponse(url);
+        HostService.Response response = hostService.getResponse(url, context);
        Document doc = response.getDocument();
-        Header[] headers = response.getHeaders();
-        String cookies = Arrays.asList(headers)
-                .stream()
-                .filter(e -> e.getName().toLowerCase().contains("Set-Cookie".toLowerCase()))
-                .map(e -> e.getValue().split(";")[0].trim())
-                .collect(Collectors.joining("; "));

        Node contDiv;
        try {
-            logger.info(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
+            log.debug(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
            contDiv = xpathService.getAsNode(doc, CONTINUE_BUTTON_XPATH);
        } catch (XpathException e) {
            throw new HostException(e);
        }

        if (contDiv != null) {
-            logger.info(String.format("Getting cookies to use for %s", url));
-            logger.info(String.format("Click button found for %s", url));
+            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);
-            httpGet.addHeader("Cookie", cookies);
-            logger.info(String.format("Requesting %s", httpGet));
-            try (CloseableHttpResponse res = (CloseableHttpResponse) client.execute(httpGet)) {
+            log.debug(String.format("Requesting %s", httpGet));
+            try (CloseableHttpResponse res = (CloseableHttpResponse) client.execute(httpGet, context)) {
                String s = EntityUtils.toString(res.getEntity());
-                logger.debug(String.format("%s response is:%n%s", httpGet, s));
-                logger.debug(String.format("Cleaning response for %s", httpGet));
+                log.debug(String.format("%s response is:%n%s", httpGet, s));
+                log.debug(String.format("Cleaning response for %s", httpGet));
                doc = htmlProcessorService.clean(s);
                EntityUtils.consumeQuietly(res.getEntity());
            } catch (IOException | HtmlProcessorException e) {
@@ -84,20 +84,19 @@ public class ImageBamHost extends Host {

        Node imgNode;
        try {
-            logger.info(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+            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 {
-            logger.info(String.format("Resolving name and image url for %s", url));
+            log.debug(String.format("Resolving name and image url for %s", url));
            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);
-        } catch(Exception e) {
+            return new HostService.NameUrl(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
+        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
    }
@@ -1,26 +1,33 @@
 package tn.mnlr.vripper.host;

-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+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.ConnectionManager;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;

 import java.util.Optional;

@Service
+@Slf4j
 public class ImageTwistHost extends Host {

-    public static final String IMG_XPATH = "//img[contains(@class, 'img')]";
-    private static final Logger logger = LoggerFactory.getLogger(ImageTwistHost.class);
+    private static final String IMG_XPATH = "//img[contains(@class, 'img')]";
    private static final String host = "imagetwist.com";
+
+    private final HostService hostService;
+    private final XpathService xpathService;
+
    @Autowired
-    private ConnectionManager cm;
+    public ImageTwistHost(HostService hostService, XpathService xpathService) {
+        this.hostService = hostService;
+        this.xpathService = xpathService;
+    }

    @Override
    public String getHost() {
@@ -33,25 +40,24 @@ public class ImageTwistHost extends Host {
    }

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

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

        Node imgNode;
        try {
-            logger.info(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+            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 {
-            logger.info(String.format("Resolving name and image url for %s", url));
+            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();

-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle);
+            return new HostService.NameUrl(imgTitle, imgUrl);
        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
@@ -0,0 +1,82 @@
+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;
+
+@Service
+@Slf4j
+public class ImageVenueHost extends Host {
+
+    private static final String host = "imagevenue.com";
+    private static final String CONTINUE_BUTTON_XPATH = "//a[@title='Continue to ImageVenue']";
+    private static final String IMG_XPATH = "//a[@data-toggle='full']/img";
+
+    private final HostService hostService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public ImageVenueHost(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 {
+
+        String url = _url.replace("http://", "https://");
+
+        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 = hostService.getResponse(url, context);
+                doc = resp.getDocument();
+            }
+        } catch (XpathException e) {
+            throw new HostException(e);
+        }
+
+        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);
+        }
+
+        if (imgNode == null) {
+            throw new HostException("Failed to locate image");
+        }
+
+        try {
+            log.debug(String.format("Resolving name and image url for %s", url));
+            String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
+            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
+
+            return new HostService.NameUrl(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
+        } catch (Exception e) {
+            throw new HostException("Unexpected error occurred", e);
+        }
+    }
+}
@@ -1,27 +1,32 @@
 package tn.mnlr.vripper.host;

-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+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.ConnectionManager;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
+@Slf4j
 public class ImageZillaHost extends Host {

-    private static final Logger logger = LoggerFactory.getLogger(ImageZillaHost.class);
-
    private static final String host = "imagezilla.net";
    private static final String lookup = "imagezilla.net/show";
-    public static final String IMG_XPATH = "//img[@id='photo']";
+    private static final String IMG_XPATH = "//img[@id='photo']";
+
+    private final HostService hostService;
+    private final XpathService xpathService;

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

    @Override
    public String getHost() {
@@ -34,16 +39,16 @@ public class ImageZillaHost extends Host {
    }

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

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

        String title;
        try {
-            logger.info(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
            Node titleNode = xpathService.getAsNode(doc, IMG_XPATH).getAttributes().getNamedItem("title");
-            logger.info(String.format("Resolving name for %s", url));
-            if(titleNode != null) {
+            log.debug(String.format("Resolving name for %s", url));
+            if (titleNode != null) {
                title = titleNode.getTextContent().trim();
            } else {
                title = null;
@@ -52,13 +57,12 @@ public class ImageZillaHost extends Host {
            throw new HostException(e);
        }

-        if(title == null || title.isEmpty()) {
-            title = getDefaultImageName(url);
+        if (title == null || title.isEmpty()) {
+            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);
        }
@@ -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;
+
+@Service
+@Slf4j
+public class ImgSpiceHost extends Host {
+
+    private static final String host = "imgspice.com";
+    private static final String IMG_XPATH = "//img[@id='imgpreview']";
+
+    private final HostService hostService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public ImgSpiceHost(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 {
+
+        String url = _url.replace("http://", "https://");
+        HostService.Response resp = hostService.getResponse(url, context);
+        Document doc = resp.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 = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
+            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
+
+            return new HostService.NameUrl(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
+        } catch (Exception e) {
+            throw new HostException("Unexpected error occurred", e);
+        }
+    }
+}
@@ -1,26 +1,32 @@
 package tn.mnlr.vripper.host;

-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+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.ConnectionManager;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
+@Slf4j
 public class ImgboxHost extends Host {

-    private static final Logger logger = LoggerFactory.getLogger(ImgboxHost.class);
-
    private static final String host = "imgbox.com";
-    public static final String IMG_XPATH = "//img[@id='img']";
+    private static final String IMG_XPATH = "//img[@id='img']";
+
+    private final HostService hostService;
+    private final XpathService xpathService;
+

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

    @Override
    public String getHost() {
@@ -33,25 +39,24 @@ public class ImgboxHost extends Host {
    }

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

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

        Node imgNode;
        try {
-            logger.info(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+            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 {
-            logger.info(String.format("Resolving name and image url for %s", url));
+            log.debug(String.format("Resolving name and image url for %s", url));
            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);
        }
@@ -1,14 +1,14 @@
 package tn.mnlr.vripper.host;

+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.HttpClient;
 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.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
@@ -16,24 +16,35 @@ 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;
 import java.util.List;

@Service
+@Slf4j
 public class ImxHost extends Host {

-    private static final Logger logger = LoggerFactory.getLogger(ImxHost.class);
-
    private static final String host = "imx.to";
-    public static final String CONTINUE_BUTTON_XPATH = "//*[@name='imgContinue']";
-    public static final String IMG_XPATH = "//img[@class='centred']";
+    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() {
@@ -46,16 +57,16 @@ public class ImxHost extends Host {
    }

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

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

        Node contDiv;
        String value = null;
        try {
-            logger.info(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
+            log.debug(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
            contDiv = xpathService.getAsNode(doc, CONTINUE_BUTTON_XPATH);
            Node node = contDiv.getAttributes().getNamedItem("value");
            if (node != null) {
@@ -65,46 +76,43 @@ public class ImxHost extends Host {
            throw new HostException(e);
        }

-        if (contDiv != null) {
-            if (value == null) {
-                throw new HostException("Failed to obtain value attribute from continue input");
-            }
-            logger.info(String.format("Click button found for %s", url));
-            HttpClient client = cm.getClient().build();
-            HttpPost httpPost = cm.buildHttpPost(url);
-            List<NameValuePair> params = new ArrayList<>();
-            params.add(new BasicNameValuePair("imgContinue", value));
-            try {
-                httpPost.setEntity(new UrlEncodedFormEntity(params));
-            } catch (Exception e) {
-                throw new HostException(e);
-            }
-            logger.info(String.format("Requesting %s", httpPost));
-            try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(httpPost)) {
-                logger.debug(String.format("Cleaning response for %s", httpPost));
-                doc = htmlProcessorService.clean(EntityUtils.toString(response.getEntity()));
-                EntityUtils.consumeQuietly(response.getEntity());
-            } catch (IOException | HtmlProcessorException e) {
-                throw new HostException(e);
-            }
+        if (value == null) {
+            throw new HostException("Failed to obtain value attribute from continue input");
+        }
+        log.debug(String.format("Click button found for %s", url));
+        HttpClient client = cm.getClient().build();
+        HttpPost httpPost = cm.buildHttpPost(url, context);
+        List<NameValuePair> params = new ArrayList<>();
+        params.add(new BasicNameValuePair("imgContinue", value));
+        try {
+            httpPost.setEntity(new UrlEncodedFormEntity(params));
+        } catch (Exception e) {
+            throw new HostException(e);
+        }
+        log.debug(String.format("Requesting %s", httpPost));
+        try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(httpPost, context)) {
+            log.debug(String.format("Cleaning response for %s", httpPost));
+            doc = htmlProcessorService.clean(EntityUtils.toString(response.getEntity()));
+            EntityUtils.consumeQuietly(response.getEntity());
+        } catch (IOException | HtmlProcessorException e) {
+            throw new HostException(e);
        }

        Node imgNode;
        try {
-            logger.info(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+            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 {
-            logger.info(String.format("Resolving name and image url for %s", url));
+            log.debug(String.format("Resolving name and image url for %s", url));
            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);
-        } catch(Exception e) {
+            return new HostService.NameUrl(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
+        } catch (Exception e) {
            throw new HostException("Unexpected error occurred", e);
        }
    }
@@ -0,0 +1,75 @@
+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;
+
+@Service
+@Slf4j
+public class PimpandhostHost extends Host {
+
+    private static final String host = "pimpandhost.com";
+    private static final String IMG_XPATH = "//img[contains(@class, 'original')]";
+
+    private final HostService hostService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public PimpandhostHost(HostService hostService, XpathService xpathService) {
+        super();
+        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 {
+
+        String url;
+        try {
+            url = hostService.appendUri(_url.replace("http://", "https://"), "size=original");
+        } catch (Exception e) {
+            throw new HostException(e);
+        }
+
+        HostService.Response resp = hostService.getResponse(url, context);
+        Document doc = resp.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 = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
+            String imgUrl = "https:" + imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
+
+            return new HostService.NameUrl(
+                    imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle,
+                    imgUrl
+            );
+        } catch (Exception e) {
+            throw new HostException("Unexpected error occurred", e);
+        }
+    }
+}
@@ -0,0 +1,69 @@
+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;
+
+@Service
+@Slf4j
+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;
+    }
+
+    @Override
+    public String getLookup() {
+        return host;
+    }
+
+    @Override
+    public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context) throws HostException {
+
+        String url = _url.replace("http://", "https://");
+        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);
+        }
+
+        if (imgNode == null) {
+            throw new HostException("Failed to locate image");
+        }
+
+        try {
+            log.debug(String.format("Resolving name and image url for %s", url));
+
+            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);
+        }
+    }
+}
@@ -1,27 +1,32 @@
 package tn.mnlr.vripper.host;

-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+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.ConnectionManager;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
+@Slf4j
 public class PixhostHost extends Host {

-    private static final Logger logger = LoggerFactory.getLogger(PixhostHost.class);
-
    private static final String host = "pixhost.to";
    private static final String lookup = "pixhost.to/show";
-    public static final String IMG_XPATH = "//img[@id='image']";
+    private static final String IMG_XPATH = "//img[@id='image']";
+
+    private final HostService hostService;
+    private final XpathService xpathService;

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

    @Override
    public String getHost() {
@@ -34,25 +39,24 @@ public class PixhostHost extends Host {
    }

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

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

        Node imgNode;
        try {
-            logger.info(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+            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 {
-            logger.info(String.format("Resolving name and image url for %s", url));
+            log.debug(String.format("Resolving name and image url for %s", url));
            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);
        }
@@ -0,0 +1,70 @@
+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;
+
+@Service
+@Slf4j
+public class PixxxelsHost extends Host {
+
+    private static final String host = "pixxxels.cc";
+    private static final String IMG_XPATH = "//*[@id='download']";
+    private static final String TITLE_XPATH = "//*[contains(@class,'imagename')]";
+
+    private final HostService hostService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public PixxxelsHost(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 {
+
+        String url = _url.replace("http://", "https://");
+        HostService.Response resp = hostService.getResponse(url, context);
+        Document doc = resp.getDocument();
+
+        Node imgNode, titleNode;
+        try {
+            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+            imgNode = xpathService.getAsNode(doc, IMG_XPATH);
+
+            log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url));
+            titleNode = xpathService.getAsNode(doc, TITLE_XPATH);
+
+        } catch (XpathException e) {
+            throw new HostException(e);
+        }
+
+        try {
+            log.debug(String.format("Resolving name and image url for %s", url));
+            String imgTitle = titleNode.getTextContent().trim();
+            String imgUrl = imgNode.getAttributes().getNamedItem("href").getTextContent().trim();
+
+            return new HostService.NameUrl(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
+        } catch (Exception e) {
+            throw new HostException("Unexpected error occurred", e);
+        }
+    }
+}
@@ -0,0 +1,69 @@
+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 PostImgHost extends Host {
+
+    private static final String host = "postimg.cc";
+    private static final String TITLE_XPATH = "//span[contains(@class,'imagename')]";
+    private static final String IMG_XPATH = "//a[@id='download']";
+
+    private final HostService hostService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public PostImgHost(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 {
+
+        String url = _url.replace("http://", "https://");
+        Document doc = hostService.getResponse(url, context).getDocument();
+
+        Node urlNode, titleNode;
+        try {
+            log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url));
+            titleNode = xpathService.getAsNode(doc, TITLE_XPATH);
+
+            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+            urlNode = 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(titleNode).map(node -> node.getTextContent().trim()).orElseGet(() -> hostService.getDefaultImageName(url));
+
+            return new HostService.NameUrl(imgTitle, urlNode.getAttributes().getNamedItem("href").getTextContent().trim());
+        } catch (Exception e) {
+            throw new HostException("Unexpected error occurred", e);
+        }
+    }
+}
@@ -1,27 +1,32 @@
 package tn.mnlr.vripper.host;

-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+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.ConnectionManager;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
+@Slf4j
 public class TurboImageHost extends Host {

-    private static final Logger logger = LoggerFactory.getLogger(TurboImageHost.class);
-
    private static final String host = "turboimagehost.com";
-    public static final String TITLE_XPATH = "//div[contains(@class,'titleFullS')]/h1";
-    public static final String IMG_XPATH = "//img[@id='uImage']";
+    private static final String TITLE_XPATH = "//div[contains(@class,'titleFullS')]/h1";
+    private static final String IMG_XPATH = "//img[@id='imageid']";
+
+    private final HostService hostService;
+    private final XpathService xpathService;

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

    @Override
    public String getHost() {
@@ -34,16 +39,16 @@ public class TurboImageHost extends Host {
    }

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

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

        String title;
        try {
-            logger.info(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url));
+            log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url));
            Node titleNode = xpathService.getAsNode(doc, TITLE_XPATH);
-            logger.info(String.format("Resolving name for %s", url));
-            if(titleNode != null) {
+            log.debug(String.format("Resolving name for %s", url));
+            if (titleNode != null) {
                title = titleNode.getTextContent().trim();
            } else {
                title = null;
@@ -52,14 +57,13 @@ public class TurboImageHost extends Host {
            throw new HostException(e);
        }

-        if(title == null || title.isEmpty()) {
-            title = getDefaultImageName(url);
+        if (title == null || title.isEmpty()) {
+            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);
+        }
+    }
+}
@@ -0,0 +1,70 @@
+package tn.mnlr.vripper.jpa;
+
+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;
+import java.time.format.DateTimeFormatter;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@Component
+@EnableScheduling
+public class Management {
+
+    public static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+    private static final Pattern BACKUP_FILE_PATTERN = Pattern.compile("^db_(\\d{4}-\\d{2}-\\d{2})\\.tar\\.gz$");
+
+    private final JdbcTemplate jdbcTemplate;
+    private final String backupFolder;
+    private final ThreadPoolService threadPoolService;
+    private final DownloadService downloadService;
+
+    public Management(JdbcTemplate jdbcTemplate, @Value("${base.dir}") String baseDir, @Value("${base.dir.name}") String baseDirName, ThreadPoolService threadPoolService, DownloadService downloadService) {
+        this.jdbcTemplate = jdbcTemplate;
+        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
+    @Scheduled(cron = "0 0 0 ? * *")
+    private void backup() {
+
+        for (File file : Optional.ofNullable(new File(backupFolder).listFiles()).orElse(new File[]{})) {
+            Matcher matcher = BACKUP_FILE_PATTERN.matcher(file.getName());
+            if (matcher.find()) {
+                LocalDate localDate = LocalDate.parse(matcher.group(1), FORMATTER);
+                if (localDate.isEqual(LocalDate.now())) {
+                    return;
+                }
+            }
+        }
+
+        // create a backup file
+        File backupFile = new File(backupFolder, String.format("db_%s.tar.gz", LocalDateTime.now().format(FORMATTER)));
+        jdbcTemplate.execute(String.format("BACKUP DATABASE TO '%s' BLOCKING", backupFile.getPath()));
+    }
+}
@@ -0,0 +1,70 @@
+package tn.mnlr.vripper.jpa.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import tn.mnlr.vripper.host.Host;
+import tn.mnlr.vripper.jpa.domain.enums.Status;
+
+import java.util.Objects;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class Image {
+
+    @JsonIgnore
+    protected Long id;
+
+    @JsonIgnore
+    private Host host;
+
+    private String url;
+
+    private int index;
+
+    private long current = 0;
+
+    private long total = 0;
+
+    private Status status;
+
+    private String postId;
+
+    @JsonIgnore
+    private Long postIdRef;
+
+    public Image(String postId, String url, Host host, int index) {
+        this.postId = postId;
+        this.url = url;
+        this.host = host;
+        this.index = index;
+        status = Status.STOPPED;
+    }
+
+
+    public void increase(int read) {
+        current += read;
+    }
+
+    public void init() {
+        current = 0;
+        status = Status.STOPPED;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Image image = (Image) o;
+        return Objects.equals(url, image.url);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(url);
+    }
+}
@@ -0,0 +1,24 @@
+package tn.mnlr.vripper.jpa.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.Collections;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class Metadata {
+
+    @JsonIgnore
+    private Long id;
+
+    private List<String> resolvedNames = Collections.emptyList();
+
+    private String postedBy;
+
+    private Long postIdRef;
+}
@@ -0,0 +1,78 @@
+package tn.mnlr.vripper.jpa.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import tn.mnlr.vripper.jpa.domain.enums.Status;
+
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Set;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class Post {
+
+    @JsonIgnore
+    private Long id;
+
+    private Status status;
+
+    private String postId;
+
+    private String threadTitle;
+
+    private String threadId;
+
+    private String title;
+
+    private String url;
+
+    private int done;
+
+    private int total;
+
+    private Set<String> hosts;
+
+    private String forum;
+
+    @JsonIgnore
+    private String securityToken;
+
+    @JsonIgnore
+    private String postFolderName;
+
+    private boolean thanked;
+
+    private Set<String> previews = Collections.emptySet();
+
+    private Metadata metadata;
+
+    public Post(String title, String url, String postId, String threadId, String threadTitle, String forum, String securityToken) {
+        this.title = title;
+        this.url = url;
+        this.postId = postId;
+        this.forum = forum;
+        this.threadId = threadId;
+        this.threadTitle = threadTitle;
+        this.securityToken = securityToken;
+        status = Status.STOPPED;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Post post = (Post) o;
+        return Objects.equals(postId, post.postId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(postId);
+    }
+}
@@ -0,0 +1,57 @@
+package tn.mnlr.vripper.jpa.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.Objects;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class Queued {
+
+    @JsonIgnore
+    private Long id;
+
+    private String link;
+
+    private String threadId;
+
+    private String postId;
+
+    private int total = 0;
+
+    private boolean loading = true;
+
+    public Queued(String link, String threadId, String postId) {
+        this();
+        this.link = link;
+        this.threadId = threadId;
+        this.postId = postId;
+    }
+
+    public void done() {
+        this.loading = false;
+    }
+
+    public void increment() {
+        this.total++;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Queued that = (Queued) o;
+        return Objects.equals(threadId, that.threadId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(threadId);
+    }
+}
@@ -0,0 +1,5 @@
+package tn.mnlr.vripper.jpa.domain.enums;
+
+public enum Status {
+    PENDING, DOWNLOADING, COMPLETE, ERROR, STOPPED, PARTIAL
+}
@@ -0,0 +1,32 @@
+package tn.mnlr.vripper.jpa.repositories;
+
+import tn.mnlr.vripper.jpa.domain.Image;
+import tn.mnlr.vripper.jpa.domain.enums.Status;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface IImageRepository extends IRepository {
+
+    Image save(Image image);
+
+    void deleteAllByPostId(String postId);
+
+    List<Image> findByPostId(String postId);
+
+    Integer countError();
+
+    List<Image> findByPostIdAndIsNotCompleted(String postId);
+
+    int stopByPostIdAndIsNotCompleted(String postId);
+
+    List<Image> findByPostIdAndIsError(String postId);
+
+    Optional<Image> findById(Long id);
+
+    int updateStatus(Status status, Long id);
+
+    int updateCurrent(long current, Long id);
+
+    int updateTotal(long total, Long id);
+}
@@ -0,0 +1,16 @@
+package tn.mnlr.vripper.jpa.repositories;
+
+import tn.mnlr.vripper.jpa.domain.Metadata;
+
+import java.util.Optional;
+
+public interface IMetadataRepository extends IRepository {
+
+    Metadata save(Metadata metadata);
+
+    Optional<Metadata> findById(Long id);
+
+    Optional<Metadata> findByPostId(String postId);
+
+    int deleteByPostId(String postId);
+}
@@ -0,0 +1,38 @@
+package tn.mnlr.vripper.jpa.repositories;
+
+import tn.mnlr.vripper.jpa.domain.Post;
+import tn.mnlr.vripper.jpa.domain.enums.Status;
+
+import java.util.List;
+import java.util.Optional;
+
+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<Post> findAll();
+
+    boolean existByPostId(String postId);
+
+    int setDownloadingToStopped();
+
+    int deleteByPostId(String postId);
+
+    int updateStatus(Status status, Long id);
+
+    int updateDone(int done, Long id);
+
+    int updateFolderName(String postFolderName, Long id);
+
+    int updateTitle(String title, Long id);
+
+    int updateThanked(boolean thanked, Long id);
+}
@@ -0,0 +1,18 @@
+package tn.mnlr.vripper.jpa.repositories;
+
+import tn.mnlr.vripper.jpa.domain.Queued;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface IQueuedRepository extends IRepository {
+    Queued save(Queued queued);
+
+    Optional<Queued> findByThreadId(String threadId);
+
+    List<Queued> findAll();
+
+    Optional<Queued> findById(Long id);
+
+    int deleteByThreadId(String threadId);
+}
@@ -0,0 +1,6 @@
+package tn.mnlr.vripper.jpa.repositories;
+
+public interface IRepository {
+
+    public void init();
+}
@@ -0,0 +1,141 @@
+package tn.mnlr.vripper.jpa.repositories.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+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 {
+
+    private final JdbcTemplate jdbcTemplate;
+    private final AtomicLong counter = new AtomicLong(0);
+
+    @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);
+    }
+
+    @Override
+    public Image save(Image image) {
+        long id = counter.incrementAndGet();
+        jdbcTemplate.update(
+                "INSERT INTO IMAGE (ID, CURRENT, HOST, INDEX, POST_ID, STATUS, TOTAL, URL, POST_ID_REF) VALUES (?,?,?,?,?,?,?,?,?)",
+                id,
+                image.getCurrent(),
+                image.getHost().getHost(),
+                image.getIndex(),
+                image.getPostId(),
+                image.getStatus().name(),
+                image.getTotal(),
+                image.getUrl(),
+                image.getPostIdRef()
+        );
+        image.setId(id);
+        return image;
+    }
+
+    @Override
+    public void deleteAllByPostId(String postId) {
+        jdbcTemplate.update("DELETE FROM IMAGE WHERE POST_ID = ?", postId);
+    }
+
+    @Override
+    public List<Image> findByPostId(String postId) {
+        return jdbcTemplate.query(
+                "SELECT * FROM IMAGE WHERE POST_ID = ?",
+                new Object[]{postId},
+                new ImageRowMapper()
+        );
+    }
+
+    @Override
+    public Integer countError() {
+        return jdbcTemplate.queryForObject(
+                "SELECT COUNT(*) FROM IMAGE AS image WHERE image.STATUS = 'ERROR'",
+                Integer.class
+        );
+    }
+
+    @Override
+    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()
+        );
+    }
+
+    @Override
+    public int stopByPostIdAndIsNotCompleted(String postId) {
+        return jdbcTemplate.update(
+                "UPDATE IMAGE AS image SET image.STATUS = 'STOPPED' WHERE image.POST_ID = ? AND image.STATUS <> 'COMPLETE'",
+                postId
+        );
+    }
+
+    @Override
+    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()
+        );
+    }
+
+    @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()
+        );
+        if (images.isEmpty()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(images.get(0));
+        }
+    }
+
+    @Override
+    public int updateStatus(Status status, Long id) {
+        return jdbcTemplate.update(
+                "UPDATE IMAGE AS image SET image.STATUS = ? WHERE image.ID = ?",
+                status.name(), id
+        );
+    }
+
+    @Override
+    public int updateCurrent(long current, Long id) {
+        return jdbcTemplate.update(
+                "UPDATE IMAGE AS image SET image.CURRENT = ? WHERE image.ID = ?",
+                current, id
+        );
+    }
+
+    @Override
+    public int updateTotal(long total, Long id) {
+        return jdbcTemplate.update(
+                "UPDATE IMAGE AS image SET image.TOTAL = ? WHERE image.ID = ?",
+                total, id
+        );
+    }
+}
@@ -0,0 +1,29 @@
+package tn.mnlr.vripper.jpa.repositories.impl;
+
+import org.springframework.jdbc.core.RowMapper;
+import tn.mnlr.vripper.SpringContext;
+import tn.mnlr.vripper.host.Host;
+import tn.mnlr.vripper.jpa.domain.Image;
+import tn.mnlr.vripper.jpa.domain.enums.Status;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class ImageRowMapper implements RowMapper<Image> {
+
+    @Override
+    public Image mapRow(ResultSet rs, int rowNum) throws SQLException {
+        Image image = new Image();
+        image.setId(rs.getLong("ID"));
+        String host = rs.getString("HOST");
+        image.setHost(SpringContext.getBeansOfType(Host.class).values().stream().filter(e -> e.getHost().equals(host)).findAny().orElse(null));
+        image.setUrl(rs.getString("URL"));
+        image.setIndex(rs.getInt("INDEX"));
+        image.setCurrent(rs.getLong("CURRENT"));
+        image.setTotal(rs.getLong("TOTAL"));
+        image.setStatus(Status.valueOf(rs.getString("STATUS")));
+        image.setPostId(rs.getString("POST_ID"));
+        image.setPostIdRef(rs.getLong("POST_ID_REF"));
+        return image;
+    }
+}
@@ -0,0 +1,85 @@
+package tn.mnlr.vripper.jpa.repositories.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+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 {
+
+    private final JdbcTemplate jdbcTemplate;
+    private final AtomicLong counter = new AtomicLong(0);
+
+    @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,
+                metadata.getPostedBy(),
+                String.join("%sep%", metadata.getResolvedNames()),
+                metadata.getPostIdRef()
+        );
+        metadata.setId(id);
+        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()
+        );
+        if (metadata.isEmpty()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(metadata.get(0));
+        }
+    }
+
+    @Override
+    public int deleteByPostId(String postId) {
+        return jdbcTemplate.update(
+                "DELETE FROM METADATA AS metadata WHERE metadata.ID = (SELECT inner_metadata.ID FROM POST AS post INNER JOIN METADATA inner_metadata ON post.ID = inner_metadata.POST_ID_REF WHERE post.POST_ID = ?)",
+                postId
+        );
+    }
+}
@@ -0,0 +1,24 @@
+package tn.mnlr.vripper.jpa.repositories.impl;
+
+import org.springframework.jdbc.core.RowMapper;
+import tn.mnlr.vripper.jpa.domain.Metadata;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+
+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.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;
+    }
+}
@@ -0,0 +1,183 @@
+package tn.mnlr.vripper.jpa.repositories.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+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 {
+
+    private final JdbcTemplate jdbcTemplate;
+    private final AtomicLong counter = new AtomicLong(0);
+
+    @Autowired
+    public PostRepository(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+
+    }
+
+    @Override
+    public void init() {
+        Long maxId = jdbcTemplate.queryForObject(
+                "SELECT MAX(ID) FROM POST",
+                Long.class
+        );
+        if (maxId == null) {
+            maxId = 0L;
+        }
+        counter.set(maxId);
+    }
+
+    @Override
+    public Post save(Post post) {
+        long id = counter.incrementAndGet();
+        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.getPostId(),
+                String.join(";", post.getPreviews()),
+                post.getSecurityToken(),
+                post.getStatus().name(),
+                post.isThanked(),
+                post.getThreadId(),
+                post.getThreadTitle(),
+                post.getTitle(),
+                post.getTotal(),
+                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
+        );
+    }
+
+    @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()
+        );
+        if (posts.isEmpty()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(posts.get(0));
+        }
+    }
+
+    @Override
+    public List<String> findCompleted() {
+        return jdbcTemplate.query(
+                "SELECT POST_ID FROM POST WHERE status = 'COMPLETE' AND done >= total",
+                ((rs, rowNum) -> rs.getString("POST_ID"))
+        );
+    }
+
+    @Override
+    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()
+        );
+        if (posts.isEmpty()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(posts.get(0));
+        }
+    }
+
+    @Override
+    public List<Post> findAll() {
+        return jdbcTemplate.query(
+                "SELECT metadata.*,post.* FROM METADATA metadata FULL JOIN POST post ON metadata.POST_ID_REF = post.ID",
+                new PostRowMapper()
+        );
+    }
+
+    @Override
+    public boolean existByPostId(String postId) {
+        Integer count = jdbcTemplate.queryForObject(
+                "SELECT COUNT(*) FROM POST AS post WHERE post.POST_ID = ?",
+                new Object[]{postId},
+                Integer.class
+        );
+        if (count == null) {
+            return false;
+        } else {
+            return count > 0;
+        }
+    }
+
+    @Override
+    public int setDownloadingToStopped() {
+        return jdbcTemplate.update(
+                "UPDATE POST AS post SET post.STATUS = 'STOPPED' WHERE post.STATUS = 'DOWNLOADING' OR post.STATUS = 'PARTIAL' OR post.STATUS = 'PENDING'"
+        );
+    }
+
+    @Override
+    public int deleteByPostId(String postId) {
+        return jdbcTemplate.update(
+                "DELETE FROM POST AS post WHERE post.POST_ID = ?",
+                postId
+        );
+    }
+
+    @Override
+    public int updateStatus(Status status, Long id) {
+        return jdbcTemplate.update(
+                "UPDATE POST AS post SET post.STATUS = ? WHERE post.ID = ?",
+                status.name(), id
+        );
+    }
+
+    @Override
+    public int updateDone(int done, Long id) {
+        return jdbcTemplate.update(
+                "UPDATE POST AS post SET post.DONE = ? WHERE post.ID = ?",
+                done, id
+        );
+    }
+
+    @Override
+    public int updateFolderName(String postFolderName, Long id) {
+        return jdbcTemplate.update(
+                "UPDATE POST AS post SET post.POST_FOLDER_NAME = ? WHERE post.ID = ?",
+                postFolderName, id
+        );
+    }
+
+    @Override
+    public int updateTitle(String title, Long id) {
+        return jdbcTemplate.update(
+                "UPDATE POST AS post SET post.TITLE = ? WHERE post.ID = ?",
+                title, id
+        );
+    }
+
+    @Override
+    public int updateThanked(boolean thanked, Long id) {
+        return jdbcTemplate.update(
+                "UPDATE POST AS post SET post.THANKED = ? WHERE post.ID = ?",
+                thanked, id
+        );
+    }
+}
@@ -0,0 +1,55 @@
+package tn.mnlr.vripper.jpa.repositories.impl;
+
+import org.springframework.jdbc.core.RowMapper;
+import tn.mnlr.vripper.jpa.domain.Metadata;
+import tn.mnlr.vripper.jpa.domain.Post;
+import tn.mnlr.vripper.jpa.domain.enums.Status;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Set;
+
+public class PostRowMapper implements RowMapper<Post> {
+
+    private static final String DELIMITER = ";";
+
+    @Override
+    public Post mapRow(ResultSet rs, int rowNum) throws SQLException {
+
+        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"));
+        String previews;
+        if ((previews = rs.getString("PREVIEWS")) != null) {
+            post.setPreviews(Set.of(previews.split(DELIMITER)));
+        }
+
+        Long metadataId = rs.getLong("metadata.ID");
+        if (!rs.wasNull()) {
+            Metadata metadata = new Metadata();
+            metadata.setId(metadataId);
+            metadata.setPostIdRef(rs.getLong("POST_ID_REF"));
+            String resolvedNames = rs.getString("RESOLVED_NAMES");
+            if (resolvedNames != null && !resolvedNames.isBlank()) {
+                metadata.setResolvedNames(List.of(resolvedNames.split("%sep%")));
+            }
+            metadata.setPostedBy(rs.getString("POSTED_BY"));
+            post.setMetadata(metadata);
+        }
+
+        return post;
+    }
+}
@@ -0,0 +1,95 @@
+package tn.mnlr.vripper.jpa.repositories.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+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 {
+
+    private final JdbcTemplate jdbcTemplate;
+    private final AtomicLong counter = new AtomicLong(0);
+
+    @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);
+    }
+
+    @Override
+    public Queued save(Queued queued) {
+        long id = counter.incrementAndGet();
+        jdbcTemplate.update(
+                "INSERT INTO QUEUED (ID, TOTAL, LINK, LOADING, POST_ID, THREAD_ID) values (?,?,?,?,?,?)",
+                id,
+                queued.getTotal(),
+                queued.getLink(),
+                queued.isLoading(),
+                queued.getPostId(),
+                queued.getThreadId()
+        );
+        queued.setId(id);
+        return queued;
+    }
+
+    @Override
+    public Optional<Queued> findByThreadId(String threadId) {
+        List<Queued> queuedList = jdbcTemplate.query(
+                "SELECT * FROM QUEUED AS queued WHERE queued.THREAD_ID = ?",
+                new Object[]{threadId},
+                new QueuedRowMapper()
+        );
+        if (queuedList.isEmpty()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(queuedList.get(0));
+        }
+    }
+
+    @Override
+    public List<Queued> findAll() {
+        return jdbcTemplate.query(
+                "SELECT * FROM QUEUED",
+                new QueuedRowMapper()
+        );
+    }
+
+    @Override
+    public Optional<Queued> findById(Long id) {
+        List<Queued> queuedList = jdbcTemplate.query(
+                "SELECT * FROM QUEUED AS queued WHERE queued.ID = ?",
+                new Object[]{id},
+                new QueuedRowMapper()
+        );
+        if (queuedList.isEmpty()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(queuedList.get(0));
+        }
+    }
+
+    @Override
+    public int deleteByThreadId(String threadId) {
+        return jdbcTemplate.update(
+                "DELETE FROM QUEUED AS queued WHERE THREAD_ID = ?",
+                threadId
+        );
+    }
+}
@@ -0,0 +1,22 @@
+package tn.mnlr.vripper.jpa.repositories.impl;
+
+import org.springframework.jdbc.core.RowMapper;
+import tn.mnlr.vripper.jpa.domain.Queued;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class QueuedRowMapper implements RowMapper<Queued> {
+
+    @Override
+    public Queued mapRow(ResultSet rs, int rowNum) throws SQLException {
+        Queued queued = new Queued();
+        queued.setId(rs.getLong("ID"));
+        queued.setLink(rs.getString("LINK"));
+        queued.setThreadId(rs.getString("THREAD_ID"));
+        queued.setPostId(rs.getString("POST_ID"));
+        queued.setTotal(rs.getInt("TOTAL"));
+        queued.setLoading(rs.getBoolean("LOADING"));
+        return queued;
+    }
+}
@@ -1,48 +0,0 @@
-package tn.mnlr.vripper.q;
-
-import lombok.Getter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import tn.mnlr.vripper.entities.Image;
-
-import java.util.Objects;
-import java.util.concurrent.Callable;
-
-public class DownloadJob implements Callable<Image> {
-
-    private static final Logger logger = LoggerFactory.getLogger(DownloadJob.class);
-
-    @Getter
-    private final Image image;
-
-    @Getter
-    private final ImageFileData imageFileData = new ImageFileData();
-
-    public DownloadJob(Image image) {
-        this.image = image;
-    }
-
-    @Override
-    public Image call() throws Exception {
-
-        logger.info(String.format("Starting downloading %s", image.getUrl()));
-        image.setStatus(Image.Status.DOWNLOADING);
-        image.setCurrent(0);
-        image.getHost().download(image, imageFileData);
-        image.setStatus(Image.Status.COMPLETE);
-        return 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 image.equals(that.image);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(image);
-    }
-}
@@ -1,156 +0,0 @@
-package tn.mnlr.vripper.q;
-
-import lombok.Getter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import tn.mnlr.vripper.entities.Image;
-import tn.mnlr.vripper.entities.Post;
-import tn.mnlr.vripper.services.AppStateService;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.stream.Collectors;
-
-@Service
-public class DownloadQ {
-
-    private static final List<Post.Status> FINISHED = Arrays.asList(Post.Status.ERROR, Post.Status.COMPLETE, Post.Status.STOPPED);
-
-    private static final Logger logger = LoggerFactory.getLogger(DownloadQ.class);
-
-    @Autowired
-    private AppStateService appStateService;
-
-    @Autowired
-    private ExecutionService executionService;
-
-    private BlockingQueue<DownloadJob> downloadQ = new LinkedBlockingQueue<>();
-
-    @Getter
-    private boolean notPauseQ = true;
-
-    public void put(Image image) throws InterruptedException {
-        synchronized (appStateService) {
-            logger.info(String.format("Enqueuing a job for %s", image.getUrl()));
-            image.init();
-            DownloadJob downloadJob = new DownloadJob(image);
-            downloadQ.put(downloadJob);
-            appStateService.newDownloadJob(downloadJob);
-        }
-    }
-
-    public DownloadJob take() throws InterruptedException {
-        DownloadJob downloadJob = downloadQ.take();
-        logger.info(String.format("Retrieving a job for %s", downloadJob.getImage().getUrl()));
-        return downloadJob;
-    }
-
-    public synchronized void enqueue(Post post) throws InterruptedException {
-        for (Image image : post.getImages()) {
-            put(image);
-        }
-    }
-
-    public void restart(String postId) throws InterruptedException {
-        synchronized (appStateService) {
-            if (appStateService.getRunningPosts().get(postId) != null && appStateService.getRunningPosts().get(postId).get() > 0) {
-                logger.warn(String.format("Cannot restart, jobs are currently running for post id %s", postId));
-                return;
-            }
-            List<Image> images = appStateService.getPost(postId)
-                    .getImages()
-                    .stream()
-                    .filter(e -> !e.getStatus().equals(Image.Status.COMPLETE))
-                    .collect(Collectors.toList());
-            if (images.isEmpty()) {
-                return;
-            }
-            appStateService.getPost(postId).setStatus(Post.Status.PENDING);
-            logger.info(String.format("Restarting %d jobs for post id %s", images.size(), postId));
-            for (Image image : images) {
-                put(image);
-            }
-        }
-    }
-
-    public void removeScheduled(Image image) {
-        synchronized (appStateService) {
-            image.setStatus(Image.Status.STOPPED);
-            logger.info(String.format("Removing scheduled job for %s", image.getUrl()));
-
-            Iterator<DownloadJob> iterator = downloadQ.iterator();
-            boolean removed = false;
-            while (iterator.hasNext()) {
-                DownloadJob next = iterator.next();
-                if (next.getImage().getPostId().equals(image.getPostId())) {
-                    iterator.remove();
-                    appStateService.doneDownloadJob(image);
-                    logger.info(String.format("Scheduled job for %s is removed", image.getUrl()));
-                    removed = true;
-                    break;
-                }
-            }
-
-            if (!removed) {
-                logger.warn(String.format("Job for %s does not exist", image.getUrl()));
-            }
-
-            image.cleanup();
-        }
-    }
-
-    public void removeRunning(String postId) {
-        logger.info(String.format("Interrupting running jobs for post id %s", postId));
-        executionService.stop(postId);
-    }
-
-
-    public void stop(String postId) {
-        try {
-            synchronized (appStateService) {
-                if (FINISHED.contains(appStateService.getPost(postId).getStatus())) {
-                    return;
-                }
-                notPauseQ = false;
-                appStateService.getPost(postId).setStatus(Post.Status.STOPPED);
-                List<Image> images = appStateService.getPost(postId)
-                        .getImages()
-                        .stream()
-                        .filter(e -> !e.getStatus().equals(Image.Status.COMPLETE))
-                        .collect(Collectors.toList());
-                if (images.isEmpty()) {
-                    return;
-                }
-                logger.info(String.format("Stopping %d jobs for post id %s", images.size(), postId));
-                images.forEach(image -> removeScheduled(image));
-                removeRunning(postId);
-            }
-        } finally {
-            notPauseQ = true;
-        }
-    }
-
-    public int size() {
-        return downloadQ.size();
-    }
-
-    public void stopAll() {
-        synchronized (appStateService) {
-            appStateService.getCurrentPosts().values().stream().map(Post::getPostId).forEach(this::stop);
-        }
-    }
-
-    public void restartAll() throws InterruptedException {
-        synchronized (appStateService) {
-            for (Post post : appStateService.getCurrentPosts().values()) {
-                String postId = post.getPostId();
-                restart(postId);
-            }
-        }
-    }
-}
@@ -1,160 +0,0 @@
-package tn.mnlr.vripper.q;
-
-import net.jodah.failsafe.Failsafe;
-import net.jodah.failsafe.FailsafeException;
-import net.jodah.failsafe.RetryPolicy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import tn.mnlr.vripper.entities.Image;
-import tn.mnlr.vripper.services.AppSettingsService;
-import tn.mnlr.vripper.services.AppStateService;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-@Service
-public class ExecutionService {
-
-    private static final Logger logger = LoggerFactory.getLogger(ExecutionService.class);
-
-    @Autowired
-    private DownloadQ downloadQ;
-
-    @Autowired
-    private AppSettingsService settings;
-
-    @Autowired
-    private AppStateService appStateService;
-
-    private AtomicInteger threadCount = new AtomicInteger();
-
-    private ExecutorService executor = Executors.newFixedThreadPool(10);
-
-    private Thread executionThread;
-
-    private RetryPolicy<Object> retryPolicy;
-
-    private List<DownloadJob> running = Collections.synchronizedList(new ArrayList<>());
-
-    private Map<String, Future<?>> futures = new ConcurrentHashMap<>();
-
-    @PostConstruct
-    private void init() {
-
-        retryPolicy = new RetryPolicy<>()
-                .handleIf(e -> !(e instanceof InterruptedException))
-                .withBackoff(10, 60, ChronoUnit.SECONDS)
-                .withMaxRetries(4)
-                .abortOn(InterruptedException.class)
-                .onFailedAttempt(e -> logger.warn(String.format("#%d tries failed", e.getAttemptCount()), e.getLastFailure()));
-
-        executionThread = new Thread(this::start, "Executor thread");
-        executionThread.start();
-    }
-
-    @PreDestroy
-    private void destroy() throws InterruptedException {
-        logger.info("Shutting down ExecutionService");
-        executionThread.interrupt();
-        executor.shutdown();
-        appStateService.getCurrentPosts().keySet().forEach(p -> {
-            logger.info(String.format("Stopping download jobs for %s", p));
-            this.stop(p);
-        });
-        executor.awaitTermination(10, TimeUnit.SECONDS);
-    }
-
-    public void stop(String postId) {
-        List<DownloadJob> data = running
-                .stream()
-                .filter(e -> e.getImage().getPostId().equals(postId))
-                .peek(e -> e.getImage().setStatus(Image.Status.STOPPED))
-                .collect(Collectors.toList());
-        logger.warn(String.format("Interrupting %d jobs for post id %s", data.size(), postId));
-
-        data.forEach(e -> {
-            futures.get(e.getImage().getUrl()).cancel(true);
-            if(e.getImageFileData().getImageRequest() != null) {
-                e.getImageFileData().getImageRequest().abort();
-            }
-            e.getImage().cleanup();
-        });
-    }
-
-    boolean canRun() {
-        boolean canRun = threadCount.get() < settings.getMaxThreads();
-        if (canRun && downloadQ.isNotPauseQ()) {
-            threadCount.incrementAndGet();
-            return true;
-        }
-        return false;
-    }
-
-    public void start() {
-        while (!Thread.interrupted()) {
-            if (canRun()) {
-                DownloadJob take = null;
-                try {
-                    take = downloadQ.take();
-                    if (take == null) {
-                        continue;
-                    }
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    break;
-                }
-
-                DownloadJob finalTake = take;
-                Runnable task = () -> {
-                    running.add(finalTake);
-
-                    Failsafe.with(retryPolicy)
-                            .onFailure(e -> {
-                                if (e.getFailure() instanceof InterruptedException || (e.getFailure() instanceof FailsafeException && e.getFailure().getCause() instanceof InterruptedException)) {
-                                    logger.info("Job successfully interrupted");
-                                    return;
-                                }
-                                logger.error(String.format("Failed to download %s after %d tries", finalTake.getImage().getUrl(), e.getAttemptCount()), e.getFailure());
-                                finalTake.getImage().setStatus(Image.Status.ERROR);
-                            })
-                            .onComplete(e -> {
-                                appStateService.doneDownloadJob(finalTake.getImage());
-                                logger.info(String.format("Finished downloading %s", finalTake.getImage().getUrl()));
-                                synchronized (threadCount) {
-                                    threadCount.decrementAndGet();
-                                    running.remove(finalTake);
-                                    futures.remove(finalTake.getImage().getUrl());
-                                    threadCount.notify();
-                                }
-                            })
-                            .get(finalTake::call);
-                };
-                logger.info(String.format("Scheduling a job for %s", finalTake.getImage().getUrl()));
-                futures.put(finalTake.getImage().getUrl(), executor.submit(task));
-            } else {
-                synchronized (threadCount) {
-                    try {
-                        threadCount.wait(2_000);
-                    } catch (InterruptedException e) {
-                        Thread.currentThread().interrupt();
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    public int runningCount() {
-        return running.size();
-    }
-}
@@ -1,15 +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 imageUrl;
-    private HttpUriRequest imageRequest;
-}
@@ -1,190 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import tn.mnlr.vripper.exception.ValidationException;
-
-import javax.annotation.PreDestroy;
-import java.nio.file.Files;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.prefs.BackingStoreException;
-import java.util.prefs.Preferences;
-
-@Service
-@Getter
-@Setter
-public class AppSettingsService {
-
-    private static final Logger logger = LoggerFactory.getLogger(AppSettingsService.class);
-
-    private Preferences prefs = Preferences.userNodeForPackage(AppSettingsService.class);
-
-    private final String DOWNLOAD_PATH = "DOWNLOAD_PATH";
-    private final String MAX_THREADS = "MAX_THREADS";
-    private final String AUTO_START = "AUTO_START";
-    private final String V_LOGIN = "VLOGIN";
-    private final String V_USERNAME = "VUSERNAME";
-    private final String V_PASSWORD = "VPASSWORD";
-    private final String V_THANKS = "VTHANKS";
-    private final String DESKTOP_CLIPBOARD = "DESKTOP_CLIPBOARD";
-    private final String FORCE_ORDER = "FORCE_ORDER";
-    private final String SUBFOLDER = "SUBFOLDER";
-    private final String THREADSUBFOLDER = "THREADSUBFOLDER";
-    private final String CLEAR = "CLEAR";
-    private final String DARK_THEME = "DARK_THEME";
-
-    private String downloadPath;
-    private int maxThreads;
-    private boolean autoStart;
-    private boolean vLogin;
-    private String vUsername;
-    private String vPassword;
-    private boolean vThanks;
-    private boolean desktopClipboard;
-    private boolean subLocation;
-    private boolean threadSubLocation;
-    private boolean forceOrder;
-    private boolean clearCompleted;
-    private boolean darkTheme;
-
-    public void setVPassword(String vPassword) {
-        if(vPassword.isEmpty()) {
-            this.vPassword = "";
-        } else {
-            this.vPassword = DigestUtils.md5Hex(vPassword);
-        }
-    }
-
-    public void restore() {
-
-        downloadPath = prefs.get(DOWNLOAD_PATH, System.getProperty("user.dir"));
-        maxThreads = prefs.getInt(MAX_THREADS, 4);
-        autoStart = prefs.getBoolean(AUTO_START, true);
-        vLogin = prefs.getBoolean(V_LOGIN, false);
-        vUsername = prefs.get(V_USERNAME, "");
-        vPassword = prefs.get(V_PASSWORD, "");
-        vThanks = prefs.getBoolean(V_THANKS, false);
-        desktopClipboard = prefs.getBoolean(DESKTOP_CLIPBOARD, false);
-        forceOrder = prefs.getBoolean(FORCE_ORDER, false);
-        subLocation = prefs.getBoolean(SUBFOLDER, false);
-        threadSubLocation = prefs.getBoolean(THREADSUBFOLDER, false);
-        clearCompleted = prefs.getBoolean(CLEAR, false);
-        darkTheme = prefs.getBoolean(DARK_THEME, false);
-    }
-
-    @PreDestroy
-    public void save() {
-
-        prefs.put(DOWNLOAD_PATH, downloadPath);
-        prefs.putInt(MAX_THREADS, maxThreads);
-        prefs.putBoolean(AUTO_START, autoStart);
-        prefs.putBoolean(V_LOGIN, vLogin);
-        prefs.put(V_USERNAME, vUsername);
-        prefs.put(V_PASSWORD, vPassword);
-        prefs.putBoolean(V_THANKS, vThanks);
-        prefs.putBoolean(DESKTOP_CLIPBOARD, desktopClipboard);
-        prefs.putBoolean(FORCE_ORDER, forceOrder);
-        prefs.putBoolean(SUBFOLDER, subLocation);
-        prefs.putBoolean(THREADSUBFOLDER, threadSubLocation);
-        prefs.putBoolean(CLEAR, clearCompleted);
-        prefs.putBoolean(DARK_THEME, darkTheme);
-
-        try {
-            prefs.sync();
-        } catch (BackingStoreException e) {
-            logger.error("Failed to store user settings", e);
-        }
-    }
-
-    public void check(Settings settings) throws ValidationException {
-
-        Path path;
-        try {
-            path = Paths.get(settings.getDownloadPath());
-        } catch (InvalidPathException e) {
-            throw new ValidationException(String.format("%s is invalid", settings.getDownloadPath()));
-        }
-        if (!Files.exists(path)) {
-            throw new ValidationException(String.format("%s does not exist", settings.getDownloadPath()));
-        } else if (!Files.isDirectory(path)) {
-            throw new ValidationException(String.format("%s is not a directory", settings.getDownloadPath()));
-        }
-
-        if (settings.getMaxThreads() < 1 || settings.getMaxThreads() > 8) {
-            throw new ValidationException(String.format("Invalid max concurrent download settings, values must be in [%d,%d]", 1, 8));
-        }
-    }
-
-    public Theme getTheme() {
-        return new Theme(this.darkTheme);
-    }
-
-    public void setTheme(Theme theme) {
-        this.darkTheme = theme.darkTheme;
-        save();
-    }
-
-    @Getter
-    @NoArgsConstructor
-    public static class Theme {
-
-        @JsonProperty("darkTheme")
-        private boolean darkTheme;
-
-        public Theme(boolean darkTheme) {
-            this.darkTheme = darkTheme;
-        }
-    }
-
-    @Getter
-    public static class Settings {
-
-        @JsonProperty("downloadPath")
-        private String downloadPath;
-        @JsonProperty("maxThreads")
-        private int maxThreads;
-        @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;
-
-        public Settings(String downloadPath, int maxThreads, boolean autoStart, boolean vLogin, String vUsername, String vPassword, boolean vThanks, boolean desktopClipboard, boolean forceOrder, boolean subLocation, boolean threadSubLocation, boolean clearCompleted) {
-            this.downloadPath = downloadPath;
-            this.maxThreads = maxThreads;
-            this.autoStart = autoStart;
-            this.vLogin = vLogin;
-            this.vUsername = vUsername;
-            this.vPassword = vPassword;
-            this.vThanks = vThanks;
-            this.desktopClipboard = desktopClipboard;
-            this.forceOrder = forceOrder;
-            this.subLocation = subLocation;
-            this.threadSubLocation = threadSubLocation;
-            this.clearCompleted = clearCompleted;
-        }
-    }
-}
@@ -1,148 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import io.reactivex.disposables.Disposable;
-import io.reactivex.processors.PublishProcessor;
-import lombok.Getter;
-import lombok.Setter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import tn.mnlr.vripper.entities.Image;
-import tn.mnlr.vripper.entities.Post;
-import tn.mnlr.vripper.q.DownloadJob;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-@Service
-@Getter
-public class AppStateService {
-
-    private static final Logger logger = LoggerFactory.getLogger(AppStateService.class);
-
-    private Map<String, Image> currentImages = new ConcurrentHashMap<>();
-
-    private Map<String, Post> currentPosts = new ConcurrentHashMap<>();
-
-    private Map<String, AtomicInteger> runningPosts = new ConcurrentHashMap<>();
-
-    private PublishProcessor<Image> liveImageUpdates = PublishProcessor.create();
-
-    private PublishProcessor<Post> livePostsState = PublishProcessor.create();
-
-    @Autowired
-    private PersistenceService persistenceService;
-
-    @Autowired
-    private AppSettingsService appSettingsService;
-
-    private Disposable subscription;
-
-    public void onImageUpdate(Image imageState) {
-
-        persistenceService.getProcessor().onNext(currentPosts);
-
-        liveImageUpdates.onNext(imageState);
-        if (imageState.isCompleted()) {
-
-            Post postState = currentPosts.get(imageState.getPostId());
-            postState.increase();
-        }
-    }
-
-    public Post getPost(String postId) {
-        return currentPosts.get(postId);
-    }
-
-    public synchronized void newDownloadJob(DownloadJob downloadJob) {
-        String postId = downloadJob.getImage().getPostId();
-        checkKeyRunningPosts(postId);
-        runningPosts.get(postId).incrementAndGet();
-    }
-
-    public synchronized void postDownloadingUpdate(String postId) {
-        Post post = currentPosts.get(postId);
-        if (!post.getStatus().equals(Post.Status.DOWNLOADING)) {
-            post.setStatus(Post.Status.DOWNLOADING);
-            livePostsState.onNext(post);
-        }
-    }
-
-    public void doneDownloadJob(Image image) {
-        String postId = image.getPostId();
-        int i = runningPosts.get(postId).decrementAndGet();
-        Post post = currentPosts.get(postId);
-        if(image.getStatus().equals(Image.Status.ERROR)) {
-            post.setStatus(Post.Status.PARTIAL);
-        }
-        if (i == 0) {
-            if (post.getImages().stream().map(Image::getStatus).filter(e -> e.equals(Image.Status.ERROR)).count() > 0) {
-                post.setStatus(Post.Status.ERROR);
-            } else {
-                if (!Post.Status.STOPPED.equals(post.getStatus())) {
-                    post.setStatus(Post.Status.COMPLETE);
-                    if (appSettingsService.isClearCompleted()) {
-                        remove(image.getPostId());
-                    }
-                }
-            }
-        }
-    }
-
-    private synchronized void checkKeyRunningPosts(String key) {
-        if (!runningPosts.containsKey(key)) {
-            runningPosts.put(key, new AtomicInteger(0));
-        }
-    }
-
-    public synchronized void remove(String postId) {
-        currentPosts.get(postId).setRemoved(true);
-        runningPosts.remove(postId);
-        currentPosts.remove(postId);
-        Iterator<Map.Entry<String, Image>> iterator = currentImages.entrySet().iterator();
-        while (iterator.hasNext()) {
-            Map.Entry<String, Image> entry = iterator.next();
-            if(entry.getValue().getPostId().equals(postId)) {
-                iterator.remove();
-            }
-        }
-        persistenceService.getProcessor().onNext(currentPosts);
-    }
-
-    public synchronized List<String> clearAll() {
-        List<String> toRemove = this.currentPosts
-                .values()
-                .stream()
-                .filter(e -> e.getStatus().equals(Post.Status.COMPLETE) && e.getDone().get() >= e.getTotal())
-                .map(Post::getPostId)
-                .collect(Collectors.toList());
-        toRemove.forEach(this::remove);
-        return toRemove;
-    }
-
-    public synchronized List<String> removeAll() {
-        List<String> toRemove = this.currentPosts
-                .values()
-                .stream()
-                .map(Post::getPostId)
-                .collect(Collectors.toList());
-        toRemove.forEach(this::remove);
-        return toRemove;
-    }
-
-
-    @Getter
-    public static class CachedThread {
-
-        private Map<String, Post> posts = new ConcurrentHashMap<>();
-        private AtomicInteger parsed = new AtomicInteger(0);
-
-        @Setter
-        private int total = 0;
-    }
-}
@@ -1,64 +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.DefaultHttpRequestRetryHandler;
-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.stereotype.Service;
-
-import java.net.URI;
-
-@Service
-public class ConnectionManager {
-
-    private ConnectionManager() {
-        buildConnectionPool();
-    }
-
-    private PoolingHttpClientConnectionManager pcm;
-
-    private RequestConfig rc = RequestConfig.custom()
-            .setConnectionRequestTimeout(10_000)
-            .setConnectTimeout(10_000)
-            .setSocketTimeout(10_000)
-            .setCookieSpec(CookieSpecs.STANDARD)
-            .build();
-
-    private void buildConnectionPool() {
-
-        pcm = new PoolingHttpClientConnectionManager();
-        pcm.setMaxTotal(200);
-        pcm.setDefaultMaxPerRoute(10);
-    }
-
-    public HttpClientBuilder getClient() {
-        return HttpClients.custom()
-                .setConnectionManager(pcm)
-                .setRedirectStrategy(new LaxRedirectStrategy())
-                .setRetryHandler(new DefaultHttpRequestRetryHandler(5, true))
-                .setDefaultRequestConfig(rc);
-    }
-
-    public HttpGet buildHttpGet(String url) {
-        HttpGet httpGet = new HttpGet(url);
-        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);
-        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,89 @@
+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.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 tn.mnlr.vripper.download.DownloadJob;
+
+import java.net.URI;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+@Service
+@EnableScheduling
+public class ConnectionService {
+
+    private ConnectionService() {
+        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, 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);
+            }
+        }
+    }
+}
@@ -0,0 +1,256 @@
+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.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 java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+@Service
+@Transactional
+@Slf4j
+public class DataService {
+
+    private final IPostRepository postRepository;
+    private final IImageRepository imageRepository;
+    private final IQueuedRepository queuedRepository;
+    private final IMetadataRepository metadataRepository;
+    private final SettingsService settingsService;
+
+    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();
+    }
+
+    @Autowired
+    public DataService(IPostRepository postRepository, IImageRepository imageRepository, IQueuedRepository queuedRepository, IMetadataRepository metadataRepository, SettingsService settingsService) {
+        this.postRepository = postRepository;
+        this.imageRepository = imageRepository;
+        this.queuedRepository = queuedRepository;
+        this.metadataRepository = metadataRepository;
+        this.settingsService = settingsService;
+    }
+
+    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) {
+        return postRepository.existByPostId(postId);
+    }
+
+    public void newPost(Post post, Collection<Image> images) {
+        save(post);
+        images.forEach(image -> {
+            image.setPostIdRef(post.getId());
+            save(image);
+        });
+    }
+
+    public void setDownloadingToStopped() {
+        postRepository.setDownloadingToStopped();
+    }
+
+    public synchronized void afterJobFinish(Image image, Post post) {
+        if (image.getStatus().equals(Status.COMPLETE)) {
+            post.setDone(post.getDone() + 1);
+            updatePostDone(post.getDone(), post.getId());
+        } else if (image.getStatus().equals(Status.ERROR)) {
+            post.setStatus(Status.PARTIAL);
+            updatePostStatus(post.getStatus(), post.getId());
+        }
+    }
+
+    private void updatePostDone(int done, Long id) {
+        livePostsState.onNext(id);
+        postRepository.updateDone(done, id);
+    }
+
+    public void finishPost(@NonNull Post post) {
+        if (!imageRepository.findByPostIdAndIsError(post.getPostId()).isEmpty()) {
+            post.setStatus(Status.ERROR);
+            updatePostStatus(post.getStatus(), post.getId());
+        } else {
+            if (post.getDone() < post.getTotal()) {
+                post.setStatus(Status.STOPPED);
+                updatePostStatus(post.getStatus(), post.getId());
+            } else {
+                post.setStatus(Status.COMPLETE);
+                updatePostStatus(post.getStatus(), post.getId());
+                if (settingsService.getSettings().getClearCompleted()) {
+                    remove(post.getPostId());
+                }
+            }
+        }
+    }
+
+    private void remove(@NonNull final String postId) {
+        imageRepository.deleteAllByPostId(postId);
+        metadataRepository.deleteByPostId(postId);
+        postRepository.deleteByPostId(postId);
+        postRemove.onNext(postId);
+    }
+
+    public void newQueueLink(@NonNull final Queued queued) {
+        save(queued);
+    }
+
+    public void removeQueueLink(@NonNull final String threadId) {
+        queuedRepository.deleteByThreadId(threadId);
+        queueRemove.onNext(threadId);
+    }
+
+    public List<String> clearCompleted() {
+        List<String> completed = postRepository.findCompleted();
+        completed.forEach(this::remove);
+        return completed;
+    }
+
+    public void removeAll(final List<String> postIds) {
+        if (postIds != null && !postIds.isEmpty()) {
+            for (String postId : postIds) {
+                remove(postId);
+            }
+        } else {
+            postRepository.findAll().forEach(p -> remove(p.getPostId()));
+        }
+    }
+
+    public List<Image> findByPostIdAndIsNotCompleted(@NonNull String postId) {
+        return imageRepository.findByPostIdAndIsNotCompleted(postId);
+
+    }
+
+    public long countErrorImages() {
+        return imageRepository.countError();
+    }
+
+    public List<Image> findImagesByPostId(String postId) {
+        return imageRepository.findByPostId(postId);
+    }
+
+    public Iterable<Post> findAllPosts() {
+        return postRepository.findAll();
+    }
+
+    public Optional<Post> findPostByPostId(String postId) {
+        return postRepository.findByPostId(postId);
+    }
+
+    public void stopImagesByPostIdAndIsNotCompleted(String postId) {
+        imageRepository.stopByPostIdAndIsNotCompleted(postId);
+    }
+
+    public Optional<Queued> findQueuedByThreadId(String threadId) {
+        return queuedRepository.findByThreadId(threadId);
+    }
+
+    public Iterable<Queued> findAllQueued() {
+        return queuedRepository.findAll();
+    }
+
+    public Optional<Post> findPostById(Long aLong) {
+        return postRepository.findById(aLong);
+    }
+
+    public Optional<Image> findImageById(Long aLong) {
+        return imageRepository.findById(aLong);
+    }
+
+    public Optional<Queued> findQueuedById(Long aLong) {
+        return queuedRepository.findById(aLong);
+    }
+
+    public void setMetadata(Post post, Metadata metadata) {
+        metadata.setPostIdRef(post.getId());
+        metadataRepository.save(metadata);
+        livePostsState.onNext(post.getId());
+    }
+
+    public Optional<Metadata> findMetadataByPostId(String postId) {
+        return metadataRepository.findByPostId(postId);
+    }
+
+    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) {
+        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);
+    }
+}
@@ -14,10 +14,11 @@ public class DownloadSpeedService {

    private AtomicLong read = new AtomicLong(0);

+    @Getter
    private long currentValue;

    @Getter
-    private PublishProcessor<Long> readBytesPerSecond = PublishProcessor.create();
+    private final PublishProcessor<Long> readBytesPerSecond = PublishProcessor.create();

    private boolean allowWrite = false;

@@ -1,39 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import lombok.Getter;
-
-import java.util.Objects;
-
-@Getter
-public class GlobalState {
-
-    private final String type = "globalState";
-    private long running;
-    private long queued;
-    private long remaining;
-    private long error;
-
-    public GlobalState(long running, long queued, long remaining, long error) {
-        this.running = running;
-        this.queued = queued;
-        this.remaining = remaining;
-        this.error = error;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        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 &&
-                Objects.equals(type, that.type);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(type, running, queued, remaining, error);
-    }
-}
@@ -6,44 +6,37 @@ 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.entities.Image;
-import tn.mnlr.vripper.q.DownloadQ;
-import tn.mnlr.vripper.q.ExecutionService;
+import tn.mnlr.vripper.download.DownloadService;
+import tn.mnlr.vripper.download.PendingQueue;
+import tn.mnlr.vripper.services.domain.GlobalState;

@Service
@EnableScheduling
 public class GlobalStateService {

-    @Autowired
-    private DownloadQ downloadQ;
-
-    @Autowired
-    private ExecutionService executionService;
-
-    @Autowired
-    private AppStateService appStateService;
+    private final PendingQueue pendingQueue;
+    private final DownloadService downloadService;
+    private final DataService dataService;

    @Getter
    private GlobalState currentState;

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

    @Scheduled(fixedDelay = 3000)
    private void interval() {
        GlobalState newGlobalState = new GlobalState(
-                executionService.runningCount(),
-                downloadQ.size(),
-                appStateService.getCurrentImages()
-                        .values()
-                        .stream()
-                        .filter(e -> e.getTotal() == 0 || e.getTotal() != e.getCurrent().get())
-                        .count(),
-                appStateService.getCurrentImages()
-                        .values()
-                        .stream()
-                        .filter(e -> e.getStatus().equals(Image.Status.ERROR))
-                        .count());
+                downloadService.runningCount(),
+                pendingQueue.size(),
+                dataService.countErrorImages());
        if (!newGlobalState.equals(currentState)) {
            currentState = newGlobalState;
            liveGlobalState.onNext(currentState);
@@ -0,0 +1,105 @@
+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;
+    }
+
+    @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 String name;
+        private String url;
+
+        public NameUrl(String name, String url) {
+            this.name = name;
+            this.url = url;
+        }
+    }
+
+
+    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;
+    }
+}
@@ -11,10 +11,6 @@ import tn.mnlr.vripper.exception.HtmlProcessorException;
@Service
 public class HtmlProcessorService {

-    private HtmlProcessorService() {
-
-    }
-
    public Document clean(String htmlContent) throws HtmlProcessorException {
        try {
            TagNode clean = new HtmlCleaner().clean(htmlContent);
@@ -0,0 +1,165 @@
+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;
+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.stereotype.Service;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import tn.mnlr.vripper.VripperApplication;
+import tn.mnlr.vripper.exception.DownloadException;
+import tn.mnlr.vripper.exception.PostParseException;
+import tn.mnlr.vripper.jpa.domain.Metadata;
+import tn.mnlr.vripper.jpa.domain.Post;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class MetadataService {
+
+    @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);
+        }
+    }
+
+    private static final List<String> dictionary = Arrays.asList("download", "link", "rapidgator", "filefactory", "filefox");
+
+    private final LoadingCache<Key, Metadata> cache;
+    private final ConnectionService cm;
+    private final VGAuthService VGAuthService;
+    private final HtmlProcessorService htmlProcessorService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public MetadataService(ConnectionService cm, VGAuthService VGAuthService, HtmlProcessorService htmlProcessorService, XpathService xpathService) {
+        this.cm = cm;
+        this.VGAuthService = VGAuthService;
+        this.htmlProcessorService = htmlProcessorService;
+        this.xpathService = xpathService;
+
+        CacheLoader<Key, Metadata> loader = new CacheLoader<>() {
+            @Override
+            public Metadata load(@NonNull Key key) {
+                return fetchMetadata(key);
+            }
+        };
+        cache = CacheBuilder.newBuilder()
+                .expireAfterWrite(30, TimeUnit.MINUTES)
+                .build(loader);
+    }
+
+    public Metadata get(Post post) throws ExecutionException {
+        Metadata metadata = new Metadata();
+        Metadata cachedMetadata = cache.get(new Key(post.getPostId(), post.getThreadId(), post.getUrl()));
+        metadata.setPostedBy(cachedMetadata.getPostedBy());
+        metadata.setResolvedNames(List.copyOf(cachedMetadata.getResolvedNames()));
+        return metadata;
+    }
+
+    private Metadata fetchMetadata(Key key) {
+        HttpGet httpGet = cm.buildHttpGet(key.getUrl(), null);
+        Metadata metadata = new Metadata();
+        Failsafe.with(VripperApplication.retryPolicy)
+                .onFailure(e -> {
+                    if (e.getFailure() instanceof InterruptedException || e.getFailure().getCause() instanceof InterruptedException) {
+                        log.debug("Fetching interrupted");
+                        return;
+                    }
+                    log.error(String.format("Error occurred when getting post metadata, postId %s", key.getPostId()), e.getFailure());
+                })
+                .run(() -> {
+                    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 {
+                            if (Thread.interrupted()) {
+                                return;
+                            }
+                            Document document = htmlProcessorService.clean(EntityUtils.toString(response.getEntity()));
+                            Node postNode = xpathService.getAsNode(document, String.format("//li[@id='post_%s']/div[contains(@class, 'postdetails')]", key.getPostId()));
+                            String postedBy = xpathService.getAsNode(postNode, "./div[contains(@class, 'userinfo')]//a[contains(@class, 'username')]//font").getTextContent().trim();
+                            metadata.setPostedBy(postedBy);
+
+                            Node node = xpathService.getAsNode(document, String.format("//div[@id='post_message_%s']", key.getPostId()));
+                            metadata.setResolvedNames(findTitleInContent(node));
+                        } catch (Exception e) {
+                            throw new PostParseException(String.format("Failed to parse thread %s, post %s", key.getThreadId(), key.getPostId()), e);
+                        } finally {
+                            EntityUtils.consumeQuietly(response.getEntity());
+                        }
+                    }
+                });
+        return metadata;
+    }
+
+    private List<String> findTitleInContent(Node node) {
+        List<String> altTitle = new ArrayList<>();
+        findTitle(node, altTitle, new AtomicBoolean(true));
+        return altTitle.stream().distinct().collect(Collectors.toList());
+    }
+
+    private void findTitle(Node node, List<String> altTitle, AtomicBoolean keepGoing) {
+        if (!keepGoing.get()) {
+            return;
+        }
+        if (node.getNodeName().equals("a") || node.getNodeName().equals("img")) {
+            keepGoing.set(false);
+            return;
+        }
+        if (node.getNodeType() == Node.ELEMENT_NODE) {
+            for (int i = 0; i < node.getChildNodes().getLength(); i++) {
+                Node item = node.getChildNodes().item(i);
+                findTitle(item, altTitle, keepGoing);
+                if (!keepGoing.get()) {
+                    return;
+                }
+            }
+
+        } else if (node.getNodeType() == Node.TEXT_NODE) {
+            String text = node.getTextContent().trim();
+            if (!text.isBlank() && dictionary.stream().noneMatch(e -> text.toLowerCase().contains(e.toLowerCase()))) {
+                altTitle.add(text);
+            }
+        }
+    }
+}
@@ -1,53 +1,135 @@
 package tn.mnlr.vripper.services;

-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import tn.mnlr.vripper.entities.Post;
+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.Objects;
+import java.util.stream.Collectors;

@Service
+@Slf4j
 public class PathService {

-    private static final Logger logger = LoggerFactory.getLogger(PathService.class);
+    public static final int MAX_ATTEMPTS = 24;
+    private final SettingsService settingsService;
+    private final DataService dataService;
+
+    private final ThreadPoolService threadPoolService;

    @Autowired
-    private AppStateService appStateService;
-
-    @Autowired
-    private AppSettingsService appSettingsService;
-
-    public final File getDownloadDestinationFolder(String postId) {
-        Post post = appStateService.getCurrentPosts().get(postId);
-        String postTitle = post.getTitle();
-        String threadTitle = post.getThreadTitle();
-        File sourceFolder = appSettingsService.isSubLocation() ? new File(appSettingsService.getDownloadPath(), sanitize(post.getForum())) : new File(appSettingsService.getDownloadPath());
-        sourceFolder = appSettingsService.isThreadSubLocation() ? new File(sourceFolder, threadTitle) : sourceFolder;
-        return new File(sourceFolder, sanitize(postTitle + "_" + postId));
+    public PathService(SettingsService settingsService, DataService dataService, ThreadPoolService threadPoolService) {
+        this.settingsService = settingsService;
+        this.dataService = dataService;
+        this.threadPoolService = threadPoolService;
    }

-    public final String sanitize(final String folderName) {
+    public final File getDownloadDestinationFolder(Post post) {
+        return _getDownloadDestinationFolder(post.getForum(), post.getThreadTitle(), post.getPostFolderName(), post.getPostId());
+    }
+
+    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;
+    }
+
+    private File _getDownloadDestinationFolder(@NonNull String forum, @NonNull String threadTitle, @NonNull String title, @NonNull String postId) {
+        File sourceFolder = _getRootFolder(forum, threadTitle);
+        return new File(sourceFolder, title);
+    }
+
+    private File _createDownloadDestinationFolder(@NonNull String forum, @NonNull String threadTitle, @NonNull String title, @NonNull String postId) {
+        File sourceFolder = _getRootFolder(forum, threadTitle);
+        return new File(sourceFolder, settingsService.getSettings().getAppendPostId() ? title + "_" + postId : title);
+    }
+
+    public final void createDefaultPostFolder(Post post) {
+        File sourceFolder = _createDownloadDestinationFolder(post.getForum(), post.getThreadTitle(), sanitize(post.getTitle()), post.getPostId());
+        File destFolder = makeDirs(sourceFolder);
+        post.setPostFolderName(destFolder.getName());
+        dataService.updatePostFolderName(post.getPostFolderName(), post.getId());
+    }
+
+    public final void rename(@NonNull String postId, @NonNull String altName) {
+        Post post = dataService.findPostByPostId(postId).orElseThrow();
+        threadPoolService.getGeneralExecutor().submit(() -> {
+            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), postId));
+            File currentDesFolder = getDownloadDestinationFolder(post);
+            post.setPostFolderName(newDestFolder.getName());
+            dataService.updatePostFolderName(post.getPostFolderName(), post.getId());
+
+            List<File> files = Arrays.stream(Objects.requireNonNull(currentDesFolder.listFiles())).filter(e -> !e.getName().endsWith(".tmp")).collect(Collectors.toList());
+            for (File f : files) {
+                try {
+                    Files.move(f.toPath(), Paths.get(newDestFolder.toString(), f.toPath().getFileName().toString()), StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
+                } catch (IOException e) {
+                    log.error(String.format("Failed to move files from %s to %s", currentDesFolder.toString(), newDestFolder.toString()), e);
+                    return;
+                }
+            }
+
+            int attempts = 0;
+            while (currentDesFolder.exists() && attempts <= MAX_ATTEMPTS) {
+                attempts++;
+                if (!currentDesFolder.delete()) {
+                    log.warn(String.format("Failed to remove %s", currentDesFolder.toString()));
+                }
+                try {
+                    Thread.sleep(5_000);
+                } catch (InterruptedException ignored) {
+                }
+            }
+            if (attempts > MAX_ATTEMPTS) {
+                log.error(String.format("Failed to rename post %s", postId));
+            }
+        });
+    }
+
+    private File makeDirs(@NonNull final File sourceFolder) {
+        int counter = 1;
+        File folder = sourceFolder;
+
+        while (folder.exists()) {
+            folder = new File(sourceFolder.toString() + '.' + counter++);
+        }
+
+        if (!folder.mkdirs()) {
+            throw new RuntimeException(String.format("Failed to create the folder %s", sourceFolder.toString()));
+        }
+
+        return folder;
+    }
+
+    private String sanitize(final String folderName) {
        String sanitizedFolderName = folderName.replaceAll("\\.|\\\\|/|\\||:|\\?|\\*|\"|<|>|\\p{Cntrl}", "_");
-        logger.debug(String.format("%s sanitized to %s", folderName, sanitizedFolderName));
+        log.debug(String.format("%s sanitized to %s", folderName, sanitizedFolderName));
        return sanitizedFolderName;
    }

    /**
     * Will sanitize the image name and remove extension
     *
-     * @param imageName
-     * @return
+     * @param imageName path string
+     * @return Sanitized local path string
     */
    public final String formatImageFileName(String imageName) {
-        int extensionIndex = imageName.lastIndexOf('.');
-        String fileName;
-        if (extensionIndex != -1) {
-            fileName = imageName.substring(0, extensionIndex);
-        } else {
-            fileName = imageName;
-        }
-        return sanitize(fileName);
+        return sanitize(imageName);
    }
 }
@@ -1,157 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.processors.PublishProcessor;
-import lombok.Getter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import tn.mnlr.vripper.SpringContext;
-import tn.mnlr.vripper.VripperApplication;
-import tn.mnlr.vripper.entities.Image;
-import tn.mnlr.vripper.entities.Post;
-import tn.mnlr.vripper.entities.mixin.persistance.ImagePersistanceMixin;
-import tn.mnlr.vripper.entities.mixin.persistance.PostPersistanceMixin;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-@Service
-public class PersistenceService {
-
-    private static final Logger logger = LoggerFactory.getLogger(PersistenceService.class);
-
-    @Autowired
-    private AppStateService stateService;
-
-    @Autowired
-    private VripperApplication.AppCommandRunner appCommandRunner;
-
-    private ObjectMapper om;
-
-    private Disposable subscription;
-
-    @Getter
-    private PublishProcessor<Map<String, Post>> processor = PublishProcessor.create();
-
-    private PersistenceService() {
-        om = new ObjectMapper();
-        om.addMixIn(Image.class, ImagePersistanceMixin.class);
-        om.addMixIn(Post.class, PostPersistanceMixin.class);
-        subscription = processor
-                .onBackpressureLatest()
-                .buffer(10, TimeUnit.SECONDS)
-                .filter(e -> !e.isEmpty())
-                .map(e -> e.get(0))
-                .doOnNext(this::persist)
-                .subscribe();
-    }
-
-    @PostConstruct
-    public void init() {
-        File dataFile = new File(appCommandRunner.getDataPath());
-        if (!dataFile.exists()) {
-            try {
-                dataFile.getParentFile().mkdirs();
-                if (!dataFile.getParentFile().isDirectory() || !dataFile.getParentFile().canWrite()) {
-                    logger.error(String.format("Unable to write in %s", dataFile.getParent()));
-                    SpringContext.close();
-                }
-
-                if (dataFile.createNewFile()) {
-                    logger.info("Data file successfully created");
-                    try (FileWriter fw = new FileWriter(dataFile)) {
-                        fw.write("{}");
-                    }
-                } else {
-                    logger.info("Data file already exists");
-                }
-            } catch (IOException e) {
-                logger.error("Unable to create data file", e);
-                SpringContext.close();
-            }
-        }
-    }
-
-    @PreDestroy
-    public void preDestroy() {
-        this.subscription.dispose();
-        logger.info(String.format("Destroying %s", PersistenceService.class.getSimpleName()));
-        logger.info("Persisting data before destroying");
-        this.persist(stateService.getCurrentPosts());
-    }
-
-    public void persist(Map<String, Post> currentPosts) {
-
-        try (PrintWriter out = new PrintWriter(appCommandRunner.getDataPath(), "UTF-8")) {
-            out.print(om.writeValueAsString(currentPosts));
-        } catch (IOException e) {
-            logger.error("Failed to persist app state", e);
-        }
-    }
-
-    private Map<String, Post> read(String content) {
-
-        try {
-            return om.readValue(content, om.getTypeFactory().constructMapType(HashMap.class, String.class, Post.class));
-        } catch (IOException e) {
-            logger.error("Failed to read app state", e);
-            long timestamp = new Date().getTime();
-            logger.warn(String.format("trying to rename old data file from %s to %s", appCommandRunner.getDataPath(), appCommandRunner.getDataPath() + "." + timestamp + ".old"));
-            try {
-                Files.move(new File(appCommandRunner.getDataPath()).toPath(), new File(appCommandRunner.getDataPath() + "." + timestamp + ".old").toPath());
-            } catch (IOException ex) {
-                logger.error(String.format("Failed to rename %s to %s", appCommandRunner.getDataPath(), appCommandRunner.getDataPath() + ".old"));
-                SpringContext.close();
-            }
-        }
-
-        return new HashMap<>();
-    }
-
-    public void restore() {
-
-        String jsonContent = null;
-        try {
-            jsonContent = Files.readAllLines(Paths.get(appCommandRunner.getDataPath()), StandardCharsets.UTF_8).stream().collect(Collectors.joining());
-        } catch (Exception e) {
-            logger.error("data file cannot be read, previous state cannot be restored", e);
-            SpringContext.close();
-        }
-
-        Map<String, Post> read = read(jsonContent);
-
-        stateService.getCurrentPosts().clear();
-        stateService.getCurrentPosts().putAll(read);
-        stateService.getCurrentPosts().values().forEach(p -> {
-            if(Arrays.asList(Post.Status.DOWNLOADING, Post.Status.PARTIAL).contains(p.getStatus())) {
-                p.setStatus(Post.Status.STOPPED);
-            }
-        });
-
-        stateService.getCurrentImages().clear();
-        read.values().stream().flatMap(e -> e.getImages().stream()).forEach(e -> {
-            e.setAppStateService(stateService);
-            stateService.getCurrentImages().put(e.getUrl(), e);
-        });
-
-        read.values().forEach(e -> {
-            e.setAppStateService(stateService);
-        });
-    }
-}
@@ -1,434 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import io.reactivex.processors.PublishProcessor;
-import lombok.Getter;
-import net.jodah.failsafe.Failsafe;
-import net.jodah.failsafe.RetryPolicy;
-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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-import tn.mnlr.vripper.entities.Image;
-import tn.mnlr.vripper.entities.Post;
-import tn.mnlr.vripper.exception.DownloadException;
-import tn.mnlr.vripper.exception.PostParseException;
-import tn.mnlr.vripper.host.Host;
-import tn.mnlr.vripper.q.DownloadQ;
-
-import javax.annotation.PostConstruct;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
-
-@Service
-public class PostParser {
-
-    private static final Logger logger = LoggerFactory.getLogger(PostParser.class);
-
-    private static final String VR_API = "https://vipergirls.to/vr.php";
-
-    @Autowired
-    private ConnectionManager cm;
-
-    SAXParserFactory factory = SAXParserFactory.newInstance();
-
-    @Autowired
-    private List<Host> supportedHosts;
-
-    @Autowired
-    private AppStateService appStateService;
-
-    @Autowired
-    private VipergirlsAuthService authService;
-
-    @Autowired
-    private AppSettingsService appSettingsService;
-
-    @Autowired
-    private DownloadQ downloadQ;
-
-    @Autowired
-    private VipergirlsAuthService vipergirlsAuthService;
-
-    private RetryPolicy<Object> retryPolicy;
-
-    public PostParser() throws ParserConfigurationException, SAXException {
-    }
-
-    @PostConstruct
-    private void init() {
-
-        retryPolicy = new RetryPolicy<>()
-                .handleIf(e -> e instanceof IOException)
-                .withBackoff(2, 20, ChronoUnit.SECONDS)
-                .withMaxRetries(4)
-                .abortOn(InterruptedException.class)
-                .onFailedAttempt(e -> logger.warn(String.format("#%d tries failed", e.getAttemptCount()), e.getLastFailure()));
-    }
-
-    public void addPost(String postId, String threadId) throws PostParseException {
-
-        if (appStateService.getCurrentPosts().containsKey(postId)) {
-            logger.info(String.format("skipping %s, already loaded", postId));
-            return;
-        }
-
-        VRPostParser vrPostParser = new VRPostParser(threadId, postId);
-        Post post = vrPostParser.parse();
-
-        post.setAppStateService(appStateService);
-        post.getImages().forEach(e -> e.setAppStateService(appStateService));
-        authService.leaveThanks(post.getUrl(), post.getPostId());
-        if (appSettingsService.isAutoStart()) {
-            logger.info("Auto start downloads option is enabled");
-            logger.info(String.format("Starting to enqueue %d jobs for %s", post.getImages().size(), post.getUrl()));
-            try {
-                downloadQ.enqueue(post);
-            } catch (InterruptedException e) {
-                logger.warn("Interruption was caught");
-                Thread.currentThread().interrupt();
-                return;
-            }
-            logger.info(String.format("Done enqueuing jobs for %s", post.getUrl()));
-        } else {
-            logger.info("Auto start downloads option is disabled");
-        }
-    }
-
-    @Getter
-    public static abstract class VRPostState {
-        private final String threadId;
-
-        protected VRPostState(String threadId) {
-            this.threadId = threadId;
-        }
-    }
-
-    @Getter
-    public static class VRPostParse extends VRPostState {
-
-        private final String type = "postParse";
-        private String postId;
-        private int number;
-        private String title;
-        private int imageCount;
-        private String url;
-        private List<String> previews;
-
-
-        public VRPostParse(String threadId, String postId, int number, String title, int imageCount, String url, List<String> previews) {
-            super(threadId);
-            this.postId = postId;
-            this.number = number;
-            this.title = title;
-            this.imageCount = imageCount;
-            this.previews = previews;
-            this.url = url;
-        }
-    }
-
-    @Getter
-    public static class VRThreadParseState extends VRPostState {
-
-        private final String type = "threadParseState";
-        private final String state;
-
-        public VRThreadParseState(String threadId, String state) {
-            super(threadId);
-            this.state = state;
-        }
-    }
-
-    public class VRThreadParser {
-
-        @Getter
-        private final PublishProcessor<VRPostState> postPublishProcessor = PublishProcessor.create();
-
-        private String threadId;
-
-        public VRThreadParser(String threadId) {
-            this.threadId = threadId;
-        }
-
-        public Void parse() throws PostParseException {
-
-            logger.info(String.format("Parsing thread %s", threadId));
-            HttpGet httpGet;
-            try {
-                URIBuilder uriBuilder = new URIBuilder(VR_API);
-                uriBuilder.setParameter("t", threadId);
-                httpGet = cm.buildHttpGet(uriBuilder.build());
-                if (vipergirlsAuthService.getCookies() != null) {
-                    httpGet.addHeader("Cookie", vipergirlsAuthService.getCookies());
-                }
-            } catch (URISyntaxException e) {
-                throw new PostParseException(e);
-            }
-
-            VRThreadHandler handler = new VRThreadHandler(threadId, postPublishProcessor);
-            HttpClient connection = cm.getClient().build();
-            AtomicReference<Throwable> thr = new AtomicReference<>();
-            logger.info(String.format("Requesting %s", httpGet));
-            Failsafe.with(retryPolicy)
-                    .onFailure(e -> thr.set(e.getFailure()))
-                    .get(() -> {
-                        try (CloseableHttpResponse response = (CloseableHttpResponse) connection.execute(httpGet)) {
-                            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);
-                            } catch (Exception e) {
-                                throw new PostParseException(String.format("Failed to parse thread %s", threadId), e);
-                            } finally {
-                                EntityUtils.consumeQuietly(response.getEntity());
-                            }
-                        }
-                        return null;
-                    });
-            if (thr.get() != null) {
-                logger.error(String.format("parsing failed for thread %s", threadId), thr.get());
-                throw new PostParseException(thr.get());
-            }
-            return null;
-        }
-    }
-
-    private class VRThreadHandler extends DefaultHandler {
-
-        private final String threadId;
-        private final PublishProcessor<VRPostState> vrPostPublishProcessor;
-        private String threadTitle;
-        private String postId;
-        private String postTitle;
-        private int imageCount;
-        private int postCounter;
-        private int previewCounter = 0;
-        private List<String> previews = new ArrayList<>();
-
-        public VRThreadHandler(String threadId, PublishProcessor<VRPostState> vrPostPublishProcessor) {
-            this.vrPostPublishProcessor = vrPostPublishProcessor;
-            this.threadId = threadId;
-        }
-
-        @Override
-        public void startDocument() {
-            vrPostPublishProcessor.onNext(new VRThreadParseState(threadId, "START"));
-        }
-
-        @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":
-                    if (previewCounter++ < 4) {
-                        String thumbUrl = Optional.ofNullable(attributes.getValue("thumb_url")).map(String::trim).orElse(null);
-                        if (thumbUrl != null) {
-                            previews.add(thumbUrl);
-                        }
-                    }
-                    break;
-            }
-        }
-
-        @Override
-        public void endElement(String uri, String localName, String qName) {
-            switch (qName.toLowerCase()) {
-                case "post":
-                    if (imageCount != 0) {
-                        vrPostPublishProcessor.onNext(new VRPostParse(
-                                threadId,
-                                postId,
-                                postCounter,
-                                postTitle,
-                                imageCount,
-                                String.format("https://vipergirls.to/threads/%s/?p=%s&viewfull=1#post%s", threadId, postId, postId),
-                                previews
-                        ));
-                    }
-                    previewCounter = 0;
-                    previews = new ArrayList<>();
-                    break;
-            }
-        }
-
-        @Override
-        public void endDocument() {
-            vrPostPublishProcessor.onNext(new VRThreadParseState(threadId, "END"));
-            vrPostPublishProcessor.onComplete();
-        }
-    }
-
-    public class VRPostParser {
-
-        private String threadId;
-        private String postId;
-
-        public VRPostParser(String threadId, String postId) {
-            this.threadId = threadId;
-            this.postId = postId;
-        }
-
-        public Post parse() throws PostParseException {
-
-            logger.info(String.format("Parsing post %s", postId));
-            HttpGet httpGet;
-            try {
-                URIBuilder uriBuilder = new URIBuilder(VR_API);
-                uriBuilder.setParameter("p", postId);
-                httpGet = cm.buildHttpGet(uriBuilder.build());
-                if (vipergirlsAuthService.getCookies() != null) {
-                    httpGet.addHeader("Cookie", vipergirlsAuthService.getCookies());
-                }
-            } catch (URISyntaxException e) {
-                throw new PostParseException(e);
-            }
-            VRPostHandler handler = new VRPostHandler(threadId, postId);
-            HttpClient connection = cm.getClient().build();
-            AtomicReference<Throwable> thr = new AtomicReference<>();
-            logger.info(String.format("Requesting %s", httpGet));
-            Post post = Failsafe.with(retryPolicy)
-                    .onFailure(e -> thr.set(e.getFailure()))
-                    .get(() -> {
-                        try (CloseableHttpResponse response = (CloseableHttpResponse) connection.execute(httpGet)) {
-                            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.getParsedPost();
-                            } catch (Exception e) {
-                                throw new PostParseException(String.format("Failed to parse thread %s, post %s", threadId, postId), e);
-                            } finally {
-                                EntityUtils.consumeQuietly(response.getEntity());
-                            }
-                        }
-                    });
-            if (thr.get() != null || post == null) {
-                logger.error(String.format("parsing failed for thread %s, post %s", threadId, postId), thr.get());
-                throw new PostParseException(thr.get());
-            }
-            return post;
-        }
-    }
-
-    private class VRPostHandler extends DefaultHandler {
-
-        private final String threadId;
-        private final String postId;
-        private String threadTitle;
-
-        private int previewCounter = 0;
-        private int index = 0;
-
-        private String postTitle;
-        private int imageCount;
-
-        private String forum;
-
-        private List<String> previews = new ArrayList<>();
-        private List<Image> images = new ArrayList<>();
-        @Getter
-        private Post parsedPost;
-
-        public VRPostHandler(String threadId, String postId) {
-            this.threadId = threadId;
-            this.postId = postId;
-        }
-
-        @Override
-        public void startDocument() {
-        }
-
-        @Override
-        public void startElement(String uri, String localName, String qName, Attributes attributes) {
-
-            switch (qName.toLowerCase()) {
-                case "forum":
-                    forum = attributes.getValue("title").trim();
-                    break;
-                case "thread":
-                    threadTitle = attributes.getValue("title").trim();
-                    break;
-                case "post":
-                    imageCount = Integer.parseInt(attributes.getValue("imagecount").trim());
-                    postTitle = Optional.ofNullable(attributes.getValue("title")).map(e -> e.trim().isEmpty() ? null : e.trim()).orElse(threadTitle);
-                    break;
-                case "image":
-                    index++;
-                    if (previewCounter++ < 4) {
-                        String thumbUrl = Optional.ofNullable(attributes.getValue("thumb_url")).map(String::trim).orElse(null);
-                        if (thumbUrl != null) {
-                            previews.add(thumbUrl);
-                        }
-                    }
-
-                    String mainUrl = Optional.ofNullable(attributes.getValue("main_url")).map(String::trim).orElse(null);
-                    if (mainUrl != null) {
-                        Host foundHost = supportedHosts.stream().filter(host -> host.isSupported(mainUrl)).findFirst().orElse(null);
-                        if (foundHost != null) {
-                            logger.info(String.format("Found supported host %s for %s", foundHost.getClass().getSimpleName(), mainUrl));
-                            images.add(new Image(mainUrl, postId, postTitle, foundHost, index));
-                        } else {
-                            logger.warn(String.format("unsupported host for %s, skipping", mainUrl));
-                        }
-                    }
-                    break;
-            }
-        }
-
-        @Override
-        public void endElement(String uri, String localName, String qName) {
-            switch (qName.toLowerCase()) {
-                case "post":
-                    if (imageCount != 0) {
-                        HashMap<String, Object> metadata = new HashMap<>();
-                        metadata.put("PREVIEWS", previews);
-                        parsedPost = new Post(
-                                postTitle,
-                                String.format("https://vipergirls.to/threads/%s/?p=%s&viewfull=1#post%s", threadId, postId, postId),
-                                images,
-                                metadata,
-                                postId,
-                                threadId,
-                                threadTitle,
-                                forum
-                        );
-                    }
-                    index = 0;
-                    previewCounter = 0;
-                    previews = new ArrayList<>();
-                    images = new ArrayList<>();
-                    break;
-            }
-        }
-    }
-}
-
@@ -0,0 +1,156 @@
+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.download.PendingQueue;
+import tn.mnlr.vripper.exception.PostParseException;
+import tn.mnlr.vripper.jpa.domain.Image;
+import tn.mnlr.vripper.jpa.domain.Post;
+import tn.mnlr.vripper.jpa.domain.Queued;
+import tn.mnlr.vripper.jpa.domain.enums.Status;
+import tn.mnlr.vripper.services.domain.*;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+@Service
+@Slf4j
+public class PostService {
+
+    private final SettingsService settingsService;
+    private final PendingQueue pendingQueue;
+    private final DataService dataService;
+    private final ThreadPoolService threadPoolService;
+    private final Map<String, Future<?>> fetchingMetadata = new ConcurrentHashMap<>();
+    private final VGAuthService VGAuthService;
+
+    @Getter
+    private final LoadingCache<Queued, List<MultiPostItem>> cache;
+
+    @Autowired
+    public PostService(SettingsService settingsService, PendingQueue pendingQueue, DataService dataService, ThreadPoolService threadPoolService, VGAuthService VGAuthService) {
+        this.settingsService = settingsService;
+        this.pendingQueue = pendingQueue;
+        this.dataService = dataService;
+        this.threadPoolService = threadPoolService;
+        this.VGAuthService = VGAuthService;
+
+        CacheLoader<Queued, List<MultiPostItem>> loader = new CacheLoader<>() {
+            @Override
+            public List<MultiPostItem> load(@NonNull Queued multiPostItem) throws Exception {
+                ApiThreadParser apiThreadParser = new ApiThreadParser(multiPostItem);
+                return apiThreadParser.parse();
+            }
+        };
+
+        cache = CacheBuilder.newBuilder()
+                .expireAfterWrite(30, TimeUnit.MINUTES)
+                .build(loader);
+    }
+
+    public void addPost(String postId, String threadId) throws PostParseException {
+
+        if (dataService.exists(postId)) {
+            log.warn(String.format("skipping %s, already loaded", postId));
+            return;
+        }
+
+        ApiPostParser apiPostParser = new ApiPostParser(threadId, postId);
+        ApiPost apiPost = apiPostParser.parse();
+        if (apiPost.getPost().isEmpty()) {
+            throw new PostParseException(String.format("parsing failed for thread %s, post %s", threadId, postId));
+        }
+
+        Post post = apiPost.getPost().get();
+        Set<Image> images = apiPost.getImages();
+
+        dataService.newPost(post, images);
+
+        // Metadata thread
+        fetchingMetadata.put(post.getPostId(), threadPoolService.getGeneralExecutor().submit(new MetadataRunnable(post)));
+
+        if (settingsService.getSettings().getAutoStart()) {
+            log.debug("Auto start downloads option is enabled");
+            post.setStatus(Status.PENDING);
+            try {
+                pendingQueue.enqueue(post, images);
+            } catch (InterruptedException e) {
+                log.warn("Interruption was caught");
+                Thread.currentThread().interrupt();
+                return;
+            }
+            log.debug(String.format("Done enqueuing jobs for %s", post.getUrl()));
+        } else {
+            post.setStatus(Status.STOPPED);
+            log.debug("Auto start downloads option is disabled");
+        }
+        if (!settingsService.getSettings().getLeaveThanksOnStart()) {
+            VGAuthService.leaveThanks(post);
+        }
+        dataService.updatePostStatus(post.getStatus(), post.getId());
+    }
+
+    public void stopFetchingMetadata(Post post) {
+        this.fetchingMetadata.forEach((k, v) -> {
+            if (k.equals(post.getPostId())) {
+                v.cancel(true);
+            }
+        });
+        fetchingMetadata.remove(post.getPostId());
+    }
+
+    public void processMultiPost(List<Queued> queuedList) throws Exception {
+        for (Queued queued : queuedList) {
+            if (queued.getPostId() != null) {
+                addPost(queued.getPostId(), queued.getThreadId());
+            } else {
+                threadPoolService.getGeneralExecutor().submit(() -> this.multiPost(queued));
+            }
+        }
+    }
+
+    private void multiPost(Queued queued) {
+
+        List<MultiPostItem> multiPostItems;
+        try {
+            multiPostItems = 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(multiPostItems.size());
+        queued.done();
+        log.debug(String.format("%d found for %s", multiPostItems.size(), queued.getLink()));
+        if (multiPostItems.size() == 1) {
+            try {
+                addPost(multiPostItems.get(0).getPostId(), multiPostItems.get(0).getThreadId());
+            } catch (PostParseException e) {
+                log.error(String.format("Failed to add post with postId %s", multiPostItems.get(0).getPostId()), e);
+                return;
+            }
+            log.debug(String.format("threadId %s, postId %s is added automatically for download", queued.getThreadId(), queued.getPostId()));
+        } else {
+            if(dataService.findQueuedByThreadId(queued.getThreadId()).isEmpty()) {
+                dataService.newQueueLink(queued);
+            } else {
+                log.info(String.format("Thread with id = %s is already loaded", queued.getThreadId()));
+            }
+        }
+
+    }
+
+    public void remove(String threadId) {
+        dataService.removeQueueLink(threadId);
+    }
+}
@@ -0,0 +1,254 @@
+package tn.mnlr.vripper.services;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+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.stereotype.Service;
+import tn.mnlr.vripper.SpringContext;
+import tn.mnlr.vripper.exception.ValidationException;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import static java.nio.file.StandardOpenOption.*;
+
+@Service
+@Getter
+@Setter
+@Slf4j
+public class SettingsService {
+
+    private final Path configPath;
+    private final ObjectMapper om = new ObjectMapper();
+
+    private Settings settings = new Settings();
+
+    public SettingsService(@Value("${base.dir}") String baseDir, @Value("${base.dir.name}") String baseDirName) {
+        this.configPath = Paths.get(baseDir, baseDirName, "config.json");
+        om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    }
+
+    @PostConstruct
+    private void init() {
+        restore();
+    }
+
+    public void newSettings(Settings settings) {
+
+        if (settings.getVLogin() != null && settings.getVLogin()) {
+            if (!this.settings.getVPassword().equals(settings.getVPassword())) {
+                settings.setVPassword(DigestUtils.md5Hex(settings.getVPassword()));
+            }
+        } else {
+            settings.setVUsername("");
+            settings.setVPassword("");
+            settings.setVThanks(false);
+            settings.setVLogin(false);
+        }
+        this.settings = settings;
+
+        save();
+    }
+
+    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();
+            }
+        } catch (IOException e) {
+            log.error("Failed restore user settings", e);
+            settings = new Settings();
+        }
+
+        if (settings.getDownloadPath() == null) {
+            settings.setDownloadPath(System.getProperty("user.home"));
+        }
+
+        if (settings.getMaxThreads() == null) {
+            settings.setMaxThreads(4);
+        }
+
+        if (settings.getMaxTotalThreads() == null) {
+            settings.setMaxTotalThreads(0);
+        }
+
+        if (settings.getAutoStart() == null) {
+            settings.setAutoStart(true);
+        }
+
+        if (settings.getVLogin() == null) {
+            settings.setVLogin(false);
+        }
+
+        if (settings.getVUsername() == null) {
+            settings.setVUsername("");
+        }
+
+        if (settings.getVPassword() == null) {
+            settings.setVPassword("");
+        }
+
+        if (settings.getVThanks() == null) {
+            settings.setVThanks(false);
+        }
+
+        if (settings.getDesktopClipboard() == null) {
+            settings.setDesktopClipboard(false);
+        }
+
+        if (settings.getForceOrder() == null) {
+            settings.setForceOrder(false);
+        }
+
+        if (settings.getSubLocation() == null) {
+            settings.setSubLocation(false);
+        }
+
+        if (settings.getThreadSubLocation() == null) {
+            settings.setThreadSubLocation(false);
+        }
+
+        if (settings.getClearCompleted() == null) {
+            settings.setClearCompleted(false);
+        }
+
+        if (settings.getDarkTheme() == null) {
+            settings.setDarkTheme(false);
+        }
+
+        if (settings.getAppendPostId() == null) {
+            settings.setAppendPostId(true);
+        }
+
+        if (settings.getLeaveThanksOnStart() == null) {
+            settings.setLeaveThanksOnStart(false);
+        }
+
+        save();
+    }
+
+    @PreDestroy
+    public void save() {
+        try {
+
+            Files.write(configPath, om.writeValueAsBytes(settings), CREATE, WRITE, TRUNCATE_EXISTING, SYNC);
+        } catch (IOException e) {
+            log.error("Failed to store user settings", e);
+        }
+    }
+
+    public void check(Settings settings) throws ValidationException {
+
+        Path path;
+        try {
+            path = Paths.get(settings.getDownloadPath());
+        } catch (InvalidPathException e) {
+            throw new ValidationException(String.format("%s is invalid", settings.getDownloadPath()));
+        }
+        if (!Files.exists(path)) {
+            throw new ValidationException(String.format("%s does not exist", settings.getDownloadPath()));
+        } else if (!Files.isDirectory(path)) {
+            throw new ValidationException(String.format("%s is not a directory", settings.getDownloadPath()));
+        }
+
+        if (settings.getMaxTotalThreads() < 0 || settings.getMaxTotalThreads() > 12) {
+            throw new ValidationException(String.format("Invalid max global concurrent download settings, values must be in [%d,%d]", 0, 12));
+        }
+
+        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));
+        }
+    }
+
+    public Theme getTheme() {
+        return new Theme(this.settings.getDarkTheme());
+    }
+
+    public void setTheme(Theme theme) {
+        this.settings.setDarkTheme(theme.darkTheme);
+        save();
+    }
+
+    @Getter
+    @NoArgsConstructor
+    public static class Theme {
+
+        @JsonProperty("darkTheme")
+        private boolean darkTheme;
+
+        Theme(boolean darkTheme) {
+            this.darkTheme = darkTheme;
+        }
+    }
+
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public static class Settings {
+
+        @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("darkTheme")
+        private Boolean darkTheme;
+
+        @JsonProperty("appendPostId")
+        private Boolean appendPostId;
+
+        @JsonProperty("leaveThanksOnStart")
+        private Boolean leaveThanksOnStart;
+    }
+}
@@ -0,0 +1,28 @@
+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 ThreadPoolService {
+    @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);
+
+    public void destroy() throws Exception {
+        generalExecutor.shutdown();
+        generalExecutor.awaitTermination(5, TimeUnit.SECONDS);
+        schedulerExecutor.shutdown();
+        schedulerExecutor.awaitTermination(5, TimeUnit.SECONDS);
+    }
+}
@@ -0,0 +1,195 @@
+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 VGAuthService {
+
+    private final ConnectionService cm;
+    private final SettingsService settingsService;
+    private final ThreadPoolService threadPoolService;
+    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 VGAuthService(ConnectionService cm, SettingsService settingsService, ThreadPoolService threadPoolService, DataService dataService) {
+        this.cm = cm;
+        this.settingsService = settingsService;
+        this.threadPoolService = threadPoolService;
+        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 (!settingsService.getSettings().getVLogin()) {
+            log.debug("Authentication option is disabled");
+            context.getCookieStore().clear();
+            loggedUser = "";
+            loggedInUser.onNext(loggedUser);
+            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 = "";
+            loggedInUser.onNext(loggedUser);
+            return;
+        }
+
+        HttpPost postAuth = cm.buildHttpPost("https://vipergirls.to/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 = "";
+            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 (!settingsService.getSettings().getVLogin()) {
+            log.debug("Authentication with ViperGirls option is disabled");
+            return;
+        }
+        if (!settingsService.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;
+        }
+        threadPoolService.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", null);
+        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");
+        }
+    }
+}
@@ -1,231 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import io.reactivex.processors.PublishProcessor;
-import lombok.Getter;
-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.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.w3c.dom.Document;
-import tn.mnlr.vripper.VripperApplication;
-import tn.mnlr.vripper.exception.VripperException;
-
-import javax.annotation.PreDestroy;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-@Service
-public class VipergirlsAuthService {
-
-    private static final Logger logger = LoggerFactory.getLogger(VipergirlsAuthService.class);
-
-    @Autowired
-    private ConnectionManager cm;
-
-    @Autowired
-    private HtmlProcessorService htmlProcessorService;
-
-    @Autowired
-    private XpathService xpathService;
-
-    @Autowired
-    private AppSettingsService appSettingsService;
-
-    @Getter
-    private String cookies;
-
-    private boolean authenticated = false;
-
-    @Getter
-    private String loggedUser;
-
-    @Getter
-    private PublishProcessor<String> loggedInUser = PublishProcessor.create();
-
-    @PreDestroy
-    private void destroy() throws InterruptedException {
-        logger.info("Shutting down VipergirlsAuthService");
-        VripperApplication.commonExecutor.shutdown();
-        VripperApplication.commonExecutor.awaitTermination(10, TimeUnit.SECONDS);
-    }
-
-    public void authenticate() throws VripperException {
-
-        logger.info("Authenticating using ViperGirls credentials");
-        authenticated = false;
-
-        if(!appSettingsService.isVLogin()) {
-            logger.warn("Authentication option is disabled");
-            cookies = null;
-            loggedUser = "";
-            loggedInUser.onNext(loggedUser);
-            return;
-        }
-
-        String username = appSettingsService.getVUsername();
-        String password = appSettingsService.getVPassword();
-
-        if (username == null || password == null || username.isEmpty() || password.isEmpty()) {
-            logger.error("Cannot authenticate with ViperGirls credentials, username or password is empty");
-            cookies = null;
-            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("vb_login_password", ""));
-        params.add(new BasicNameValuePair("vb_login_password_hint", "Password"));
-
-        params.add(new BasicNameValuePair("cookieuser", "1"));
-        params.add(new BasicNameValuePair("securitytoken", "guest"));
-        params.add(new BasicNameValuePair("do", "login"));
-        params.add(new BasicNameValuePair("vb_login_md5password", password));
-        params.add(new BasicNameValuePair("vb_login_md5password_utf", password));
-        try {
-            postAuth.setEntity(new UrlEncodedFormEntity(params));
-        } catch (Exception e) {
-            cookies = null;
-            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)) {
-
-            if (response.getStatusLine().getStatusCode() / 100 != 2) {
-                throw new VripperException(String.format("Unexpected response code returned %s", response.getStatusLine().getStatusCode()));
-            }
-            StringBuilder sb = new StringBuilder();
-            Arrays.asList(response.getHeaders("set-cookie"))
-                    .stream()
-                    .map(e -> e.getValue())
-                    .map(e -> e.split(";")[0])
-                    .filter(e -> e.startsWith("vg_lastactivity") || e.startsWith("vg_userid") || e.startsWith("vg_password"))
-                    .forEach(e -> sb.append(e).append(";"));
-            String cookies = sb.toString();
-            String responseBody = EntityUtils.toString(response.getEntity());
-            logger.debug(String.format("Authentication with ViperGirls response body:%n%s", responseBody));
-            EntityUtils.consumeQuietly(response.getEntity());
-            if(!cookies.contains("vg_userid")) {
-                throw new VripperException("Failed to authenticate user with ViperRipper");
-            }
-            this.cookies = cookies;
-        } catch (Exception e) {
-            cookies = null;
-            loggedUser = "";
-            loggedInUser.onNext(loggedUser);
-            if (e instanceof VripperException) {
-                throw (VripperException) e;
-            } else {
-                throw new VripperException(e);
-            }
-        }
-        authenticated = true;
-        loggedUser = username;
-        logger.info(String.format("Authenticated: %s", username));
-        loggedInUser.onNext(loggedUser);
-    }
-
-    public void leaveThanks(String postUrl, String postId) {
-        VripperApplication.commonExecutor.submit(() -> {
-            if (!appSettingsService.isVLogin()) {
-                logger.warn("Authentication with ViperGirls option is disabled");
-                return;
-            }
-            if (!appSettingsService.isVThanks()) {
-                logger.warn("Leave thanks option is disabled");
-                return;
-            }
-            if (!authenticated) {
-                logger.error("You are not authenticated");
-                return;
-            }
-            try {
-                postThanks(postId, getSecurityToken(postUrl));
-            } catch (Exception e) {
-                logger.error(String.format("Failed to leave a thanks for url %s, post id %s", postUrl, postId), e);
-            }
-        });
-    }
-
-    private String getSecurityToken(String url) throws VripperException {
-
-        String securityToken = "";
-
-        HttpGet httpGet = cm.buildHttpGet(url);
-        httpGet.addHeader("Referer", "https://vipergirls.to/");
-        httpGet.addHeader("Host", "vipergirls.to");
-        httpGet.addHeader("Cookie", cookies);
-
-        CloseableHttpClient client = cm.getClient().build();
-
-        try (CloseableHttpResponse response = client.execute(httpGet)) {
-
-            String postPage = EntityUtils.toString(response.getEntity());
-            Document document = htmlProcessorService.clean(postPage);
-
-            String thanksUrl = xpathService
-                    .getAsNode(document, "//li[contains(@id,'post_')][not(contains(@id,'post_thank'))]//a[@class='post_thanks_button']")
-                    .getAttributes()
-                    .getNamedItem("href")
-                    .getTextContent()
-                    .trim();
-
-            securityToken = Arrays.asList(thanksUrl.split("&amp;")).stream()
-                    .filter(v -> v.startsWith("securitytoken"))
-                    .findAny()
-                    .orElse("")
-                    .replace("securitytoken=", "");
-
-            EntityUtils.consumeQuietly(response.getEntity());
-        } catch (Exception e) {
-            throw new VripperException(e);
-        }
-        return securityToken;
-    }
-
-    private void postThanks(String postId, String securityKey) 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", postId));
-        params.add(new BasicNameValuePair("securitytoken", securityKey));
-        try {
-            postThanks.setEntity(new UrlEncodedFormEntity(params));
-        } catch (Exception e) {
-            throw new VripperException(e);
-        }
-
-        postThanks.addHeader("Referer", "https://vipergirls.to/");
-        postThanks.addHeader("Host", "vipergirls.to");
-        postThanks.addHeader("Cookie", cookies);
-
-        CloseableHttpClient client = cm.getClient().build();
-
-        try (CloseableHttpResponse response = client.execute(postThanks)) {
-            EntityUtils.consumeQuietly(response.getEntity());
-        } catch (Exception e) {
-            throw new VripperException(e);
-        }
-    }
-}
@@ -12,20 +12,8 @@ import javax.xml.xpath.XPathFactory;
@Service
 public class XpathService {

-    private XpathService() {
-
-    }
-
    private XPath xpath = XPathFactory.newInstance().newXPath();

-    public NodeList getAsNodeList(Node source, String xpathExpression) throws XpathException {
-        try {
-            return (NodeList) xpath.compile(xpathExpression).evaluate(source, XPathConstants.NODESET);
-        } catch (Exception e) {
-            throw new XpathException(e);
-        }
-    }
-
    public Node getAsNode(Node source, String xpathExpression) throws XpathException {
        try {
            return (Node) xpath.compile(xpathExpression).evaluate(source, XPathConstants.NODE);
@@ -34,4 +22,12 @@ public class XpathService {
        }
    }

+    public NodeList getAsNodeList(Node source, String xpathExpression) throws XpathException {
+        try {
+            return (NodeList) xpath.compile(xpathExpression).evaluate(source, XPathConstants.NODESET);
+        } catch (Exception e) {
+            throw new XpathException(e);
+        }
+    }
+
 }
@@ -0,0 +1,25 @@
+package tn.mnlr.vripper.services.domain;
+
+import lombok.Getter;
+import tn.mnlr.vripper.jpa.domain.Image;
+import tn.mnlr.vripper.jpa.domain.Post;
+
+import java.util.Optional;
+import java.util.Set;
+
+public class ApiPost {
+
+    private final Post post;
+
+    @Getter
+    private final Set<Image> images;
+
+    public ApiPost(Post post, Set<Image> images) {
+        this.post = post;
+        this.images = images;
+    }
+
+    public Optional<Post> getPost() {
+        return Optional.ofNullable(post);
+    }
+}
@@ -0,0 +1,109 @@
+package tn.mnlr.vripper.services.domain;
+
+import lombok.extern.slf4j.Slf4j;
+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.Image;
+import tn.mnlr.vripper.jpa.domain.Post;
+import tn.mnlr.vripper.services.domain.ApiPost;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Slf4j
+class ApiPostHandler extends DefaultHandler {
+
+    private final Collection<Host> supportedHosts;
+
+    private final String threadId;
+    private final String postId;
+    private final String postUrl;
+    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;
+
+    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();
+    }
+
+
+    public ApiPost getParsedPost() {
+        return new ApiPost(parsedPost, images);
+    }
+
+    @Override
+    public void startDocument() {
+    }
+
+    @Override
+    public void startElement(String uri, String localName, String qName, Attributes attributes) {
+
+        switch (qName.toLowerCase()) {
+            case "forum":
+                forum = attributes.getValue("title").trim();
+                break;
+            case "user":
+                userHash = attributes.getValue("hash").trim();
+                break;
+            case "thread":
+                threadTitle = attributes.getValue("title").trim();
+                break;
+            case "post":
+                postTitle = Optional.ofNullable(attributes.getValue("title")).map(e -> e.trim().isEmpty() ? null : e.trim()).orElse(threadTitle);
+                parsedPost = new Post(
+                        postTitle,
+                        postUrl,
+                        postId,
+                        threadId,
+                        threadTitle,
+                        forum,
+                        userHash
+                );
+                break;
+            case "image":
+                index++;
+                if (previews.size() < 4) {
+                    Optional.ofNullable(attributes.getValue("thumb_url")).map(String::trim).ifPresent(previews::add);
+                }
+
+                String mainUrl = Optional.ofNullable(attributes.getValue("main_url")).map(String::trim).orElse(null);
+                if (mainUrl != null) {
+                    Host foundHost = supportedHosts.stream().filter(host -> host.isSupported(mainUrl)).findFirst().orElse(null);
+                    if (foundHost != null) {
+                        log.debug(String.format("Found supported host %s for %s", foundHost.getClass().getSimpleName(), mainUrl));
+                        images.add(new Image(postId, mainUrl, foundHost, index));
+                    } else {
+                        log.warn(String.format("unsupported host for %s, skipping", mainUrl));
+                    }
+                }
+                break;
+        }
+    }
+
+    @Override
+    public void endElement(String uri, String localName, String qName) {
+        if ("post".equals(qName.toLowerCase())) {
+            parsedPost.setTotal(images.size());
+            if (!previews.isEmpty()) {
+                parsedPost.setPreviews(previews);
+            }
+            parsedPost.setHosts(images.stream().map(Image::getHost).map(Host::getHost).collect(Collectors.toSet()));
+            index = 0;
+            previews = new HashSet<>();
+        }
+    }
+}
@@ -0,0 +1,79 @@
+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.VripperApplication;
+import tn.mnlr.vripper.exception.DownloadException;
+import tn.mnlr.vripper.exception.PostParseException;
+import tn.mnlr.vripper.services.ConnectionService;
+import tn.mnlr.vripper.services.VGAuthService;
+
+import javax.xml.parsers.SAXParserFactory;
+import java.net.URISyntaxException;
+import java.util.concurrent.atomic.AtomicReference;
+
+@Slf4j
+public class ApiPostParser {
+
+    private static final String VR_API = "https://vipergirls.to/vr.php";
+
+    private static final SAXParserFactory factory = SAXParserFactory.newInstance();
+
+    private final String threadId;
+    private final String postId;
+    private final ConnectionService cm;
+    private final VGAuthService VGAuthService;
+
+    public ApiPostParser(String threadId, String postId) {
+        this.threadId = threadId;
+        this.postId = postId;
+        this.cm = SpringContext.getBean(ConnectionService.class);
+        this.VGAuthService = SpringContext.getBean(VGAuthService.class);
+    }
+
+    public ApiPost parse() throws PostParseException {
+
+        log.debug(String.format("Parsing post %s", postId));
+        HttpGet httpGet;
+        try {
+            URIBuilder uriBuilder = new URIBuilder(VR_API);
+            uriBuilder.setParameter("p", postId);
+            httpGet = cm.buildHttpGet(uriBuilder.build(), null);
+        } catch (URISyntaxException e) {
+            throw new PostParseException(e);
+        }
+
+        AtomicReference<Throwable> thr = new AtomicReference<>();
+        ApiPostHandler apiPostHandler = new ApiPostHandler(threadId, postId);
+        log.debug(String.format("Requesting %s", httpGet));
+        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());
+        }
+        return post;
+    }
+
+    private ApiPost getPost(HttpGet httpGet, ApiPostHandler apiPostHandler, AtomicReference<Throwable> thr) {
+        return Failsafe.with(VripperApplication.retryPolicy)
+                .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));
+                        }
+
+                        factory.newSAXParser().parse(response.getEntity().getContent(), apiPostHandler);
+                        EntityUtils.consumeQuietly(response.getEntity());
+                        return apiPostHandler.getParsedPost();
+                    }
+                });
+    }
+}
@@ -0,0 +1,90 @@
+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 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 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 final List<MultiPostItem> posts = new ArrayList<>();
+
+    public ApiThreadHandler(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(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".equals(qName.toLowerCase())) {
+            if (imageCount != 0) {
+                posts.add(new MultiPostItem(
+                        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();
+    }
+}
@@ -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.VripperApplication;
+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.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 String VR_API = "https://vipergirls.to/vr.php";
+
+    private static final SAXParserFactory factory = SAXParserFactory.newInstance();
+    private final Queued queued;
+    private final ConnectionService cm;
+    private final VGAuthService VGAuthService;
+
+    public ApiThreadParser(Queued queued) {
+        this.queued = queued;
+        this.cm = SpringContext.getBean(ConnectionService.class);
+        this.VGAuthService = SpringContext.getBean(VGAuthService.class);
+    }
+
+    public List<MultiPostItem> 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(), 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(VripperApplication.retryPolicy)
+                .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;
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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
death-claw	15c97d5cfc	v3.0.0	2020-08-03 15:06:36 +01:00
death-claw	905cbd5a35	Code refactoring Fix bugs with rename gallery	2020-08-03 15:03:42 +01:00
death-clawandGitHub	5c0e2e6185	Merge pull request #12 from life-claw/imgVenueFix Fixed ImageVenue	2020-07-30 20:56:41 +01:00
death-clawandGitHub	4836d2dacb	Merge branch 'master' into imgVenueFix	2020-07-30 20:56:30 +01:00
death-claw	bc81ec1ab5	Bug fixes Code enhancements	2020-07-30 14:59:58 +01:00
death-claw	8a4d039a37	Bug fixes Code enhancements	2020-07-30 14:00:56 +01:00
death-claw	468639264a	Major rewrites of data persistence, websocket, and user interface	2020-07-26 15:10:09 +01:00
death-claw	9b649b470f	Major rewrites of data persistence, websocket, and user interface	2020-07-26 14:45:04 +01:00
life-claw	edd5cf2bf7	Fixed ImageVenue Updated XPaths to match their current markup And added HTTPs redirect, since they support that now	2020-07-17 16:57:51 -05:00
death-claw	67c605e640	v2.12.1	2020-05-22 15:55:05 +01:00
death-claw	8d4b878656	Fix alternative name bug	2020-05-22 15:54:11 +01:00
death-claw	bf532dd1d0	v2.12.0	2020-05-21 16:43:03 +01:00
death-claw	eb1a125e59	Use new user hash from the api	2020-05-21 16:41:16 +01:00
death-claw	256659a72d	v2.11.7	2020-05-08 12:57:41 +01:00
death-claw	dbf3aa7e7d	Fix bug with paths creation Move Open Link button Rename rename all title	2020-05-08 12:56:11 +01:00
death-claw	a75ce181ff	v2.11.6	2020-05-04 21:07:16 +01:00
death-claw	37ae6b4ebf	Merge branch 'master' of https://github.com/death-claw/vripper-project	2020-05-04 21:06:48 +01:00
death-claw	6631a6a95b	PNG filenames are now correctly named Fix issue with special characters in post titles	2020-05-04 21:04:51 +01:00
death-clawandGitHub	918f8578ad	Update CHANGELOG.md	2020-05-03 16:40:26 +01:00
death-claw	10fa9f68ae	v2.11.5	2020-05-03 15:18:28 +01:00
death-claw	6b5c9ccb0f	Reduce rows buffer size	2020-05-03 15:16:31 +01:00
death-claw	652e8f1a9d	v2.11.4	2020-05-03 14:24:27 +01:00
death-claw	fe53ae733d	Code cleanup Dependencies update	2020-05-03 14:22:40 +01:00
death-claw	690dab2ae8	v2.11.3	2020-04-30 18:26:42 +01:00
death-claw	530542163e	Add missing files	2020-04-30 18:26:23 +01:00
death-claw	cf7f4c75c0	Source code restructure UI fixes and enhancements Add menu entry to rename a gallery to first alternative title Add menu on toolbar for massive rename to first alternative title	2020-04-30 18:23:11 +01:00
death-claw	c6b395cf4c	v2.11.2	2020-04-26 22:06:34 +01:00
death-claw	e72edeed62	Fix icon Bug fixes	2020-04-26 22:02:51 +01:00
death-claw	3f22d53f89	v2.11.1	2020-04-25 16:32:25 +01:00
death-claw	08c0fa62b1	Add option to rename gallery Code source maintenance	2020-04-25 16:28:56 +01:00
death-claw	4c79cca079	v2.11.0	2020-03-29 17:37:28 +01:00
death-clawandGitHub	67096242a2	Merge pull request #4 from life-claw/pixroute Added Support for pixroute.com	2020-03-29 17:30:34 +01:00
death-claw	f66112375d	Merge branch 'master' of https://github.com/death-claw/vripper-project	2020-03-29 17:28:39 +01:00
death-claw	c5a082e248	Upgrade Electron to v8 Upgrade Angular to v9 App settings are now portable in a json file Add grab post title from thread option General code source maintenance	2020-03-29 17:03:14 +01:00
life-claw	c2a1b0aa33	Added Support for pixroute.com	2020-03-08 13:25:57 -05:00
death-clawandGitHub	a89dcc96d8	Update README.md	2020-02-11 21:16:37 +01:00
death-claw	b2a10eafd9	v2.10.8	2020-01-25 16:00:05 +01:00
death-claw	f027aff89d	Fix app url	2020-01-25 15:57:45 +01:00
death-claw	b4eaf0d1c4	v2.10.7	2020-01-25 14:45:54 +01:00
death-claw	9d2975faaa	Drop SockJs and switch to WebSocket Autoreconnect front to back	2020-01-25 14:39:50 +01:00
death-claw	0c0fdf9d78	v2.10.6	2020-01-19 13:01:03 +01:00
death-claw	e17afa0ef3	Limit cache size	2020-01-19 12:59:47 +01:00
death-claw	3d3eb6aa36	v2.10.5	2020-01-18 22:28:27 +01:00
death-claw	e22132255e	Bug fixes	2020-01-18 22:24:53 +01:00
death-claw	ef041526ec	v2.10.4	2020-01-18 13:27:47 +01:00
death-claw	704311dd9a	Zero value for total max download will disable the limit Add system notification Bug fixes	2020-01-18 13:21:46 +01:00
death-claw	9617a6f20f	v2.10.3	2020-01-16 21:39:59 +01:00
death-claw	bc17442961	Some bug fixes Enhance download queue logic Clear cache button Fix the partial status	2020-01-16 21:34:09 +01:00
death-claw	574d6818c1	Refactor PostImgHost	2020-01-14 21:03:35 +01:00
death-clawandGitHub	5c416055ee	Merge pull request #3 from life-claw/postimg Added Support for postimg.cc	2020-01-14 19:01:41 +01:00
death-clawandGitHub	fa30458dc6	Merge pull request #1 from life-claw/imagevenue Add support for imagevenue.com	2020-01-14 18:47:47 +01:00
death-clawandGitHub	638af93225	Merge pull request #2 from life-claw/urlSpaces Sanitize URLs that contain spaces	2020-01-14 18:14:47 +01:00
life-claw	2c6ca741c7	Added PostImgHost	2020-01-07 16:50:11 -06:00
life-claw	d7f2df2540	Sanitize URLs with that contain spaces	2020-01-07 16:18:45 -06:00
life-claw	b85ade1dba	Added ImageVenueHost	2020-01-07 16:04:04 -06:00
death-claw	1c61a0b34e	v2.10.2	2019-12-29 11:35:59 +01:00
death-claw	46b9449969	Upgrade electron to v7 Update the retry policy	2019-12-29 11:33:03 +01:00
death-claw	cc1bbd1231	v2.10.1	2019-12-27 23:05:10 +01:00
death-claw	b29cba2911	Bug fix	2019-12-27 22:58:33 +01:00
death-claw	13bde3aa2c	2.10.0	2019-12-27 21:27:27 +01:00
death-claw	35b4f5fc97	Add support for imgspice Fix spring dependency bug	2019-12-27 21:25:33 +01:00
death-claw	1b0482b7d4	v2.9.1	2019-12-27 20:10:31 +01:00
death-claw	c9ff6eeab6	Fix build issue	2019-12-27 20:09:16 +01:00
death-claw	5ac57b743d	v2.9.0	2019-12-27 20:07:19 +01:00
death-claw	f7b219701f	Allow many hosts to run at the same time Add title to gallery Add global concurrent downloads Decrease timeout for fast fail Add counter badge in link collector	2019-12-27 20:03:35 +01:00
death-claw	d009aa3f8c	v2.8.1	2019-12-24 20:21:29 +01:00
death-claw	078d49f883	v2.8.1	2019-12-24 20:18:22 +01:00
death-claw	f1bf517ba5	Fix issue with path creation	2019-12-24 20:15:03 +01:00
death-claw	6269ed6f6e	v2.8.0	2019-12-24 19:47:17 +01:00
death-claw	43b8dedbb1	Use pointer cursor on gallery items	2019-12-24 19:42:45 +01:00
death-claw	978be7bd49	Add view photos settings Some improvements	2019-12-23 22:46:46 +01:00
death-claw	1b7f3aef62	Add missing css and script includes	2019-12-23 19:36:07 +01:00
death-claw	7d24ee4867	Use photoswipe for image gallery	2019-12-23 00:02:13 +01:00
death-claw	269a3475b0	Generate thumbnails on the fly and cache them	2019-12-21 19:17:51 +01:00
death-claw	18e2bc6afc	Add Photo Viewer	2019-12-21 17:23:22 +01:00
death-claw	c6ef54e115	v2.7.1	2019-12-21 11:24:03 +01:00
death-claw	441b2831fc	Add version to title	2019-12-21 11:16:53 +01:00
death-claw	3cf4d60eca	v2.7.0	2019-12-21 09:59:17 +01:00
death-claw	d228c89a1c	Add support for pixxxels Add missing icon	2019-12-21 09:56:57 +01:00
death-claw	f3b592e81b	v2.6.0	2019-12-21 08:39:04 +01:00
death-claw	a5ff659fb4	Better quality app icon Implement context menu on download tab Add stop remove and start button to context menu Link will not be removed automatically from link collector tab Some UI fixes	2019-12-21 08:34:56 +01:00
death-claw	ab80e2f3b3	v2.5.1	2019-12-09 20:26:52 +01:00
death-claw	2ef082f87e	Add hosts column in Link collector grab menu Disable download button when nothing selected in Link collector grab menu	2019-12-09 19:56:26 +01:00
death-claw	a1b97e76a7	v2.5.0	2019-12-08 20:13:58 +01:00
death-claw	185a078b4d	Missing change	2019-12-08 20:08:42 +01:00
death-claw	28a4c944ee	Add support for multiple links at a time Add the Link collector feature Fix bug with previews	2019-12-08 20:07:13 +01:00
death-claw	23d3553d99	Include startup icon Fix UI layout	2019-12-06 23:09:57 +01:00
death-claw	fb09e4c46b	v2.4.1	2019-11-26 20:03:10 +01:00
death-claw	4feb6f5fe1	Increase attempts for establishing ws connection between front and back end Change default download folder to Home folder (installer), App folder (portable)	2019-11-26 20:01:08 +01:00
death-claw	df1b9efbbb	v2.4.0	2019-11-23 14:50:16 +01:00
death-claw	553924fa1d	Pimpandhost Host support	2019-11-23 14:48:05 +01:00
death-claw	a90dbd568f	v2.3.2	2019-11-23 12:15:42 +01:00
death-claw	ca7ca1ce8e	Fix a bug with the scan component	2019-11-23 12:14:07 +01:00
death-claw	b3ab239a1e	v2.3.1	2019-11-22 20:07:41 +01:00
death-claw	6e212c791c	Fix connexion reset issue Fix Post Status when autostart option is selected Add stop all button	2019-11-22 20:05:14 +01:00
death-claw	c6067ef147	v2.3.0	2019-11-21 21:17:25 +01:00
death-claw	8333f0c34e	Fix Restoring post status on App startup Use local sockjs and material icons font	2019-11-21 21:16:24 +01:00
death-claw	75becd8bb4	UI enhancements and overhaul Stability fixes with HTTP connections MacOS official support	2019-11-21 20:54:44 +01:00