v3.0.8

Host class refactoring

.gitignore

@@ -3,4 +3,5 @@
 /**/*/target
 /**/*/build-dir
 /**/*/java-runtime
-.idea
+.idea
+.vripper

CHANGELOG.md

@@ -1,5 +1,112 @@
 # Changelog
 
+## [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
@@ -304,4 +411,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

README.md

@@ -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)

pom.xml

@@ -4,12 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>tn.mnlr</groupId>
     <artifactId>vripper</artifactId>
-    <version>2.10.5</version>
+    <version>3.0.8</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>

vripper-electron/main.js

@@ -1,12 +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 { 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;
@@ -18,139 +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);
 });
 
-function createWindow() {
+createWindow = () => {
 
-  if (process.platform === 'win32') {
-    app.setAppUserModelId("tn.mnlr.vripper");
-  }
+    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
-    },
-    icon: icon
-  });
+    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.removeMenu();
+    win.setMenu(null);
+    win.setMenuBarVisibility(false);
 
-  win.loadURL(
-    url.format({
-      pathname: path.join(__dirname, `vripper-ui/index.html`),
-      protocol: "file:",
-      slashes: true
-    })
-  );
+    win.loadURL(
+        url.format({
+            pathname: path.join(__dirname, `vripper-ui/index.html`),
+            protocol: "file:",
+            slashes: true
+        })
+    );
 
-  // win.webContents.openDevTools();
+    // win.webContents.openDevTools();
 
-  win.on("closed", () => {
-    win = null;
-  });
+    win.on("closed", () => {
+        win = null;
+    });
 }
 
-const gotTheLock = app.requestSingleInstanceLock();
-
-if (!gotTheLock) {
-  app.quit();
-} else {
-  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",
-      "-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();
-    });
-  });
-  
-  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") {
-      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();
-          }
+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) => {
+    }).catch((error) => {
         // Terminate immediately
         console.log(error);
         vripperServer.kill('SIGKILL');
         terminated = true;
         app.quit();
-      });
-    }
-  });
-
-  app.on("activate", () => {
-    if (win === null) {
-      createWindow();
-    }
-  });
+    });
+}
+
+const gotTheLock = app.requestSingleInstanceLock();
+
+if (!gotTheLock) {
+    app.quit();
+} else {
+    getPort().then(port => {
+        serverPort = port;
+        ipcMain.on("get-port", event => {
+            event.reply("port", port);
+        });
+
+        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();
+        }
+
+        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();
+        }
+    });
 }

vripper-electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vripper-electron",
-  "version": "2.10.5",
+  "version": "3.0.8",
   "description": "A ripper for vipergirls.to built using web technolgies",
   "main": "main.js",
   "author": "death-claw <53543762+death-claw@users.noreply.github.com>",
@@ -40,14 +40,9 @@
     "win": {
       "icon": "icon.ico",
       "target": [
-        "nsis"
+        "dir"
       ]
     },
-    "nsis": {
-      "createDesktopShortcut": "always",
-      "oneClick": false,
-      "perMachine": false
-    },
     "linux": {
       "synopsis": "vipergirls.to ripper",
       "category": "Utility",
@@ -70,15 +65,16 @@
     "dist": "node pre-build.js && electron-builder"
   },
   "devDependencies": {
-    "electron": "^7.1.9",
-    "electron-builder": "^22.2.0"
+    "electron": "9.1.0",
+    "electron-builder": "22.7.0"
   },
   "dependencies": {
-    "axios": "^0.19.0",
-    "cheerio": "^1.0.0-rc.3",
-    "copy-dir": "^1.1.0",
-    "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"
   }
 }

vripper-electron/pom.xml

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

vripper-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>tn.mnlr</groupId>
         <artifactId>vripper</artifactId>
-        <version>2.10.5</version>
+        <version>3.0.8</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>
@@ -72,11 +86,6 @@
             <artifactId>guava</artifactId>
             <version>28.1-jre</version>
         </dependency>
-        <dependency>
-            <groupId>org.imgscalr</groupId>
-            <artifactId>imgscalr-lib</artifactId>
-            <version>4.2</version>
-        </dependency>
         <dependency>
             <groupId>tn.mnlr</groupId>
             <artifactId>vripper-ui</artifactId>

vripper-server/src/main/java/tn/mnlr/vripper/EventListenerBean.java

@@ -5,20 +5,32 @@ 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.services.PersistenceService;
+import tn.mnlr.vripper.jpa.repositories.IRepository;
+import tn.mnlr.vripper.services.DataService;
+
+import java.util.Set;
 
 @Component
 public class EventListenerBean {
 
-    @Autowired
-    private PersistenceService persistenceService;
-
     @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;
-        persistenceService.restore();
     }
+
+
 }

vripper-server/src/main/java/tn/mnlr/vripper/SpringContext.java

@@ -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,10 +10,9 @@ 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;
 
     public static <T> T getBean(Class<T> beanClass) {
@@ -26,7 +24,7 @@ public class SpringContext implements ApplicationContextAware {
     }
 
     public static void close() {
-        logger.info("Application terminating...");
+        log.info("Application terminating...");
         if (context != null) {
             context.close();
         }

vripper-server/src/main/java/tn/mnlr/vripper/VripperApplication.java

@@ -1,25 +1,27 @@
 package tn.mnlr.vripper;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+import net.jodah.failsafe.RetryPolicy;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-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 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);
+            log.error("Failed to run the application", e);
         }
     }
 }

vripper-server/src/main/java/tn/mnlr/vripper/entities/Image.java

@@ -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.STOPPED;
-        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.STOPPED;
-        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);
-    }
-}

vripper-server/src/main/java/tn/mnlr/vripper/entities/Post.java

@@ -1,108 +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.hosts = this.images.stream().map(Image::getHost).map(Host::getHost).collect(Collectors.toSet());
-        total = images.size();
-        status = Status.STOPPED;
-    }
-
-    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);
-    }
-}

vripper-server/src/main/java/tn/mnlr/vripper/entities/mixin/persistance/HostToString.java

@@ -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();
-    }
-}

vripper-server/src/main/java/tn/mnlr/vripper/entities/mixin/persistance/ImagePersistanceMixin.java

@@ -1,36 +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 lombok.Getter;
-import lombok.Setter;
-import tn.mnlr.vripper.entities.Image;
-import tn.mnlr.vripper.host.Host;
-import tn.mnlr.vripper.services.AppStateService;
-
-@Getter
-@Setter
-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;
-}

vripper-server/src/main/java/tn/mnlr/vripper/entities/mixin/persistance/PostPersistanceMixin.java

@@ -1,21 +0,0 @@
-package tn.mnlr.vripper.entities.mixin.persistance;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Getter;
-import lombok.Setter;
-import tn.mnlr.vripper.services.AppStateService;
-
-@Getter
-@Setter
-public abstract class PostPersistanceMixin {
-
-    @JsonIgnore
-    private String type;
-
-    @JsonIgnore
-    private AppStateService appStateService;
-
-
-    @JsonIgnore
-    private boolean removed;
-}

vripper-server/src/main/java/tn/mnlr/vripper/entities/mixin/persistance/StringToHost.java

@@ -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);
-    }
-}

vripper-server/src/main/java/tn/mnlr/vripper/entities/mixin/ui/ImageUIMixin.java

@@ -1,27 +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 lombok.Getter;
-import lombok.Setter;
-import tn.mnlr.vripper.entities.Image;
-import tn.mnlr.vripper.host.Host;
-import tn.mnlr.vripper.services.AppStateService;
-
-@Getter
-@Setter
-public abstract class ImageUIMixin {
-
-    @JsonIgnore
-    private Host host;
-
-    @JsonIgnore
-    private BehaviorProcessor<Image> imageStateProcessor;
-
-    @JsonIgnore
-    private Disposable subscription;
-
-    @JsonIgnore
-    private AppStateService appStateService;
-}

vripper-server/src/main/java/tn/mnlr/vripper/entities/mixin/ui/PostUIMixin.java

@@ -1,20 +0,0 @@
-package tn.mnlr.vripper.entities.mixin.ui;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Getter;
-import lombok.Setter;
-import tn.mnlr.vripper.entities.Image;
-import tn.mnlr.vripper.services.AppStateService;
-
-import java.util.List;
-
-@Getter
-@Setter
-public abstract class PostUIMixin {
-
-    @JsonIgnore
-    private List<Image> images;
-
-    @JsonIgnore
-    private AppStateService appStateService;
-}

vripper-server/src/main/java/tn/mnlr/vripper/exception/QueueException.java

@@ -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);
+    }
+}

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

@@ -1,5 +1,6 @@
 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;
@@ -8,31 +9,41 @@ 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.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']";
     private static final String IMG_XPATH = "//img[@class='centred']";
 
+    private final ConnectionManager cm;
+    private final HostService hostService;
+    private final XpathService xpathService;
+    private final HtmlProcessorService htmlProcessorService;
+
+
     @Autowired
-    private ConnectionManager cm;
+    public AcidimgHost(ConnectionManager cm, HostService hostService, XpathService xpathService, HtmlProcessorService htmlProcessorService) {
+        this.cm = cm;
+        this.hostService = hostService;
+        this.xpathService = xpathService;
+        this.htmlProcessorService = htmlProcessorService;
+    }
 
     @Override
     public String getHost() {
@@ -45,22 +56,22 @@ public class AcidimgHost extends Host {
     }
 
     @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException {
 
-        Document doc = getResponse(url, context).getDocument();
+        Document doc = hostService.getResponse(url, context).getDocument();
 
         Node contDiv;
         try {
-            logger.debug(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.debug(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"));
@@ -70,9 +81,9 @@ public class AcidimgHost extends Host {
                 throw new HostException(e);
             }
 
-            logger.debug(String.format("Requesting %s", httpPost));
+            log.debug(String.format("Requesting %s", httpPost));
             try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(httpPost, context)) {
-                logger.debug(String.format("Cleaning response for %s", httpPost));
+                log.debug(String.format("Cleaning response for %s", httpPost));
                 doc = htmlProcessorService.clean(EntityUtils.toString(response.getEntity()));
                 EntityUtils.consumeQuietly(response.getEntity());
             } catch (Exception e) {
@@ -82,23 +93,22 @@ public class AcidimgHost extends Host {
 
         Node imgNode;
         try {
-            logger.debug(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.debug(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);
         }

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

@@ -1,243 +1,26 @@
 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 lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.impl.client.BasicCookieStore;
-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.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.net.URI;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-import java.util.Iterator;
 import java.util.Objects;
 
 @Service
+@Slf4j
 abstract public class Host {
 
-    private static final 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();
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(pathService);
-    }
-
     public boolean isSupported(String url) {
         return url.contains(getLookup());
     }
 
-    public void download(Image image, ImageFileData imageFileData) throws DownloadException, InterruptedException {
-
-        HttpClientContext context = HttpClientContext.create();
-        context.setCookieStore(new BasicCookieStore());
-        try {
-
-            appStateService.postDownloadingUpdate(image.getPostId());
-
-            imageFileData.setPageUrl(image.getUrl());
-
-            /*
-             * HOST SPECIFIC
-             */
-            logger.debug(String.format("Getting image url and name from %s using %s", image.getUrl(), this.getHost()));
-            setNameAndUrl(image.getUrl(), imageFileData, context);
-            logger.debug(String.format("Resolved name for %s: %s", image.getUrl(), imageFileData.getImageName()));
-            logger.debug(String.format("Resolved image url for %s: %s", image.getUrl(), imageFileData.getImageUrl()));
-
-            logger.debug(String.format("Building image request for %s", image.getUrl()));
-            setImageRequest(imageFileData);
-            /*
-             * END HOST SPECIFIC
-             */
-
-            String formatImageFileName = pathService.formatImageFileName(imageFileData.getImageName());
-            logger.debug(String.format("Sanitizing image name from %s to %s", imageFileData.getImageName(), formatImageFileName));
-            imageFileData.setImageName(formatImageFileName);
-            File destinationFolder = pathService.getDownloadDestinationFolder(image.getPostId());
-            logger.debug(String.format("Saving to %s", destinationFolder.getPath()));
-            logger.debug(String.format("Creating %s", destinationFolder.getPath()));
-            destinationFolder.mkdirs();
-            if (!destinationFolder.exists()) {
-                logger.debug(String.format("Folder %s is created", destinationFolder.toString()));
-            }
-
-            HttpClient client = cm.getClient().build();
-
-            logger.debug(String.format("Downloading %s", imageFileData.getImageUrl()));
-            try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(imageFileData.getImageRequest(), context)) {
-
-                if (response.getStatusLine().getStatusCode() / 100 != 2) {
-                    EntityUtils.consumeQuietly(response.getEntity());
-                    throw new DownloadException(String.format("Server returned code %d", response.getStatusLine().getStatusCode()));
-                }
-
-                File outputFile = new File(destinationFolder.getPath() + File.separator + String.format("%03d_", image.getIndex()) + imageFileData.getImageName() + ".tmp");
-                try (InputStream downloadStream = response.getEntity().getContent(); FileOutputStream fos = new FileOutputStream(outputFile)) {
-                    image.setTotal(response.getEntity().getContentLength());
-                    logger.debug(String.format("%s length is %d", imageFileData.getImageUrl(), image.getTotal()));
-                    logger.debug(String.format("Starting data transfer for %s", imageFileData.getImageUrl()));
-
-                    byte[] buffer = new byte[READ_BUFFER_SIZE];
-                    int read;
-                    while ((read = downloadStream.read(buffer, 0, READ_BUFFER_SIZE)) != -1) {
-                        fos.write(buffer, 0, read);
-                        image.increase(read);
-                        downloadSpeedService.increase(read);
-                    }
-                    fos.flush();
-                    EntityUtils.consumeQuietly(response.getEntity());
-                }
-                File finalName = checkImageTypeAndRename(outputFile, imageFileData.getImageName(), image.getIndex());
-                imageFileData.setFileName(finalName.getName());
-            }
-        } catch (Exception e) {
-            if (Thread.interrupted()) {
-                throw new InterruptedException("Download was interrupted");
-            }
-            throw new DownloadException(e);
-        }
-    }
-
-    private File checkImageTypeAndRename(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";
-                    }
-                }
-            }
-        } 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);
-            if (outImage.exists() && outImage.delete()) {
-                logger.debug(String.format("%s is deleted", outImage.toString()));
-            }
-            return Files.move(outputFile.toPath(), outImage.toPath(), StandardCopyOption.ATOMIC_MOVE).toFile();
-        } catch (Exception e) {
-            throw new HostException("Failed to rename the image", e);
-        }
-    }
-
-    final String getDefaultImageName(final String imgUrl) {
-        String imageTitle = imgUrl.substring(imgUrl.lastIndexOf('/') + 1);
-        logger.debug(String.format("Extracting name from url %s: %s", imgUrl, imageTitle));
-        return imgUrl;
-    }
-
-    final Response getResponse(final String url, final HttpClientContext context) throws HostException {
-        String basePage;
-
-        HttpClient client = cm.getClient().build();
-        HttpGet httpGet = cm.buildHttpGet(url);
-        Header[] headers;
-        logger.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());
-            logger.debug(String.format("%s response: %n%s", url, basePage));
-            EntityUtils.consumeQuietly(response.getEntity());
-        } catch (IOException e) {
-            throw new HostException(e);
-        }
-
-        try {
-            logger.debug(String.format("Cleaning %s response", url));
-            return new Response(htmlProcessorService.clean(basePage), headers);
-        } catch (HtmlProcessorException e) {
-            throw new HostException(e);
-        }
-    }
-
-    protected String appendUri(String uri, String appendQuery) throws URISyntaxException {
-        URI oldUri = new URI(uri);
-
-        String newQuery = oldUri.getQuery();
-        if (newQuery == null) {
-            newQuery = appendQuery;
-        } else {
-            newQuery += "&" + appendQuery;
-        }
-
-        return new URI(oldUri.getScheme(), oldUri.getAuthority(),
-                oldUri.getPath(), newQuery, oldUri.getFragment()).toString();
-    }
-
-    private void setImageRequest(final ImageFileData imageFileData) {
-        HttpGet httpGet = cm.buildHttpGet(imageFileData.getImageUrl());
-        httpGet.addHeader("Referer", imageFileData.getPageUrl());
-        imageFileData.setImageRequest(httpGet);
-    }
-
-    protected abstract void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException;
+    public abstract HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException;
 
     @Override
     public boolean equals(Object o) {
@@ -247,16 +30,9 @@ abstract public class Host {
         return Objects.equals(getHost(), host.getHost());
     }
 
-    @Getter
-    public static class Response {
-
-        protected Response(Document document, Header[] headers) {
-            this.document = document;
-            this.headers = headers;
-        }
-
-        private Document document;
-        private Header[] headers;
+    @Override
+    public int hashCode() {
+        return Objects.hash(getHost());
     }
 
     @Override

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

@@ -1,12 +1,11 @@
 package tn.mnlr.vripper.host;
 
+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,22 +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.HostService;
+import tn.mnlr.vripper.services.HtmlProcessorService;
+import tn.mnlr.vripper.services.XpathService;
 
 import java.io.IOException;
 
 @Service
+@Slf4j
 public class ImageBamHost extends Host {
 
-    private static final Logger logger = LoggerFactory.getLogger(ImageBamHost.class);
-
     private static final String host = "imagebam.com";
     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 ConnectionManager cm;
+    private final XpathService xpathService;
+    private final HtmlProcessorService htmlProcessorService;
+
     @Autowired
-    private ConnectionManager cm;
+    public ImageBamHost(HostService hostService, ConnectionManager cm, XpathService xpathService, HtmlProcessorService htmlProcessorService) {
+        this.hostService = hostService;
+        this.cm = cm;
+        this.xpathService = xpathService;
+        this.htmlProcessorService = htmlProcessorService;
+    }
 
     @Override
     public String getHost() {
@@ -42,29 +52,29 @@ public class ImageBamHost extends Host {
     }
 
     @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException {
 
-        Response response = getResponse(url, context);
+        HostService.Response response = hostService.getResponse(url, context);
         Document doc = response.getDocument();
 
         Node contDiv;
         try {
-            logger.debug(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.debug(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);
-            logger.debug(String.format("Requesting %s", 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) {
@@ -74,20 +84,19 @@ public class ImageBamHost extends Host {
 
         Node imgNode;
         try {
-            logger.debug(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.debug(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);
         }
     }

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

@@ -1,27 +1,33 @@
 package tn.mnlr.vripper.host;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
-import tn.mnlr.vripper.services.ConnectionManager;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;
 
 import java.util.Optional;
 
 @Service
+@Slf4j
 public class ImageTwistHost extends Host {
 
     private static final String IMG_XPATH = "//img[contains(@class, 'img')]";
-    private static final Logger logger = LoggerFactory.getLogger(ImageTwistHost.class);
     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() {
@@ -34,25 +40,24 @@ public class ImageTwistHost extends Host {
     }
 
     @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException {
 
-        Document doc = getResponse(url, context).getDocument();
+        Document doc = hostService.getResponse(url, context).getDocument();
 
         Node imgNode;
         try {
-            logger.debug(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.debug(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);
         }

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

@@ -1,25 +1,32 @@
 package tn.mnlr.vripper.host;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
-
-import java.net.URI;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;
 
 @Service
+@Slf4j
 public class ImageVenueHost extends Host {
 
-    private static final Logger logger = LoggerFactory.getLogger(ImageVenueHost.class);
-
     private static final String host = "imagevenue.com";
-    private static final String CONTINUE_BUTTON_XPATH = "//a[@title='Continue to your image']";
-    private static final String IMG_XPATH = "//img[@id='thepic']";
+    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() {
@@ -32,20 +39,18 @@ public class ImageVenueHost extends Host {
     }
 
     @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context) throws HostException {
 
-        //Sadly, they do not support https.
-        //If they add such support in the future,
-        //then we should automatically adapt the URL here as done elsewhere.
+        String url = _url.replace("http://", "https://");
 
-        Response resp = getResponse(url, context);
+        HostService.Response resp = hostService.getResponse(url, context);
         Document doc = resp.getDocument();
 
         try {
-            logger.debug(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
-            if(xpathService.getAsNode(doc, CONTINUE_BUTTON_XPATH) != null) {
+            log.debug(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
+            if (xpathService.getAsNode(doc, CONTINUE_BUTTON_XPATH) != null) {
                 //Button detected. No need to actually click it, just make the call again.
-                resp = getResponse(url, context);
+                resp = hostService.getResponse(url, context);
                 doc = resp.getDocument();
             }
         } catch (XpathException e) {
@@ -54,7 +59,7 @@ public class ImageVenueHost extends Host {
 
         Node imgNode;
         try {
-            logger.debug(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);
@@ -65,14 +70,12 @@ public class ImageVenueHost extends Host {
         }
 
         try {
-            logger.debug(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();
 
-            URI baseUri = new URI(url);
-            imageFileData.setImageUrl(new URI(baseUri.getScheme(), baseUri.getHost(), '/'+imgUrl, null).toString());
-            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);
         }
     }

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

@@ -1,28 +1,32 @@
 package tn.mnlr.vripper.host;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
-import tn.mnlr.vripper.services.ConnectionManager;
+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";
     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() {
@@ -35,16 +39,16 @@ public class ImageZillaHost extends Host {
     }
 
     @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException {
 
-        Document doc = getResponse(url, context).getDocument();
+        Document doc = hostService.getResponse(url, context).getDocument();
 
         String title;
         try {
-            logger.debug(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.debug(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;
@@ -53,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);
         }

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

@@ -1,27 +1,31 @@
 package tn.mnlr.vripper.host;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
-import tn.mnlr.vripper.services.ConnectionManager;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;
 
 @Service
+@Slf4j
 public class ImgSpiceHost extends Host {
 
-    private static final Logger logger = LoggerFactory.getLogger(ImgSpiceHost.class);
-
     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
-    private ConnectionManager cm;
+    public ImgSpiceHost(HostService hostService, XpathService xpathService) {
+        this.hostService = hostService;
+        this.xpathService = xpathService;
+    }
 
     @Override
     public String getHost() {
@@ -34,27 +38,26 @@ public class ImgSpiceHost extends Host {
     }
 
     @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context) throws HostException {
 
         String url = _url.replace("http://", "https://");
-        Response resp = getResponse(url, context);
+        HostService.Response resp = hostService.getResponse(url, context);
         Document doc = resp.getDocument();
 
         Node imgNode;
         try {
-            logger.debug(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.debug(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);
+            return new HostService.NameUrl(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
         } catch (Exception e) {
             throw new HostException("Unexpected error occurred", e);
         }

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

@@ -1,27 +1,32 @@
 package tn.mnlr.vripper.host;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
-import tn.mnlr.vripper.services.ConnectionManager;
+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";
     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() {
@@ -34,25 +39,24 @@ public class ImgboxHost extends Host {
     }
 
     @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException {
 
-        Document doc = getResponse(url, context).getDocument();
+        Document doc = hostService.getResponse(url, context).getDocument();
 
         Node imgNode;
         try {
-            logger.debug(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.debug(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);
         }

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

@@ -1,5 +1,6 @@
 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;
@@ -8,8 +9,6 @@ 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;
@@ -17,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.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";
     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 ConnectionManager cm;
+    private final HtmlProcessorService htmlProcessorService;
+
     @Autowired
-    private ConnectionManager cm;
+    public ImxHost(HostService hostService, XpathService xpathService, ConnectionManager cm, HtmlProcessorService htmlProcessorService) {
+        this.hostService = hostService;
+        this.xpathService = xpathService;
+        this.cm = cm;
+        this.htmlProcessorService = htmlProcessorService;
+    }
 
     @Override
     public String getHost() {
@@ -47,16 +57,16 @@ public class ImxHost extends Host {
     }
 
     @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context) throws HostException {
 
         String url = _url.replace("http://", "https://");
-        Response resp = getResponse(url, context);
+        HostService.Response resp = hostService.getResponse(url, context);
         Document doc = resp.getDocument();
 
         Node contDiv;
         String value = null;
         try {
-            logger.debug(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) {
@@ -69,9 +79,9 @@ public class ImxHost extends Host {
         if (value == null) {
             throw new HostException("Failed to obtain value attribute from continue input");
         }
-        logger.debug(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);
         List<NameValuePair> params = new ArrayList<>();
         params.add(new BasicNameValuePair("imgContinue", value));
         try {
@@ -79,9 +89,9 @@ public class ImxHost extends Host {
         } catch (Exception e) {
             throw new HostException(e);
         }
-        logger.debug(String.format("Requesting %s", httpPost));
+        log.debug(String.format("Requesting %s", httpPost));
         try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(httpPost, context)) {
-            logger.debug(String.format("Cleaning response for %s", httpPost));
+            log.debug(String.format("Cleaning response for %s", httpPost));
             doc = htmlProcessorService.clean(EntityUtils.toString(response.getEntity()));
             EntityUtils.consumeQuietly(response.getEntity());
         } catch (IOException | HtmlProcessorException e) {
@@ -90,20 +100,19 @@ public class ImxHost extends Host {
 
         Node imgNode;
         try {
-            logger.debug(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.debug(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);
         }
     }

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

@@ -1,27 +1,32 @@
 package tn.mnlr.vripper.host;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
-import tn.mnlr.vripper.services.ConnectionManager;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;
 
 @Service
+@Slf4j
 public class PimpandhostHost extends Host {
 
-    private static final Logger logger = LoggerFactory.getLogger(PimpandhostHost.class);
-
     private static final String host = "pimpandhost.com";
     private static final String IMG_XPATH = "//img[contains(@class, 'original')]";
 
+    private final HostService hostService;
+    private final XpathService xpathService;
+
     @Autowired
-    private ConnectionManager cm;
+    public PimpandhostHost(HostService hostService, XpathService xpathService) {
+        super();
+        this.hostService = hostService;
+        this.xpathService = xpathService;
+    }
 
     @Override
     public String getHost() {
@@ -34,33 +39,35 @@ public class PimpandhostHost extends Host {
     }
 
     @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context) throws HostException {
 
         String url;
         try {
-            url = appendUri(_url.replace("http://", "https://"), "size=original");
+            url = hostService.appendUri(_url.replace("http://", "https://"), "size=original");
         } catch (Exception e) {
             throw new HostException(e);
         }
 
-        Response resp = getResponse(url, context);
+        HostService.Response resp = hostService.getResponse(url, context);
         Document doc = resp.getDocument();
 
         Node imgNode;
         try {
-            logger.debug(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.debug(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 = "https:" + imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
 
-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle);
+            return new HostService.NameUrl(
+                    imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle,
+                    imgUrl
+            );
         } catch (Exception e) {
             throw new HostException("Unexpected error occurred", e);
         }

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

@@ -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);
+        }
+    }
+}

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

@@ -1,28 +1,32 @@
 package tn.mnlr.vripper.host;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
-import tn.mnlr.vripper.services.ConnectionManager;
+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";
     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() {
@@ -35,25 +39,24 @@ public class PixhostHost extends Host {
     }
 
     @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException {
 
-        Document doc = getResponse(url, context).getDocument();
+        Document doc = hostService.getResponse(url, context).getDocument();
 
         Node imgNode;
         try {
-            logger.debug(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.debug(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);
         }

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

@@ -1,28 +1,32 @@
 package tn.mnlr.vripper.host;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
-import tn.mnlr.vripper.services.ConnectionManager;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;
 
 @Service
+@Slf4j
 public class PixxxelsHost extends Host {
 
-    private static final Logger logger = LoggerFactory.getLogger(PixxxelsHost.class);
-
     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
-    private ConnectionManager cm;
+    public PixxxelsHost(HostService hostService, XpathService xpathService) {
+        this.hostService = hostService;
+        this.xpathService = xpathService;
+    }
 
     @Override
     public String getHost() {
@@ -35,18 +39,18 @@ public class PixxxelsHost extends Host {
     }
 
     @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context) throws HostException {
 
         String url = _url.replace("http://", "https://");
-        Response resp = getResponse(url, context);
+        HostService.Response resp = hostService.getResponse(url, context);
         Document doc = resp.getDocument();
 
         Node imgNode, titleNode;
         try {
-            logger.debug(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);
 
-            logger.debug(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));
             titleNode = xpathService.getAsNode(doc, TITLE_XPATH);
 
         } catch (XpathException e) {
@@ -54,12 +58,11 @@ public class PixxxelsHost extends Host {
         }
 
         try {
-            logger.debug(String.format("Resolving name and image url for %s", url));
+            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();
 
-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle);
+            return new HostService.NameUrl(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
         } catch (Exception e) {
             throw new HostException("Unexpected error occurred", e);
         }

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

@@ -1,26 +1,35 @@
 package tn.mnlr.vripper.host;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;
 
 import java.util.Optional;
 
 @Service
+@Slf4j
 public class PostImgHost extends Host {
 
-    private static final Logger logger = LoggerFactory.getLogger(PostImgHost.class);
-
     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;
@@ -32,28 +41,27 @@ public class PostImgHost extends Host {
     }
 
     @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context) throws HostException {
 
         String url = _url.replace("http://", "https://");
-        Document doc = getResponse(url, context).getDocument();
+        Document doc = hostService.getResponse(url, context).getDocument();
 
         Node urlNode, titleNode;
         try {
-            logger.debug(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));
             titleNode = xpathService.getAsNode(doc, TITLE_XPATH);
 
-            logger.debug(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));
             urlNode = xpathService.getAsNode(doc, IMG_XPATH);
         } catch (XpathException e) {
             throw new HostException(e);
         }
 
         try {
-            logger.debug(String.format("Resolving name and image url for %s", url));
-            String imgTitle = Optional.ofNullable(titleNode).map(node -> node.getTextContent().trim()).orElseGet(() -> getDefaultImageName(url));
+            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));
 
-            imageFileData.setImageUrl(urlNode.getAttributes().getNamedItem("href").getTextContent().trim());
-            imageFileData.setImageName(imgTitle);
+            return new HostService.NameUrl(imgTitle, urlNode.getAttributes().getNamedItem("href").getTextContent().trim());
         } catch (Exception e) {
             throw new HostException("Unexpected error occurred", e);
         }

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

@@ -1,28 +1,32 @@
 package tn.mnlr.vripper.host;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
-import tn.mnlr.vripper.services.ConnectionManager;
+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";
     private static final String TITLE_XPATH = "//div[contains(@class,'titleFullS')]/h1";
-    private static final String IMG_XPATH = "//img[@id='uImage']";
+    private static final String IMG_XPATH = "//img[@id='imageid']";
+
+    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() {
@@ -35,16 +39,16 @@ public class TurboImageHost extends Host {
     }
 
     @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context) throws HostException {
 
-        Document doc = getResponse(url, context).getDocument();
+        Document doc = hostService.getResponse(url, context).getDocument();
 
         String title;
         try {
-            logger.debug(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.debug(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;
@@ -53,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);
         }

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

@@ -0,0 +1,53 @@
+package tn.mnlr.vripper.jpa;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+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;
+
+    @Autowired
+    public Management(JdbcTemplate jdbcTemplate, @Value("${base.dir}") String baseDir, @Value("${base.dir.name}") String baseDirName) {
+        this.jdbcTemplate = jdbcTemplate;
+        this.backupFolder = baseDir + File.separator + baseDirName + File.separator + "backup";
+    }
+
+    @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()));
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/domain/Image.java

@@ -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);
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/domain/Metadata.java

@@ -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;
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/domain/Post.java

@@ -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);
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/domain/Queued.java

@@ -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);
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/domain/enums/Status.java

@@ -0,0 +1,5 @@
+package tn.mnlr.vripper.jpa.domain.enums;
+
+public enum Status {
+    PENDING, DOWNLOADING, COMPLETE, ERROR, STOPPED, PARTIAL
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/IImageRepository.java

@@ -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);
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/IMetadataRepository.java

@@ -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);
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/IPostRepository.java

@@ -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);
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/IQueuedRepository.java

@@ -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);
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/IRepository.java

@@ -0,0 +1,6 @@
+package tn.mnlr.vripper.jpa.repositories;
+
+public interface IRepository {
+
+    public void init();
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/impl/ImageRepository.java

@@ -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
+        );
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/impl/ImageRowMapper.java

@@ -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;
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/impl/MetadataRepository.java

@@ -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 WHERE POST_ID_REF = (SELECT post.ID FROM POST AS post INNER JOIN METADATA metadata ON post.ID = metadata.POST_ID_REF WHERE post.POST_ID = ?)",
+                postId
+        );
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/impl/MetadataRowMapper.java

@@ -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;
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/impl/PostRepository.java

@@ -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
+        );
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/impl/PostRowMapper.java

@@ -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;
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/impl/QueuedRepository.java

@@ -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
+        );
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/impl/QueuedRowMapper.java

@@ -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;
+    }
+}

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

@@ -1,36 +1,255 @@
 package tn.mnlr.vripper.q;
 
 import lombok.Getter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import tn.mnlr.vripper.entities.Image;
+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 java.util.Objects;
-import java.util.concurrent.Callable;
+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.*;
 
-public class DownloadJob implements Callable<Image> {
+@Slf4j
+public class DownloadJob implements CheckedRunnable {
 
-    private static final Logger logger = LoggerFactory.getLogger(DownloadJob.class);
+    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 Byte LOCK = 0;
+    private static final int READ_BUFFER_SIZE = 8192;
+
+    private final DataService dataService;
+    private final PathService pathService;
+    private final ConnectionManager cm;
+    private final VipergirlsAuthService authService;
+    private final DownloadSpeedService downloadSpeedService;
+    private final AppSettingsService appSettingsService;
+
+    private final HttpClientContext context;
 
     @Getter
     private final Image image;
 
     @Getter
-    private final ImageFileData imageFileData = new ImageFileData();
+    private final Post post;
 
-    DownloadJob(Image image) {
+    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(ConnectionManager.class);
+        authService = SpringContext.getBean(VipergirlsAuthService.class);
+        downloadSpeedService = SpringContext.getBean(DownloadSpeedService.class);
+        appSettingsService = SpringContext.getBean(AppSettingsService.class);
+        context = HttpClientContext.create();
+        context.setCookieStore(new BasicCookieStore());
+        context.setAttribute(ContextAttributes.OPEN_CONNECTION.toString(), Collections.synchronizedList(new ArrayList<AbstractExecutionAwareRequest>()));
+    }
+
+    public void download(final Post post, final Image image) throws DownloadException {
+
+        try {
+
+            image.setStatus(Status.DOWNLOADING);
+            image.setCurrent(0);
+            dataService.updateImageStatus(image.getStatus(), image.getId());
+            dataService.updateImageCurrent(image.getCurrent(), image.getId());
+
+            synchronized (LOCK) {
+                if (!post.getStatus().equals(Status.DOWNLOADING) && !post.getStatus().equals(Status.PARTIAL)) {
+                    post.setStatus(Status.DOWNLOADING);
+                    dataService.updatePostStatus(post.getStatus(), post.getId());
+                }
+            }
+
+
+            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;
+                synchronized (LOCK) {
+                    Post updatedPost = dataService.findPostById(post.getId()).orElseThrow();
+                    if (updatedPost.getPostFolderName() == null) {
+                        pathService.createDefaultPostFolder(updatedPost);
+                    }
+                    destinationFolder = pathService.getDownloadDestinationFolder(updatedPost);
+                    authService.leaveThanks(updatedPost);
+                }
+                File outputFile = new File(destinationFolder.getPath() + File.separator + String.format("%03d_", image.getIndex()) + nameAndUrl.getName() + ".tmp");
+                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.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, (appSettingsService.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 Image call() throws Exception {
-
-        logger.debug(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;
+    public void run() throws Exception {
+        if (stopped) {
+            finished = true;
+            return;
+        }
+        log.debug(String.format("Starting downloading %s", image.getUrl()));
+        download(post, image);
     }
 
     @Override
@@ -38,11 +257,22 @@ public class DownloadJob implements Callable<Image> {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         DownloadJob that = (DownloadJob) o;
-        return image.equals(that.image);
+        return Objects.equals(image, that.image) &&
+                Objects.equals(post, that.post);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(image);
+        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;
     }
 }

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

@@ -1,83 +0,0 @@
-package tn.mnlr.vripper.q;
-
-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.host.Host;
-import tn.mnlr.vripper.services.AppSettingsService;
-import tn.mnlr.vripper.services.AppStateService;
-
-import javax.annotation.PostConstruct;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.BlockingDeque;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.LinkedBlockingDeque;
-
-@Service
-public class DownloadQ {
-
-    private static final Logger logger = LoggerFactory.getLogger(DownloadQ.class);
-
-    @Autowired
-    private AppStateService appStateService;
-
-    private final ConcurrentHashMap<Host, BlockingDeque<DownloadJob>> downloadQ = new ConcurrentHashMap<>();
-    @Autowired
-    private AppSettingsService appSettingsService;
-    @Autowired
-    private List<Host> hosts;
-
-    @PostConstruct
-    private void init() {
-        hosts.forEach(host -> downloadQ.put(host, new LinkedBlockingDeque<>()));
-    }
-
-    public void put(Image image) throws InterruptedException {
-        logger.debug(String.format("Enqueuing a job for %s", image.getUrl()));
-        image.init();
-        DownloadJob downloadJob = new DownloadJob(image);
-        downloadQ.get(downloadJob.getImage().getHost()).putLast(downloadJob);
-        appStateService.newDownloadJob(downloadJob);
-    }
-
-    public void remove(final DownloadJob downloadJob) {
-        downloadQ.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 = downloadQ.get(host).iterator();
-            for (int i = 0; i < appSettingsService.getMaxThreads(); i++) {
-                DownloadJob downloadJob = it.hasNext() ? it.next() : null;
-                if (downloadJob != null) {
-                    downloadJobs.add(downloadJob);
-                }
-            }
-        }
-        return downloadJobs;
-    }
-
-    public void enqueue(Post post) throws InterruptedException {
-        for (Image image : post.getImages()) {
-            put(image);
-        }
-    }
-
-    public int size() {
-        return downloadQ.values().stream().mapToInt(BlockingDeque::size).sum();
-    }
-
-    public Iterable<? extends Map.Entry<Host, BlockingDeque<DownloadJob>>> entries() {
-        return downloadQ.entrySet();
-    }
-}

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

@@ -0,0 +1,38 @@
+package tn.mnlr.vripper.q;
+
+import lombok.extern.slf4j.Slf4j;
+import net.jodah.failsafe.Failsafe;
+import tn.mnlr.vripper.SpringContext;
+import tn.mnlr.vripper.VripperApplication;
+import tn.mnlr.vripper.jpa.domain.enums.Status;
+import tn.mnlr.vripper.services.DataService;
+
+@Slf4j
+public class ExecuteRunnable implements Runnable {
+
+    private final ExecutionService executionService;
+    private final DataService dataService;
+
+    private final DownloadJob downloadJob;
+
+    public ExecuteRunnable(final DownloadJob downloadJob) {
+        executionService = SpringContext.getBean(ExecutionService.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());
+                    executionService.afterJobFinish(downloadJob);
+                    log.debug(String.format("Finished downloading %s", downloadJob.getImage().getUrl()));
+                }).run(downloadJob);
+    }
+}

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

@@ -1,76 +1,54 @@
 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 lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import tn.mnlr.vripper.VripperApplication;
-import tn.mnlr.vripper.entities.Image;
-import tn.mnlr.vripper.entities.Post;
 import tn.mnlr.vripper.host.Host;
+import tn.mnlr.vripper.jpa.domain.Image;
+import tn.mnlr.vripper.jpa.domain.Post;
+import tn.mnlr.vripper.jpa.domain.enums.Status;
 import tn.mnlr.vripper.services.AppSettingsService;
-import tn.mnlr.vripper.services.AppStateService;
-import tn.mnlr.vripper.services.ThumbnailGenerator;
+import tn.mnlr.vripper.services.DataService;
+import tn.mnlr.vripper.services.post.PostService;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
 
 @Service
+@Slf4j
 public class ExecutionService {
 
-    private static final Logger logger = LoggerFactory.getLogger(ExecutionService.class);
+    private static final List<Status> FINISHED = Arrays.asList(Status.ERROR, Status.COMPLETE, Status.STOPPED);
+    private final int MAX_POOL_SIZE = 12;
 
-    private static final List<Post.Status> FINISHED = Arrays.asList(Post.Status.ERROR, Post.Status.COMPLETE, Post.Status.STOPPED);
-
-    @Autowired
-    private DownloadQ downloadQ;
-
-    @Autowired
-    private AppSettingsService settings;
-
-    @Autowired
-    private AppStateService appStateService;
-
-    @Autowired
-    private ThumbnailGenerator thumbnailGenerator;
-
-    @Autowired
-    private AppSettingsService appSettingsService;
     private final ConcurrentHashMap<Host, AtomicInteger> threadCount = new ConcurrentHashMap<>();
-    private boolean notPauseQ = true;
-    private ExecutorService executor = Executors.newFixedThreadPool(20);
+    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 PendingQ pendingQ;
+    private final AppSettingsService settings;
+    private final DataService dataService;
+    private final PostService postService;
+
+    private boolean pauseQ = false;
     private Thread executionThread;
-
-    BlockingQueue<DownloadJob> queue = new LinkedBlockingQueue<>();
-
-    private RetryPolicy<Object> retryPolicy;
-
-    private List<DownloadJob> running = Collections.synchronizedList(new ArrayList<>());
-
-    private Map<String, Future<?>> futures = new ConcurrentHashMap<>();
     private Thread pollThread;
 
+    @Autowired
+    public ExecutionService(PendingQ pendingQ, AppSettingsService settings, DataService dataService, PostService postService) {
+        this.pendingQ = pendingQ;
+        this.settings = settings;
+        this.dataService = dataService;
+        this.postService = postService;
+    }
+
     @PostConstruct
     private void init() {
-
-        retryPolicy = new RetryPolicy<>()
-                .handleIf(e -> !(e instanceof InterruptedException))
-                .withBackoff(1, 10, ChronoUnit.SECONDS)
-                .withMaxDuration(Duration.of(10, ChronoUnit.SECONDS))
-                .withMaxAttempts(3)
-                .abortOn(InterruptedException.class)
-                .onFailedAttempt(e -> logger.warn(String.format("#%d tries failed", e.getAttemptCount()), e.getLastFailure()));
-
         executionThread = new Thread(this::start, "Executor thread");
         pollThread = new Thread(this::poll, "Polling thread");
         pollThread.start();
@@ -79,117 +57,99 @@ public class ExecutionService {
 
     @PreDestroy
     private void destroy() throws InterruptedException {
-        logger.info("Shutting down ExecutionService");
+        log.info("Shutting down ExecutionService");
         executionThread.interrupt();
+        pollThread.interrupt();
         executor.shutdown();
-        appStateService.getCurrentPosts().keySet().forEach(p -> {
-            logger.debug(String.format("Stopping download jobs for %s", p));
-            this.stopRunning(p);
+        dataService.findAllPosts().forEach(p -> {
+            log.debug(String.format("Stopping download jobs for %s", p));
+            this.stopRunning(p.getPostId());
         });
         executor.awaitTermination(10, TimeUnit.SECONDS);
     }
 
-    public void stopRunning(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.debug(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();
+    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);
             }
-            e.getImage().cleanup();
-        });
-    }
+        }
 
-
-    public synchronized void stopAll() {
-        appStateService.getCurrentPosts().values().stream().map(Post::getPostId).forEach(this::stop);
-    }
-
-    public synchronized void restartAll() throws InterruptedException {
-        for (Post post : appStateService.getCurrentPosts().values()) {
-            String postId = post.getPostId();
-            restart(postId);
+        while (!stopping.isEmpty()) {
+            stopping.removeIf(DownloadJob::isFinished);
+            try {
+                Thread.sleep(500);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
         }
     }
 
-    public synchronized void restart(String postId) throws InterruptedException {
-        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));
+    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 = appStateService.getPost(postId)
-                .getImages()
-                .stream()
-                .filter(e -> !e.getStatus().equals(Image.Status.COMPLETE))
-                .collect(Collectors.toList());
+        List<Image> images = dataService.findByPostIdAndIsNotCompleted(postId);
         if (images.isEmpty()) {
             return;
         }
-        appStateService.getPost(postId).setStatus(Post.Status.PENDING);
-        logger.debug(String.format("Restarting %d jobs for post id %s", images.size(), postId));
+        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) {
-            downloadQ.put(image);
-        }
-    }
-
-    private synchronized void removeScheduled(Image image) {
-        image.setStatus(Image.Status.STOPPED);
-        logger.debug(String.format("Removing scheduled job for %s", image.getUrl()));
-
-        boolean removed = false;
-        main:
-        for (Map.Entry<Host, BlockingDeque<DownloadJob>> entry : downloadQ.entries()) {
-            Iterator<DownloadJob> iterator = entry.getValue().iterator();
-            while (iterator.hasNext()) {
-                DownloadJob next = iterator.next();
-                if (next.getImage().getPostId().equals(image.getPostId())) {
-                    iterator.remove();
-                    appStateService.doneDownloadJob(image);
-                    logger.debug(String.format("Scheduled job for %s is removed", image.getUrl()));
-                    removed = true;
-                    break main;
-                }
+            try {
+                pendingQ.put(post, image);
+            } catch (InterruptedException e) {
+                log.warn("Thread was interrupted", e);
+                Thread.currentThread().interrupt();
             }
         }
-
-        if (!removed) {
-            logger.debug(String.format("Job for %s does not exist", image.getUrl()));
-        }
-
-        image.cleanup();
     }
 
-    private synchronized void removeRunning(String postId) {
-        logger.debug(String.format("Interrupting running jobs for post id %s", postId));
-        stopRunning(postId);
+    private boolean isPending(String postId) {
+        return pendingQ.isPending(postId);
     }
 
-    public synchronized void stop(String postId) {
+    private void stop(String postId) {
         try {
-            if (FINISHED.contains(appStateService.getPost(postId).getStatus())) {
+            pauseQ = true;
+            final Post post = dataService.findPostByPostId(postId).orElseThrow();
+            if (post == null) {
                 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()) {
+            if (FINISHED.contains(post.getStatus())) {
                 return;
             }
-            logger.debug(String.format("Stopping %d jobs for post id %s", images.size(), postId));
-            images.forEach(this::removeScheduled);
-            removeRunning(postId);
+            pendingQ.stop(post);
+            stopRunning(postId);
+            dataService.stopImagesByPostIdAndIsNotCompleted(postId);
+            dataService.finishPost(post);
+            postService.stopFetchingMetadata(post);
         } finally {
-            notPauseQ = true;
+            pauseQ = false;
         }
     }
 
@@ -199,22 +159,22 @@ public class ExecutionService {
         if (count == null) {
             threadCount.put(host, new AtomicInteger(0));
         }
-        canRun = threadCount.get(host).get() < settings.getMaxThreads() && (settings.getMaxTotalThreads() == 0 || threadCount.values().stream().mapToInt(AtomicInteger::get).sum() < settings.getMaxTotalThreads());
-        if (canRun && notPauseQ) {
+        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;
     }
 
-    public void poll() {
+    private void poll() {
         while (!Thread.interrupted()) {
             try {
-                List<DownloadJob> peek = downloadQ.peek();
+                List<DownloadJob> peek = pendingQ.peek();
                 for (DownloadJob downloadJob : peek) {
                     if (canRun(downloadJob.getImage().getHost())) {
-                        queue.offer(downloadJob);
-                        downloadQ.remove(downloadJob);
+                        executionQueue.offer(downloadJob);
+                        pendingQ.remove(downloadJob);
                     }
                 }
                 synchronized (threadCount) {
@@ -227,55 +187,39 @@ public class ExecutionService {
         }
     }
 
-    public void start() {
+    private void start() {
         while (!Thread.interrupted()) {
             try {
-                push(queue.take());
+                push(executionQueue.take());
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
                 break;
             } catch (Exception e) {
-                logger.error("Execution Service failed", e);
+                log.error("Execution Service failed", e);
                 break;
             }
         }
     }
 
-    private void push(DownloadJob take) {
-        Runnable task = () -> {
-            running.add(take);
+    private void push(DownloadJob downloadJob) {
+        log.debug(String.format("Scheduling a job for %s", downloadJob.getImage().getUrl()));
+        executor.execute(new ExecuteRunnable(downloadJob));
+        executing.add(downloadJob);
+    }
 
-            Failsafe.with(retryPolicy)
-                    .onFailure(e -> {
-                        if (e.getFailure() instanceof InterruptedException || (e.getFailure() instanceof FailsafeException && e.getFailure().getCause() instanceof InterruptedException)) {
-                            logger.debug("Job successfully interrupted");
-                            return;
-                        }
-                        logger.error(String.format("Failed to download %s after %d tries", take.getImage().getUrl(), e.getAttemptCount()), e.getFailure());
-                        take.getImage().setStatus(Image.Status.ERROR);
-                    })
-                    .onComplete(e -> {
-                        appStateService.doneDownloadJob(take.getImage());
-                        logger.debug(String.format("Finished downloading %s", take.getImage().getUrl()));
-                        if (appSettingsService.isViewPhotos()) {
-                            VripperApplication.commonExecutor.submit(
-                                    () -> thumbnailGenerator.getThumbnails()
-                                            .get(new ThumbnailGenerator.CacheKey(take.getImage().getPostId(), take.getImageFileData().getFileName())));
-                        }
-                        threadCount.get(take.getImage().getHost()).decrementAndGet();
-                        running.remove(take);
-                        futures.remove(take.getImage().getUrl());
-                        synchronized (threadCount) {
-                            threadCount.notify();
-                        }
-                    })
-                    .get(take::call);
-        };
-        logger.debug(String.format("Scheduling a job for %s", take.getImage().getUrl()));
-        futures.put(take.getImage().getUrl(), executor.submit(task));
+    public synchronized void afterJobFinish(DownloadJob downloadJob) {
+        int count = pendingQ.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 running.size();
+        return executing.size();
     }
 }

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

@@ -1,16 +0,0 @@
-package tn.mnlr.vripper.q;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.http.client.methods.HttpUriRequest;
-
-@Getter
-@Setter
-public class ImageFileData {
-
-    private String pageUrl;
-    private String imageName;
-    private String fileName;
-    private String imageUrl;
-    private HttpUriRequest imageRequest;
-}

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

@@ -0,0 +1,115 @@
+package tn.mnlr.vripper.q;
+
+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.AppSettingsService;
+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 PendingQ {
+
+    private final DataService dataService;
+    private final AppSettingsService appSettingsService;
+    private final List<Host> hosts;
+
+    private final ConcurrentHashMap<Host, BlockingDeque<DownloadJob>> pendingQ = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, AtomicInteger> toBeExecuted = new ConcurrentHashMap<>();
+
+    @Autowired
+    public PendingQ(DataService dataService, AppSettingsService appSettingsService, List<Host> hosts) {
+        this.dataService = dataService;
+        this.appSettingsService = appSettingsService;
+        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 < appSettingsService.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;
+    }
+}

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

@@ -1,129 +1,156 @@
 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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 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 java.util.prefs.BackingStoreException;
-import java.util.prefs.Preferences;
+
+import static java.nio.file.StandardOpenOption.*;
 
 @Service
 @Getter
 @Setter
+@Slf4j
 public class AppSettingsService {
 
     private final String MAX_TOTAL_THREADS = "MAX_TOTAL_THREADS";
+    private final String baseDir;
 
-    @Value("${base.dir}")
-    private String defaultDownloadPath;
+    private final Path configPath;
+    private final ObjectMapper om = new ObjectMapper();
 
-    private static final Logger logger = LoggerFactory.getLogger(AppSettingsService.class);
+    private Settings settings = new Settings();
 
-    private Preferences prefs = Preferences.userNodeForPackage(AppSettingsService.class);
-
-    private final String DOWNLOAD_PATH = "DOWNLOAD_PATH";
-    private final String MAX_THREADS = "MAX_THREADS";
-    private int maxTotalThreads;
-    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 final String VIEW_PHOTOS = "VIEW_PHOTOS";
-    private final String NOTIFICATION = "NOTIFICATION";
+    public AppSettingsService(@Value("${base.dir}") String baseDir, @Value("${base.dir.name}") String baseDirName) {
+        this.baseDir = baseDir;
+        this.configPath = Paths.get(baseDir, baseDirName, "config.json");
+        om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    }
 
     @PostConstruct
     private void init() {
         restore();
     }
 
-    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;
-    private boolean viewPhotos;
-    private boolean notificationEnabled;
+    public void newSettings(Settings settings) {
 
-    public void setVPassword(String vPassword) {
-        if(vPassword.isEmpty()) {
-            this.vPassword = "";
+        if (settings.getVLogin()) {
+            if (!this.settings.getVPassword().equals(settings.getVPassword())) {
+                settings.setVPassword(settings.getVPassword());
+            }
         } else {
-            this.vPassword = DigestUtils.md5Hex(vPassword);
+            settings.setVUsername("");
+            settings.setVPassword("");
+            settings.setVThanks(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();
+        }
 
-        downloadPath = prefs.get(DOWNLOAD_PATH, defaultDownloadPath);
-        maxThreads = prefs.getInt(MAX_THREADS, 4);
-        maxTotalThreads = prefs.getInt(MAX_TOTAL_THREADS, 0);
-        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);
-        viewPhotos = prefs.getBoolean(VIEW_PHOTOS, false);
-        notificationEnabled = prefs.getBoolean(NOTIFICATION, false);
+        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.getViewPhotos() == null) {
+            settings.setViewPhotos(false);
+        }
+
+        save();
     }
 
     @PreDestroy
     public void save() {
-
-        prefs.put(DOWNLOAD_PATH, downloadPath);
-        prefs.putInt(MAX_THREADS, maxThreads);
-        prefs.putInt(MAX_TOTAL_THREADS, maxTotalThreads);
-        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);
-        prefs.putBoolean(VIEW_PHOTOS, viewPhotos);
-        prefs.putBoolean(NOTIFICATION, notificationEnabled);
-
         try {
-            prefs.sync();
-        } catch (BackingStoreException e) {
-            logger.error("Failed to store user settings", e);
+            // force disable gallery
+            settings.setViewPhotos(false);
+
+            Files.write(configPath, om.writeValueAsBytes(settings), CREATE, WRITE, TRUNCATE_EXISTING, SYNC);
+        } catch (IOException e) {
+            log.error("Failed to store user settings", e);
         }
     }
 
@@ -141,8 +168,8 @@ public class AppSettingsService {
             throw new ValidationException(String.format("%s is not a directory", settings.getDownloadPath()));
         }
 
-        if (settings.getMaxTotalThreads() < 0) {
-            throw new ValidationException(String.format("Invalid max global concurrent download settings, values must be in greater than %d", 1));
+        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) {
@@ -151,11 +178,11 @@ public class AppSettingsService {
     }
 
     public Theme getTheme() {
-        return new Theme(this.darkTheme);
+        return new Theme(this.settings.getDarkTheme());
     }
 
     public void setTheme(Theme theme) {
-        this.darkTheme = theme.darkTheme;
+        this.settings.setDarkTheme(theme.darkTheme);
         save();
     }
 
@@ -172,55 +199,48 @@ public class AppSettingsService {
     }
 
     @Getter
+    @Setter
+    @NoArgsConstructor
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public static class Settings {
 
         @JsonProperty("downloadPath")
         private String downloadPath;
         @JsonProperty("maxThreads")
-        private int maxThreads;
+        private Integer maxThreads;
         @JsonProperty("maxTotalThreads")
-        private int maxTotalThreads;
+        private Integer maxTotalThreads;
         @JsonProperty("autoStart")
-        private boolean autoStart;
+        private Boolean autoStart;
         @JsonProperty("vLogin")
-        private boolean vLogin;
+        private Boolean vLogin;
         @JsonProperty("vUsername")
         private String vUsername;
         @JsonProperty("vPassword")
         private String vPassword;
         @JsonProperty("vThanks")
-        private boolean vThanks;
+        private Boolean vThanks;
         @JsonProperty("desktopClipboard")
-        private boolean desktopClipboard;
+        private Boolean desktopClipboard;
         @JsonProperty("forceOrder")
-        private boolean forceOrder;
+        private Boolean forceOrder;
         @JsonProperty("subLocation")
-        private boolean subLocation;
+        private Boolean subLocation;
         @JsonProperty("threadSubLocation")
-        private boolean threadSubLocation;
+        private Boolean threadSubLocation;
         @JsonProperty("clearCompleted")
-        private boolean clearCompleted;
+        private Boolean clearCompleted;
         @JsonProperty("viewPhotos")
-        private boolean viewPhotos;
-        @JsonProperty("notification")
-        private boolean notification;
+        private Boolean viewPhotos;
+        @JsonProperty("darkTheme")
+        private Boolean darkTheme;
 
-        public Settings(String downloadPath, int maxThreads, int maxTotalThreads, boolean autoStart, boolean vLogin, String vUsername, String vPassword, boolean vThanks, boolean desktopClipboard, boolean forceOrder, boolean subLocation, boolean threadSubLocation, boolean clearCompleted, boolean viewPhotos, boolean notification) {
-            this.downloadPath = downloadPath;
-            this.maxThreads = maxThreads;
-            this.maxTotalThreads = maxTotalThreads;
-            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;
-            this.viewPhotos = viewPhotos;
-            this.notification = notification;
+        public void setVPassword(String vPassword) {
+            if (vPassword == null || vPassword.isEmpty()) {
+                this.vPassword = "";
+            } else {
+                this.vPassword = DigestUtils.md5Hex(vPassword);
+            }
         }
     }
 }

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

@@ -1,142 +0,0 @@
-package tn.mnlr.vripper.services;
-
-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.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 Map<String, QueuedVGLink> grabQueue = new ConcurrentHashMap<>();
-
-    private PublishProcessor<QueuedVGLink> liveGrabQueue = PublishProcessor.create();
-
-    private PublishProcessor<Image> liveImageUpdates = PublishProcessor.create();
-
-    private PublishProcessor<Post> livePostsState = PublishProcessor.create();
-
-    @Autowired
-    private PersistenceService persistenceService;
-
-    @Autowired
-    private AppSettingsService appSettingsService;
-
-    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 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.getStatus().equals(Post.Status.PARTIAL)) {
-            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).anyMatch(e -> e.equals(Image.Status.ERROR))) {
-                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);
-        currentImages.entrySet().removeIf(entry -> entry.getValue().getPostId().equals(postId));
-        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;
-    }
-}

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

@@ -0,0 +1,29 @@
+package tn.mnlr.vripper.services;
+
+import io.reactivex.Scheduler;
+import io.reactivex.schedulers.Schedulers;
+import lombok.Getter;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PreDestroy;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+@Service
+public class CommonExecutor {
+    @Getter
+    private final ExecutorService generalExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
+    private final ExecutorService schedulerExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
+
+    @Getter
+    private final Scheduler scheduler = Schedulers.from(schedulerExecutor);
+
+    @PreDestroy
+    private void destroy() throws InterruptedException {
+        generalExecutor.shutdown();
+        generalExecutor.awaitTermination(10, TimeUnit.SECONDS);
+        schedulerExecutor.shutdown();
+        schedulerExecutor.awaitTermination(10, TimeUnit.SECONDS);
+    }
+}

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

@@ -2,8 +2,10 @@ 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;
@@ -11,8 +13,10 @@ 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.q.DownloadJob;
 
 import java.net.URI;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 @Service
@@ -53,21 +57,33 @@ public class ConnectionManager {
                 .setDefaultRequestConfig(rc);
     }
 
-    public HttpGet buildHttpGet(String url) {
+    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) {
+    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) {
+    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);
+            }
+        }
+    }
 }

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

@@ -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 AppSettingsService appSettingsService;
+
+    private final PublishProcessor<Long> liveGrabQueue = PublishProcessor.create();
+    private final PublishProcessor<Long> liveImageUpdates = PublishProcessor.create();
+    private final PublishProcessor<Long> livePostsState = PublishProcessor.create();
+
+    private final PublishProcessor<String> postRemove = PublishProcessor.create();
+    private final PublishProcessor<String> queueRemove = PublishProcessor.create();
+
+    public Observable<Long> liveQueue() {
+        return liveGrabQueue.toObservable();
+    }
+
+    public Observable<Long> livePost() {
+        return livePostsState.toObservable();
+    }
+
+    public Observable<Long> liveImage() {
+        return liveImageUpdates.toObservable();
+    }
+
+    public Observable<String> queueRemove() {
+        return queueRemove.toObservable();
+    }
+
+    public Observable<String> postRemove() {
+        return postRemove.toObservable();
+    }
+
+    @Autowired
+    public DataService(IPostRepository postRepository, IImageRepository imageRepository, IQueuedRepository queuedRepository, IMetadataRepository metadataRepository, AppSettingsService appSettingsService) {
+        this.postRepository = postRepository;
+        this.imageRepository = imageRepository;
+        this.queuedRepository = queuedRepository;
+        this.metadataRepository = metadataRepository;
+        this.appSettingsService = appSettingsService;
+    }
+
+    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 (appSettingsService.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);
+    }
+}

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

@@ -5,8 +5,7 @@ import lombok.Getter;
 @Getter
 public class DownloadSpeed {
 
-    private final String type = "downSpeed";
-    private String speed;
+    private final String speed;
 
     public DownloadSpeed(long bytes) {
         speed = formatSI(bytes);

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

@@ -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;
 

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

@@ -7,15 +7,12 @@ 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;
+    private final long running;
+    private final long remaining;
+    private final long error;
 
-    GlobalState(long running, long queued, long remaining, long error) {
+    GlobalState(long running, long remaining, long error) {
         this.running = running;
-        this.queued = queued;
         this.remaining = remaining;
         this.error = error;
     }
@@ -25,11 +22,11 @@ public class GlobalState {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         GlobalState that = (GlobalState) o;
-        return running == that.running && queued == that.queued && remaining == that.remaining && error == that.error;
+        return running == that.running && remaining == that.remaining && error == that.error;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(type, running, queued, remaining, error);
+        return Objects.hash(running, remaining, error);
     }
 }

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

@@ -6,47 +6,36 @@ 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.q.PendingQ;
 
 @Service
 @EnableScheduling
 public class GlobalStateService {
 
-    @Autowired
-    private DownloadQ downloadQ;
-
-    @Autowired
-    private ExecutionService executionService;
-
-    @Autowired
-    private AppStateService appStateService;
+    private final PendingQ pendingQ;
+    private final ExecutionService executionService;
+    private final DataService dataService;
 
     @Getter
     private GlobalState currentState;
 
     @Getter
-    private PublishProcessor<GlobalState> liveGlobalState = PublishProcessor.create();
+    private final PublishProcessor<GlobalState> liveGlobalState = PublishProcessor.create();
 
-    public GlobalStateService() {
+    @Autowired
+    public GlobalStateService(PendingQ pendingQ, ExecutionService executionService, DataService dataService) {
+        this.pendingQ = pendingQ;
+        this.executionService = executionService;
+        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());
+                pendingQ.size(),
+                dataService.countErrorImages());
         if (!newGlobalState.equals(currentState)) {
             currentState = newGlobalState;
             liveGlobalState.onNext(currentState);

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

@@ -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 ConnectionManager cm;
+    private final HtmlProcessorService htmlProcessorService;
+
+    @Autowired
+    public HostService(ConnectionManager 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;
+    }
+}

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

@@ -1,36 +1,116 @@
 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 AppSettingsService appSettingsService;
+    private final DataService dataService;
+
+    private final CommonExecutor commonExecutor;
 
     @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(AppSettingsService appSettingsService, DataService dataService, CommonExecutor commonExecutor) {
+        this.appSettingsService = appSettingsService;
+        this.dataService = dataService;
+        this.commonExecutor = commonExecutor;
     }
 
-    public final String sanitize(final String folderName) {
+    public final File getDownloadDestinationFolder(Post post) {
+        return _getDownloadDestinationFolder(post.getForum(), post.getThreadTitle(), post.getPostFolderName());
+    }
+
+    private File _getDownloadDestinationFolder(@NonNull String forum, @NonNull String threadTitle, @NonNull String title) {
+        File sourceFolder = appSettingsService.getSettings().getSubLocation() ? new File(appSettingsService.getSettings().getDownloadPath(), sanitize(forum)) : new File(appSettingsService.getSettings().getDownloadPath());
+        sourceFolder = appSettingsService.getSettings().getThreadSubLocation() ? new File(sourceFolder, threadTitle) : sourceFolder;
+        return new File(sourceFolder, title);
+    }
+
+    public final void createDefaultPostFolder(Post post) {
+        File sourceFolder = _getDownloadDestinationFolder(post.getForum(), post.getThreadTitle(), sanitize(post.getTitle()));
+        File destFolder = makeDirs(sourceFolder);
+        post.setPostFolderName(destFolder.getName());
+        dataService.updatePostFolderName(post.getPostFolderName(), post.getId());
+    }
+
+    public final void rename(@NonNull String postId, @NonNull String altName) {
+        Post post = dataService.findPostByPostId(postId).orElseThrow();
+        commonExecutor.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)));
+            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;
     }
 

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

@@ -1,161 +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.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import tn.mnlr.vripper.EventListenerBean;
-import tn.mnlr.vripper.SpringContext;
-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;
-
-@Service
-public class PersistenceService {
-
-    private static final Logger logger = LoggerFactory.getLogger(PersistenceService.class);
-
-    @Autowired
-    private AppStateService stateService;
-
-    @Value("${base.dir}")
-    private String baseDir;
-
-    @Getter
-    private String dataPath;
-
-    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()
-                .throttleLatest(1, TimeUnit.SECONDS)
-                .doOnNext(this::persist)
-                .subscribe();
-    }
-
-    @PostConstruct
-    public void init() {
-        dataPath = baseDir + File.separator + ".vripper" + File.separator + "data.json";
-        File dataFile = new File(dataPath);
-        if (!dataFile.exists()) {
-            try {
-                if (dataFile.getParentFile().mkdirs()) {
-                    logger.debug(String.format("%s is created", dataFile.getParentFile().toString()));
-                }
-                if (!dataFile.getParentFile().isDirectory() || !dataFile.getParentFile().canWrite()) {
-                    logger.error(String.format("Unable to write in %s", dataFile.getParent()));
-                    SpringContext.close();
-                }
-
-                if (dataFile.createNewFile()) {
-                    logger.debug("Data file successfully created");
-                    try (FileWriter fw = new FileWriter(dataFile)) {
-                        fw.write("{}");
-                    }
-                } else {
-                    logger.warn("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");
-        if (EventListenerBean.isInit()) {
-            this.persist(stateService.getCurrentPosts());
-        }
-    }
-
-    private void persist(Map<String, Post> currentPosts) {
-
-        try (PrintWriter out = new PrintWriter(dataPath, StandardCharsets.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", dataPath, dataPath + "." + timestamp + ".old"));
-            try {
-                Files.move(new File(dataPath).toPath(), new File(dataPath + "." + timestamp + ".old").toPath());
-            } catch (IOException ex) {
-                logger.error(String.format("Failed to rename %s to %s", dataPath, dataPath + ".old"));
-                SpringContext.close();
-            }
-        }
-
-        return new HashMap<>();
-    }
-
-    public void restore() {
-
-        String jsonContent = null;
-        try {
-            jsonContent = String.join("", Files.readAllLines(Paths.get(dataPath), StandardCharsets.UTF_8));
-        } 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, Post.Status.PENDING).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));
-    }
-}

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

@@ -1,82 +0,0 @@
-package tn.mnlr.vripper.services;
-
-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.Post;
-import tn.mnlr.vripper.exception.PostParseException;
-import tn.mnlr.vripper.host.Host;
-import tn.mnlr.vripper.q.DownloadQ;
-
-import javax.annotation.PostConstruct;
-import java.util.List;
-
-@Service
-public class PostParser {
-
-    private static final Logger logger = LoggerFactory.getLogger(PostParser.class);
-
-    static final String VR_API = "https://vipergirls.to/vr.php";
-
-    @Autowired
-    private ConnectionManager cm;
-
-    @Autowired
-    private AppStateService appStateService;
-
-    @Autowired
-    private VipergirlsAuthService authService;
-
-    @Autowired
-    private AppSettingsService appSettingsService;
-
-    @Autowired
-    private DownloadQ downloadQ;
-
-    @Autowired
-    private VipergirlsAuthService vipergirlsAuthService;
-
-    @Autowired
-    private List<Host> supportedHosts;
-
-    @PostConstruct
-    private void init() {
-
-    }
-
-    public synchronized void addPost(String postId, String threadId) throws PostParseException {
-
-        if (appStateService.getCurrentPosts().containsKey(postId)) {
-            logger.warn(String.format("skipping %s, already loaded", postId));
-            return;
-        }
-
-        VRPostParser vrPostParser = new VRPostParser(threadId, postId, cm, vipergirlsAuthService, supportedHosts);
-        Post post = vrPostParser.parse();
-
-        post.setAppStateService(appStateService);
-        post.getImages().forEach(e -> e.setAppStateService(appStateService));
-        authService.leaveThanks(post.getUrl(), post.getPostId());
-        if (appSettingsService.isAutoStart()) {
-            logger.debug("Auto start downloads option is enabled");
-            logger.debug(String.format("Starting to enqueue %d jobs for %s", post.getImages().size(), post.getUrl()));
-            post.setStatus(Post.Status.PENDING);
-            try {
-                downloadQ.enqueue(post);
-            } catch (InterruptedException e) {
-                logger.warn("Interruption was caught");
-                Thread.currentThread().interrupt();
-                return;
-            }
-            logger.debug(String.format("Done enqueuing jobs for %s", post.getUrl()));
-        } else {
-            post.setStatus(Post.Status.STOPPED);
-            logger.debug("Auto start downloads option is disabled");
-        }
-    }
-
-    public VRThreadParser createVRThreadParser(String threadId) {
-        return new VRThreadParser(threadId, cm, vipergirlsAuthService, supportedHosts);
-    }
-}

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

@@ -1,38 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.util.Objects;
-
-@Getter
-@ToString
-public class QueuedVGLink {
-
-    private final String type = "grabQueue";
-    private final String link;
-    private final String threadId;
-    private final String postId;
-    @Setter
-    boolean removed;
-
-    public QueuedVGLink(String link, String threadId, String postId) {
-        this.link = link;
-        this.threadId = threadId;
-        this.postId = postId;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        QueuedVGLink that = (QueuedVGLink) o;
-        return Objects.equals(link, that.link);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(link);
-    }
-}

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

@@ -1,161 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.imgscalr.Scalr;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.util.FileSystemUtils;
-
-import javax.annotation.PostConstruct;
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicLong;
-
-@Service
-public class ThumbnailGenerator {
-
-    @Getter
-    private LoadingCache<CacheKey, byte[]> thumbnails;
-
-    @Value("${base.dir}")
-    private String baseDir;
-
-    @Autowired
-    private PathService pathService;
-
-    @Getter
-    private File cacheFolder;
-    CacheLoader<CacheKey, byte[]> loader = new CacheLoader<>() {
-        @Override
-        public byte[] load(CacheKey key) throws Exception {
-            File destinationFolder = pathService.getDownloadDestinationFolder(key.getPostId());
-            if (!destinationFolder.exists() || !destinationFolder.isDirectory()) {
-                return null;
-            }
-            return Files.readAllBytes(generateThumbnail(new File(destinationFolder, key.getImgName()), key.getPostId()).toPath());
-        }
-    };
-
-    @PostConstruct
-    private void init() throws Exception {
-        cacheFolder = new File(baseDir + File.separator + ".vripper" + File.separator + "cache");
-        cacheFolder.mkdirs();
-        if (!cacheFolder.exists()) {
-            throw new Exception(String.format("%s could not be created", cacheFolder.toString()));
-        }
-        thumbnails = CacheBuilder.newBuilder()
-                .maximumSize(20000)
-                .build(loader);
-    }
-
-    public void clearCache() {
-        thumbnails.invalidateAll();
-        for (File file : Optional.ofNullable(cacheFolder.listFiles()).orElse(new File[]{})) {
-            FileSystemUtils.deleteRecursively(file);
-        }
-    }
-
-    public long cacheSize() {
-
-        final AtomicLong size = new AtomicLong(0);
-
-        try {
-            Files.walkFileTree(cacheFolder.toPath(), new SimpleFileVisitor<>() {
-                @Override
-                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
-
-                    size.addAndGet(attrs.size());
-                    return FileVisitResult.CONTINUE;
-                }
-
-                @Override
-                public FileVisitResult visitFileFailed(Path file, IOException exc) {
-
-                    System.out.println("skipped: " + file + " (" + exc + ")");
-                    // Skip folders that can't be traversed
-                    return FileVisitResult.CONTINUE;
-                }
-
-                @Override
-                public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
-
-                    if (exc != null)
-                        System.out.println("had trouble traversing: " + dir + " (" + exc + ")");
-                    else
-                        size.addAndGet(dir.toFile().length());
-                    // Ignore errors traversing a folder
-                    return FileVisitResult.CONTINUE;
-                }
-            });
-        } catch (IOException e) {
-            throw new AssertionError("walkFileTree will not throw IOException if the FileVisitor does not");
-        }
-
-        return size.get();
-    }
-
-    private File generateThumbnail(File inputFile, String postId) throws Exception {
-        if (!inputFile.exists()) {
-            throw new Exception(String.format("Input file %s does not exist", inputFile.toString()));
-        }
-        File postsCacheFolder = new File(cacheFolder, postId);
-        postsCacheFolder.mkdirs();
-        if (!postsCacheFolder.exists()) {
-            throw new Exception(String.format("%s could not be created", postsCacheFolder.toString()));
-        }
-
-        File thumbFile = new File(postsCacheFolder, inputFile.getName());
-        if (thumbFile.exists()) {
-            return thumbFile;
-        }
-
-        BufferedImage image = ImageIO.read(inputFile);
-        BufferedImage resize = Scalr.resize(image, 350, 350);
-        ImageIO.write(resize, "jpg", thumbFile);
-        image.flush();
-        resize.flush();
-        return thumbFile;
-    }
-
-    @Getter
-    @Setter
-    @NoArgsConstructor
-    public static class CacheKey {
-        private String postId;
-        private String imgName;
-
-        public CacheKey(String postId, String imgName) {
-            this.postId = postId;
-            this.imgName = imgName;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            CacheKey cacheKey = (CacheKey) o;
-            return Objects.equals(postId, cacheKey.postId) &&
-                    Objects.equals(imgName, cacheKey.imgName);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(postId, imgName);
-        }
-    }
-}

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

@@ -4,46 +4,41 @@ import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import lombok.Getter;
-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.VripperApplication;
+import tn.mnlr.vripper.exception.PostParseException;
+import tn.mnlr.vripper.jpa.domain.Queued;
+import tn.mnlr.vripper.services.post.CachedPost;
+import tn.mnlr.vripper.services.post.PostService;
 
-import javax.annotation.PostConstruct;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
 @Service
+@Slf4j
 public class VGHandler {
 
-    private static final Logger logger = LoggerFactory.getLogger(VGHandler.class);
-
-    @Autowired
-    private AppStateService appStateService;
-
-    @Autowired
-    private PostParser postParser;
+    private final DataService dataService;
+    private final PostService postService;
+    private final CommonExecutor commonExecutor;
 
     @Getter
-    private LoadingCache<String, List<VRPostState>> cache;
+    private final LoadingCache<Queued, List<CachedPost>> cache;
 
-    @PostConstruct
-    private void init() {
+    @Autowired
+    public VGHandler(DataService dataService, PostService postService, CommonExecutor commonExecutor) {
+        this.dataService = dataService;
+        this.postService = postService;
+        this.commonExecutor = commonExecutor;
 
-        CacheLoader<String, List<VRPostState>> loader = new CacheLoader<>() {
+        CacheLoader<Queued, List<CachedPost>> loader = new CacheLoader<>() {
             @Override
-            public List<VRPostState> load(String threadId) throws Exception {
-                VRThreadParser vrThreadParser = postParser.createVRThreadParser(threadId);
-                List<VRPostState> posts = new ArrayList<>();
-                vrThreadParser.parse();
-                vrThreadParser.getPostPublishProcessor()
-                        .onBackpressureBuffer()
-                        .blockingSubscribe(posts::add);
-                return posts;
+            public List<CachedPost> load(@NonNull Queued queuedVGLink) throws Exception {
+                VRThreadParser vrThreadParser = new VRThreadParser(queuedVGLink);
+                return vrThreadParser.parse();
             }
         };
 
@@ -52,32 +47,40 @@ public class VGHandler {
                 .build(loader);
     }
 
-    public void handle(List<QueuedVGLink> queuedVGLinks) throws Exception {
-        for (QueuedVGLink queuedVGLink : queuedVGLinks) {
-            if (queuedVGLink.getPostId() != null) {
-                postParser.addPost(queuedVGLink.getPostId(), queuedVGLink.getThreadId());
+    public void handle(List<Queued> queuedList) throws Exception {
+        for (Queued queued : queuedList) {
+            if (queued.getPostId() != null) {
+                postService.addPost(queued.getPostId(), queued.getThreadId());
             } else {
-                Callable<Void> cl = () -> {
-                    List<VRPostState> vrPostStates = cache.get(queuedVGLink.getThreadId());
-                    logger.debug(String.format("%d found for %s", vrPostStates.size(), queuedVGLink.getLink()));
-                    if (vrPostStates.size() == 1) {
-                        postParser.addPost(vrPostStates.get(0).getPostId(), vrPostStates.get(0).getThreadId());
-                        logger.debug(String.format("threadId %s, postId %s is added automatically for download", queuedVGLink.getThreadId(), queuedVGLink.getPostId()));
+                Runnable runnable = () -> {
+                    List<CachedPost> cachedPosts;
+                    try {
+                        cachedPosts = cache.get(queued);
+                    } catch (ExecutionException e) {
+                        log.error(String.format("Failed to add post with thread id %s, postId %s", queued.getThreadId(), queued.getPostId()), e);
+                        return;
+                    }
+                    queued.setTotal(cachedPosts.size());
+                    queued.done();
+                    log.debug(String.format("%d found for %s", cachedPosts.size(), queued.getLink()));
+                    if (cachedPosts.size() == 1) {
+                        try {
+                            postService.addPost(cachedPosts.get(0).getPostId(), cachedPosts.get(0).getThreadId());
+                        } catch (PostParseException e) {
+                            log.error(String.format("Failed to add post with postId %s", cachedPosts.get(0).getPostId()), e);
+                            return;
+                        }
+                        log.debug(String.format("threadId %s, postId %s is added automatically for download", queued.getThreadId(), queued.getPostId()));
                     } else {
-                        appStateService.getGrabQueue().put(queuedVGLink.getLink(), queuedVGLink);
-                        appStateService.getLiveGrabQueue().onNext(queuedVGLink);
+                        dataService.newQueueLink(queued);
                     }
-                    return null;
                 };
-                VripperApplication.commonExecutor.submit(cl);
+                commonExecutor.getGeneralExecutor().submit(runnable);
             }
         }
     }
 
-    public void remove(String url) {
-        Optional.ofNullable(appStateService.getGrabQueue().remove(url)).ifPresent(e -> {
-            e.setRemoved(true);
-            appStateService.getLiveGrabQueue().onNext(e);
-        });
+    public void remove(String threadId) {
+        dataService.removeQueueLink(threadId);
     }
 }

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

@@ -1,190 +0,0 @@
-package tn.mnlr.vripper.services;
-
-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.xml.sax.Attributes;
-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 javax.xml.parsers.SAXParserFactory;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.time.Duration;
-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;
-
-import static tn.mnlr.vripper.services.PostParser.VR_API;
-
-class VRPostParser {
-
-    private static final Logger logger = LoggerFactory.getLogger(VRPostParser.class);
-
-    private static SAXParserFactory factory = SAXParserFactory.newInstance();
-
-    private static RetryPolicy<Object> retryPolicy = new RetryPolicy<>()
-            .handleIf(e -> e instanceof IOException)
-            .withDelay(1, 3, ChronoUnit.SECONDS)
-            .withMaxRetries(2)
-            .withMaxDuration(Duration.of(10, ChronoUnit.SECONDS))
-            .abortOn(InterruptedException.class)
-            .onFailedAttempt(e -> logger.warn(String.format("#%d tries failed", e.getAttemptCount()), e.getLastFailure()));
-
-    private final String threadId;
-    private final String postId;
-    private final ConnectionManager cm;
-    private final VipergirlsAuthService vipergirlsAuthService;
-    private final List<Host> supportedHosts;
-
-    VRPostParser(String threadId, String postId, ConnectionManager cm, VipergirlsAuthService vipergirlsAuthService, List<Host> supportedHosts) {
-        this.threadId = threadId;
-        this.postId = postId;
-        this.cm = cm;
-        this.vipergirlsAuthService = vipergirlsAuthService;
-        this.supportedHosts = supportedHosts;
-    }
-
-    public Post parse() throws PostParseException {
-
-        logger.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());
-        } catch (URISyntaxException e) {
-            throw new PostParseException(e);
-        }
-        VRPostHandler handler = new VRPostHandler(threadId, postId, supportedHosts);
-        AtomicReference<Throwable> thr = new AtomicReference<>();
-        logger.debug(String.format("Requesting %s", httpGet));
-        Post post = Failsafe.with(retryPolicy)
-                .onFailure(e -> thr.set(e.getFailure()))
-                .get(() -> {
-                    HttpClient connection = cm.getClient().build();
-                    try (CloseableHttpResponse response = (CloseableHttpResponse) connection.execute(httpGet, vipergirlsAuthService.getContext())) {
-                        if (response.getStatusLine().getStatusCode() / 100 != 2) {
-                            throw new DownloadException(String.format("Unexpected response code '%d' for %s", response.getStatusLine().getStatusCode(), httpGet));
-                        }
-
-                        try {
-                            factory.newSAXParser().parse(new BufferedInputStream(response.getEntity().getContent()), handler);
-                            return handler.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;
-    }
-}
-
-class VRPostHandler extends DefaultHandler {
-
-    private static final Logger logger = LoggerFactory.getLogger(VRPostHandler.class);
-
-    private final List<Host> supportedHosts;
-    private final String threadId;
-    private final String postId;
-    private List<Image> images = new ArrayList<>();
-    private List<String> previews = new ArrayList<>();
-    private String threadTitle;
-    private String postTitle;
-    private String forum;
-    private int previewCounter = 0;
-    private int index = 0;
-    private int imageCount;
-
-    @Getter
-    private Post parsedPost;
-
-    VRPostHandler(String threadId, String postId, List<Host> supportedHosts) {
-        this.threadId = threadId;
-        this.postId = postId;
-        this.supportedHosts = supportedHosts;
-    }
-
-    @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) {
-                    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) {
-                        logger.debug(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) {
-        if ("post".equals(qName.toLowerCase())) {
-            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<>();
-        }
-    }
-}

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

@@ -1,29 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import lombok.Getter;
-
-import java.util.List;
-
-@Getter
-public class VRPostState {
-    private final String type = "postParse";
-    private final String threadId;
-    private String postId;
-    private int number;
-    private String title;
-    private int imageCount;
-    private String url;
-    private List<String> previews;
-    private String hosts;
-
-    VRPostState(String threadId, String postId, int number, String title, int imageCount, String url, List<String> previews, String hosts) {
-        this.threadId = threadId;
-        this.postId = postId;
-        this.number = number;
-        this.title = title;
-        this.imageCount = imageCount;
-        this.previews = previews;
-        this.url = url;
-        this.hosts = hosts;
-    }
-}

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

@@ -1,78 +1,63 @@
 package tn.mnlr.vripper.services;
 
-import io.reactivex.processors.ReplayProcessor;
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 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.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;
+import tn.mnlr.vripper.SpringContext;
+import tn.mnlr.vripper.VripperApplication;
 import tn.mnlr.vripper.exception.DownloadException;
 import tn.mnlr.vripper.exception.PostParseException;
 import tn.mnlr.vripper.host.Host;
+import tn.mnlr.vripper.jpa.domain.Queued;
+import tn.mnlr.vripper.services.post.CachedPost;
 
 import javax.xml.parsers.SAXParserFactory;
 import java.io.BufferedInputStream;
-import java.io.IOException;
 import java.net.URISyntaxException;
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-import static tn.mnlr.vripper.services.PostParser.VR_API;
-
+@Slf4j
 public class VRThreadParser {
 
-    private static final Logger logger = LoggerFactory.getLogger(VRThreadParser.class);
+    private static final String VR_API = "https://vipergirls.to/vr.php";
 
-    private static RetryPolicy<Object> retryPolicy = new RetryPolicy<>()
-            .handleIf(e -> e instanceof IOException)
-            .withDelay(1, 3, ChronoUnit.SECONDS)
-            .withMaxRetries(2)
-            .withMaxDuration(Duration.of(10, ChronoUnit.SECONDS))
-            .abortOn(InterruptedException.class)
-            .onFailedAttempt(e -> logger.warn(String.format("#%d tries failed", e.getAttemptCount()), e.getLastFailure()));
-    private static SAXParserFactory factory = SAXParserFactory.newInstance();
-    @Getter
-    private final ReplayProcessor<VRPostState> postPublishProcessor = ReplayProcessor.create();
-    private final String threadId;
+    private static final SAXParserFactory factory = SAXParserFactory.newInstance();
+    private final Queued queued;
     private final ConnectionManager cm;
     private final VipergirlsAuthService vipergirlsAuthService;
-    private final List<Host> hosts;
 
-
-    VRThreadParser(String threadId, ConnectionManager cm, VipergirlsAuthService vipergirlsAuthService, List<Host> hosts) {
-        this.threadId = threadId;
-        this.cm = cm;
-        this.vipergirlsAuthService = vipergirlsAuthService;
-        this.hosts = hosts;
+    VRThreadParser(Queued queued) {
+        this.queued = queued;
+        this.cm = SpringContext.getBean(ConnectionManager.class);
+        this.vipergirlsAuthService = SpringContext.getBean(VipergirlsAuthService.class);
     }
 
-    public Void parse() throws PostParseException {
+    public List<CachedPost> parse() throws PostParseException {
 
-        logger.debug(String.format("Parsing thread %s", threadId));
+        log.debug(String.format("Parsing thread %s", queued));
         HttpGet httpGet;
         try {
             URIBuilder uriBuilder = new URIBuilder(VR_API);
-            uriBuilder.setParameter("t", threadId);
-            httpGet = cm.buildHttpGet(uriBuilder.build());
+            uriBuilder.setParameter("t", queued.getThreadId());
+            httpGet = cm.buildHttpGet(uriBuilder.build(), null);
         } catch (URISyntaxException e) {
             throw new PostParseException(e);
         }
 
-        VRThreadHandler handler = new VRThreadHandler(threadId, postPublishProcessor, hosts);
+        VRThreadHandler handler = new VRThreadHandler(queued);
         AtomicReference<Throwable> thr = new AtomicReference<>();
-        logger.debug(String.format("Requesting %s", httpGet));
-        Failsafe.with(retryPolicy)
+        log.debug(String.format("Requesting %s", httpGet));
+        List<CachedPost> posts = Failsafe.with(VripperApplication.retryPolicy)
                 .onFailure(e -> thr.set(e.getFailure()))
                 .get(() -> {
                     HttpClient connection = cm.getClient().build();
@@ -83,27 +68,26 @@ public class VRThreadParser {
 
                         try {
                             factory.newSAXParser().parse(new BufferedInputStream(response.getEntity().getContent()), handler);
+                            return handler.getPosts();
                         } catch (Exception e) {
-                            throw new PostParseException(String.format("Failed to parse thread %s", threadId), e);
+                            throw new PostParseException(String.format("Failed to parse thread %s", queued), e);
                         } finally {
                             EntityUtils.consumeQuietly(response.getEntity());
                         }
                     }
-                    return null;
                 });
         if (thr.get() != null) {
-            logger.error(String.format("parsing failed for thread %s", threadId), thr.get());
+            log.error(String.format("parsing failed for thread %s", queued), thr.get());
             throw new PostParseException(thr.get());
         }
-        return null;
+        return posts;
     }
 }
 
 class VRThreadHandler extends DefaultHandler {
 
-    private final String threadId;
-    private final ReplayProcessor<VRPostState> vrPostPublishProcessor;
-    private final List<Host> supportedHosts;
+    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;
@@ -113,10 +97,12 @@ class VRThreadHandler extends DefaultHandler {
     private int postCounter;
     private int previewCounter = 0;
 
-    VRThreadHandler(String threadId, ReplayProcessor<VRPostState> vrPostPublishProcessor, List<Host> supportedHosts) {
-        this.vrPostPublishProcessor = vrPostPublishProcessor;
-        this.threadId = threadId;
-        this.supportedHosts = supportedHosts;
+    @Getter
+    private List<CachedPost> posts = new ArrayList<>();
+
+    VRThreadHandler(Queued queued) {
+        this.queued = queued;
+        this.supportedHosts = SpringContext.getBeansOfType(Host.class).values();
     }
 
     @Override
@@ -152,16 +138,17 @@ class VRThreadHandler extends DefaultHandler {
     public void endElement(String uri, String localName, String qName) {
         if ("post".equals(qName.toLowerCase())) {
             if (imageCount != 0) {
-                vrPostPublishProcessor.onNext(new VRPostState(
-                        threadId,
+                posts.add(new CachedPost(
+                        queued.getThreadId(),
                         postId,
                         postCounter,
                         postTitle,
                         imageCount,
-                        String.format("https://vipergirls.to/threads/%s/?p=%s&viewfull=1#post%s", threadId, postId, postId),
+                        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<>();
@@ -171,6 +158,6 @@ class VRThreadHandler extends DefaultHandler {
 
     @Override
     public void endDocument() {
-        vrPostPublishProcessor.onComplete();
+        queued.done();
     }
 }

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

@@ -2,10 +2,10 @@ 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.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.cookie.Cookie;
@@ -13,48 +13,43 @@ 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.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 tn.mnlr.vripper.jpa.domain.Post;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 @Service
+@Slf4j
 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;
+    private final ConnectionManager cm;
+    private final AppSettingsService appSettingsService;
+    private final CommonExecutor commonExecutor;
+    private final DataService dataService;
 
     @Getter
-    private HttpClientContext context = HttpClientContext.create();
+    private final HttpClientContext context = HttpClientContext.create();
 
+    @Getter
     private boolean authenticated = false;
 
     @Getter
-    private String loggedUser;
+    private String loggedUser = "";
 
     @Getter
-    private PublishProcessor<String> loggedInUser = PublishProcessor.create();
+    private final PublishProcessor<String> loggedInUser = PublishProcessor.create();
+
+    @Autowired
+    public VipergirlsAuthService(ConnectionManager cm, AppSettingsService appSettingsService, CommonExecutor commonExecutor, DataService dataService) {
+        this.cm = cm;
+        this.appSettingsService = appSettingsService;
+        this.commonExecutor = commonExecutor;
+        this.dataService = dataService;
+    }
 
     @PostConstruct
     private void init() {
@@ -62,52 +57,41 @@ public class VipergirlsAuthService {
         try {
             authenticate();
         } catch (VripperException e) {
-            logger.error("Cannot authenticate user with ViperGirls", e);
+            log.error("Cannot authenticate user with ViperGirls", e);
         }
     }
 
-    @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");
+        log.info("Authenticating using ViperGirls credentials");
         authenticated = false;
 
-        if(!appSettingsService.isVLogin()) {
-            logger.debug("Authentication option is disabled");
+        if (!appSettingsService.getSettings().getVLogin()) {
+            log.debug("Authentication option is disabled");
             context.getCookieStore().clear();
             loggedUser = "";
             loggedInUser.onNext(loggedUser);
             return;
         }
 
-        String username = appSettingsService.getVUsername();
-        String password = appSettingsService.getVPassword();
+        String username = appSettingsService.getSettings().getVUsername();
+        String password = appSettingsService.getSettings().getVPassword();
 
         if (username == null || password == null || username.isEmpty() || password.isEmpty()) {
-            logger.error("Cannot authenticate with ViperGirls credentials, username or password is empty");
+            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");
+        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("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) {
@@ -128,7 +112,7 @@ public class VipergirlsAuthService {
                 throw new VripperException(String.format("Unexpected response code returned %s", response.getStatusLine().getStatusCode()));
             }
             String responseBody = EntityUtils.toString(response.getEntity());
-            logger.debug(String.format("Authentication with ViperGirls response body:%n%s", responseBody));
+            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");
@@ -145,75 +129,44 @@ public class VipergirlsAuthService {
         }
         authenticated = true;
         loggedUser = username;
-        logger.info(String.format("Authenticated: %s", username));
+        log.info(String.format("Authenticated: %s", username));
         loggedInUser.onNext(loggedUser);
     }
 
-    void leaveThanks(String postUrl, String postId) {
-        VripperApplication.commonExecutor.submit(() -> {
-            if (!appSettingsService.isVLogin()) {
-                logger.debug("Authentication with ViperGirls option is disabled");
-                return;
-            }
-            if (!appSettingsService.isVThanks()) {
-                logger.debug("Leave thanks option is disabled");
-                return;
-            }
-            if (!authenticated) {
-                logger.error("You are not authenticated");
-                return;
-            }
+    public void leaveThanks(Post post) {
+        if (!appSettingsService.getSettings().getVLogin()) {
+            log.debug("Authentication with ViperGirls option is disabled");
+            return;
+        }
+        if (!appSettingsService.getSettings().getVThanks()) {
+            log.debug("Leave thanks option is disabled");
+            return;
+        }
+        if (!authenticated) {
+            log.error("You are not authenticated");
+            return;
+        }
+        if (post.isThanked()) {
+            log.debug("Already left a thanks");
+            return;
+        }
+        commonExecutor.getGeneralExecutor().submit(() -> {
             try {
-                postThanks(postId, getSecurityToken(postUrl));
+                postThanks(post);
             } catch (Exception e) {
-                logger.error(String.format("Failed to leave a thanks for url %s, post id %s", postUrl, postId), e);
+                log.error(String.format("Failed to leave a thanks for url %s, post id %s", post.getUrl(), post.getPostId()), e);
             }
         });
     }
 
-    private String getSecurityToken(String url) throws VripperException {
+    private void postThanks(Post post) throws VripperException {
 
-        String securityToken;
-
-        HttpGet httpGet = cm.buildHttpGet(url);
-        httpGet.addHeader("Referer", "https://vipergirls.to/");
-        httpGet.addHeader("Host", "vipergirls.to");
-
-        CloseableHttpClient client = cm.getClient().build();
-
-        try (CloseableHttpResponse response = client.execute(httpGet, context)) {
-
-            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.stream(thanksUrl.split("&amp;"))
-                    .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");
+        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", postId));
-        params.add(new BasicNameValuePair("securitytoken", securityKey));
+        params.add(new BasicNameValuePair("p", post.getPostId()));
+        params.add(new BasicNameValuePair("securitytoken", post.getSecurityToken()));
         try {
             postThanks.setEntity(new UrlEncodedFormEntity(params));
         } catch (Exception e) {
@@ -226,9 +179,17 @@ public class VipergirlsAuthService {
         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");
+        }
     }
 }

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

@@ -2,6 +2,7 @@ package tn.mnlr.vripper.services;
 
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import tn.mnlr.vripper.exception.XpathException;
 
 import javax.xml.xpath.XPath;
@@ -21,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);
+        }
+    }
+
 }

vripper-server/src/main/java/tn/mnlr/vripper/services/post/CachedPost.java

@@ -0,0 +1,29 @@
+package tn.mnlr.vripper.services.post;
+
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+public class CachedPost {
+    private final String type = "postParse";
+    private final String threadId;
+    private final String postId;
+    private final int number;
+    private final String title;
+    private final int imageCount;
+    private final String url;
+    private final List<String> previews;
+    private final String hosts;
+
+    public CachedPost(String threadId, String postId, int number, String title, int imageCount, String url, List<String> previews, String hosts) {
+        this.threadId = threadId;
+        this.postId = postId;
+        this.number = number;
+        this.title = title;
+        this.imageCount = imageCount;
+        this.previews = previews;
+        this.url = url;
+        this.hosts = hosts;
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/services/post/MetadataCache.java

@@ -0,0 +1,169 @@
+package tn.mnlr.vripper.services.post;
+
+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 tn.mnlr.vripper.services.ConnectionManager;
+import tn.mnlr.vripper.services.HtmlProcessorService;
+import tn.mnlr.vripper.services.VipergirlsAuthService;
+import tn.mnlr.vripper.services.XpathService;
+
+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 MetadataCache {
+
+    @Getter
+    static class Key {
+        private final String postId;
+        private final String threadId;
+        private final String url;
+
+        Key(String postId, String threadId, String url) {
+            this.postId = postId;
+            this.threadId = threadId;
+            this.url = url;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Key key = (Key) o;
+            return Objects.equals(postId, key.postId);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(postId);
+        }
+    }
+
+    private static final List<String> dictionary = Arrays.asList("download", "link", "rapidgator", "filefactory", "filefox");
+
+    private final LoadingCache<Key, Metadata> cache;
+    private final ConnectionManager cm;
+    private final VipergirlsAuthService vipergirlsAuthService;
+    private final HtmlProcessorService htmlProcessorService;
+    private final XpathService xpathService;
+
+    @Autowired
+    public MetadataCache(ConnectionManager cm, VipergirlsAuthService vipergirlsAuthService, HtmlProcessorService htmlProcessorService, XpathService xpathService) {
+        this.cm = cm;
+        this.vipergirlsAuthService = vipergirlsAuthService;
+        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, vipergirlsAuthService.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);
+            }
+        }
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/services/post/MetadataRunnable.java

@@ -0,0 +1,39 @@
+package tn.mnlr.vripper.services.post;
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import net.jodah.failsafe.FailsafeException;
+import org.apache.http.impl.execchain.RequestAbortedException;
+import tn.mnlr.vripper.SpringContext;
+import tn.mnlr.vripper.jpa.domain.Metadata;
+import tn.mnlr.vripper.jpa.domain.Post;
+import tn.mnlr.vripper.services.DataService;
+
+@Slf4j
+public class MetadataRunnable implements Runnable {
+
+    @Getter
+    private final Post post;
+
+    private final MetadataCache metadataCache;
+    private final DataService dataService;
+
+    public MetadataRunnable(Post post) {
+        this.post = post;
+        this.metadataCache = SpringContext.getBean(MetadataCache.class);
+        this.dataService = SpringContext.getBean(DataService.class);
+    }
+
+    @Override
+    public void run() {
+        try {
+            Metadata metadata = metadataCache.get(post);
+            dataService.setMetadata(post, metadata);
+        } catch (Exception e) {
+            if (e.getCause() instanceof InterruptedException || (e.getCause() instanceof FailsafeException && (e.getCause().getCause() instanceof InterruptedException || e.getCause().getCause() instanceof RequestAbortedException))) {
+                return;
+            }
+            log.error(String.format("Failed to get metadata for postId %s", post.getPostId()), e);
+        }
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/services/post/ParseResult.java

@@ -0,0 +1,25 @@
+package tn.mnlr.vripper.services.post;
+
+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 ParseResult {
+
+    private final Post post;
+
+    @Getter
+    private final Set<Image> images;
+
+    ParseResult(Post post, Set<Image> images) {
+        this.post = post;
+        this.images = images;
+    }
+
+    public Optional<Post> getPost() {
+        return Optional.ofNullable(post);
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/services/post/PostService.java

@@ -0,0 +1,85 @@
+package tn.mnlr.vripper.services.post;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import tn.mnlr.vripper.exception.PostParseException;
+import tn.mnlr.vripper.jpa.domain.Image;
+import tn.mnlr.vripper.jpa.domain.Post;
+import tn.mnlr.vripper.jpa.domain.enums.Status;
+import tn.mnlr.vripper.q.PendingQ;
+import tn.mnlr.vripper.services.AppSettingsService;
+import tn.mnlr.vripper.services.CommonExecutor;
+import tn.mnlr.vripper.services.DataService;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Future;
+
+@Service
+@Slf4j
+public class PostService {
+
+    private final AppSettingsService appSettingsService;
+    private final PendingQ pendingQ;
+    private final DataService dataService;
+    private final CommonExecutor commonExecutor;
+    private final Map<String, Future<?>> fetchingMetadata = new ConcurrentHashMap<>();
+
+    @Autowired
+    public PostService(AppSettingsService appSettingsService, PendingQ pendingQ, DataService dataService, DataService dataService1, CommonExecutor commonExecutor) {
+        this.appSettingsService = appSettingsService;
+        this.pendingQ = pendingQ;
+        this.dataService = dataService1;
+        this.commonExecutor = commonExecutor;
+    }
+
+    public void addPost(String postId, String threadId) throws PostParseException {
+
+        if (dataService.exists(postId)) {
+            log.warn(String.format("skipping %s, already loaded", postId));
+            return;
+        }
+
+        VRPostParser vrPostParser = new VRPostParser(threadId, postId);
+        ParseResult parseResult = vrPostParser.parse();
+        if (parseResult.getPost().isEmpty()) {
+            throw new PostParseException(String.format("parsing failed for thread %s, post %s", threadId, postId));
+        }
+
+        Post post = parseResult.getPost().get();
+        Set<Image> images = parseResult.getImages();
+
+        dataService.newPost(post, images);
+
+        // Metadata thread
+        fetchingMetadata.put(post.getPostId(), commonExecutor.getGeneralExecutor().submit(new MetadataRunnable(post)));
+
+        if (appSettingsService.getSettings().getAutoStart()) {
+            log.debug("Auto start downloads option is enabled");
+            post.setStatus(Status.PENDING);
+            try {
+                pendingQ.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");
+        }
+        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());
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/services/post/VRApiPostHandler.java

@@ -0,0 +1,108 @@
+package tn.mnlr.vripper.services.post;
+
+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 java.util.Collection;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Slf4j
+class VRApiPostHandler 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;
+
+    VRApiPostHandler(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 ParseResult getParsedPost() {
+        return new ParseResult(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<>();
+        }
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/services/post/VRPostParser.java

@@ -0,0 +1,79 @@
+package tn.mnlr.vripper.services.post;
+
+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.ConnectionManager;
+import tn.mnlr.vripper.services.VipergirlsAuthService;
+
+import javax.xml.parsers.SAXParserFactory;
+import java.net.URISyntaxException;
+import java.util.concurrent.atomic.AtomicReference;
+
+@Slf4j
+public class VRPostParser {
+
+    private static final String VR_API = "https://vipergirls.to/vr.php";
+
+    private static final SAXParserFactory factory = SAXParserFactory.newInstance();
+
+    private final String threadId;
+    private final String postId;
+    private final ConnectionManager cm;
+    private final VipergirlsAuthService vipergirlsAuthService;
+
+    public VRPostParser(String threadId, String postId) {
+        this.threadId = threadId;
+        this.postId = postId;
+        this.cm = SpringContext.getBean(ConnectionManager.class);
+        this.vipergirlsAuthService = SpringContext.getBean(VipergirlsAuthService.class);
+    }
+
+    public ParseResult 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<>();
+        VRApiPostHandler handler = new VRApiPostHandler(threadId, postId);
+        log.debug(String.format("Requesting %s", httpGet));
+        ParseResult post = getPost(httpGet, handler, 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 ParseResult getPost(HttpGet httpGet, VRApiPostHandler handler, 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, vipergirlsAuthService.getContext())) {
+                        if (response.getStatusLine().getStatusCode() / 100 != 2) {
+                            throw new DownloadException(String.format("Unexpected response code '%d' for %s", response.getStatusLine().getStatusCode(), httpGet));
+                        }
+
+                        factory.newSAXParser().parse(response.getEntity().getContent(), handler);
+                        EntityUtils.consumeQuietly(response.getEntity());
+                        return handler.getParsedPost();
+                    }
+                });
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/web/WebSocketConfig.java

@@ -1,21 +0,0 @@
-package tn.mnlr.vripper.web;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.socket.config.annotation.EnableWebSocket;
-import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
-import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
-import tn.mnlr.vripper.web.wsendpoints.WebSocketHandler;
-
-@Configuration
-@EnableWebSocket
-public class WebSocketConfig implements WebSocketConfigurer {
-
-    @Autowired
-    private WebSocketHandler handler;
-
-    @Override
-    public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-        registry.addHandler(handler, "/endpoint").setAllowedOrigins("*").withSockJS().setClientLibraryUrl("../../assets/sockjs.min.js");
-    }
-}

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

@@ -1,202 +0,0 @@
-package tn.mnlr.vripper.web.restendpoints;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import lombok.Setter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.CacheControl;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import tn.mnlr.vripper.services.AppSettingsService;
-import tn.mnlr.vripper.services.PathService;
-import tn.mnlr.vripper.services.ThumbnailGenerator;
-
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReader;
-import javax.imageio.stream.ImageInputStream;
-import javax.servlet.http.HttpServletResponse;
-import java.awt.*;
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.*;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-@RestController
-@CrossOrigin(value = "*")
-public class GalleryEndpoint {
-
-    private static final Logger logger = LoggerFactory.getLogger(GalleryEndpoint.class);
-
-    @Autowired
-    private PathService pathService;
-
-    @Autowired
-    private ThumbnailGenerator thumbnailGenerator;
-
-    private static final String cacheControl = CacheControl.maxAge(365, TimeUnit.DAYS).getHeaderValue();
-    @Autowired
-    private AppSettingsService appSettingsService;
-
-    @ExceptionHandler(Exception.class)
-    public ResponseEntity handleException(Exception e) {
-        logger.error("Error when process request", e);
-        return ResponseEntity
-                .status(HttpStatus.INTERNAL_SERVER_ERROR)
-                .body(e.getMessage());
-    }
-
-    @GetMapping(value = "/image/{postId}/{imgName}", produces = {MediaType.IMAGE_JPEG_VALUE})
-    @ResponseStatus(value = HttpStatus.OK)
-    public ResponseEntity<byte[]> getImage(@PathVariable("postId") @NonNull String postId, @PathVariable("imgName") @NonNull String imgName, HttpServletResponse response) throws Exception {
-        if (!appSettingsService.isViewPhotos()) {
-            return new ResponseEntity("Gallery option is disabled", HttpStatus.BAD_REQUEST);
-        }
-        response.addHeader("Cache-Control", cacheControl);
-        File destinationFolder = pathService.getDownloadDestinationFolder(postId);
-        return ResponseEntity.ok(Files.readAllBytes(Paths.get(destinationFolder.toPath().toString(), imgName)));
-    }
-
-    @GetMapping(value = "/image/thumb/{postId}/{imgName}", produces = {MediaType.IMAGE_JPEG_VALUE})
-    @ResponseStatus(value = HttpStatus.OK)
-    public ResponseEntity<byte[]> getImageThumb(@PathVariable("postId") @NonNull String postId, @PathVariable("imgName") @NonNull String imgName, HttpServletResponse response) throws Exception {
-        if (!appSettingsService.isViewPhotos()) {
-            return new ResponseEntity("Gallery option is disabled", HttpStatus.BAD_REQUEST);
-        }
-        response.addHeader("Cache-Control", cacheControl);
-        File destinationFolder = pathService.getDownloadDestinationFolder(postId);
-        if (destinationFolder.exists() && destinationFolder.isDirectory()) {
-            return ResponseEntity.ok(thumbnailGenerator.getThumbnails().get(new ThumbnailGenerator.CacheKey(postId, imgName)));
-        }
-        return new ResponseEntity("Gallery does not exist in download location, you probably removed it", HttpStatus.BAD_REQUEST);
-    }
-
-    @GetMapping("/gallery/{postId}")
-    @ResponseStatus(value = HttpStatus.OK)
-    public ResponseEntity<List<GalleryImage>> getGallery(@PathVariable("postId") @NonNull String postId) {
-        if (!appSettingsService.isViewPhotos()) {
-            return new ResponseEntity("Gallery option is disabled", HttpStatus.BAD_REQUEST);
-        }
-        File destinationFolder = pathService.getDownloadDestinationFolder(postId);
-        if (destinationFolder.exists() && destinationFolder.isDirectory()) {
-            return ResponseEntity.ok(
-                    Arrays.stream(Objects.requireNonNull(destinationFolder.listFiles()))
-                            .filter(f -> !f.getName().endsWith("tmp"))
-                            .filter(f -> f.getName().toLowerCase().endsWith(".jpg") || f.getName().toLowerCase().endsWith(".jpeg"))
-                            .sorted(Comparator.comparing(File::getName))
-                            .map(GalleryImage::fromFile)
-                            .filter(Objects::nonNull)
-                            .collect(Collectors.toList())
-            );
-        }
-        return new ResponseEntity("Gallery does not exist in download location, you probably removed it", HttpStatus.BAD_REQUEST);
-    }
-
-    @GetMapping("/gallery/cache")
-    @ResponseStatus(value = HttpStatus.OK)
-    public ResponseEntity<CacheSize> getCacheSize() {
-        return ResponseEntity.ok(new CacheSize(humanReadableByteCount(thumbnailGenerator.cacheSize(), false)));
-    }
-
-    @GetMapping("/gallery/cache/clear")
-    @ResponseStatus(value = HttpStatus.OK)
-    public ResponseEntity<CacheSize> clearCache() {
-        thumbnailGenerator.clearCache();
-        return ResponseEntity.ok(new CacheSize(humanReadableByteCount(thumbnailGenerator.cacheSize(), false)));
-    }
-
-    private String humanReadableByteCount(long bytes, boolean si) {
-        int unit = si ? 1000 : 1024;
-        if (bytes < unit) return bytes + " B";
-        int exp = (int) (Math.log(bytes) / Math.log(unit));
-        String pre = (si ? "kMGTPE" : "KMGTPE").charAt(exp - 1) + (si ? "" : "i");
-        return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre);
-    }
-}
-
-@Getter
-@Setter
-@NoArgsConstructor
-class CacheSize {
-
-    private String size;
-
-    public CacheSize(String size) {
-        this.size = size;
-    }
-}
-
-@Getter
-@Setter
-@NoArgsConstructor
-class GalleryImage {
-
-    private static final CacheLoader<File, Dimension> loader = new CacheLoader<>() {
-
-        @Override
-        public Dimension load(File file) {
-            try (ImageInputStream in = ImageIO.createImageInputStream(file)) {
-                final Iterator<ImageReader> readers = ImageIO.getImageReaders(in);
-                if (readers.hasNext()) {
-                    ImageReader reader = readers.next();
-                    try {
-                        reader.setInput(in);
-                        return new Dimension(reader.getWidth(0), reader.getHeight(0));
-                    } finally {
-                        reader.dispose();
-                    }
-                } else {
-                    logger.error(String.format("No reader found for image %s", file.toString()));
-                    return null;
-                }
-            } catch (Exception e) {
-                logger.error(String.format("Failed to create image object for %s", file.toString()), e);
-                return null;
-            }
-        }
-    };
-
-    private static final LoadingCache<File, Dimension> cache = CacheBuilder.newBuilder()
-            .maximumSize(20000)
-            .build(loader);
-
-    private static final Logger logger = LoggerFactory.getLogger(GalleryImage.class);
-    private String title;
-    private String src;
-    private String msrc;
-    private double w;
-    private double h;
-
-    public GalleryImage(String title, String src, String msrc, double w, double h) {
-        this.title = title;
-        this.src = src;
-        this.msrc = msrc;
-        this.w = w;
-        this.h = h;
-    }
-
-    public static GalleryImage fromFile(File file) {
-
-        Dimension dimension = null;
-        try {
-            dimension = cache.get(file);
-        } catch (ExecutionException e) {
-            logger.error(String.format("Failed to get image dimensions for %s", file.toString()), e);
-        }
-        if (dimension == null) {
-            return null;
-        }
-        return new GalleryImage(file.getName(), file.getName(), file.getName(), dimension.getWidth(), dimension.getHeight());
-    }
-}

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

@@ -1,285 +1,258 @@
 package tn.mnlr.vripper.web.restendpoints;
 
-import lombok.*;
-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.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import tn.mnlr.vripper.VripperApplication;
 import tn.mnlr.vripper.exception.PostParseException;
+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.q.ExecutionService;
-import tn.mnlr.vripper.services.*;
+import tn.mnlr.vripper.services.CommonExecutor;
+import tn.mnlr.vripper.services.DataService;
+import tn.mnlr.vripper.services.PathService;
+import tn.mnlr.vripper.services.VGHandler;
+import tn.mnlr.vripper.services.post.CachedPost;
+import tn.mnlr.vripper.services.post.PostService;
+import tn.mnlr.vripper.web.restendpoints.domain.posts.*;
+import tn.mnlr.vripper.web.restendpoints.exceptions.BadRequestException;
+import tn.mnlr.vripper.web.restendpoints.exceptions.NotFoundException;
+import tn.mnlr.vripper.web.restendpoints.exceptions.ServerErrorException;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+@Slf4j
 @RestController
 @CrossOrigin(value = "*")
 public class PostRestEndpoint {
 
-    private static final Logger logger = LoggerFactory.getLogger(PostRestEndpoint.class);
-
     private static final Pattern VG_URL_PATTERN = Pattern.compile("https://vipergirls\\.to/threads/(\\d+)((.*p=)(\\d+))?");
 
-    @Autowired
-    private AppStateService appStateService;
+    private final DataService dataService;
+    private final PathService pathService;
+    private final VGHandler vgHandler;
+    private final ExecutionService executionService;
+    private final PostService postService;
+    private final CommonExecutor commonExecutor;
+
+    private static final Byte LOCK = -1;
 
     @Autowired
-    private AppSettingsService appSettingsService;
-
-    @Autowired
-    private PathService pathService;
-
-    @Autowired
-    private VGHandler vgHandler;
-
-    @ExceptionHandler(Exception.class)
-    public ResponseEntity<String> handleException(Exception e) {
-        logger.error("Error when process request", e);
-        return ResponseEntity
-                .status(HttpStatus.INTERNAL_SERVER_ERROR)
-                .body(e.getMessage());
+    public PostRestEndpoint(DataService dataService, PathService pathService, VGHandler vgHandler, ExecutionService executionService, PostService postService, CommonExecutor commonExecutor) {
+        this.dataService = dataService;
+        this.pathService = pathService;
+        this.vgHandler = vgHandler;
+        this.executionService = executionService;
+        this.postService = postService;
+        this.commonExecutor = commonExecutor;
     }
 
-    @Autowired
-    private ExecutionService executionService;
-
-
-    @Autowired
-    private PostParser postParser;
-
     @PostMapping("/post")
-    @ResponseStatus(value = HttpStatus.OK)
-    public synchronized ResponseEntity processPost(@RequestBody ThreadUrl _url) throws Exception {
-        if (_url.getUrl() == null || _url.getUrl().isEmpty()) {
-            return new ResponseEntity("Failed to process empty request", HttpStatus.BAD_REQUEST);
-        }
-        List<String> urls = Arrays.stream(_url.getUrl().split("\\r?\\n")).map(String::trim).filter(e -> !e.isEmpty()).collect(Collectors.toList());
-        ArrayList<QueuedVGLink> queuedVGLinks = new ArrayList<>();
-        for (String url : urls) {
-            logger.debug(String.format("Starting to process thread: %s", url));
-            if (!url.startsWith("https://vipergirls.to")) {
-                logger.error(String.format("Unsupported link %s", url));
-                continue;
+    @ResponseStatus(code = HttpStatus.OK)
+    public void processPost(@RequestBody ThreadUrl _url) {
+        synchronized (LOCK) {
+            if (_url.getUrl() == null || _url.getUrl().isBlank()) {
+                log.error("Cannot process empty requests");
+                throw new BadRequestException("Cannot process empty requests");
             }
+            List<String> urlList = Arrays.stream(_url.getUrl().split("\\r?\\n")).map(String::trim).filter(e -> !e.isEmpty()).collect(Collectors.toList());
+            ArrayList<Queued> queuedList = new ArrayList<>();
+            for (String url : urlList) {
+                log.debug(String.format("Starting to process thread: %s", url));
+                if (!url.startsWith("https://vipergirls.to")) {
+                    log.error(String.format("Unsupported link %s", url));
+                    continue;
+                }
 
-            String threadId, postId;
-            try {
+                String threadId, postId;
                 Matcher m = VG_URL_PATTERN.matcher(url);
                 if (m.find()) {
                     threadId = m.group(1);
                     postId = m.group(4);
                 } else {
-                    throw new PostParseException(String.format("Cannot retrieve thread id from URL %s", url));
+                    throw new BadRequestException(String.format("Cannot retrieve thread id from URL %s", url));
                 }
+                queuedList.add(new Queued(url, threadId, postId));
+            }
+            try {
+                vgHandler.handle(queuedList);
             } catch (Exception e) {
-                throw new PostParseException(String.format("Cannot retrieve thread id from URL %s", url), e);
+                log.error("Failed to parse links", e);
+                throw new ServerErrorException(e.getMessage());
             }
-            queuedVGLinks.add(new QueuedVGLink(url, threadId, postId));
         }
-        vgHandler.handle(queuedVGLinks);
-        return ResponseEntity.ok().build();
     }
 
     @PostMapping("/post/restart")
     @ResponseStatus(value = HttpStatus.OK)
-    public synchronized void restartPost(@RequestBody @NonNull List<PostId> postIds) throws Exception {
-        for (PostId postId : postIds) {
-            executionService.restart(postId.getPostId());
+    public void restartPost(@RequestBody @NonNull List<PostId> postIds) {
+        synchronized (LOCK) {
+            executionService.restartAll(postIds.stream().map(PostId::getPostId).collect(Collectors.toList()));
         }
     }
 
     @PostMapping("/post/add")
     @ResponseStatus(value = HttpStatus.OK)
-    public synchronized void addPost(@RequestBody List<PostToAdd> posts) {
-        for (PostToAdd post : posts) {
-            VripperApplication.commonExecutor.submit(() -> {
-                try {
-                    postParser.addPost(post.getPostId(), post.getThreadId());
-                } catch (PostParseException e) {
-                    logger.error(String.format("Failed to add post %s", post.getPostId()), e);
-                }
-            });
+    public void addPost(@RequestBody List<PostToAdd> posts) {
+        synchronized (LOCK) {
+            for (PostToAdd post : posts) {
+                commonExecutor.getGeneralExecutor().submit(() -> {
+                    try {
+                        postService.addPost(post.getPostId(), post.getThreadId());
+                    } catch (PostParseException e) {
+                        log.error(String.format("Failed to add post %s", post.getPostId()), e);
+                        throw new ServerErrorException(String.format("Failed to add post %s", post.getPostId()));
+                    }
+                });
+            }
         }
     }
 
     @GetMapping("/post/path/{postId}")
     @ResponseStatus(value = HttpStatus.OK)
-    public ResponseEntity<DownloadPath> folderPath(@PathVariable("postId") String postId) {
-        File destinationFolder = pathService.getDownloadDestinationFolder(postId);
-        return ResponseEntity.ok(new DownloadPath(destinationFolder.getPath()));
+    public DownloadPath folderPath(@PathVariable("postId") String postId) {
+        synchronized (LOCK) {
+            return getDownloadPath(postId);
+        }
+    }
+
+    private DownloadPath getDownloadPath(String postId) {
+        Optional<Post> _post = dataService.findPostByPostId(postId);
+        if (_post.isPresent()) {
+            Post post = _post.get();
+            if (post.getPostFolderName() == null) {
+                log.error("Download has not been started yet for this post");
+                throw new NotFoundException("Download has not been started yet for this post");
+            } else {
+                return new DownloadPath(pathService.getDownloadDestinationFolder(post).getPath());
+            }
+        } else {
+            log.error(String.format("Unable to find post with postId = %s", postId));
+            throw new NotFoundException(String.format("Unable to find post with postId = %s", postId));
+        }
     }
 
     @PostMapping("/post/restart/all")
     @ResponseStatus(value = HttpStatus.OK)
-    public synchronized void restartPost() throws Exception {
-        executionService.restartAll();
+    public void restartPost() {
+        synchronized (LOCK) {
+            executionService.restartAll(null);
+        }
     }
 
     @PostMapping("/post/stop")
     @ResponseStatus(value = HttpStatus.OK)
-    public synchronized void stop(@RequestBody @NonNull List<PostId> postIds) {
-        for (PostId postId : postIds) {
-            executionService.stop(postId.getPostId());
+    public void stop(@RequestBody @NonNull List<PostId> postIds) {
+        synchronized (LOCK) {
+            executionService.stopAll(postIds.stream().map(PostId::getPostId).collect(Collectors.toList()));
         }
     }
 
     @PostMapping("/post/stop/all")
     @ResponseStatus(value = HttpStatus.OK)
-    public synchronized void stopAll() {
-        executionService.stopAll();
+    public void stopAll() {
+        synchronized (LOCK) {
+            executionService.stopAll(null);
+        }
     }
 
     @PostMapping("/post/remove")
     @ResponseStatus(value = HttpStatus.OK)
-    public synchronized ResponseEntity<List<RemoveResult>> remove(@RequestBody @NonNull List<PostId> postIds) {
-        List<RemoveResult> result = new ArrayList<>();
-        for (PostId postId : postIds) {
-            executionService.stop(postId.getPostId());
-            appStateService.remove(postId.getPostId());
-            result.add(new RemoveResult(postId.getPostId()));
+    public List<RemoveResult> remove(@RequestBody @NonNull List<PostId> postIds) {
+        synchronized (LOCK) {
+            List<RemoveResult> result = new ArrayList<>();
+            List<String> collect = postIds.stream().map(PostId::getPostId).peek(e -> result.add(new RemoveResult(e))).collect(Collectors.toList());
+            executionService.stopAll(collect);
+            dataService.removeAll(collect);
+            return result;
+        }
+    }
+
+    @PostMapping("/post/rename")
+    @ResponseStatus(value = HttpStatus.OK)
+    public List<AltPostName> rename(@RequestBody @NonNull List<AltPostName> postToRename) {
+        synchronized (LOCK) {
+            renamePosts(postToRename);
+            return postToRename;
+        }
+    }
+
+    private void renamePosts(@RequestBody @NonNull List<AltPostName> postToRename) {
+        for (AltPostName altPostName : postToRename) {
+            try {
+                pathService.rename(altPostName.getPostId(), altPostName.getAltName());
+            } catch (Exception e) {
+                log.error(String.format("Failed to rename post with postId = %s", altPostName.getPostId()), e);
+                throw new ServerErrorException(e.getMessage());
+            }
+        }
+    }
+
+    @PostMapping("/post/rename/first")
+    @ResponseStatus(value = HttpStatus.OK)
+    public List<PostId> renameFirst(@RequestBody @NonNull List<PostId> postToRename) {
+        synchronized (LOCK) {
+            renamePostsToFirst(postToRename);
+            return postToRename;
+        }
+    }
+
+    public void renamePostsToFirst(@RequestBody @NonNull List<PostId> postToRename) {
+        synchronized (LOCK) {
+            for (PostId postId : postToRename) {
+                Optional<Metadata> _metadata = dataService.findMetadataByPostId(postId.getPostId());
+                if (_metadata.isPresent()) {
+                    Metadata metadata = _metadata.get();
+                    if (metadata.getResolvedNames() != null) {
+                        List<String> resolvedNames = metadata.getResolvedNames();
+                        if (!resolvedNames.isEmpty()) {
+                            String altTitle = resolvedNames.get(0);
+                            try {
+                                pathService.rename(postId.getPostId(), altTitle);
+                            } catch (Exception e) {
+                                log.error(String.format("Failed to rename post with postId = %s", postId.getPostId()), e);
+                                throw new ServerErrorException(e.getMessage());
+                            }
+                        }
+                    }
+                }
+            }
         }
-        return ResponseEntity.ok(result);
     }
 
     @PostMapping("/post/clear/all")
     @ResponseStatus(value = HttpStatus.OK)
-    public synchronized ResponseEntity<RemoveAllResult> clearAll() {
-        return ResponseEntity.ok(new RemoveAllResult(appStateService.clearAll()));
-    }
-
-    @PostMapping("/post/remove/all")
-    @ResponseStatus(value = HttpStatus.OK)
-    public synchronized ResponseEntity<RemoveAllResult> removeAll() {
-        return ResponseEntity.ok(new RemoveAllResult(appStateService.removeAll()));
+    public RemoveAllResult clearAll() {
+        synchronized (LOCK) {
+            return new RemoveAllResult(dataService.clearCompleted());
+        }
     }
 
     @GetMapping("/grab/{threadId}")
     @ResponseStatus(value = HttpStatus.OK)
-    public synchronized ResponseEntity<List<VRPostState>> grab(@PathVariable("threadId") @NonNull ThreadId threadId) throws Exception {
-        return ResponseEntity.ok(vgHandler.getCache().get(threadId.getThreadId()));
+    public List<CachedPost> grab(@PathVariable("threadId") @NonNull String threadId) {
+        Queued queued = dataService.findQueuedByThreadId(threadId).orElseThrow(() -> new NotFoundException(String.format("Unable to find links for threadId = %s", threadId)));
+        try {
+            return vgHandler.getCache().get(queued);
+        } catch (ExecutionException e) {
+            log.error(String.format("Failed to get links for threadId = %s", threadId), e);
+            throw new ServerErrorException(String.format("Failed to get links for threadId = %s", threadId));
+        }
     }
 
     @PostMapping("/grab/remove")
     @ResponseStatus(value = HttpStatus.OK)
-    public synchronized void grabRemove(@RequestBody @NonNull ThreadUrl threadUrl) {
-        vgHandler.remove(threadUrl.getUrl());
+    public ThreadId grabRemove(@RequestBody @NonNull ThreadId threadId) {
+        vgHandler.remove(threadId.getThreadId());
+        return threadId;
     }
 }
-
-@Getter
-@Setter
-@NoArgsConstructor
-class ThreadUrl {
-    private String url;
-
-    public ThreadUrl(String url) {
-        this.url = url;
-    }
-}
-
-@Getter
-@Setter
-@NoArgsConstructor
-class ThreadId {
-    private String threadId;
-
-    public ThreadId(String threadId) {
-        this.threadId = threadId;
-    }
-}
-
-@Getter
-@Setter
-@NoArgsConstructor
-class PostId {
-    private String postId;
-
-    public PostId(String postId) {
-        this.postId = postId;
-    }
-}
-
-@Getter
-@Setter
-@NoArgsConstructor
-class PostToAdd {
-    private String threadId;
-    private String postId;
-
-    public PostToAdd(String threadId, String postId) {
-        this.threadId = threadId;
-        this.postId = postId;
-    }
-}
-
-@Getter
-@Setter
-@NoArgsConstructor
-class RemoveAllResult {
-    private List<String> postIds;
-    private int removed;
-
-    RemoveAllResult(List<String> postIds) {
-        this.removed = postIds.size();
-        this.postIds = postIds;
-    }
-}
-
-@Getter
-@Setter
-@NoArgsConstructor
-class RemoveResult {
-    private String postId;
-
-    RemoveResult(String postId) {
-        this.postId = postId;
-    }
-}
-
-@Getter
-@Setter
-@NoArgsConstructor
-class DownloadPath {
-    private String path;
-
-    DownloadPath(String path) {
-        this.path = path;
-    }
-}
-
-@Getter
-@Setter
-@NoArgsConstructor
-@ToString
-class PairThreadIdPostId {
-    private String threadId;
-    private String postId;
-
-    public PairThreadIdPostId(String threadId, String postId) {
-        this.threadId = threadId;
-        this.postId = postId;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        PairThreadIdPostId that = (PairThreadIdPostId) o;
-        return Objects.equals(threadId, that.threadId) &&
-                Objects.equals(postId, that.postId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(threadId, postId);
-    }
-}

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

@@ -1,124 +1,61 @@
 package tn.mnlr.vripper.web.restendpoints;
 
-import lombok.Getter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import tn.mnlr.vripper.exception.ValidationException;
 import tn.mnlr.vripper.services.AppSettingsService;
 import tn.mnlr.vripper.services.VipergirlsAuthService;
+import tn.mnlr.vripper.web.restendpoints.exceptions.BadRequestException;
 
 @RestController
+@Slf4j
 @CrossOrigin(value = "*")
 public class SettingsRestEndpoint {
 
-    private static final Logger logger = LoggerFactory.getLogger(SettingsRestEndpoint.class);
+    private final AppSettingsService appSettingsService;
+    private final VipergirlsAuthService vipergirlsAuthService;
 
     @Autowired
-    private AppSettingsService settings;
-
-    @Autowired
-    private VipergirlsAuthService vipergirlsAuthService;
-
-    @ExceptionHandler(Exception.class)
-    public ResponseEntity handleException(Exception e) {
-        logger.error("Error when process request", e);
-        return ResponseEntity
-                .status(HttpStatus.INTERNAL_SERVER_ERROR)
-                .body(e.getMessage());
+    public SettingsRestEndpoint(AppSettingsService appSettingsService, VipergirlsAuthService vipergirlsAuthService) {
+        this.appSettingsService = appSettingsService;
+        this.vipergirlsAuthService = vipergirlsAuthService;
     }
 
     @PostMapping("/settings/theme")
     @ResponseStatus(value = HttpStatus.OK)
     public AppSettingsService.Theme postTheme(@RequestBody AppSettingsService.Theme theme) {
-        synchronized (this.settings) {
-            this.settings.setTheme(theme);
-            return settings.getTheme();
-        }
+        this.appSettingsService.setTheme(theme);
+        return appSettingsService.getTheme();
     }
 
     @GetMapping("/settings/theme")
     @ResponseStatus(value = HttpStatus.OK)
     public AppSettingsService.Theme getTheme() {
-        return settings.getTheme();
+        return appSettingsService.getTheme();
     }
 
     @PostMapping("/settings")
     @ResponseStatus(value = HttpStatus.OK)
-    public ResponseEntity postSettings(@RequestBody AppSettingsService.Settings settings) throws Exception {
+    public AppSettingsService.Settings postSettings(@RequestBody AppSettingsService.Settings settings) throws Exception {
 
-        synchronized (this.settings) {
-            try {
-                this.settings.check(settings);
-            } catch (ValidationException e) {
-                return ResponseEntity
-                        .status(HttpStatus.BAD_REQUEST)
-                        .body(e.getMessage());
-            }
-            this.settings.setDownloadPath(settings.getDownloadPath());
-            this.settings.setMaxThreads(settings.getMaxThreads());
-            this.settings.setMaxTotalThreads(settings.getMaxTotalThreads());
-            this.settings.setAutoStart(settings.isAutoStart());
-            this.settings.setVLogin(settings.isVLogin());
-
-            if (settings.isVLogin()) {
-                this.settings.setVUsername(settings.getVUsername());
-                if (!this.settings.getVPassword().equals(settings.getVPassword())) {
-                    this.settings.setVPassword(settings.getVPassword());
-                }
-                this.settings.setVThanks(settings.isVThanks());
-            } else {
-                this.settings.setVUsername("");
-                this.settings.setVPassword("");
-                this.settings.setVThanks(false);
-            }
-            this.settings.setDesktopClipboard(settings.isDesktopClipboard());
-            this.settings.setForceOrder(settings.isForceOrder());
-            this.settings.setSubLocation(settings.isSubLocation());
-            this.settings.setThreadSubLocation(settings.isThreadSubLocation());
-            this.settings.setClearCompleted(settings.isClearCompleted());
-            this.settings.setViewPhotos(settings.isViewPhotos());
-            this.settings.setNotificationEnabled(settings.isNotification());
-
-            this.settings.save();
-
-            vipergirlsAuthService.authenticate();
+        try {
+            this.appSettingsService.check(settings);
+        } catch (ValidationException e) {
+            log.error("Invalid settings", e);
+            throw new BadRequestException(e.getMessage());
         }
-        return ResponseEntity.ok(getSettings());
+
+        this.appSettingsService.newSettings(settings);
+        vipergirlsAuthService.authenticate();
+        return getAppSettingsService();
     }
 
     @GetMapping("/settings")
     @ResponseStatus(value = HttpStatus.OK)
-    public AppSettingsService.Settings getSettings() {
+    public AppSettingsService.Settings getAppSettingsService() {
 
-        return new AppSettingsService.Settings(
-                settings.getDownloadPath(),
-                settings.getMaxThreads(),
-                settings.getMaxTotalThreads(),
-                settings.isAutoStart(),
-                settings.isVLogin(),
-                settings.getVUsername(),
-                settings.getVPassword(),
-                settings.isVThanks(),
-                settings.isDesktopClipboard(),
-                settings.isForceOrder(),
-                settings.isSubLocation(),
-                settings.isThreadSubLocation(),
-                settings.isClearCompleted(),
-                settings.isViewPhotos(),
-                settings.isNotificationEnabled()
-        );
-    }
-
-    @Getter
-    static class Response {
-        String message;
-
-        Response(String message) {
-            this.message = message;
-        }
+        return appSettingsService.getSettings();
     }
 }

vripper-server/src/main/java/tn/mnlr/vripper/web/restendpoints/domain/posts/AltPostName.java

@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.web.restendpoints.domain.posts;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class AltPostName {
+    private String postId;
+    private String altName;
+}

vripper-server/src/main/java/tn/mnlr/vripper/web/restendpoints/domain/posts/DownloadPath.java

@@ -0,0 +1,18 @@
+package tn.mnlr.vripper.web.restendpoints.domain.posts;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class DownloadPath {
+    private String path;
+
+    public DownloadPath(String path) {
+        this.path = path;
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/web/restendpoints/domain/posts/PostId.java

@@ -0,0 +1,18 @@
+package tn.mnlr.vripper.web.restendpoints.domain.posts;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PostId {
+    private String postId;
+
+    public PostId(String postId) {
+        this.postId = postId;
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/web/restendpoints/domain/posts/PostToAdd.java

@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.web.restendpoints.domain.posts;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PostToAdd {
+    private String threadId;
+    private String postId;
+}

vripper-server/src/main/java/tn/mnlr/vripper/web/restendpoints/domain/posts/RemoveAllResult.java

@@ -0,0 +1,22 @@
+package tn.mnlr.vripper.web.restendpoints.domain.posts;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class RemoveAllResult {
+    private List<String> postIds;
+    private int removed;
+
+    public RemoveAllResult(List<String> postIds) {
+        this.removed = postIds.size();
+        this.postIds = postIds;
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/web/restendpoints/domain/posts/RemoveResult.java

@@ -0,0 +1,18 @@
+package tn.mnlr.vripper.web.restendpoints.domain.posts;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class RemoveResult {
+    private String postId;
+
+    public RemoveResult(String postId) {
+        this.postId = postId;
+    }
+}

vripper-server/src/main/java/tn/mnlr/vripper/web/restendpoints/domain/posts/ThreadId.java

@@ -0,0 +1,14 @@
+package tn.mnlr.vripper.web.restendpoints.domain.posts;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class ThreadId {
+    private String threadId;
+}