v3.3.8

Fix fonts path
v3.3.7
2026-08-19 08:35:41 +02:00 · 2021-05-05 18:31:13 +01:00 · 2021-05-05 18:29:50 +01:00 · 2021-05-05 18:16:00 +01:00 · 2021-05-05 18:14:25 +01:00 · 2021-03-20 11:35:46 +01:00
300 changed files with 21048 additions and 23235 deletions
@@ -1,160 +1,379 @@
 # Changelog

-## [3.0.3] - 2020-08-16
+## [3.3.8] - 2021-05-05
+
 ### Changed
+
+- Fix imagebam host
+- Fix font path
+
+## [3.3.6] - 2021-03-20
+
+### Changed
+
+- Optimize build size
+
+## [3.3.5] - 2021-03-18
+
+### Changed
+
+- Bug fixe
+
+## [3.3.4] - 2021-03-18
+
+### Changed
+
+- Bug fixes
+
+## [3.3.3] - 2021-03-13
+
+### Changed
+
+- Remove unnecessary event logs
+
+## [3.3.2] - 2021-03-11
+
+### Changed
+
+- Fix a bug with event logs
+- Change event names and add some icons
+
+## [3.3.1] - 2021-02-18
+
+### Added
+
+- Add about menu
+
+### Changed
+
+- Fix README.md
+
+## [3.3.0] - 2021-02-16
+
+### Changed
+
+- Add support for proxies
+- Add a Event Logs
+- Fix bugs with the database
+
+## [3.2.3] - 2021-01-13
+
+### Changed
+
+- Finished posts are not cleared from the UI
+
+## [3.2.2] - 2021-01-13
+
+### Changed
+
+- Set total download to max value
+
+## [3.2.1] - 2021-01-12
+
+### Added
+
+- Add settings for connection timeout
+- Add settings for maximum attempts
+
+### Changed
+
+- Enhance posts rename logic
+- Dependencies update
+- Switch reactive from rx-java to reactor
+
+## [3.2.0] - 2020-11-16
+
+### Changed
+
+- Fix build issue
+
+## [3.1.0] - 2020-11-16
+
+### Changed
+
+- UI revamp
+- Fix bugs
+
+## [3.0.11] - 2020-10-31
+
+### Added
+
+- Support for vipr.im
+
+## [3.0.10] - 2020-10-04
+
+### Changed
+
+- Fix bug on settings update
+
+## [3.0.9] - 2020-09-27
+
+### Changed
+
+- Revert to appending post id to download folders
+- Fix a bug that lead to adding duplicate posts
+- Remove old unused settings
+
+## [3.0.8] - 2020-08-22
+
+### Changed
+
+- Bug fix which breaks concurrent downloads
+
+## [3.0.7] - 2020-08-22
+
+### Changed
+
+- Fix MacOs build
+
+## [3.0.6] - 2020-08-18
+
+### Changed
+
+- Fix TurboImageHost
+
+## [3.0.5] - 2020-08-17
+
+### Changed
+
+- Update packages
+- Host class refactoring
+
+## [3.0.4] - 2020-08-16
+
+### Changed
+
+- Improve rename UI
+
+## [3.0.3] - 2020-08-16
+
+### Changed
+
 - Fix bugs with electron app

 ## [3.0.2] - 2020-08-15
+
 ### Changed
+
 - Fix bugs with download queue

 ## [3.0.1] - 2020-08-03
+
 ### Changed
+
 - Fix bugs with download queue

 ## [3.0.0] - 2020-08-03
+
 ### Changed
+
 - Major rewrites
 - Introducing a proper database for persistence

 ## [2.12.1] - 2020-05-22
+
 ### Changed
+
 - Fix alternative name bug

 ## [2.12.0] - 2020-05-21
+
 ### Changed
+
 - Use new user hash from the api

 ## [2.11.7] - 2020-05-08
+
 ### Changed
+
 - Fix bug with paths creation
 - Move Open Link button
 - Rename rename all title

 ## [2.11.6] - 2020-05-04
+
 ### Changed
+
 - PNG filenames are now correctly named
 - Fix issue with special characters in post titles

 ## [2.11.5] - 2020-05-03
+
 ### Changed
+
 - Reduce rows buffer size

 ## [2.11.4] - 2020-05-03
+
 ### Changed
+
 - Code cleanup
 - Dependencies update

 ## [2.11.3] - 2020-04-30
+
 ### Changed
+
 - Source code restructure
 - UI fixes and enhancements
+
 ### Added
+
 - Add menu entry to rename a gallery to first alternative title
 - Add menu on toolbar for massive rename to first alternative title

 ## [2.11.2] - 2020-04-26
+
 ### Changed
+
 - Bug fixes

 ## [2.11.1] - 2020-04-25
+
 ### Changed
+
 - Code source maintenance
+
 ### Added
+
 - Added option to rename gallery

 ## [2.11.0] - 2020-03-29
+
 ### Changed
+
 - Upgrade Electron to v8
 - Upgrade Angular to v9
 - App settings are now portable in a json file
 - General code source maintenance
+
 ### Added
+
 - Added Support for pixroute.com
 - Added grab post title from thread option

 ## [2.10.8] - 2020-01-25
+
 ### Changed
+
 - Fix app url

 ## [2.10.7] - 2020-01-25
+
 ### Changed
+
 - Drop SockJs and switch to WebSocket
 - Autoreconnect front to back

 ## [2.10.6] - 2020-01-19
+
 ### Changed
+
 - Limit cache size

 ## [2.10.5] - 2020-01-18
+
 ### Changed
+
 - Bug fixes

 ## [2.10.4] - 2020-01-18
+
 ### Changed
+
 - Zero value for total max download will disable the limit
 - Add system notification
 - Bug fixes

 ## [2.10.3] - 2020-01-16
+
 ### Changed
+
 - Some bug fixes
 - Enhance download queue logic
 - Clear cache button
 - Fix the partial status
 - Sanitize URLs with spaces
+
 ### Added
+
 - Support for Postimg host
 - Support for Imagevenue host

 ## [2.10.2] - 2019-12-29
+
 ### Changed
+
 - Upgrade electron to v7
 - Bug fix

 ## [2.10.1] - 2019-12-27
+
 ### Changed
+
 - Bug fix

 ## [2.10.0] - 2019-12-27
+
 ### Changed
+
 - Fix spring dependency bug
+
 ### Added
+
 - Add support for imgspice

 ## [2.9.0] - 2019-12-27
+
 ### Changed
+
 - Fix build issue

 ## [2.9.0] - 2019-12-27
+
 ### Changed
+
 - Decrease timeout for fast fail
+
 ### Added
+
 - Allow many hosts to run at the same time
 - Add title to gallery
 - Add global concurrent downloads
 - Add counter badge in link collector

 ## [2.8.1] - 2019-12-24
+
 ### Changed
+
 - Fix issue with path creation

 ## [2.8.0] - 2019-12-24
+
 ### Added
+
 - Photo gallery feature

 ## [2.7.1] - 2019-12-21
+
 ### Added
+
 - Add version to title bar

 ## [2.7.0] - 2019-12-21
+
 ### Changed
+
 - Add missing icon
+
 ### Added
+
 - Add support for pixxxels

 ## [2.6.0] - 2019-12-21
+
 ### Changed
+
 - Disable download button when nothing selected in Link collector grab menu
 - Better quality app icon
 - Implement context menu on download tab
@@ -163,143 +382,207 @@
 - Some UI fixes

 ## [2.5.1] - 2019-12-09
+
 ### Changed
+
 - Disable download button when nothing selected in Link collector grab menu
+
 ### Added
+
 - Add hosts column in Link collector grab menu

 ## [2.5.0] - 2019-12-08
+
 ### Changed
+
 - Change loading screen
 - UI Fixes
 - Fix bug with previews
+
 ### Added
+
 - Add link collector feature
 - Add support for multiple links at a time

 ## [2.4.1] - 2019-11-26
+
 ### Changed
+
 - Increase attempts for establishing ws connection between front and back end
 - Change default download folder to Home folder (installer), App folder (portable)

 ## [2.4.0] - 2019-11-23
+
 ### Changed
+
 - Pimpandhost Host support

 ## [2.3.2] - 2019-11-23
+
 ### Changed
+
 - Fix a bug with the scan component

 ## [2.3.1] - 2019-11-22
+
 ### Changed
+
 - Fix connexion reset issue
 - Fix Post Status when autostart option is selected
 - Add stop all button

 ## [2.3.0] - 2019-11-21
+
 ### Changed
+
 - UI enhancements and overhaul
 - Stability fixes with HTTP connections
 - MacOS official support
 - Use local sockjs and material icons font

 ## [2.2.5] - 2019-11-09
+
 ### Changed
+
 - Exclude thumbs download for imagezilla and pixhost
 - Change retry on fail logic (may help avoid having download errors)

 ## [2.2.4] - 2019-10-05
+
 ### Added
+
 - AppImage target for linux

 ## [2.2.3] - 2019-10-01
+
 ### Changed
+
 - Strip libjvm.so for debian

 ## [2.2.2] - 2019-10-01
+
 ### Changed
+
 - Update product name

 ## [2.2.1] - 2019-10-01
+
 ### Changed
+
 - Update dependency list for deb package

 ## [2.2.0] - 2019-10-01
+
 ### Added
+
 - Embedd JRE within the app
+
 ### Changed
+
 - Fix 'Start' on pending items
 - Upgrade to Java 11

 ## [2.1.0] - 2019-09-30
+
 ### Added
+
 - Add a create a subfolder per thread option

 ## [2.0.4] - 2019-09-27
+
 ### Changed
+
 - Fix some issues with ImxHost

 ## [2.0.3] - 2019-09-23
+
 ### Changed
+
 - Update deb dependencies

 ## [2.0.2] - 2019-09-23
+
 ### Changed
+
 - Add portable mode

 ## [2.0.1] - 2019-09-22
+
 ### Changed
+
 - Change app name

 ## [2.0.0] - 2019-09-22
+
 ### Added
+
 - Add sub folder option
 - Add clear finished option
+
 ### Changed
+
 - UI enhancements
 - Bug fixes
 - Change data and log paths

 ## [1.6.5] - 2019-09-18
+
 ### Changed
+
 - electron update

 ## [1.6.4] - 2019-09-18
+
 ### Changed
+
 - Change menu item name

 ## [1.6.3] - 2019-09-18
+
 ### Changed
+
 - Better multithread management
 - Fix partial state UI

 ## [1.6.2] - 2019-09-17
+
 ### Changed
+
 - Rework UI colors
 - Fix scan input bug

 ## [1.6.1] - 2019-09-16
+
 ### Changed
+
 - Rework UI
 - Fix clipboard monitoring

 ## [1.6.0] - 2019-09-15
+
 ### Changed
+
 - Rework the UI
 - Add a dark theme
 - Fix the force ordering bug
 - Other bug fixes

 ## [1.5.2] - 2019-09-01
+
 ### Added
+
 - imx.to host fix

 ## [1.5.1] - 2019-08-24
+
 ### Added
+
 - Bug fixes

 ## [1.5.0] - 2019-08-24
+
 ### Added
+
 - Display logged in user
 - Add post details when clicking on main list items (Status, Post URL, Host)
 - Add open download location on main list items menu
@@ -307,86 +590,126 @@
 - Add link to image from details list

 ## [1.4.10] - 2019-08-15
+
 ### Changed
+
 - Fix a rename issue on windows

 ## [1.4.9] - 2019-08-13
+
 ### Changed
+
 - Update Built-By to be generic

 ## [1.4.8] - 2019-08-13
+
 ### Changed
+
 - Add option to force image ordering

 ## [1.4.7] - 2019-08-13
+
 ### Changed
- Fixed a bug in image filename extensions 
+
+- Fixed a bug in image filename extensions

 ## [1.4.6] - 2019-08-06
+
 ### Changed
+
 - Fixed a bug when creating image file names
 - Remove unnecessary logs
- Fix data.json init 
+- Fix data.json init

 ## [1.4.5] - 2019-08-03
+
 ### Changed
+
 - Add min width and height for electron app
+
 ### Added
+
 - Add download speed to status bar

 ## [1.4.4] - 2019-08-01
+
 ### Changed
+
 - Fix names for ImgboxHost
 - Enhance UI
 - Minor fixes
+
 ### Added
+
 - Add start and stop button

 ## [1.4.3] - 2019-07-14
+
 ### Changed
+
 - Update some messages
 - Fix scrolling issue

 ## [1.4.2] - 2019-07-14
+
 ### Changed
+
 - Fix layout issue in web mode

 ## [1.4.1] - 2019-07-14
+
 ### Changed
+
 - Change title's font
+
 ### Added
+
 - Add borders

 ## [1.4.0] - 2019-07-14
+
 ### Changed
+
 - Better error handling on startup
 - Better support for linux AppImage
+
 ### Added
+
 - Clear all completed
 - Add clipboard support
 - Add option to remove all posts
 - Add confirmation on remove

 ## [1.3.0-rc0] - 2019-07-04
+
 ### Changed
+
 - Change default setting for autostart false -> true
 - Change default setting for max concurrent downloads 1 -> 4
+
 ### Added
+
 - Desktop app built with electron
 - Add the option to remove a post

 ## [1.2.0] - 2019-06-23
+
 ### Added
+
 - Add a shutdown button to gracefully shutdown the app
 - Open and redirect the browser to the app address on startup
 - Add the option to run the app in headless mode (-Djava.awt.headless=true)

 ## [1.1.1] - 2019-06-22
+
 ### Changed
+
 - Fix a stability issue with progress updates when the app is runninh for a long time

 ## [1.0.0] - 2019-06-22
+
 ### Added
+
 - 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)
@@ -1,4 +1,4 @@
-# Viper Ripper!
+# VRipper!

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

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

    mvn clean install -Pelectron -DskipTests

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

-[![Donate with PayPal](https://raw.githubusercontent.com/stefan-niedermann/paypal-donate-button/master/paypal-donate-button.png)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=SC7M5LNWZ528Q)
+If you feel generous and want to support me, you can donate some coins, and I would be very grateful 🙏
+
+I accept Bitcoin (BTC) for donations, following is my address
+
+    bc1q9jzzw3st49r9vmxgtylq4vrd67cl7zfclf3lsq
@@ -4,12 +4,12 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>tn.mnlr</groupId>
    <artifactId>vripper</artifactId>
-    <version>3.0.3</version>
+    <version>3.3.8</version>
    <packaging>pom</packaging>
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.0.RELEASE</version>
+        <version>2.4.1</version>
        <relativePath/> <!-- lookup parent from repository -->
    </parent>
    <modules>
@@ -17,4 +17,4 @@
        <module>vripper-ui</module>
        <module>vripper-electron</module>
    </modules>
-</project>
+</project>
@@ -116,7 +116,7 @@ if (!gotTheLock) {
        } else if (process.platform === 'darwin') {
            javaBinPath = path.join(appPath, "java-runtime/bin/java");
            jarPath = path.join(appPath, "bin/vripper-server.jar");
-            baseDir = path.join(appPath, '../..');
+            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");
@@ -130,6 +130,7 @@ if (!gotTheLock) {
            "-Xms256m",
            "-Dvripper.server.port=" + port,
            "-Dbase.dir=" + baseDir,
+            "-Djava.net.preferIPv4Stack=true",
            "-jar",
            jarPath
        ], {
@@ -1,6 +1,6 @@
 {
  "name": "vripper-electron",
-  "version": "3.0.3",
+  "version": "3.3.8",
  "description": "A ripper for vipergirls.to built using web technolgies",
  "main": "main.js",
  "author": "death-claw <53543762+death-claw@users.noreply.github.com>",
@@ -22,6 +22,10 @@
      "!**/{__pycache__,thumbs.db,.flowconfig,.idea,.vs,.nyc_output}",
      "!**/{appveyor.yml,.travis.yml,circle.yml}",
      "!**/{npm-debug.log,yarn.lock,.yarn-integrity,.yarn-metadata.json}",
+      "!**/build-dir",
+      "!**/java-runtime",
+      "!**/pre-build.js",
+      "!**/pom.xml",
      {
        "from": "./build/",
        "to": "."
@@ -55,7 +59,7 @@
    "mac": {
      "category": "public.app-category.utilities",
      "target": [
-        "dir"
+        "dmg"
      ],
      "icon": "icon.icns"
    }
@@ -65,11 +69,11 @@
    "dist": "node pre-build.js && electron-builder"
  },
  "devDependencies": {
-    "electron": "9.1.0",
-    "electron-builder": "22.7.0"
+    "electron": "11.1.1",
+    "electron-builder": "22.9.1"
  },
  "dependencies": {
-    "axios": "0.19.2",
+    "axios": "0.21.1",
    "cheerio": "1.0.0-rc.3",
    "copy-dir": "1.3.0",
    "electron-context-menu": "2.1.0",
@@ -1,77 +1,77 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>tn.mnlr</groupId>
-    <artifactId>vripper</artifactId>
-    <version>3.0.3</version>
-  </parent>
-  <artifactId>vripper-electron</artifactId>
-  <name>vripper-electron</name>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <classifier>${buildClassifier}</classifier>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>electron</id>
-      <properties>
-        <buildClassifier>electron</buildClassifier>
-      </properties>
-      <dependencies>
-        <dependency>
-          <groupId>tn.mnlr</groupId>
-          <artifactId>vripper-server</artifactId>
-          <version>${project.version}</version>
-          <scope>runtime</scope>
-          <classifier>${buildClassifier}</classifier>
-        </dependency>
-      </dependencies>
-      <build>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>tn.mnlr</groupId>
+        <artifactId>vripper</artifactId>
+        <version>3.3.8</version>
+    </parent>
+    <artifactId>vripper-electron</artifactId>
+    <name>vripper-electron</name>
+    <build>
        <plugins>
-          <plugin>
-            <groupId>com.github.eirslett</groupId>
-            <artifactId>frontend-maven-plugin</artifactId>
-            <version>1.3</version>
-            <configuration>
-              <nodeVersion>v12.2.0</nodeVersion>
-              <npmVersion>6.9.0</npmVersion>
-              <workingDirectory>build-dir</workingDirectory>
-            </configuration>
-            <executions>
-              <execution>
-                <id>install node and npm</id>
-                <goals>
-                  <goal>install-node-and-npm</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>npm install</id>
-                <goals>
-                  <goal>npm</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>npm run build</id>
-                <goals>
-                  <goal>npm</goal>
-                </goals>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
                <configuration>
-                  <arguments>run dist</arguments>
+                    <classifier>${buildClassifier}</classifier>
                </configuration>
-                <phase>generate-resources</phase>
-              </execution>
-            </executions>
-          </plugin>
+            </plugin>
        </plugins>
-      </build>
-    </profile>
-  </profiles>
+    </build>
+    <profiles>
+        <profile>
+            <id>electron</id>
+            <properties>
+                <buildClassifier>electron</buildClassifier>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>tn.mnlr</groupId>
+                    <artifactId>vripper-server</artifactId>
+                    <version>${project.version}</version>
+                    <scope>runtime</scope>
+                    <classifier>${buildClassifier}</classifier>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.github.eirslett</groupId>
+                        <artifactId>frontend-maven-plugin</artifactId>
+                        <version>1.11.2</version>
+                        <configuration>
+                            <nodeVersion>v14.16.0</nodeVersion>
+                            <yarnVersion>v1.22.10</yarnVersion>
+                            <workingDirectory>build-dir</workingDirectory>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>install node and yarn</id>
+                                <goals>
+                                    <goal>install-node-and-yarn</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>yarn install</id>
+                                <goals>
+                                    <goal>yarn</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>yarn run build</id>
+                                <goals>
+                                    <goal>yarn</goal>
+                                </goals>
+                                <configuration>
+                                    <arguments>run dist</arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
@@ -2,7 +2,7 @@ const cheerio = require('cheerio');
 const fs = require('fs');
 const rimraf = require("rimraf");
 const copydir = require("copy-dir");
-const { execSync } = require("child_process");
+const {execSync} = require("child_process");

 rimraf.sync('./build/vripper-ui');
 copydir.sync('../vripper-ui/dist/vripper-ui', './build/vripper-ui', {});
@@ -19,7 +19,7 @@ fs.writeFileSync('./build/vripper-ui/index.html', $.html());
 console.log('Building runtime environment');
 rimraf.sync('java-runtime');
 execSync('jlink --no-header-files --no-man-pages --compress=2 --strip-debug --add-modules java.base,java.desktop,java.instrument,java.management,java.naming,java.prefs,java.rmi,java.scripting,java.security.jgss,java.sql,jdk.httpserver,jdk.unsupported,jdk.crypto.ec --output java-runtime');
-if(process.platform === 'linux') {
+if (process.platform === 'linux') {
    console.log('Stripping libjvm.so');
    execSync('strip -p --strip-unneeded java-runtime/lib/server/libjvm.so');
-}
+}
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>tn.mnlr</groupId>
        <artifactId>vripper</artifactId>
-        <version>3.0.3</version>
+        <version>3.3.8</version>
    </parent>
    <artifactId>vripper-server</artifactId>
    <name>vripper-server</name>
@@ -72,9 +72,8 @@
            <version>2.22</version>
        </dependency>
        <dependency>
-            <groupId>io.reactivex.rxjava2</groupId>
-            <artifactId>rxjava</artifactId>
-            <version>2.2.6</version>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core</artifactId>
        </dependency>
        <dependency>
            <groupId>net.jodah</groupId>
@@ -101,6 +100,12 @@
                <artifactId>maven-jar-plugin</artifactId>
                <configuration>
                    <classifier>${buildClassifier}</classifier>
+                    <archive>
+                        <manifestEntries>
+                            <Build-Time>${maven.build.timestamp}</Build-Time>
+                            <Built-By>${user.name}</Built-By>
+                        </manifestEntries>
+                    </archive>
                </configuration>
            </plugin>
            <plugin>
@@ -118,54 +123,6 @@
                    </execution>
                </executions>
            </plugin>
-            <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <version>3.0.0</version>
-                <executions>
-                    <execution>
-                        <id>get-the-git-infos</id>
-                        <goals>
-                            <goal>revision</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>validate-the-git-infos</id>
-                        <goals>
-                            <goal>validateRevision</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <dotGitDirectory>${project.parent.basedir}/.git</dotGitDirectory>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Build-Time>${maven.build.timestamp}</Build-Time>
-                            <Built-By>${user.name}</Built-By>
-                        </manifestEntries>
-                        <manifestSections>
-                            <manifestSection>
-                                <name>Versions</name>
-                                <manifestEntries>
-                                    <Implementation-Version>${git.build.version}</Implementation-Version>
-                                    <Implementation-SCM-Revision>${git.commit.id}</Implementation-SCM-Revision>
-                                    <Implementation-SCM-Branch>${git.branch}</Implementation-SCM-Branch>
-                                    <Implementation-SCM-Time>${git.build.time}</Implementation-SCM-Time>
-                                    <Implementation-SCM-Dirty>${git.dirty}</Implementation-SCM-Dirty>
-                                    <Implementation-SCM-Tags>${git.tags}</Implementation-SCM-Tags>
-                                </manifestEntries>
-                            </manifestSection>
-                        </manifestSections>
-                    </archive>
-                </configuration>
-            </plugin>
        </plugins>
    </build>

@@ -13,24 +13,20 @@ import java.util.Set;
@Component
 public class EventListenerBean {

-    @Getter
-    private static boolean init = false;
+  @Getter private static boolean init = false;

-    private final DataService dataService;
-    private final Set<IRepository> repositorySet;
+  private final DataService dataService;
+  private final Set<IRepository> repositorySet;

-    @Autowired
-    public EventListenerBean(DataService dataService, Set<IRepository> repositorySet) {
-        this.dataService = dataService;
-        this.repositorySet = 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;
-    }
-
-
-}
+  @EventListener
+  public void onApplicationEvent(ContextRefreshedEvent event) {
+    dataService.setDownloadingToStopped();
+    init = true;
+  }
+}
@@ -13,28 +13,27 @@ import java.util.Map;
@Slf4j
 public class SpringContext implements ApplicationContextAware {

-    private static ConfigurableApplicationContext context;
+  private static ConfigurableApplicationContext context;

-    public static <T> T getBean(Class<T> beanClass) {
-        return context.getBean(beanClass);
+  public static <T> T getBean(Class<T> beanClass) {
+    return context.getBean(beanClass);
+  }
+
+  public static <T> Map<String, T> getBeansOfType(Class<T> beanClass) {
+    return context.getBeansOfType(beanClass);
+  }
+
+  public static void close() {
+    log.info("Application terminating...");
+    if (context != null) {
+      context.close();
    }
+  }

-    public static <T> Map<String, T> getBeansOfType(Class<T> beanClass) {
-        return context.getBeansOfType(beanClass);
-    }
+  @Override
+  public void setApplicationContext(ApplicationContext context) throws BeansException {

-    public static void close() {
-        log.info("Application terminating...");
-        if (context != null) {
-            context.close();
-        }
-
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext context) throws BeansException {
-
-        // store ApplicationContext reference to access required beans later on
-        SpringContext.context = ((ConfigurableApplicationContext) context);
-    }
-}
+    // store ApplicationContext reference to access required beans later on
+    SpringContext.context = ((ConfigurableApplicationContext) context);
+  }
+}
@@ -0,0 +1,24 @@
+package tn.mnlr.vripper;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+@Slf4j
+public class Utils {
+
+  public static String throwableToString(Throwable th) {
+    try (StringWriter stringWriter = new StringWriter();
+        PrintWriter printWriter = new PrintWriter(stringWriter)) {
+      th.printStackTrace(printWriter);
+      printWriter.flush();
+      stringWriter.flush();
+      return stringWriter.toString();
+    } catch (IOException e) {
+      log.error("Failed to convert throwable to string", e);
+    }
+    return "Cannot display error, please check the log file for details";
+  }
+}
@@ -1,28 +1,19 @@
 package tn.mnlr.vripper;

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

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

-    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) {
-            log.error("Failed to run the application", e);
-        }
+  public static void main(String[] args) {
+    try {
+      Runtime.getRuntime().addShutdownHook(new Thread(SpringContext::close));
+      SpringApplication.run(VripperApplication.class, args);
+    } catch (Exception e) {
+      log.error("Failed to run the application", e);
    }
+  }
 }
-
@@ -0,0 +1,296 @@
+package tn.mnlr.vripper.download;
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import net.jodah.failsafe.function.CheckedRunnable;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.AbstractExecutionAwareRequest;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.util.EntityUtils;
+import tn.mnlr.vripper.SpringContext;
+import tn.mnlr.vripper.exception.DownloadException;
+import tn.mnlr.vripper.exception.HostException;
+import tn.mnlr.vripper.jpa.domain.Image;
+import tn.mnlr.vripper.jpa.domain.Post;
+import tn.mnlr.vripper.jpa.domain.enums.Status;
+import tn.mnlr.vripper.services.*;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.*;
+
+@Slf4j
+public class DownloadJob implements CheckedRunnable {
+
+  private static final Object LOCK = new Object();
+  private static final int READ_BUFFER_SIZE = 8192;
+  private final DataService dataService;
+  private final PathService pathService;
+  private final ConnectionService cm;
+  private final VGAuthService authService;
+  private final DownloadSpeedService downloadSpeedService;
+  private final SettingsService settingsService;
+  private final HttpClientContext context;
+  @Getter private final Image image;
+  @Getter private final Post post;
+  private volatile boolean stopped = false;
+  @Getter private boolean finished = false;
+
+  DownloadJob(Post post, Image image) {
+    this.image = image;
+    this.post = post;
+    dataService = SpringContext.getBean(DataService.class);
+    pathService = SpringContext.getBean(PathService.class);
+    cm = SpringContext.getBean(ConnectionService.class);
+    authService = SpringContext.getBean(VGAuthService.class);
+    downloadSpeedService = SpringContext.getBean(DownloadSpeedService.class);
+    settingsService = SpringContext.getBean(SettingsService.class);
+    context = HttpClientContext.create();
+    context.setCookieStore(new BasicCookieStore());
+    context.setAttribute(
+        ContextAttributes.OPEN_CONNECTION.toString(),
+        Collections.synchronizedList(new ArrayList<AbstractExecutionAwareRequest>()));
+  }
+
+  public void download(final Post post, final Image image) throws DownloadException {
+
+    try {
+
+      image.setStatus(Status.DOWNLOADING);
+      image.setCurrent(0);
+      dataService.updateImageStatus(image.getStatus(), image.getId());
+      dataService.updateImageCurrent(image.getCurrent(), image.getId());
+
+      synchronized (LOCK) {
+        if (!post.getStatus().equals(Status.DOWNLOADING)
+            && !post.getStatus().equals(Status.PARTIAL)) {
+          post.setStatus(Status.DOWNLOADING);
+          dataService.updatePostStatus(post.getStatus(), post.getId());
+        }
+
+        // The post may be updated and the download directory might be set by another thread
+        Post updatedPost = dataService.findById(post.getId()).orElseThrow();
+        if (updatedPost.getDownloadDirectory() == null) {
+          pathService.createDefaultPostFolder(updatedPost);
+        }
+        if (settingsService.getSettings().getLeaveThanksOnStart() != null
+            && settingsService.getSettings().getLeaveThanksOnStart()) {
+          authService.leaveThanks(updatedPost);
+        }
+      }
+
+      if (stopped) {
+        return;
+      }
+      /*
+       * HOST SPECIFIC
+       */
+      log.debug(
+          String.format(
+              "Getting image url and name from %s using %s", image.getUrl(), image.getHost()));
+      HostService.NameUrl nameAndUrl = image.getHost().getNameAndUrl(image.getUrl(), context);
+      log.debug(String.format("Resolved name for %s: %s", image.getUrl(), nameAndUrl.getName()));
+      log.debug(
+          String.format("Resolved image url for %s: %s", image.getUrl(), nameAndUrl.getUrl()));
+      /*
+       * END HOST SPECIFIC
+       */
+
+      if (stopped) {
+        return;
+      }
+      String formatImageFileName = pathService.formatImageFileName(nameAndUrl.getName());
+      log.debug(
+          String.format(
+              "Sanitizing image name from %s to %s", nameAndUrl.getName(), formatImageFileName));
+      nameAndUrl = new HostService.NameUrl(formatImageFileName, nameAndUrl.getUrl());
+
+      HttpClient client = cm.getClient().build();
+
+      log.debug(String.format("Downloading %s", nameAndUrl.getUrl()));
+      HttpGet httpGet = cm.buildHttpGet(nameAndUrl.getUrl(), context);
+      httpGet.addHeader("Referer", image.getUrl());
+      try (CloseableHttpResponse response =
+          (CloseableHttpResponse) client.execute(httpGet, context)) {
+
+        if (response.getStatusLine().getStatusCode() / 100 != 2) {
+          EntityUtils.consumeQuietly(response.getEntity());
+          throw new DownloadException(
+              String.format("Server returned code %d", response.getStatusLine().getStatusCode()));
+        }
+        if (stopped) {
+          return;
+        }
+        File outputFile = Files.createTempFile("vripper", "tmp").toFile();
+        try (InputStream downloadStream = response.getEntity().getContent();
+            FileOutputStream fos = new FileOutputStream(outputFile)) {
+
+          if (stopped) {
+            return;
+          }
+
+          image.setTotal(response.getEntity().getContentLength());
+          dataService.updateImageTotal(image.getTotal(), image.getId());
+
+          log.debug(String.format("%s length is %d", nameAndUrl.getUrl(), image.getTotal()));
+          log.debug(String.format("Starting data transfer for %s", nameAndUrl.getUrl()));
+
+          byte[] buffer = new byte[READ_BUFFER_SIZE];
+          int read;
+          while ((read = downloadStream.read(buffer, 0, READ_BUFFER_SIZE)) != -1 && !stopped) {
+            fos.write(buffer, 0, read);
+            image.increase(read);
+            downloadSpeedService.increase(read);
+            dataService.updateImageCurrent(image.getCurrent(), image.getId());
+          }
+          fos.flush();
+          EntityUtils.consumeQuietly(response.getEntity());
+          if (stopped) {
+            return;
+          }
+        }
+        checkImageTypeAndRename(
+            dataService.findById(post.getId()).orElseThrow(),
+            outputFile,
+            nameAndUrl.getName(),
+            image.getIndex());
+      }
+    } catch (Exception e) {
+      if (stopped) {
+        return;
+      }
+      throw new DownloadException(e);
+    } finally {
+      if (image.getCurrent() == image.getTotal() && image.getTotal() > 0) {
+        image.setStatus(Status.COMPLETE);
+      } else if (stopped) {
+        image.setStatus(Status.STOPPED);
+      } else {
+        image.setStatus(Status.ERROR);
+      }
+      dataService.updateImageStatus(image.getStatus(), image.getId());
+      finished = true;
+    }
+  }
+
+  private void checkImageTypeAndRename(Post post, File outputFile, String imageName, int index)
+      throws HostException {
+    try (ImageInputStream iis = ImageIO.createImageInputStream(outputFile)) {
+      Iterator<ImageReader> it = ImageIO.getImageReaders(iis);
+      if (!it.hasNext()) {
+        throw new HostException("Image file is not recognized!");
+      }
+      ImageReader reader = it.next();
+      if (reader.getFormatName().equalsIgnoreCase("JPEG")) {
+        String imageNameLC = imageName.toLowerCase();
+        if (!imageNameLC.endsWith("_jpg") && !imageNameLC.endsWith("_jpeg")) {
+          imageName += ".jpg";
+        } else {
+          String toReplace = null;
+          if (imageNameLC.endsWith("_jpg")) {
+            toReplace = "_jpg";
+          } else if (imageNameLC.endsWith("_jpeg")) {
+            toReplace = "_jpeg";
+          }
+          if (toReplace != null) {
+            imageName = imageName.substring(0, imageName.length() - toReplace.length()) + ".jpg";
+          }
+        }
+      } else if (reader.getFormatName().equalsIgnoreCase("PNG")) {
+        String imageNameLC = imageName.toLowerCase();
+        if (!imageNameLC.endsWith("_png")) {
+          imageName += ".png";
+        } else {
+          String toReplace = null;
+          if (imageNameLC.endsWith("_png")) {
+            toReplace = "_png";
+          }
+          if (toReplace != null) {
+            imageName = imageName.substring(0, imageName.length() - toReplace.length()) + ".png";
+          }
+        }
+      }
+    } catch (Exception e) {
+      throw new HostException("Failed to guess image format", e);
+    }
+    try {
+      pathService.getDirectoryAccess().lock();
+      File downloadDestinationFolder = pathService.calcDownloadDirectory(post);
+      File outImage =
+          new File(
+              downloadDestinationFolder,
+              (settingsService.getSettings().getForceOrder() ? String.format("%03d_", index) : "")
+                  + imageName);
+      Files.copy(outputFile.toPath(), outImage.toPath(), StandardCopyOption.REPLACE_EXISTING);
+    } catch (Exception e) {
+      throw new HostException("Failed to rename the image", e);
+    } finally {
+      pathService.getDirectoryAccess().unlock();
+      try {
+        Files.delete(outputFile.toPath());
+      } catch (IOException e) {
+        log.warn(String.format("Failed to delete temporary file %s", outputFile.getAbsolutePath()));
+      }
+    }
+  }
+
+  @Override
+  public void run() throws Exception {
+    if (stopped) {
+      finished = true;
+      return;
+    }
+    log.debug(String.format("Starting downloading %s", image.getUrl()));
+    download(post, image);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    DownloadJob that = (DownloadJob) o;
+    return Objects.equals(image, that.image) && Objects.equals(post, that.post);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(image, post);
+  }
+
+  public void stop() {
+    List<AbstractExecutionAwareRequest> requests =
+        (List<AbstractExecutionAwareRequest>)
+            this.context.getAttribute(ContextAttributes.OPEN_CONNECTION.toString());
+    if (requests != null) {
+      for (AbstractExecutionAwareRequest request : requests) {
+        request.abort();
+      }
+    }
+    this.stopped = true;
+  }
+
+  public enum ContextAttributes {
+    OPEN_CONNECTION("OPEN_CONNECTION");
+
+    private final String value;
+
+    ContextAttributes(String value) {
+      this.value = value;
+    }
+
+    @Override
+    public String toString() {
+      return value;
+    }
+  }
+}
@@ -0,0 +1,70 @@
+package tn.mnlr.vripper.download;
+
+import lombok.extern.slf4j.Slf4j;
+import net.jodah.failsafe.Failsafe;
+import tn.mnlr.vripper.SpringContext;
+import tn.mnlr.vripper.Utils;
+import tn.mnlr.vripper.jpa.domain.Event;
+import tn.mnlr.vripper.jpa.domain.enums.Status;
+import tn.mnlr.vripper.jpa.repositories.IEventRepository;
+import tn.mnlr.vripper.services.ConnectionService;
+import tn.mnlr.vripper.services.DataService;
+
+import java.time.LocalDateTime;
+
+@Slf4j
+public class DownloadRunnable implements Runnable {
+
+  private final DownloadService downloadService;
+  private final DataService dataService;
+  private final ConnectionService connectionService;
+  private final IEventRepository eventRepository;
+
+  private final DownloadJob downloadJob;
+
+  public DownloadRunnable(final DownloadJob downloadJob) {
+    downloadService = SpringContext.getBean(DownloadService.class);
+    dataService = SpringContext.getBean(DataService.class);
+    connectionService = SpringContext.getBean(ConnectionService.class);
+    eventRepository = SpringContext.getBean(IEventRepository.class);
+
+    this.downloadJob = downloadJob;
+  }
+
+  @Override
+  public void run() {
+    Failsafe.with(connectionService.getRetryPolicy())
+        .onFailure(
+            e -> {
+              try {
+                Event event =
+                    new Event(
+                        Event.Type.DOWNLOAD,
+                        Event.Status.ERROR,
+                        LocalDateTime.now(),
+                        String.format(
+                            "Failed to download %s\n %s",
+                            downloadJob.getImage().getUrl(),
+                            Utils.throwableToString(e.getFailure())));
+                eventRepository.save(event);
+              } catch (Exception exp) {
+                log.error("Failed to save event", exp);
+              }
+              log.error(
+                  String.format(
+                      "Failed to download %s after %d tries",
+                      downloadJob.getImage().getUrl(), e.getAttemptCount()),
+                  e.getFailure());
+              downloadJob.getImage().setStatus(Status.ERROR);
+              dataService.updateImageStatus(
+                  downloadJob.getImage().getStatus(), downloadJob.getImage().getId());
+            })
+        .onComplete(
+            e -> {
+              dataService.afterJobFinish(downloadJob.getImage(), downloadJob.getPost());
+              downloadService.afterJobFinish(downloadJob);
+              log.debug(String.format("Finished downloading %s", downloadJob.getImage().getUrl()));
+            })
+        .run(downloadJob);
+  }
+}
@@ -0,0 +1,236 @@
+package tn.mnlr.vripper.download;
+
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import tn.mnlr.vripper.host.Host;
+import tn.mnlr.vripper.jpa.domain.Image;
+import tn.mnlr.vripper.jpa.domain.Post;
+import tn.mnlr.vripper.jpa.domain.enums.Status;
+import tn.mnlr.vripper.services.DataService;
+import tn.mnlr.vripper.services.PostService;
+import tn.mnlr.vripper.services.SettingsService;
+
+import javax.annotation.PostConstruct;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Service
+@Slf4j
+public class DownloadService {
+
+  private static final List<Status> FINISHED =
+      Arrays.asList(Status.ERROR, Status.COMPLETE, Status.STOPPED);
+  private final int MAX_POOL_SIZE = 12;
+
+  private final ConcurrentHashMap<Host, AtomicInteger> threadCount = new ConcurrentHashMap<>();
+  private final ExecutorService executor = Executors.newFixedThreadPool(MAX_POOL_SIZE);
+  private final BlockingQueue<DownloadJob> executionQueue = new LinkedBlockingQueue<>();
+  private final List<DownloadJob> executing = Collections.synchronizedList(new ArrayList<>());
+
+  private final PendingQueue pendingQueue;
+  private final SettingsService settings;
+  private final DataService dataService;
+  private final PostService postService;
+
+  private boolean pauseQ = false;
+  private Thread executionThread;
+  private Thread pollThread;
+
+  @Autowired
+  public DownloadService(
+      PendingQueue pendingQueue,
+      SettingsService settings,
+      DataService dataService,
+      PostService postService) {
+    this.pendingQueue = pendingQueue;
+    this.settings = settings;
+    this.dataService = dataService;
+    this.postService = postService;
+  }
+
+  @PostConstruct
+  private void init() {
+    executionThread = new Thread(this::start, "Executor thread");
+    pollThread = new Thread(this::poll, "Polling thread");
+    pollThread.start();
+    executionThread.start();
+  }
+
+  public void destroy() throws Exception {
+    log.info("Shutting down ExecutionService");
+    executionThread.interrupt();
+    pollThread.interrupt();
+    executor.shutdown();
+    dataService
+        .findAllPosts()
+        .forEach(
+            p -> {
+              log.debug(String.format("Stopping download jobs for %s", p));
+              this.stopRunning(p.getPostId());
+            });
+    executor.awaitTermination(5, TimeUnit.SECONDS);
+  }
+
+  private void stopRunning(@NonNull String postId) {
+    List<DownloadJob> stopping = new ArrayList<>();
+    Iterator<DownloadJob> iterator = executing.iterator();
+    while (iterator.hasNext()) {
+      DownloadJob downloadJob = iterator.next();
+      if (postId.equals(downloadJob.getPost().getPostId())) {
+        downloadJob.stop();
+        iterator.remove();
+        stopping.add(downloadJob);
+      }
+    }
+
+    while (!stopping.isEmpty()) {
+      stopping.removeIf(DownloadJob::isFinished);
+      try {
+        Thread.sleep(500);
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+
+  public void stopAll(List<String> posIds) {
+    if (posIds != null) {
+      posIds.forEach(this::stop);
+    } else {
+      dataService.findAllPosts().forEach(p -> this.stop(p.getPostId()));
+    }
+  }
+
+  public void restartAll(List<String> posIds) {
+    if (posIds != null) {
+      posIds.forEach(this::restart);
+    } else {
+      dataService.findAllPosts().forEach(p -> this.restart(p.getPostId()));
+    }
+  }
+
+  private void restart(@NonNull String postId) {
+    if (isPending(postId)) {
+      log.warn(String.format("Cannot restart, jobs are currently running for post id %s", postId));
+      return;
+    }
+    List<Image> images = dataService.findByPostIdAndIsNotCompleted(postId);
+    if (images.isEmpty()) {
+      return;
+    }
+    Post post = dataService.findPostByPostId(postId).orElseThrow();
+    post.setStatus(Status.PENDING);
+    dataService.updatePostStatus(post.getStatus(), post.getId());
+    log.debug(String.format("Restarting %d jobs for post id %s", images.size(), postId));
+    for (Image image : images) {
+      try {
+        pendingQueue.put(post, image);
+      } catch (InterruptedException e) {
+        log.warn("Thread was interrupted", e);
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+
+  private boolean isPending(String postId) {
+    return pendingQueue.isPending(postId);
+  }
+
+  private void stop(String postId) {
+    try {
+      pauseQ = true;
+      final Post post = dataService.findPostByPostId(postId).orElseThrow();
+      if (post == null) {
+        return;
+      }
+      if (FINISHED.contains(post.getStatus())) {
+        return;
+      }
+      pendingQueue.stop(post);
+      stopRunning(postId);
+      dataService.stopImagesByPostIdAndIsNotCompleted(postId);
+      dataService.finishPost(post);
+      postService.stopFetchingMetadata(post);
+    } finally {
+      pauseQ = false;
+    }
+  }
+
+  private boolean canRun(Host host) {
+    boolean canRun;
+    AtomicInteger count = threadCount.get(host);
+    if (count == null) {
+      threadCount.put(host, new AtomicInteger(0));
+    }
+    canRun =
+        threadCount.get(host).get() < settings.getSettings().getMaxThreads()
+            && (settings.getSettings().getMaxTotalThreads() == 0
+                ? threadCount.values().stream().mapToInt(AtomicInteger::get).sum() < MAX_POOL_SIZE
+                : threadCount.values().stream().mapToInt(AtomicInteger::get).sum()
+                    < settings.getSettings().getMaxTotalThreads());
+    if (canRun && !pauseQ) {
+      threadCount.get(host).incrementAndGet();
+      return true;
+    }
+    return false;
+  }
+
+  private void poll() {
+    while (!Thread.interrupted()) {
+      try {
+        List<DownloadJob> peek = pendingQueue.peek();
+        for (DownloadJob downloadJob : peek) {
+          if (canRun(downloadJob.getImage().getHost())) {
+            executionQueue.offer(downloadJob);
+            pendingQueue.remove(downloadJob);
+          }
+        }
+        synchronized (threadCount) {
+          threadCount.wait(2_000);
+        }
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+        break;
+      }
+    }
+  }
+
+  private void start() {
+    while (!Thread.interrupted()) {
+      try {
+        push(executionQueue.take());
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+        break;
+      } catch (Exception e) {
+        log.error("Execution Service failed", e);
+        break;
+      }
+    }
+  }
+
+  private void push(DownloadJob downloadJob) {
+    log.debug(String.format("Scheduling a job for %s", downloadJob.getImage().getUrl()));
+    executor.execute(new DownloadRunnable(downloadJob));
+    executing.add(downloadJob);
+  }
+
+  public synchronized void afterJobFinish(DownloadJob downloadJob) {
+    int count = pendingQueue.decrement(downloadJob.getPost().getPostId());
+    if (count == 0) {
+      dataService.finishPost(downloadJob.getPost());
+    }
+    threadCount.get(downloadJob.getImage().getHost()).decrementAndGet();
+    executing.remove(downloadJob);
+    synchronized (threadCount) {
+      threadCount.notify();
+    }
+  }
+
+  public int runningCount() {
+    return executing.size();
+  }
+}
@@ -0,0 +1,116 @@
+package tn.mnlr.vripper.download;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import tn.mnlr.vripper.host.Host;
+import tn.mnlr.vripper.jpa.domain.Image;
+import tn.mnlr.vripper.jpa.domain.Post;
+import tn.mnlr.vripper.services.DataService;
+import tn.mnlr.vripper.services.SettingsService;
+
+import javax.annotation.PostConstruct;
+import java.util.*;
+import java.util.concurrent.BlockingDeque;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Predicate;
+
+@Service
+@Slf4j
+public class PendingQueue {
+
+  private final DataService dataService;
+  private final SettingsService settingsService;
+  private final List<Host> hosts;
+
+  private final ConcurrentHashMap<Host, BlockingDeque<DownloadJob>> pendingQ =
+      new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<String, AtomicInteger> toBeExecuted = new ConcurrentHashMap<>();
+
+  @Autowired
+  public PendingQueue(DataService dataService, SettingsService settingsService, List<Host> hosts) {
+    this.dataService = dataService;
+    this.settingsService = settingsService;
+    this.hosts = hosts;
+  }
+
+  @PostConstruct
+  private void init() {
+    hosts.forEach(host -> pendingQ.put(host, new LinkedBlockingDeque<>()));
+  }
+
+  public void put(Post post, Image image) throws InterruptedException {
+    log.debug(String.format("Enqueuing a job for %s", image.getUrl()));
+    image.init();
+    dataService.updateImageStatus(image.getStatus(), image.getId());
+    dataService.updateImageCurrent(image.getCurrent(), image.getId());
+    DownloadJob downloadJob = new DownloadJob(post, image);
+    pendingQ.get(downloadJob.getImage().getHost()).putLast(downloadJob);
+    checkKey(post.getPostId());
+    toBeExecuted.get(post.getPostId()).incrementAndGet();
+  }
+
+  private synchronized void checkKey(String postId) {
+    if (!toBeExecuted.containsKey(postId)) {
+      toBeExecuted.put(postId, new AtomicInteger(0));
+    }
+  }
+
+  public void remove(final DownloadJob downloadJob) {
+    pendingQ.get(downloadJob.getImage().getHost()).remove(downloadJob);
+  }
+
+  public List<DownloadJob> peek() {
+    List<DownloadJob> downloadJobs = new ArrayList<>();
+    if (hosts.size() == 0) {
+      return downloadJobs;
+    }
+    for (Host host : hosts) {
+      Iterator<DownloadJob> it = pendingQ.get(host).iterator();
+      for (int i = 0; i < settingsService.getSettings().getMaxThreads(); i++) {
+        DownloadJob downloadJob = it.hasNext() ? it.next() : null;
+        if (downloadJob != null) {
+          downloadJobs.add(downloadJob);
+        }
+      }
+    }
+    return downloadJobs;
+  }
+
+  public void enqueue(Post post, Set<Image> images) throws InterruptedException {
+    for (Image image : images) {
+      put(post, image);
+    }
+  }
+
+  public int size() {
+    return toBeExecuted.values().stream().mapToInt(AtomicInteger::get).sum();
+  }
+
+  public void stop(Post post) {
+    Predicate<DownloadJob> predicate = next -> next.getImage().getPostId().equals(post.getPostId());
+    for (Map.Entry<Host, BlockingDeque<DownloadJob>> entry : pendingQ.entrySet()) {
+      entry.getValue().stream().filter(predicate).forEach(e -> decrement(post.getPostId()));
+      entry.getValue().removeIf(predicate);
+      decrement(post.getPostId());
+    }
+  }
+
+  public boolean isPending(String postId) {
+    return toBeExecuted.containsKey(postId);
+  }
+
+  public synchronized int decrement(String postId) {
+    AtomicInteger counter = toBeExecuted.get(postId);
+    if (counter == null) {
+      return 0;
+    }
+    int count = counter.decrementAndGet();
+    if (count == 0) {
+      toBeExecuted.remove(postId);
+    }
+    return count;
+  }
+}
@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class EventRemoveEvent extends ApplicationEvent {
+
+  private final Long id;
+
+  public EventRemoveEvent(Object source, Long id) {
+    super(source);
+    this.id = id;
+  }
+}
@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class EventUpdateEvent extends ApplicationEvent {
+
+  private final Long id;
+
+  public EventUpdateEvent(Object source, Long id) {
+    super(source);
+    this.id = id;
+  }
+}
@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class ImageUpdateEvent extends ApplicationEvent {
+
+  private final Long id;
+
+  public ImageUpdateEvent(Object source, Long id) {
+    super(source);
+    this.id = id;
+  }
+}
@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class MetadataUpdateEvent extends ApplicationEvent {
+
+  private final Long postIdRef;
+
+  public MetadataUpdateEvent(Object source, Long postIdRef) {
+    super(source);
+    this.postIdRef = postIdRef;
+  }
+}
@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class PostRemoveEvent extends ApplicationEvent {
+
+  private final String postId;
+
+  public PostRemoveEvent(Object source, String postId) {
+    super(source);
+    this.postId = postId;
+  }
+}
@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class PostUpdateEvent extends ApplicationEvent {
+
+  private final Long id;
+
+  public PostUpdateEvent(Object source, Long id) {
+    super(source);
+    this.id = id;
+  }
+}
@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class QueuedRemoveEvent extends ApplicationEvent {
+
+  private final String threadId;
+
+  public QueuedRemoveEvent(Object source, String threadId) {
+    super(source);
+    this.threadId = threadId;
+  }
+}
@@ -0,0 +1,15 @@
+package tn.mnlr.vripper.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class QueuedUpdateEvent extends ApplicationEvent {
+
+  private final Long id;
+
+  public QueuedUpdateEvent(Object source, Long id) {
+    super(source);
+    this.id = id;
+  }
+}
@@ -2,11 +2,11 @@ package tn.mnlr.vripper.exception;

 public class DownloadException extends Exception {

-    public DownloadException(String message) {
-        super(message);
-    }
+  public DownloadException(String message) {
+    super(message);
+  }

-    public DownloadException(Throwable e) {
-        super(e);
-    }
+  public DownloadException(Throwable e) {
+    super(e);
+  }
 }
@@ -1,15 +1,15 @@
 package tn.mnlr.vripper.exception;

 public class HostException extends Exception {
-    public HostException(Throwable e) {
-        super(e);
-    }
+  public HostException(Throwable e) {
+    super(e);
+  }

-    public HostException(String message) {
-        super(message);
-    }
+  public HostException(String message) {
+    super(message);
+  }

-    public HostException(String message, Throwable e) {
-        super(message,e);
-    }
+  public HostException(String message, Throwable e) {
+    super(message, e);
+  }
 }
@@ -2,7 +2,7 @@ package tn.mnlr.vripper.exception;

 public class HtmlProcessorException extends Exception {

-    public HtmlProcessorException(Throwable e) {
-        super(e);
-    }
+  public HtmlProcessorException(Throwable e) {
+    super(e);
+  }
 }
@@ -2,15 +2,15 @@ package tn.mnlr.vripper.exception;

 public class PostParseException extends Exception {

-    public PostParseException(String message) {
-        super(message);
-    }
+  public PostParseException(String message) {
+    super(message);
+  }

-    public PostParseException(String message, Throwable e) {
-        super(message, e);
-    }
+  public PostParseException(String message, Throwable e) {
+    super(message, e);
+  }

-    public PostParseException(Throwable e) {
-        super(e);
-    }
+  public PostParseException(Throwable e) {
+    super(e);
+  }
 }
@@ -2,15 +2,15 @@ package tn.mnlr.vripper.exception;

 public class QueueException extends Exception {

-    public QueueException(String message) {
-        super(message);
-    }
+  public QueueException(String message) {
+    super(message);
+  }

-    public QueueException(String message, Throwable e) {
-        super(message, e);
-    }
+  public QueueException(String message, Throwable e) {
+    super(message, e);
+  }

-    public QueueException(Throwable e) {
-        super(e);
-    }
+  public QueueException(Throwable e) {
+    super(e);
+  }
 }
@@ -0,0 +1,10 @@
+package tn.mnlr.vripper.exception;
+
+import java.io.IOException;
+
+public class RenameException extends Exception {
+
+  public RenameException(String message, IOException e) {
+    super(message, e);
+  }
+}
@@ -2,7 +2,7 @@ package tn.mnlr.vripper.exception;

 public class ValidationException extends Exception {

-    public ValidationException(String message) {
-        super(message);
-    }
+  public ValidationException(String message) {
+    super(message);
+  }
 }
@@ -1,11 +1,11 @@
 package tn.mnlr.vripper.exception;

 public class VripperException extends Exception {
-    public VripperException(String message) {
-        super(message);
-    }
+  public VripperException(String message) {
+    super(message);
+  }

-    public VripperException(Throwable e) {
-        super(e);
-    }
+  public VripperException(Throwable e) {
+    super(e);
+  }
 }
@@ -1,7 +1,7 @@
 package tn.mnlr.vripper.exception;

 public class XpathException extends Exception {
-    public XpathException(Throwable e) {
-        super(e);
-    }
+  public XpathException(Throwable e) {
+    super(e);
+  }
 }
@@ -15,8 +15,10 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
-import tn.mnlr.vripper.services.ConnectionManager;
+import tn.mnlr.vripper.services.ConnectionService;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.HtmlProcessorService;
+import tn.mnlr.vripper.services.XpathService;

 import java.util.ArrayList;
 import java.util.List;
@@ -25,84 +27,96 @@ import java.util.List;
@Slf4j
 public class AcidimgHost extends Host {

-    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 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']";

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

-    public AcidimgHost() {
-        super();
+  @Autowired
+  public AcidimgHost(
+      ConnectionService cm,
+      HostService hostService,
+      XpathService xpathService,
+      HtmlProcessorService htmlProcessorService) {
+    this.cm = cm;
+    this.hostService = hostService;
+    this.xpathService = xpathService;
+    this.htmlProcessorService = htmlProcessorService;
+  }
+
+  @Override
+  public String getHost() {
+    return host;
+  }
+
+  @Override
+  public String getLookup() {
+    return host;
+  }
+
+  @Override
+  public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context)
+      throws HostException {
+
+    Document doc = hostService.getResponse(url, context).getDocument();
+
+    Node contDiv;
+    try {
+      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);
    }

-    @Override
-    public String getHost() {
-        return host;
+    if (contDiv != null) {
+      log.debug(String.format("Click button found for %s", url));
+      HttpClient client = cm.getClient().build();
+      HttpPost httpPost = cm.buildHttpPost(url, context);
+      httpPost.addHeader("Referer", url);
+      List<NameValuePair> params = new ArrayList<>();
+      params.add(new BasicNameValuePair("imgContinue", "Continue to your image"));
+      try {
+        httpPost.setEntity(new UrlEncodedFormEntity(params));
+      } catch (Exception e) {
+        throw new HostException(e);
+      }
+
+      log.debug(String.format("Requesting %s", httpPost));
+      try (CloseableHttpResponse response =
+          (CloseableHttpResponse) client.execute(httpPost, context)) {
+        log.debug(String.format("Cleaning response for %s", httpPost));
+        doc = htmlProcessorService.clean(EntityUtils.toString(response.getEntity()));
+        EntityUtils.consumeQuietly(response.getEntity());
+      } catch (Exception e) {
+        throw new HostException(e);
+      }
    }

-    @Override
-    public String getLookup() {
-        return host;
+    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);
    }

-    @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
-
-        Document doc = getResponse(url, context).getDocument();
-
-        Node contDiv;
-        try {
-            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) {
-            log.debug(String.format("Click button found for %s", url));
-            HttpClient client = cm.getClient().build();
-            HttpPost httpPost = cm.buildHttpPost(url);
-            httpPost.addHeader("Referer", url);
-            List<NameValuePair> params = new ArrayList<>();
-            params.add(new BasicNameValuePair("imgContinue", "Continue to your image"));
-            try {
-                httpPost.setEntity(new UrlEncodedFormEntity(params));
-            } catch (Exception e) {
-                throw new HostException(e);
-            }
-
-            log.debug(String.format("Requesting %s", httpPost));
-            try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(httpPost, context)) {
-                log.debug(String.format("Cleaning response for %s", httpPost));
-                doc = htmlProcessorService.clean(EntityUtils.toString(response.getEntity()));
-                EntityUtils.consumeQuietly(response.getEntity());
-            } catch (Exception e) {
-                throw new HostException(e);
-            }
-        }
-
-        Node imgNode;
-        try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
-            imgNode = xpathService.getAsNode(doc, IMG_XPATH);
-        } catch (XpathException e) {
-            throw new HostException(e);
-        }
-
-        if (imgNode == null) {
-            throw new HostException("Cannot find the image node");
-        }
-
-        try {
-            log.debug(String.format("Resolving name and image url for %s", url));
-            String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
-            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
-
-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle.isEmpty() ? getDefaultImageName(imgUrl) : imgTitle);
-        } catch (Exception e) {
-            throw new HostException("Unexpected error occurred", e);
-        }
+    if (imgNode == null) {
+      throw new HostException("Cannot find the image node");
    }
+
+    try {
+      log.debug(String.format("Resolving name and image url for %s", url));
+      String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
+      String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
+
+      return new HostService.NameUrl(
+          imgTitle.isEmpty() ? hostService.getDefaultImageName(imgUrl) : imgTitle, imgUrl);
+    } catch (Exception e) {
+      throw new HostException("Unexpected error occurred", e);
+    }
+  }
 }
@@ -1,324 +1,43 @@
 package tn.mnlr.vripper.host;

-import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.Header;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.util.EntityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.w3c.dom.Document;
-import tn.mnlr.vripper.exception.DownloadException;
 import tn.mnlr.vripper.exception.HostException;
-import tn.mnlr.vripper.exception.HtmlProcessorException;
-import tn.mnlr.vripper.jpa.domain.Image;
-import tn.mnlr.vripper.jpa.domain.Post;
-import tn.mnlr.vripper.jpa.domain.enums.Status;
-import tn.mnlr.vripper.q.DownloadJob;
-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 {
+public abstract class Host {

-    private static final int READ_BUFFER_SIZE = 8192;
+  public abstract String getHost();

-    private static final Byte LOCK = 0;
+  public abstract String getLookup();

-    @Autowired
-    protected HtmlProcessorService htmlProcessorService;
+  public boolean isSupported(String url) {
+    return url.contains(getLookup());
+  }

-    @Autowired
-    protected XpathService xpathService;
+  public abstract HostService.NameUrl getNameAndUrl(
+      final String url, final HttpClientContext context) throws HostException;

-    @Autowired
-    private AppSettingsService appSettingsService;
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    Host host = (Host) o;
+    return Objects.equals(getHost(), host.getHost());
+  }

-    @Autowired
-    private DataService dataService;
+  @Override
+  public int hashCode() {
+    return Objects.hash(getHost());
+  }

-    @Autowired
-    private ConnectionManager cm;
-
-    @Autowired
-    private DownloadSpeedService downloadSpeedService;
-
-    @Autowired
-    private PathService pathService;
-
-    @Autowired
-    private VipergirlsAuthService authService;
-
-    protected Host() {
-
-    }
-
-    abstract public String getHost();
-
-    abstract public String getLookup();
-
-    public boolean isSupported(String url) {
-        return url.contains(getLookup());
-    }
-
-    public void download(final Post post, final Image image, final ImageFileData imageFileData, DownloadJob downloadJob) throws DownloadException, InterruptedException {
-
-        try {
-
-            image.setStatus(Status.DOWNLOADING);
-            image.setCurrent(0);
-            dataService.updateImageStatus(image.getStatus(), image.getId());
-            dataService.updateImageCurrent(image.getCurrent(), image.getId());
-
-            HttpClientContext context = HttpClientContext.create();
-            context.setCookieStore(new BasicCookieStore());
-
-            synchronized (LOCK) {
-                if (!post.getStatus().equals(Status.DOWNLOADING) && !post.getStatus().equals(Status.PARTIAL)) {
-                    post.setStatus(Status.DOWNLOADING);
-                    dataService.updatePostStatus(post.getStatus(), post.getId());
-                }
-            }
-
-
-            imageFileData.setPageUrl(image.getUrl());
-
-            /*
-             * HOST SPECIFIC
-             */
-            log.debug(String.format("Getting image url and name from %s using %s", image.getUrl(), this.getHost()));
-            setNameAndUrl(image.getUrl(), imageFileData, context);
-            log.debug(String.format("Resolved name for %s: %s", image.getUrl(), imageFileData.getImageName()));
-            log.debug(String.format("Resolved image url for %s: %s", image.getUrl(), imageFileData.getImageUrl()));
-
-            log.debug(String.format("Building image request for %s", image.getUrl()));
-            setImageRequest(imageFileData);
-            /*
-             * END HOST SPECIFIC
-             */
-
-            String formatImageFileName = pathService.formatImageFileName(imageFileData.getImageName());
-            log.debug(String.format("Sanitizing image name from %s to %s", imageFileData.getImageName(), formatImageFileName));
-            imageFileData.setImageName(formatImageFileName);
-
-            HttpClient client = cm.getClient().build();
-
-            log.debug(String.format("Downloading %s", imageFileData.getImageUrl()));
-            try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(imageFileData.getImageRequest(), context)) {
-
-                if (response.getStatusLine().getStatusCode() / 100 != 2) {
-                    EntityUtils.consumeQuietly(response.getEntity());
-                    throw new DownloadException(String.format("Server returned code %d", response.getStatusLine().getStatusCode()));
-                }
-                if (downloadJob.isStopped()) {
-                    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()) + imageFileData.getImageName() + ".tmp");
-                try (InputStream downloadStream = response.getEntity().getContent(); FileOutputStream fos = new FileOutputStream(outputFile)) {
-
-                    if (downloadJob.isStopped()) {
-                        return;
-                    }
-
-                    image.setTotal(response.getEntity().getContentLength());
-                    dataService.updateImageTotal(image.getTotal(), image.getId());
-
-                    log.debug(String.format("%s length is %d", imageFileData.getImageUrl(), image.getTotal()));
-                    log.debug(String.format("Starting data transfer for %s", imageFileData.getImageUrl()));
-
-                    byte[] buffer = new byte[READ_BUFFER_SIZE];
-                    int read;
-                    while ((read = downloadStream.read(buffer, 0, READ_BUFFER_SIZE)) != -1 && !downloadJob.isStopped()) {
-                        fos.write(buffer, 0, read);
-                        image.increase(read);
-                        downloadSpeedService.increase(read);
-                        dataService.updateImageCurrent(image.getCurrent(), image.getId());
-                    }
-                    fos.flush();
-                    EntityUtils.consumeQuietly(response.getEntity());
-                    if (downloadJob.isStopped()) {
-                        return;
-                    }
-                }
-                File finalName = checkImageTypeAndRename(dataService.findPostById(post.getId()).orElseThrow(), outputFile, imageFileData.getImageName(), image.getIndex());
-                imageFileData.setFileName(finalName.getName());
-            }
-        } catch (Exception e) {
-            throw new DownloadException(e);
-        } finally {
-            if (image.getCurrent() == image.getTotal()) {
-                image.setStatus(Status.COMPLETE);
-            } else if (downloadJob.isStopped()) {
-                image.setStatus(Status.STOPPED);
-            } else {
-                image.setStatus(Status.ERROR);
-            }
-            dataService.updateImageStatus(image.getStatus(), image.getId());
-            downloadJob.done();
-        }
-    }
-
-    private File checkImageTypeAndRename(Post post, File outputFile, String imageName, int index) throws HostException {
-        try (ImageInputStream iis = ImageIO.createImageInputStream(outputFile)) {
-            Iterator<ImageReader> it = ImageIO.getImageReaders(iis);
-            if (!it.hasNext()) {
-                throw new HostException("Image file is not recognized!");
-            }
-            ImageReader reader = it.next();
-            if (reader.getFormatName().toUpperCase().equals("JPEG")) {
-                String imageNameLC = imageName.toLowerCase();
-                if (!imageNameLC.endsWith("_jpg") && !imageNameLC.endsWith("_jpeg")) {
-                    imageName += ".jpg";
-                } else {
-                    String toReplace = null;
-                    if (imageNameLC.endsWith("_jpg")) {
-                        toReplace = "_jpg";
-                    } else if (imageNameLC.endsWith("_jpeg")) {
-                        toReplace = "_jpeg";
-                    }
-                    if (toReplace != null) {
-                        imageName = imageName.substring(0, imageName.length() - toReplace.length()) + ".jpg";
-                    }
-                }
-            } else if (reader.getFormatName().toUpperCase().equals("PNG")) {
-                String imageNameLC = imageName.toLowerCase();
-                if (!imageNameLC.endsWith("_png")) {
-                    imageName += ".png";
-                } else {
-                    String toReplace = null;
-                    if (imageNameLC.endsWith("_png")) {
-                        toReplace = "_png";
-                    }
-                    if (toReplace != null) {
-                        imageName = imageName.substring(0, imageName.length() - toReplace.length()) + ".png";
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw new HostException("Failed to guess image format", e);
-        }
-        try {
-            File downloadDestinationFolder = pathService.getDownloadDestinationFolder(post);
-            File outImage = new File(downloadDestinationFolder, (appSettingsService.getSettings().getForceOrder() ? String.format("%03d_", index) : "") + imageName);
-            if (outImage.exists() && outImage.delete()) {
-                log.debug(String.format("%s is deleted", outImage.toString()));
-            }
-            return Files.move(outputFile.toPath(), outImage.toPath(), StandardCopyOption.ATOMIC_MOVE).toFile();
-        } catch (Exception e) {
-            throw new HostException("Failed to rename the image", e);
-        }
-    }
-
-    final String getDefaultImageName(final String imgUrl) {
-        String imageTitle = imgUrl.substring(imgUrl.lastIndexOf('/') + 1);
-        log.debug(String.format("Extracting name from url %s: %s", imgUrl, imageTitle));
-        return imgUrl;
-    }
-
-    final Response getResponse(final String url, final HttpClientContext context) throws HostException {
-        String basePage;
-
-        HttpClient client = cm.getClient().build();
-        HttpGet httpGet = cm.buildHttpGet(url);
-        Header[] headers;
-        log.debug(String.format("Requesting %s", url));
-        try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(httpGet, context)) {
-            if (response.getStatusLine().getStatusCode() / 100 != 2) {
-                throw new HostException(String.format("Unexpected response code: %d", response.getStatusLine().getStatusCode()));
-            }
-            headers = response.getAllHeaders();
-            basePage = EntityUtils.toString(response.getEntity());
-            log.debug(String.format("%s response: %n%s", url, basePage));
-            EntityUtils.consumeQuietly(response.getEntity());
-        } catch (IOException e) {
-            throw new HostException(e);
-        }
-
-        try {
-            log.debug(String.format("Cleaning %s response", url));
-            return new Response(htmlProcessorService.clean(basePage), headers);
-        } catch (HtmlProcessorException e) {
-            throw new HostException(e);
-        }
-    }
-
-    protected String appendUri(String uri, String appendQuery) throws URISyntaxException {
-        URI oldUri = new URI(uri);
-
-        String newQuery = oldUri.getQuery();
-        if (newQuery == null) {
-            newQuery = appendQuery;
-        } else {
-            newQuery += "&" + appendQuery;
-        }
-
-        return new URI(oldUri.getScheme(), oldUri.getAuthority(),
-                oldUri.getPath(), newQuery, oldUri.getFragment()).toString();
-    }
-
-    private void setImageRequest(final ImageFileData imageFileData) {
-        HttpGet httpGet = cm.buildHttpGet(imageFileData.getImageUrl());
-        httpGet.addHeader("Referer", imageFileData.getPageUrl());
-        imageFileData.setImageRequest(httpGet);
-    }
-
-    protected abstract void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException;
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        Host host = (Host) o;
-        return Objects.equals(getHost(), host.getHost());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getHost());
-    }
-
-    @Getter
-    public static class Response {
-
-        protected Response(Document document, Header[] headers) {
-            this.document = document;
-            this.headers = headers;
-        }
-
-        private final Document document;
-        private final Header[] headers;
-    }
-
-    @Override
-    public String toString() {
-        return getHost();
-    }
+  @Override
+  public String toString() {
+    return getHost();
+  }
 }
@@ -1,96 +1,84 @@
 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.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.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.XpathService;

-import java.io.IOException;
+import java.util.Optional;
+import java.util.UUID;

@Service
@Slf4j
 public class ImageBamHost extends Host {

-    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 static final String host = "imagebam.com";
+  private static final String IMG_XPATH = "//img[contains(@class,'main-image')]";

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

-    public ImageBamHost() {
-        super();
+  @Autowired
+  public ImageBamHost(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 {
+
+    HostService.Response response = hostService.getResponse(url, context);
+    Document doc = response.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);
    }

-    @Override
-    public String getHost() {
-        return host;
+    if (imgNode == null) {
+      throw new HostException(String.format("Xpath '%s' cannot be found in '%s'", IMG_XPATH, url));
    }

-    @Override
-    public String getLookup() {
-        return host;
-    }
+    try {
+      log.debug(String.format("Resolving name and image url for %s", url));
+      String imgTitle =
+          Optional.ofNullable(imgNode.getAttributes().getNamedItem("alt"))
+              .map(e -> e.getTextContent().trim())
+              .orElse("");
+      String imgUrl =
+          Optional.ofNullable(imgNode.getAttributes().getNamedItem("src"))
+              .map(e -> e.getTextContent().trim())
+              .orElse("");
+      String defaultName = UUID.randomUUID().toString();

-    @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+      int index = imgUrl.lastIndexOf('/');
+      if (index != -1 && index < imgUrl.length()) {
+        defaultName = imgUrl.substring(imgUrl.lastIndexOf('/') + 1);
+      }

-        Response response = getResponse(url, context);
-        Document doc = response.getDocument();
-
-        Node contDiv;
-        try {
-            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) {
-            log.debug(String.format("Click button found for %s", url));
-            HttpClient client = cm.getClient().build();
-            HttpGet httpGet = cm.buildHttpGet(url);
-            httpGet.addHeader("Referer", url);
-            log.debug(String.format("Requesting %s", httpGet));
-            try (CloseableHttpResponse res = (CloseableHttpResponse) client.execute(httpGet, context)) {
-                String s = EntityUtils.toString(res.getEntity());
-                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) {
-                throw new HostException(e);
-            }
-        }
-
-        Node imgNode;
-        try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
-            imgNode = xpathService.getAsNode(doc, IMG_XPATH);
-        } catch (XpathException e) {
-            throw new HostException(e);
-        }
-
-        try {
-            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) {
-            throw new HostException("Unexpected error occurred", e);
-        }
+      return new HostService.NameUrl(imgTitle.isEmpty() ? defaultName : imgTitle, imgUrl);
+    } catch (Exception e) {
+      throw new HostException("Unexpected error occurred", e);
    }
+  }
 }
@@ -2,12 +2,14 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;

 import java.util.Optional;

@@ -15,45 +17,54 @@ import java.util.Optional;
@Slf4j
 public class ImageTwistHost extends Host {

-    private static final String IMG_XPATH = "//img[contains(@class, 'img')]";
-    private static final String host = "imagetwist.com";
+  private static final String IMG_XPATH = "//img[contains(@class, 'img')]";
+  private static final String host = "imagetwist.com";

-    public ImageTwistHost() {
-        super();
+  private final HostService hostService;
+  private final XpathService xpathService;
+
+  @Autowired
+  public ImageTwistHost(HostService hostService, XpathService xpathService) {
+    this.hostService = hostService;
+    this.xpathService = xpathService;
+  }
+
+  @Override
+  public String getHost() {
+    return host;
+  }
+
+  @Override
+  public String getLookup() {
+    return host;
+  }
+
+  @Override
+  public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context)
+      throws HostException {
+
+    Document doc = hostService.getResponse(url, context).getDocument();
+
+    Node imgNode;
+    try {
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      imgNode = xpathService.getAsNode(doc, IMG_XPATH);
+    } catch (XpathException e) {
+      throw new HostException(e);
    }

-    @Override
-    public String getHost() {
-        return host;
-    }
-
-    @Override
-    public String getLookup() {
-        return host;
-    }
-
-    @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
-
-        Document doc = getResponse(url, context).getDocument();
-
-        Node imgNode;
-        try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
-            imgNode = xpathService.getAsNode(doc, IMG_XPATH);
-        } catch (XpathException e) {
-            throw new HostException(e);
-        }
-
-        try {
-            log.debug(String.format("Resolving name and image url for %s", url));
-            String imgTitle = Optional.ofNullable(imgNode.getAttributes().getNamedItem("alt")).map(Node::getTextContent).map(String::trim).orElse(null);
-            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
-
-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle);
-        } catch (Exception e) {
-            throw new HostException("Unexpected error occurred", e);
-        }
+    try {
+      log.debug(String.format("Resolving name and image url for %s", url));
+      String imgTitle =
+          Optional.ofNullable(imgNode.getAttributes().getNamedItem("alt"))
+              .map(Node::getTextContent)
+              .map(String::trim)
+              .orElse(null);
+      String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
+
+      return new HostService.NameUrl(imgTitle, imgUrl);
+    } catch (Exception e) {
+      throw new HostException("Unexpected error occurred", e);
    }
+  }
 }
@@ -2,75 +2,83 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
 public class ImageVenueHost extends Host {

-    private static final String host = "imagevenue.com";
-    private static final String CONTINUE_BUTTON_XPATH = "//a[@title='Continue to ImageVenue']";
-    private static final String IMG_XPATH = "//a[@data-toggle='full']/img";
+  private static final String host = "imagevenue.com";
+  private static final String CONTINUE_BUTTON_XPATH = "//a[@title='Continue to ImageVenue']";
+  private static final String IMG_XPATH = "//a[@data-toggle='full']/img";

-    public ImageVenueHost() {
-        super();
+  private final HostService hostService;
+  private final XpathService xpathService;
+
+  @Autowired
+  public ImageVenueHost(HostService hostService, XpathService xpathService) {
+    this.hostService = hostService;
+    this.xpathService = xpathService;
+  }
+
+  @Override
+  public String getHost() {
+    return host;
+  }
+
+  @Override
+  public String getLookup() {
+    return host;
+  }
+
+  @Override
+  public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context)
+      throws HostException {
+
+    String url = _url.replace("http://", "https://");
+
+    HostService.Response resp = hostService.getResponse(url, context);
+    Document doc = resp.getDocument();
+
+    try {
+      log.debug(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
+      if (xpathService.getAsNode(doc, CONTINUE_BUTTON_XPATH) != null) {
+        // Button detected. No need to actually click it, just make the call again.
+        resp = hostService.getResponse(url, context);
+        doc = resp.getDocument();
+      }
+    } catch (XpathException e) {
+      throw new HostException(e);
    }

-    @Override
-    public String getHost() {
-        return host;
+    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);
    }

-    @Override
-    public String getLookup() {
-        return host;
+    if (imgNode == null) {
+      throw new HostException("Failed to locate image");
    }

-    @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    try {
+      log.debug(String.format("Resolving name and image url for %s", url));
+      String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
+      String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();

-        String url = _url.replace("http://", "https://");
-
-        Response resp = getResponse(url, context);
-        Document doc = resp.getDocument();
-
-        try {
-            log.debug(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
-            if (xpathService.getAsNode(doc, CONTINUE_BUTTON_XPATH) != null) {
-                //Button detected. No need to actually click it, just make the call again.
-                resp = getResponse(url, context);
-                doc = resp.getDocument();
-            }
-        } catch (XpathException e) {
-            throw new HostException(e);
-        }
-
-        Node imgNode;
-        try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
-            imgNode = xpathService.getAsNode(doc, IMG_XPATH);
-        } catch (XpathException e) {
-            throw new HostException(e);
-        }
-
-        if (imgNode == null) {
-            throw new HostException("Failed to locate image");
-        }
-
-        try {
-            log.debug(String.format("Resolving name and image url for %s", url));
-            String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
-            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
-
-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle);
-        } catch (Exception e) {
-            throw new HostException("Unexpected error occurred", e);
-        }
+      return new HostService.NameUrl(
+          imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
+    } catch (Exception e) {
+      throw new HostException("Unexpected error occurred", e);
    }
+  }
 }
@@ -2,63 +2,70 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
 public class ImageZillaHost extends Host {

-    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 static final String host = "imagezilla.net";
+  private static final String lookup = "imagezilla.net/show";
+  private static final String IMG_XPATH = "//img[@id='photo']";

-    public ImageZillaHost() {
-        super();
+  private final HostService hostService;
+  private final XpathService xpathService;
+
+  @Autowired
+  public ImageZillaHost(HostService hostService, XpathService xpathService) {
+    this.hostService = hostService;
+    this.xpathService = xpathService;
+  }
+
+  @Override
+  public String getHost() {
+    return host;
+  }
+
+  @Override
+  public String getLookup() {
+    return lookup;
+  }
+
+  @Override
+  public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context)
+      throws HostException {
+
+    Document doc = hostService.getResponse(url, context).getDocument();
+
+    String title;
+    try {
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      Node titleNode = xpathService.getAsNode(doc, IMG_XPATH).getAttributes().getNamedItem("title");
+      log.debug(String.format("Resolving name for %s", url));
+      if (titleNode != null) {
+        title = titleNode.getTextContent().trim();
+      } else {
+        title = null;
+      }
+    } catch (XpathException e) {
+      throw new HostException(e);
    }

-    @Override
-    public String getHost() {
-        return host;
+    if (title == null || title.isEmpty()) {
+      title = hostService.getDefaultImageName(url);
    }

-    @Override
-    public String getLookup() {
-        return lookup;
-    }
-
-    @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
-
-        Document doc = getResponse(url, context).getDocument();
-
-        String title;
-        try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
-            Node titleNode = xpathService.getAsNode(doc, IMG_XPATH).getAttributes().getNamedItem("title");
-            log.debug(String.format("Resolving name for %s", url));
-            if (titleNode != null) {
-                title = titleNode.getTextContent().trim();
-            } else {
-                title = null;
-            }
-        } catch (XpathException e) {
-            throw new HostException(e);
-        }
-
-        if (title == null || title.isEmpty()) {
-            title = getDefaultImageName(url);
-        }
-
-        try {
-            imageFileData.setImageUrl(url.replace("show", "images"));
-            imageFileData.setImageName(title);
-        } catch (Exception e) {
-            throw new HostException("Unexpected error occurred", e);
-        }
+    try {
+      return new HostService.NameUrl(title, url.replace("show", "images"));
+    } catch (Exception e) {
+      throw new HostException("Unexpected error occurred", e);
    }
+  }
 }
@@ -2,58 +2,66 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
 public class ImgSpiceHost extends Host {

-    private static final String host = "imgspice.com";
-    private static final String IMG_XPATH = "//img[@id='imgpreview']";
+  private static final String host = "imgspice.com";
+  private static final String IMG_XPATH = "//img[@id='imgpreview']";

-    public ImgSpiceHost() {
-        super();
+  private final HostService hostService;
+  private final XpathService xpathService;
+
+  @Autowired
+  public ImgSpiceHost(HostService hostService, XpathService xpathService) {
+    this.hostService = hostService;
+    this.xpathService = xpathService;
+  }
+
+  @Override
+  public String getHost() {
+    return host;
+  }
+
+  @Override
+  public String getLookup() {
+    return host;
+  }
+
+  @Override
+  public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context)
+      throws HostException {
+
+    String url = _url.replace("http://", "https://");
+    HostService.Response resp = hostService.getResponse(url, context);
+    Document doc = resp.getDocument();
+
+    Node imgNode;
+    try {
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      imgNode = xpathService.getAsNode(doc, IMG_XPATH);
+    } catch (XpathException e) {
+      throw new HostException(e);
    }

-    @Override
-    public String getHost() {
-        return host;
-    }
-
-    @Override
-    public String getLookup() {
-        return host;
-    }
-
-    @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
-
-        String url = _url.replace("http://", "https://");
-        Response resp = getResponse(url, context);
-        Document doc = resp.getDocument();
-
-        Node imgNode;
-        try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
-            imgNode = xpathService.getAsNode(doc, IMG_XPATH);
-        } catch (XpathException e) {
-            throw new HostException(e);
-        }
-
-        try {
-            log.debug(String.format("Resolving name and image url for %s", url));
-            String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
-            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
-
-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle);
-        } catch (Exception e) {
-            throw new HostException("Unexpected error occurred", e);
-        }
+    try {
+      log.debug(String.format("Resolving name and image url for %s", url));
+      String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
+      String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
+
+      return new HostService.NameUrl(
+          imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
+    } catch (Exception e) {
+      throw new HostException("Unexpected error occurred", e);
    }
+  }
 }
@@ -8,55 +8,57 @@ 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 String host = "imgbox.com";
-    private static final String IMG_XPATH = "//img[@id='img']";
+  private static final String host = "imgbox.com";
+  private static final String IMG_XPATH = "//img[@id='img']";

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

-    public ImgboxHost() {
-        super();
+  @Autowired
+  public ImgboxHost(HostService hostService, XpathService xpathService) {
+    this.hostService = hostService;
+    this.xpathService = xpathService;
+  }
+
+  @Override
+  public String getHost() {
+    return host;
+  }
+
+  @Override
+  public String getLookup() {
+    return host;
+  }
+
+  @Override
+  public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context)
+      throws HostException {
+
+    Document doc = hostService.getResponse(url, context).getDocument();
+
+    Node imgNode;
+    try {
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      imgNode = xpathService.getAsNode(doc, IMG_XPATH);
+    } catch (XpathException e) {
+      throw new HostException(e);
    }

-    @Override
-    public String getHost() {
-        return host;
-    }
-
-    @Override
-    public String getLookup() {
-        return host;
-    }
-
-    @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
-
-        Document doc = getResponse(url, context).getDocument();
-
-        Node imgNode;
-        try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
-            imgNode = xpathService.getAsNode(doc, IMG_XPATH);
-        } catch (XpathException e) {
-            throw new HostException(e);
-        }
-
-        try {
-            log.debug(String.format("Resolving name and image url for %s", url));
-            String imgTitle = imgNode.getAttributes().getNamedItem("title").getTextContent().trim();
-            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
-
-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle);
-        } catch (Exception e) {
-            throw new HostException("Unexpected error occurred", e);
-        }
+    try {
+      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();
+
+      return new HostService.NameUrl(imgTitle, imgUrl);
+    } catch (Exception e) {
+      throw new HostException("Unexpected error occurred", e);
    }
+  }
 }
@@ -16,8 +16,10 @@ import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.HtmlProcessorException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
-import tn.mnlr.vripper.services.ConnectionManager;
+import tn.mnlr.vripper.services.ConnectionService;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.HtmlProcessorService;
+import tn.mnlr.vripper.services.XpathService;

 import java.io.IOException;
 import java.util.ArrayList;
@@ -27,82 +29,101 @@ import java.util.List;
@Slf4j
 public class ImxHost extends Host {

-    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 static final String host = "imx.to";
+  private static final String CONTINUE_BUTTON_XPATH = "//*[@name='imgContinue']";
+  private static final String IMG_XPATH = "//img[@class='centred']";

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

-    @Override
-    public String getHost() {
-        return host;
+  @Autowired
+  public ImxHost(
+      HostService hostService,
+      XpathService xpathService,
+      ConnectionService cm,
+      HtmlProcessorService htmlProcessorService) {
+    this.hostService = hostService;
+    this.xpathService = xpathService;
+    this.cm = cm;
+    this.htmlProcessorService = htmlProcessorService;
+  }
+
+  @Override
+  public String getHost() {
+    return host;
+  }
+
+  @Override
+  public String getLookup() {
+    return host;
+  }
+
+  @Override
+  public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context)
+      throws HostException {
+
+    String url = _url.replace("http://", "https://");
+    HostService.Response resp = hostService.getResponse(url, context);
+    Document doc = resp.getDocument();
+
+    Node contDiv;
+    String value = null;
+    try {
+      log.debug(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
+      contDiv = xpathService.getAsNode(doc, CONTINUE_BUTTON_XPATH);
+      if (contDiv == null) {
+        throw new HostException(CONTINUE_BUTTON_XPATH + " cannot be found");
+      }
+      Node node = contDiv.getAttributes().getNamedItem("value");
+      if (node != null) {
+        value = node.getTextContent();
+      }
+    } catch (XpathException e) {
+      throw new HostException(e);
    }

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

-    @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
-
-        String url = _url.replace("http://", "https://");
-        Response resp = getResponse(url, context);
-        Document doc = resp.getDocument();
-
-        Node contDiv;
-        String value = null;
-        try {
-            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) {
-                value = node.getTextContent();
-            }
-        } catch (XpathException e) {
-            throw new HostException(e);
-        }
-
-        if (value == null) {
-            throw new HostException("Failed to obtain value attribute from continue input");
-        }
-        log.debug(String.format("Click button found for %s", url));
-        HttpClient client = cm.getClient().build();
-        HttpPost httpPost = cm.buildHttpPost(url);
-        List<NameValuePair> params = new ArrayList<>();
-        params.add(new BasicNameValuePair("imgContinue", value));
-        try {
-            httpPost.setEntity(new UrlEncodedFormEntity(params));
-        } catch (Exception e) {
-            throw new HostException(e);
-        }
-        log.debug(String.format("Requesting %s", httpPost));
-        try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(httpPost, context)) {
-            log.debug(String.format("Cleaning response for %s", httpPost));
-            doc = htmlProcessorService.clean(EntityUtils.toString(response.getEntity()));
-            EntityUtils.consumeQuietly(response.getEntity());
-        } catch (IOException | HtmlProcessorException e) {
-            throw new HostException(e);
-        }
-
-        Node imgNode;
-        try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
-            imgNode = xpathService.getAsNode(doc, IMG_XPATH);
-        } catch (XpathException e) {
-            throw new HostException(e);
-        }
-
-        try {
-            log.debug(String.format("Resolving name and image url for %s", url));
-            String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
-            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
-
-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle);
-        } catch (Exception e) {
-            throw new HostException("Unexpected error occurred", e);
-        }
+    Node imgNode;
+    try {
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      imgNode = xpathService.getAsNode(doc, IMG_XPATH);
+    } catch (XpathException e) {
+      throw new HostException(e);
    }
+
+    try {
+      log.debug(String.format("Resolving name and image url for %s", url));
+      String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
+      String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
+
+      return new HostService.NameUrl(
+          imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
+    } catch (Exception e) {
+      throw new HostException("Unexpected error occurred", e);
+    }
+  }
 }
@@ -2,64 +2,74 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
 public class PimpandhostHost extends Host {

-    private static final String host = "pimpandhost.com";
-    private static final String IMG_XPATH = "//img[contains(@class, 'original')]";
+  private static final String host = "pimpandhost.com";
+  private static final String IMG_XPATH = "//img[contains(@class, 'original')]";

-    public PimpandhostHost() {
-        super();
+  private final HostService hostService;
+  private final XpathService xpathService;
+
+  @Autowired
+  public PimpandhostHost(HostService hostService, XpathService xpathService) {
+    super();
+    this.hostService = hostService;
+    this.xpathService = xpathService;
+  }
+
+  @Override
+  public String getHost() {
+    return host;
+  }
+
+  @Override
+  public String getLookup() {
+    return host;
+  }
+
+  @Override
+  public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context)
+      throws HostException {
+
+    String url;
+    try {
+      url = hostService.appendUri(_url.replace("http://", "https://"), "size=original");
+    } catch (Exception e) {
+      throw new HostException(e);
    }

-    @Override
-    public String getHost() {
-        return host;
+    HostService.Response resp = hostService.getResponse(url, context);
+    Document doc = resp.getDocument();
+
+    Node imgNode;
+    try {
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      imgNode = xpathService.getAsNode(doc, IMG_XPATH);
+    } catch (XpathException e) {
+      throw new HostException(e);
    }

-    @Override
-    public String getLookup() {
-        return host;
-    }
-
-    @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
-
-        String url;
-        try {
-            url = appendUri(_url.replace("http://", "https://"), "size=original");
-        } catch (Exception e) {
-            throw new HostException(e);
-        }
-
-        Response resp = getResponse(url, context);
-        Document doc = resp.getDocument();
-
-        Node imgNode;
-        try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
-            imgNode = xpathService.getAsNode(doc, IMG_XPATH);
-        } catch (XpathException e) {
-            throw new HostException(e);
-        }
-
-        try {
-            log.debug(String.format("Resolving name and image url for %s", url));
-            String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
-            String imgUrl = "https:" + imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
-
-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle);
-        } catch (Exception e) {
-            throw new HostException("Unexpected error occurred", e);
-        }
+    try {
+      log.debug(String.format("Resolving name and image url for %s", url));
+      String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
+      String imgUrl =
+          "https:" + imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
+
+      return new HostService.NameUrl(
+          imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
+    } catch (Exception e) {
+      throw new HostException("Unexpected error occurred", e);
    }
+  }
 }
@@ -2,55 +2,68 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
 public class PixRouteHost extends Host {

-    private static final String host = "pixroute.com";
-    private static final String IMG_XPATH = "//img[@id='imgpreview']";
+  private static final String host = "pixroute.com";
+  private static final String IMG_XPATH = "//img[@id='imgpreview']";

-    @Override
-    public String getHost() {
-        return host;
+  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);
    }

-    @Override
-    public String getLookup() {
-        return host;
+    if (imgNode == null) {
+      throw new HostException("Failed to locate image");
    }

-    @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
+    try {
+      log.debug(String.format("Resolving name and image url for %s", url));

-        String url = _url.replace("http://", "https://");
-        Document doc = 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));
-
-            imageFileData.setImageUrl(imgNode.getAttributes().getNamedItem("src").getTextContent().trim());
-            imageFileData.setImageName(imgNode.getAttributes().getNamedItem("alt").getTextContent().trim());
-        } catch (Exception e) {
-            throw new HostException("Unexpected error occurred", e);
-        }
+      return new HostService.NameUrl(
+          imgNode.getAttributes().getNamedItem("alt").getTextContent().trim(),
+          imgNode.getAttributes().getNamedItem("src").getTextContent().trim());
+    } catch (Exception e) {
+      throw new HostException("Unexpected error occurred", e);
    }
+  }
 }
@@ -2,57 +2,64 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
 public class PixhostHost extends Host {

-    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 static final String host = "pixhost.to";
+  private static final String lookup = "pixhost.to/show";
+  private static final String IMG_XPATH = "//img[@id='image']";

-    public PixhostHost() {
-        super();
+  private final HostService hostService;
+  private final XpathService xpathService;
+
+  @Autowired
+  public PixhostHost(HostService hostService, XpathService xpathService) {
+    this.hostService = hostService;
+    this.xpathService = xpathService;
+  }
+
+  @Override
+  public String getHost() {
+    return host;
+  }
+
+  @Override
+  public String getLookup() {
+    return lookup;
+  }
+
+  @Override
+  public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context)
+      throws HostException {
+
+    Document doc = hostService.getResponse(url, context).getDocument();
+
+    Node imgNode;
+    try {
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      imgNode = xpathService.getAsNode(doc, IMG_XPATH);
+    } catch (XpathException e) {
+      throw new HostException(e);
    }

-    @Override
-    public String getHost() {
-        return host;
-    }
-
-    @Override
-    public String getLookup() {
-        return lookup;
-    }
-
-    @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
-
-        Document doc = getResponse(url, context).getDocument();
-
-        Node imgNode;
-        try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
-            imgNode = xpathService.getAsNode(doc, IMG_XPATH);
-        } catch (XpathException e) {
-            throw new HostException(e);
-        }
-
-        try {
-            log.debug(String.format("Resolving name and image url for %s", url));
-            String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
-            String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
-
-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle.substring(imgTitle.indexOf('_') + 1));
-        } catch (Exception e) {
-            throw new HostException("Unexpected error occurred", e);
-        }
+    try {
+      log.debug(String.format("Resolving name and image url for %s", url));
+      String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
+      String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
+
+      return new HostService.NameUrl(imgTitle.substring(imgTitle.indexOf('_') + 1), imgUrl);
+    } catch (Exception e) {
+      throw new HostException("Unexpected error occurred", e);
    }
+  }
 }
@@ -2,63 +2,71 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
 public class PixxxelsHost extends Host {

-    private static final String host = "pixxxels.cc";
-    private static final String IMG_XPATH = "//*[@id='download']";
-    private static final String TITLE_XPATH = "//*[contains(@class,'imagename')]";
+  private static final String host = "pixxxels.cc";
+  private static final String IMG_XPATH = "//*[@id='download']";
+  private static final String TITLE_XPATH = "//*[contains(@class,'imagename')]";

-    public PixxxelsHost() {
-        super();
+  private final HostService hostService;
+  private final XpathService xpathService;
+
+  @Autowired
+  public PixxxelsHost(HostService hostService, XpathService xpathService) {
+    this.hostService = hostService;
+    this.xpathService = xpathService;
+  }
+
+  @Override
+  public String getHost() {
+    return host;
+  }
+
+  @Override
+  public String getLookup() {
+    return host;
+  }
+
+  @Override
+  public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context)
+      throws HostException {
+
+    String url = _url.replace("http://", "https://");
+    HostService.Response resp = hostService.getResponse(url, context);
+    Document doc = resp.getDocument();
+
+    Node imgNode, titleNode;
+    try {
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      imgNode = xpathService.getAsNode(doc, IMG_XPATH);
+
+      log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url));
+      titleNode = xpathService.getAsNode(doc, TITLE_XPATH);
+
+    } catch (XpathException e) {
+      throw new HostException(e);
    }

-    @Override
-    public String getHost() {
-        return host;
-    }
-
-    @Override
-    public String getLookup() {
-        return host;
-    }
-
-    @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
-
-        String url = _url.replace("http://", "https://");
-        Response resp = getResponse(url, context);
-        Document doc = resp.getDocument();
-
-        Node imgNode, titleNode;
-        try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
-            imgNode = xpathService.getAsNode(doc, IMG_XPATH);
-
-            log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url));
-            titleNode = xpathService.getAsNode(doc, TITLE_XPATH);
-
-        } catch (XpathException e) {
-            throw new HostException(e);
-        }
-
-        try {
-            log.debug(String.format("Resolving name and image url for %s", url));
-            String imgTitle = titleNode.getTextContent().trim();
-            String imgUrl = imgNode.getAttributes().getNamedItem("href").getTextContent().trim();
-
-            imageFileData.setImageUrl(imgUrl);
-            imageFileData.setImageName(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle);
-        } catch (Exception e) {
-            throw new HostException("Unexpected error occurred", e);
-        }
+    try {
+      log.debug(String.format("Resolving name and image url for %s", url));
+      String imgTitle = titleNode.getTextContent().trim();
+      String imgUrl = imgNode.getAttributes().getNamedItem("href").getTextContent().trim();
+
+      return new HostService.NameUrl(
+          imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
+    } catch (Exception e) {
+      throw new HostException("Unexpected error occurred", e);
    }
+  }
 }
@@ -2,12 +2,14 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;

 import java.util.Optional;

@@ -15,49 +17,58 @@ import java.util.Optional;
@Slf4j
 public class PostImgHost extends Host {

-    private static final String host = "postimg.cc";
-    private static final String TITLE_XPATH = "//span[contains(@class,'imagename')]";
-    private static final String IMG_XPATH = "//a[@id='download']";
+  private 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']";

-    public PostImgHost() {
-        super();
+  private final HostService hostService;
+  private final XpathService xpathService;
+
+  @Autowired
+  public PostImgHost(HostService hostService, XpathService xpathService) {
+    this.hostService = hostService;
+    this.xpathService = xpathService;
+  }
+
+  @Override
+  public String getHost() {
+    return host;
+  }
+
+  @Override
+  public String getLookup() {
+    return host;
+  }
+
+  @Override
+  public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context)
+      throws HostException {
+
+    String url = _url.replace("http://", "https://");
+    Document doc = hostService.getResponse(url, context).getDocument();
+
+    Node urlNode, titleNode;
+    try {
+      log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url));
+      titleNode = xpathService.getAsNode(doc, TITLE_XPATH);
+
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      urlNode = xpathService.getAsNode(doc, IMG_XPATH);
+    } catch (XpathException e) {
+      throw new HostException(e);
    }

-    @Override
-    public String getHost() {
-        return host;
-    }
-
-    @Override
-    public String getLookup() {
-        return host;
-    }
-
-    @Override
-    protected void setNameAndUrl(final String _url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
-
-        String url = _url.replace("http://", "https://");
-        Document doc = getResponse(url, context).getDocument();
-
-        Node urlNode, titleNode;
-        try {
-            log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url));
-            titleNode = xpathService.getAsNode(doc, TITLE_XPATH);
-
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
-            urlNode = xpathService.getAsNode(doc, IMG_XPATH);
-        } catch (XpathException e) {
-            throw new HostException(e);
-        }
-
-        try {
-            log.debug(String.format("Resolving name and image url for %s", url));
-            String imgTitle = Optional.ofNullable(titleNode).map(node -> node.getTextContent().trim()).orElseGet(() -> getDefaultImageName(url));
-
-            imageFileData.setImageUrl(urlNode.getAttributes().getNamedItem("href").getTextContent().trim());
-            imageFileData.setImageName(imgTitle);
-        } catch (Exception e) {
-            throw new HostException("Unexpected error occurred", e);
-        }
+    try {
+      log.debug(String.format("Resolving name and image url for %s", url));
+      String imgTitle =
+          Optional.ofNullable(titleNode)
+              .map(node -> node.getTextContent().trim())
+              .orElseGet(() -> hostService.getDefaultImageName(url));
+
+      return new HostService.NameUrl(
+          imgTitle, urlNode.getAttributes().getNamedItem("href").getTextContent().trim());
+    } catch (Exception e) {
+      throw new HostException("Unexpected error occurred", e);
    }
+  }
 }
@@ -2,64 +2,72 @@ package tn.mnlr.vripper.host;

 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.q.ImageFileData;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;

@Service
@Slf4j
 public class TurboImageHost extends Host {

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

-    public TurboImageHost() {
-        super();
+  private final HostService hostService;
+  private final XpathService xpathService;
+
+  @Autowired
+  public TurboImageHost(HostService hostService, XpathService xpathService) {
+    this.hostService = hostService;
+    this.xpathService = xpathService;
+  }
+
+  @Override
+  public String getHost() {
+    return host;
+  }
+
+  @Override
+  public String getLookup() {
+    return host;
+  }
+
+  @Override
+  public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context)
+      throws HostException {
+
+    Document doc = hostService.getResponse(url, context).getDocument();
+
+    String title;
+    try {
+      log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url));
+      Node titleNode = xpathService.getAsNode(doc, TITLE_XPATH);
+      log.debug(String.format("Resolving name for %s", url));
+      if (titleNode != null) {
+        title = titleNode.getTextContent().trim();
+      } else {
+        title = null;
+      }
+    } catch (XpathException e) {
+      throw new HostException(e);
    }

-    @Override
-    public String getHost() {
-        return host;
+    if (title == null || title.isEmpty()) {
+      title = hostService.getDefaultImageName(url);
    }

-    @Override
-    public String getLookup() {
-        return host;
-    }
-
-    @Override
-    protected void setNameAndUrl(final String url, final ImageFileData imageFileData, final HttpClientContext context) throws HostException {
-
-        Document doc = getResponse(url, context).getDocument();
-
-        String title;
-        try {
-            log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url));
-            Node titleNode = xpathService.getAsNode(doc, TITLE_XPATH);
-            log.debug(String.format("Resolving name for %s", url));
-            if (titleNode != null) {
-                title = titleNode.getTextContent().trim();
-            } else {
-                title = null;
-            }
-        } catch (XpathException e) {
-            throw new HostException(e);
-        }
-
-        if (title == null || title.isEmpty()) {
-            title = getDefaultImageName(url);
-        }
-
-        try {
-            Node urlNode = xpathService.getAsNode(doc, IMG_XPATH);
-            imageFileData.setImageUrl(urlNode.getAttributes().getNamedItem("src").getTextContent().trim());
-            imageFileData.setImageName(title);
-        } catch (Exception e) {
-            throw new HostException("Unexpected error occurred", e);
-        }
+    try {
+      Node urlNode = xpathService.getAsNode(doc, IMG_XPATH);
+      return new HostService.NameUrl(
+          title, urlNode.getAttributes().getNamedItem("src").getTextContent().trim());
+    } catch (Exception e) {
+      throw new HostException("Unexpected error occurred", e);
    }
+  }
 }
@@ -0,0 +1,70 @@
+package tn.mnlr.vripper.host;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import tn.mnlr.vripper.exception.HostException;
+import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.services.HostService;
+import tn.mnlr.vripper.services.XpathService;
+
+import java.util.Optional;
+
+@Service
+@Slf4j
+public class ViprImHost extends Host {
+
+  private static final String IMG_XPATH = "//img[contains(@class, 'img')]";
+  private static final String host = "vipr.im";
+
+  private final HostService hostService;
+  private final XpathService xpathService;
+
+  @Autowired
+  public ViprImHost(HostService hostService, XpathService xpathService) {
+    this.hostService = hostService;
+    this.xpathService = xpathService;
+  }
+
+  @Override
+  public String getHost() {
+    return host;
+  }
+
+  @Override
+  public String getLookup() {
+    return host;
+  }
+
+  @Override
+  public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context)
+      throws HostException {
+
+    Document doc = hostService.getResponse(url, context).getDocument();
+
+    Node imgNode;
+    try {
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      imgNode = xpathService.getAsNode(doc, IMG_XPATH);
+    } catch (XpathException e) {
+      throw new HostException(e);
+    }
+
+    try {
+      log.debug(String.format("Resolving name and image url for %s", url));
+      String imgTitle =
+          Optional.ofNullable(imgNode.getAttributes().getNamedItem("alt"))
+              .map(Node::getTextContent)
+              .map(String::trim)
+              .orElse(null);
+      String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
+
+      return new HostService.NameUrl(imgTitle, imgUrl);
+    } catch (Exception e) {
+      throw new HostException("Unexpected error occurred", e);
+    }
+  }
+}
@@ -1,13 +1,15 @@
 package tn.mnlr.vripper.jpa;

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

 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import java.io.File;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -20,34 +22,58 @@ import java.util.regex.Pattern;
@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$");
+  public static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+  private static final Pattern BACKUP_FILE_PATTERN =
+      Pattern.compile("^db_(\\d{4}-\\d{2}-\\d{2})\\.tar\\.gz$");

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

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

-    @PostConstruct
-    @Scheduled(cron = "0 0 0 ? * *")
-    private void backup() {
+  @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;
-                }
-            }
+    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()));
+      }
    }
+
+    // create a backup file
+    File backupFile =
+        new File(
+            backupFolder, String.format("db_%s.tar.gz", LocalDateTime.now().format(FORMATTER)));
+    jdbcTemplate.execute(String.format("BACKUP DATABASE TO '%s' BLOCKING", backupFile.getPath()));
+  }
 }
@@ -0,0 +1,73 @@
+package tn.mnlr.vripper.jpa.domain;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class Event {
+
+  private Long id;
+  private Type type;
+  private Status status;
+
+  @JsonSerialize(using = DateTimeSerializer.class)
+  private LocalDateTime time;
+
+  private String message;
+
+  public Event(Type type, Status status, LocalDateTime time, String message) {
+    this.type = type;
+    this.status = status;
+    this.time = time;
+    this.message = message;
+  }
+
+  public enum Type {
+    POST,
+    QUEUED,
+    THANKS,
+    METADATA,
+    SCAN,
+    DOWNLOAD,
+
+    // Below are deprecated events
+    METADATA_CACHE_MISS,
+    QUEUED_CACHE_MISS
+  }
+
+  public enum Status {
+    PENDING,
+    PROCESSING,
+    DONE,
+    ERROR
+  }
+}
+
+class DateTimeSerializer extends StdSerializer<LocalDateTime> {
+
+  private static final DateTimeFormatter DATE_TIME_FORMATTER =
+      DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss.SSS");
+
+  protected DateTimeSerializer() {
+    super(LocalDateTime.class);
+  }
+
+  @Override
+  public void serialize(LocalDateTime value, JsonGenerator gen, SerializerProvider provider)
+      throws IOException {
+    gen.writeString(value.format(DATE_TIME_FORMATTER));
+  }
+}
@@ -16,55 +16,51 @@ import java.util.Objects;
@NoArgsConstructor
 public class Image {

-    @JsonIgnore
-    protected Long id;
+  @JsonIgnore protected Long id;

-    @JsonIgnore
-    private Host host;
+  @JsonIgnore private Host host;

-    private String url;
+  private String url;

-    private int index;
+  private int index;

-    private long current = 0;
+  private long current = 0;

-    private long total = 0;
+  private long total = 0;

-    private Status status;
+  private Status status;

-    private String postId;
+  private String postId;

-    @JsonIgnore
-    private Long postIdRef;
+  @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 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 increase(int read) {
-        current += read;
-    }
+  public void init() {
+    current = 0;
+    status = Status.STOPPED;
+  }

-    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 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);
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hash(url);
+  }
 }
@@ -1,6 +1,5 @@
 package tn.mnlr.vripper.jpa.domain;

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

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

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

-    private String postedBy;
+  private String postedBy;

-    private Long postIdRef;
+  private List<String> resolvedNames = Collections.emptyList();
+
+  public static Metadata from(Metadata metadata) {
+    Metadata copy = new Metadata();
+    copy.postIdRef = metadata.postIdRef;
+    copy.postId = metadata.postId;
+    copy.postedBy = metadata.postedBy;
+    copy.resolvedNames = List.copyOf(metadata.resolvedNames);
+    return copy;
+  }
 }
@@ -17,62 +17,66 @@ import java.util.Set;
@NoArgsConstructor
 public class Post {

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

-    private Status status;
+  private Status status;

-    private String postId;
+  private String postId;

-    private String threadTitle;
+  private String threadTitle;

-    private String threadId;
+  private String threadId;

-    private String title;
+  private String title;

-    private String url;
+  private String url;

-    private int done;
+  private int done;

-    private int total;
+  private int total;

-    private Set<String> hosts;
+  private Set<String> hosts;

-    private String forum;
+  private String forum;

-    @JsonIgnore
-    private String securityToken;
+  @JsonIgnore private String securityToken;

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

-    private boolean thanked;
+  private boolean thanked;

-    private Set<String> previews = Collections.emptySet();
+  private Set<String> previews = Collections.emptySet();

-    private Metadata metadata;
+  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;
-    }
+  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 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);
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hash(postId);
+  }
 }
@@ -14,44 +14,43 @@ import java.util.Objects;
@ToString
 public class Queued {

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

-    private String link;
+  private String link;

-    private String threadId;
+  private String threadId;

-    private String postId;
+  private String postId;

-    private int total = 0;
+  private int total = 0;

-    private boolean loading = true;
+  private boolean loading = true;

-    public Queued(String link, String threadId, String postId) {
-        this();
-        this.link = link;
-        this.threadId = threadId;
-        this.postId = postId;
-    }
+  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 done() {
+    this.loading = false;
+  }

-    public void increment() {
-        this.total++;
-    }
+  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 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);
-    }
+  @Override
+  public int hashCode() {
+    return Objects.hash(threadId);
+  }
 }
@@ -1,5 +1,10 @@
 package tn.mnlr.vripper.jpa.domain.enums;

 public enum Status {
-    PENDING, DOWNLOADING, COMPLETE, ERROR, STOPPED, PARTIAL
-}
+  PENDING,
+  DOWNLOADING,
+  COMPLETE,
+  ERROR,
+  STOPPED,
+  PARTIAL
+}
@@ -0,0 +1,21 @@
+package tn.mnlr.vripper.jpa.repositories;
+
+import tn.mnlr.vripper.jpa.domain.Event;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface IEventRepository extends IRepository {
+
+  Event save(Event event);
+
+  Event update(Event event);
+
+  List<Event> findAll();
+
+  Optional<Event> findById(Long id);
+
+  void delete(Long id);
+
+  void deleteAll();
+}
@@ -8,25 +8,25 @@ import java.util.Optional;

 public interface IImageRepository extends IRepository {

-    Image save(Image image);
+  Image save(Image image);

-    void deleteAllByPostId(String postId);
+  void deleteAllByPostId(String postId);

-    List<Image> findByPostId(String postId);
+  List<Image> findByPostId(String postId);

-    Integer countError();
+  Integer countError();

-    List<Image> findByPostIdAndIsNotCompleted(String postId);
+  List<Image> findByPostIdAndIsNotCompleted(String postId);

-    int stopByPostIdAndIsNotCompleted(String postId);
+  int stopByPostIdAndIsNotCompleted(String postId);

-    List<Image> findByPostIdAndIsError(String postId);
+  List<Image> findByPostIdAndIsError(String postId);

-    Optional<Image> findById(Long id);
+  Optional<Image> findById(Long id);

-    int updateStatus(Status status, Long id);
+  int updateStatus(Status status, Long id);

-    int updateCurrent(long current, Long id);
+  int updateCurrent(long current, Long id);

-    int updateTotal(long total, Long id);
+  int updateTotal(long total, Long id);
 }
@@ -6,11 +6,9 @@ import java.util.Optional;

 public interface IMetadataRepository extends IRepository {

-    Metadata save(Metadata metadata);
+  Metadata save(Metadata metadata);

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

-    Optional<Metadata> findByPostId(String postId);
-
-    int deleteByPostId(String postId);
+  int deleteByPostId(String postId);
 }
@@ -8,31 +8,29 @@ import java.util.Optional;

 public interface IPostRepository extends IRepository {

-    Post save(Post post);
+  Post save(Post post);

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

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

-    List<String> findCompleted();
+  List<String> findCompleted();

-    Optional<Post> findById(Long id);
+  List<Post> findAll();

-    List<Post> findAll();
+  boolean existByPostId(String postId);

-    boolean existByPostId(String postId);
+  int setDownloadingToStopped();

-    int setDownloadingToStopped();
+  int deleteByPostId(String postId);

-    int deleteByPostId(String postId);
+  int updateStatus(Status status, Long id);

-    int updateStatus(Status status, Long id);
+  int updateDone(int done, Long id);

-    int updateDone(int done, Long id);
+  int updateFolderName(String postFolderName, Long id);

-    int updateFolderName(String postFolderName, Long id);
+  int updateTitle(String title, Long id);

-    int updateTitle(String title, Long id);
-
-    int updateThanked(boolean thanked, Long id);
+  int updateThanked(boolean thanked, Long id);
 }
@@ -6,13 +6,15 @@ import java.util.List;
 import java.util.Optional;

 public interface IQueuedRepository extends IRepository {
-    Queued save(Queued queued);
+  Queued save(Queued queued);

-    Optional<Queued> findByThreadId(String threadId);
+  Optional<Queued> findByThreadId(String threadId);

-    List<Queued> findAll();
+  List<Queued> findAll();

-    Optional<Queued> findById(Long id);
+  Optional<Queued> findById(Long id);

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

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

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

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

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

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

-    @Autowired
-    public ImageRepository(JdbcTemplate jdbcTemplate) {
-        this.jdbcTemplate = jdbcTemplate;
+  @Autowired
+  public ImageRepository(JdbcTemplate jdbcTemplate) {
+    this.jdbcTemplate = jdbcTemplate;
+  }
+
+  private synchronized Long nextId() {
+    return jdbcTemplate.queryForObject("CALL NEXT VALUE FOR SEQ_IMAGE", Long.class);
+  }
+
+  @Override
+  public Image save(Image image) {
+    long id = nextId();
+    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);
+    applicationEventPublisher.publishEvent(new ImageUpdateEvent(ImageRepository.class, 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 ImageRowMapper(), postId);
+  }
+
+  @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 ImageRowMapper(),
+        postId);
+  }
+
+  @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 ImageRowMapper(),
+        postId);
+  }
+
+  @Override
+  public Optional<Image> findById(Long id) {
+    List<Image> images =
+        jdbcTemplate.query(
+            "SELECT * FROM IMAGE AS image WHERE image.ID = ?", new ImageRowMapper(), id);
+    if (images.isEmpty()) {
+      return Optional.empty();
+    } else {
+      return Optional.of(images.get(0));
    }
+  }

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

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

-    @Override
-    public List<Image> findByPostId(String postId) {
-        return jdbcTemplate.query(
-                "SELECT * FROM IMAGE WHERE POST_ID = ?",
-                new Object[]{postId},
-                new ImageRowMapper()
-        );
-    }
+  @Override
+  public int updateTotal(long total, Long id) {
+    int mutationCount =
+        jdbcTemplate.update(
+            "UPDATE IMAGE AS image SET image.TOTAL = ? WHERE image.ID = ?", total, id);
+    applicationEventPublisher.publishEvent(new ImageUpdateEvent(ImageRepository.class, id));
+    return mutationCount;
+  }

-    @Override
-    public 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
-        );
-    }
+  @Override
+  public void setApplicationEventPublisher(
+      @NonNull ApplicationEventPublisher applicationEventPublisher) {
+    this.applicationEventPublisher = applicationEventPublisher;
+  }
 }
@@ -11,19 +11,23 @@ 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;
-    }
+  @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;
+  }
 }
@@ -1,85 +1,63 @@
 package tn.mnlr.vripper.jpa.repositories.impl;

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

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

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

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

-    @Autowired
-    public MetadataRepository(JdbcTemplate jdbcTemplate) {
-        this.jdbcTemplate = jdbcTemplate;
+  @Autowired
+  public MetadataRepository(JdbcTemplate jdbcTemplate) {
+    this.jdbcTemplate = jdbcTemplate;
+  }
+
+  @Override
+  public Metadata save(Metadata metadata) {
+    jdbcTemplate.update(
+        "INSERT INTO METADATA (POST_ID_REF, POST_ID, POSTED_BY, RESOLVED_NAMES) VALUES (?,?,?,?)",
+        metadata.getPostIdRef(),
+        metadata.getPostId(),
+        metadata.getPostedBy(),
+        String.join("%sep%", metadata.getResolvedNames()));
+    applicationEventPublisher.publishEvent(
+        new MetadataUpdateEvent(MetadataRepository.class, metadata.getPostIdRef()));
+    return metadata;
+  }
+
+  @Override
+  public Optional<Metadata> findByPostId(String postId) {
+    List<Metadata> metadata =
+        jdbcTemplate.query(
+            "SELECT metadata.* FROM METADATA AS metadata WHERE metadata.POST_ID = ?",
+            new MetadataRowMapper(),
+            postId);
+    if (metadata.isEmpty()) {
+      return Optional.empty();
+    } else {
+      return Optional.of(metadata.get(0));
    }
+  }

-    @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 int deleteByPostId(String postId) {
+    return jdbcTemplate.update(
+        "DELETE FROM METADATA AS metadata WHERE metadata.POST_ID = ?", postId);
+  }

-    @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
-        );
-    }
+  @Override
+  public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
+    this.applicationEventPublisher = applicationEventPublisher;
+  }
 }
@@ -9,16 +9,16 @@ 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;
+  @Override
+  public Metadata mapRow(ResultSet rs, int rowNum) throws SQLException {
+    Metadata metadata = new Metadata();
+    metadata.setPostIdRef(rs.getLong("POST_ID_REF"));
+    metadata.setPostId(rs.getString("POST_ID"));
+    metadata.setPostedBy(rs.getString("POSTED_BY"));
+    String resolvedNames = rs.getString("RESOLVED_NAMES");
+    if (resolvedNames != null && !resolvedNames.isBlank()) {
+      metadata.setResolvedNames(List.of(resolvedNames.split("%sep%")));
    }
+    return metadata;
+  }
 }
@@ -1,183 +1,176 @@
 package tn.mnlr.vripper.jpa.repositories.impl;

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

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

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

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

-    @Autowired
-    public PostRepository(JdbcTemplate jdbcTemplate) {
-        this.jdbcTemplate = jdbcTemplate;
+  @Autowired
+  public PostRepository(JdbcTemplate jdbcTemplate) {
+    this.jdbcTemplate = jdbcTemplate;
+  }

+  private synchronized Long nextId() {
+    return jdbcTemplate.queryForObject("CALL NEXT VALUE FOR SEQ_POST", Long.class);
+  }
+
+  @Override
+  public Post save(Post post) {
+    long id = nextId();
+    jdbcTemplate.update(
+        "INSERT INTO POST (ID, DONE, FORUM, HOSTS, POST_FOLDER_NAME, POST_ID, PREVIEWS, SECURITY_TOKEN, STATUS, THANKED, THREAD_ID, THREAD_TITLE, TITLE, TOTAL, URL) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
+        id,
+        post.getDone(),
+        post.getForum(),
+        String.join(";", post.getHosts()),
+        post.getDownloadDirectory(),
+        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);
+    applicationEventPublisher.publishEvent(new PostUpdateEvent(PostRepository.class, id));
+    return post;
+  }
+
+  @Override
+  public Optional<Post> findByPostId(String postId) {
+    List<Post> posts =
+        jdbcTemplate.query(
+            "SELECT metadata.*,post.* FROM METADATA metadata FULL JOIN POST post ON metadata.POST_ID_REF = post.ID WHERE post.POST_ID = ?",
+            new PostRowMapper(),
+            postId);
+    if (posts.isEmpty()) {
+      return Optional.empty();
+    } else {
+      return Optional.of(posts.get(0));
    }
+  }

-    @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 List<String> findCompleted() {
+    return jdbcTemplate.query(
+        "SELECT POST_ID FROM POST AS 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 PostRowMapper(),
+            id);
+    if (posts.isEmpty()) {
+      return Optional.empty();
+    } else {
+      return Optional.of(posts.get(0));
    }
+  }

-    @Override
-    public Post save(Post post) {
-        long id = counter.incrementAndGet();
+  @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 = ?", Integer.class, postId);
+    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) {
+    int mutationCount =
+        jdbcTemplate.update("DELETE FROM POST AS post WHERE post.POST_ID = ?", postId);
+    applicationEventPublisher.publishEvent(new PostRemoveEvent(PostRepository.class, postId));
+    return mutationCount;
+  }
+
+  @Override
+  public int updateStatus(Status status, Long id) {
+    int mutationCount =
        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;
-    }
+            "UPDATE POST AS post SET post.STATUS = ? WHERE post.ID = ?", status.name(), id);
+    applicationEventPublisher.publishEvent(new PostUpdateEvent(PostRepository.class, id));
+    return mutationCount;
+  }

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

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

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

-    @Override
-    public 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 int updateThanked(boolean thanked, Long id) {
+    int mutationCount =
+        jdbcTemplate.update(
+            "UPDATE POST AS post SET post.THANKED = ? WHERE post.ID = ?", thanked, id);
+    applicationEventPublisher.publishEvent(new PostUpdateEvent(PostRepository.class, id));
+    return mutationCount;
+  }

-    @Override
-    public 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
-        );
-    }
+  @Override
+  public void setApplicationEventPublisher(
+      @NonNull ApplicationEventPublisher applicationEventPublisher) {
+    this.applicationEventPublisher = applicationEventPublisher;
+  }
 }
@@ -12,44 +12,44 @@ import java.util.Set;

 public class PostRowMapper implements RowMapper<Post> {

-    private static final String DELIMITER = ";";
+  private static final String DELIMITER = ";";

-    @Override
-    public Post mapRow(ResultSet rs, int rowNum) throws SQLException {
+  @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;
+    Post post = new Post();
+    post.setId(rs.getLong("post.ID"));
+    post.setStatus(Status.valueOf(rs.getString("post.STATUS")));
+    post.setPostId(rs.getString("post.POST_ID"));
+    post.setThreadTitle(rs.getString("post.THREAD_TITLE"));
+    post.setThreadId(rs.getString("post.THREAD_ID"));
+    post.setTitle(rs.getString("post.TITLE"));
+    post.setUrl(rs.getString("post.URL"));
+    post.setDone(rs.getInt("post.DONE"));
+    post.setTotal(rs.getInt("post.TOTAL"));
+    post.setHosts(Set.of(rs.getString("post.HOSTS").split(DELIMITER)));
+    post.setForum(rs.getString("post.FORUM"));
+    post.setSecurityToken(rs.getString("post.SECURITY_TOKEN"));
+    post.setDownloadDirectory(rs.getString("post.POST_FOLDER_NAME"));
+    post.setThanked(rs.getBoolean("post.THANKED"));
+    String previews;
+    if ((previews = rs.getString("post.PREVIEWS")) != null) {
+      post.setPreviews(Set.of(previews.split(DELIMITER)));
    }
+
+    Long metadataId = rs.getLong("metadata.POST_ID_REF");
+    if (!rs.wasNull()) {
+      Metadata metadata = new Metadata();
+      metadata.setPostIdRef(metadataId);
+      metadata.setPostId(rs.getString("metadata.POST_ID"));
+      String resolvedNames = rs.getString("metadata.RESOLVED_NAMES");
+      if (resolvedNames != null && !resolvedNames.isBlank()) {
+        metadata.setResolvedNames(List.of(resolvedNames.split("%sep%")));
+      }
+      metadata.setPostedBy(rs.getString("metadata.POSTED_BY"));
+      post.setMetadata(metadata);
+    }
+
+    return post;
+  }
 }
@@ -1,95 +1,97 @@
 package tn.mnlr.vripper.jpa.repositories.impl;

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

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

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

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

-    @Autowired
-    public QueuedRepository(JdbcTemplate jdbcTemplate) {
-        this.jdbcTemplate = jdbcTemplate;
+  @Autowired
+  public QueuedRepository(JdbcTemplate jdbcTemplate) {
+    this.jdbcTemplate = jdbcTemplate;
+  }
+
+  private synchronized Long nextId() {
+    return jdbcTemplate.queryForObject("CALL NEXT VALUE FOR SEQ_QUEUED", Long.class);
+  }
+
+  @Override
+  public Queued save(Queued queued) {
+    long id = nextId();
+    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);
+    applicationEventPublisher.publishEvent(new QueuedUpdateEvent(QueuedRepository.class, 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 void init() {
-        Long maxId = jdbcTemplate.queryForObject(
-                "SELECT MAX(ID) FROM QUEUED",
-                Long.class
-        );
-        if (maxId == null) {
-            maxId = 0L;
-        }
-        counter.set(maxId);
-    }
+  @Override
+  public List<Queued> findAll() {
+    return jdbcTemplate.query("SELECT * FROM QUEUED", new QueuedRowMapper());
+  }

-    @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> 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 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 int deleteByThreadId(String threadId) {
+    int mutationCount =
+        jdbcTemplate.update("DELETE FROM QUEUED AS queued WHERE THREAD_ID = ?", threadId);
+    applicationEventPublisher.publishEvent(new QueuedRemoveEvent(QueuedRepository.class, threadId));
+    return mutationCount;
+  }

-    @Override
-    public List<Queued> findAll() {
-        return jdbcTemplate.query(
-                "SELECT * FROM QUEUED",
-                new QueuedRowMapper()
-        );
-    }
+  @Override
+  public void deleteAll() {
+    jdbcTemplate.update("DELETE FROM QUEUED");
+  }

-    @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
-        );
-    }
+  @Override
+  public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
+    this.applicationEventPublisher = applicationEventPublisher;
+  }
 }
@@ -8,15 +8,15 @@ 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;
-    }
+  @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;
+  }
 }
@@ -0,0 +1,7 @@
+package tn.mnlr.vripper.listener;
+
+import reactor.core.publisher.Flux;
+
+public interface DataEventListener<T> {
+  Flux<T> getDataFlux();
+}
@@ -0,0 +1,7 @@
+package tn.mnlr.vripper.listener;
+
+import reactor.core.publisher.Sinks.EmitFailureHandler;
+
+public class EmitHandler {
+  public static final EmitFailureHandler RETRY = (signalType, emitResult) -> true;
+}
@@ -0,0 +1,33 @@
+package tn.mnlr.vripper.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.event.EventRemoveEvent;
+
+import javax.annotation.PreDestroy;
+
+@Component
+@Slf4j
+public class EventRemoveEventListener
+    implements ApplicationListener<EventRemoveEvent>, DataEventListener<EventRemoveEvent> {
+
+  private final Sinks.Many<EventRemoveEvent> sink = Sinks.many().multicast().onBackpressureBuffer();
+
+  @Override
+  public void onApplicationEvent(EventRemoveEvent event) {
+    sink.emitNext(event, EmitHandler.RETRY);
+  }
+
+  @Override
+  public Flux<EventRemoveEvent> getDataFlux() {
+    return sink.asFlux();
+  }
+
+  @PreDestroy
+  private void destroy() {
+    sink.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+  }
+}
@@ -0,0 +1,34 @@
+package tn.mnlr.vripper.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.lang.NonNull;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.event.EventUpdateEvent;
+
+import javax.annotation.PreDestroy;
+
+@Component
+@Slf4j
+public class EventUpdateEventListener
+    implements ApplicationListener<EventUpdateEvent>, DataEventListener<EventUpdateEvent> {
+
+  private final Sinks.Many<EventUpdateEvent> sink = Sinks.many().multicast().onBackpressureBuffer();
+
+  @Override
+  public void onApplicationEvent(@NonNull EventUpdateEvent event) {
+    sink.emitNext(event, EmitHandler.RETRY);
+  }
+
+  @Override
+  public Flux<EventUpdateEvent> getDataFlux() {
+    return sink.asFlux();
+  }
+
+  @PreDestroy
+  private void destroy() {
+    sink.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+  }
+}
@@ -0,0 +1,33 @@
+package tn.mnlr.vripper.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.event.ImageUpdateEvent;
+
+import javax.annotation.PreDestroy;
+
+@Component
+@Slf4j
+public class ImageUpdateEventListener
+    implements ApplicationListener<ImageUpdateEvent>, DataEventListener<ImageUpdateEvent> {
+
+  private final Sinks.Many<ImageUpdateEvent> sink = Sinks.many().multicast().onBackpressureBuffer();
+
+  @Override
+  public void onApplicationEvent(ImageUpdateEvent event) {
+    sink.emitNext(event, EmitHandler.RETRY);
+  }
+
+  @Override
+  public Flux<ImageUpdateEvent> getDataFlux() {
+    return sink.asFlux();
+  }
+
+  @PreDestroy
+  private void destroy() {
+    sink.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+  }
+}
@@ -0,0 +1,34 @@
+package tn.mnlr.vripper.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.event.MetadataUpdateEvent;
+
+import javax.annotation.PreDestroy;
+
+@Component
+@Slf4j
+public class MetadataUpdateEventListener
+    implements ApplicationListener<MetadataUpdateEvent>, DataEventListener<MetadataUpdateEvent> {
+
+  private final Sinks.Many<MetadataUpdateEvent> sink =
+      Sinks.many().multicast().onBackpressureBuffer();
+
+  @Override
+  public void onApplicationEvent(MetadataUpdateEvent event) {
+    sink.emitNext(event, (signalType, emitResult) -> true);
+  }
+
+  @Override
+  public Flux<MetadataUpdateEvent> getDataFlux() {
+    return sink.asFlux();
+  }
+
+  @PreDestroy
+  private void destroy() {
+    sink.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+  }
+}
@@ -0,0 +1,33 @@
+package tn.mnlr.vripper.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.event.PostRemoveEvent;
+
+import javax.annotation.PreDestroy;
+
+@Component
+@Slf4j
+public class PostRemoveEventListener
+    implements ApplicationListener<PostRemoveEvent>, DataEventListener<PostRemoveEvent> {
+
+  private final Sinks.Many<PostRemoveEvent> sink = Sinks.many().multicast().onBackpressureBuffer();
+
+  @Override
+  public void onApplicationEvent(PostRemoveEvent event) {
+    sink.emitNext(event, EmitHandler.RETRY);
+  }
+
+  @Override
+  public Flux<PostRemoveEvent> getDataFlux() {
+    return sink.asFlux();
+  }
+
+  @PreDestroy
+  private void destroy() {
+    sink.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+  }
+}
@@ -0,0 +1,33 @@
+package tn.mnlr.vripper.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.event.PostUpdateEvent;
+
+import javax.annotation.PreDestroy;
+
+@Component
+@Slf4j
+public class PostUpdateEventListener
+    implements ApplicationListener<PostUpdateEvent>, DataEventListener<PostUpdateEvent> {
+
+  private final Sinks.Many<PostUpdateEvent> sink = Sinks.many().multicast().onBackpressureBuffer();
+
+  @Override
+  public void onApplicationEvent(PostUpdateEvent event) {
+    sink.emitNext(event, EmitHandler.RETRY);
+  }
+
+  @Override
+  public Flux<PostUpdateEvent> getDataFlux() {
+    return sink.asFlux();
+  }
+
+  @PreDestroy
+  private void destroy() {
+    sink.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+  }
+}
@@ -0,0 +1,34 @@
+package tn.mnlr.vripper.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.event.QueuedRemoveEvent;
+
+import javax.annotation.PreDestroy;
+
+@Component
+@Slf4j
+public class QueuedRemoveEventListener
+    implements ApplicationListener<QueuedRemoveEvent>, DataEventListener<QueuedRemoveEvent> {
+
+  private final Sinks.Many<QueuedRemoveEvent> sink =
+      Sinks.many().multicast().onBackpressureBuffer();
+
+  @Override
+  public void onApplicationEvent(QueuedRemoveEvent event) {
+    sink.emitNext(event, (signalType, emitResult) -> true);
+  }
+
+  @Override
+  public Flux<QueuedRemoveEvent> getDataFlux() {
+    return sink.asFlux();
+  }
+
+  @PreDestroy
+  private void destroy() {
+    sink.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+  }
+}
@@ -0,0 +1,34 @@
+package tn.mnlr.vripper.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Sinks;
+import tn.mnlr.vripper.event.QueuedUpdateEvent;
+
+import javax.annotation.PreDestroy;
+
+@Component
+@Slf4j
+public class QueuedUpdateEventListener
+    implements ApplicationListener<QueuedUpdateEvent>, DataEventListener<QueuedUpdateEvent> {
+
+  private final Sinks.Many<QueuedUpdateEvent> sink =
+      Sinks.many().multicast().onBackpressureBuffer();
+
+  @Override
+  public void onApplicationEvent(QueuedUpdateEvent event) {
+    sink.emitNext(event, (signalType, emitResult) -> true);
+  }
+
+  @Override
+  public Flux<QueuedUpdateEvent> getDataFlux() {
+    return sink.asFlux();
+  }
+
+  @PreDestroy
+  private void destroy() {
+    sink.emitComplete(Sinks.EmitFailureHandler.FAIL_FAST);
+  }
+}
@@ -1,65 +0,0 @@
-package tn.mnlr.vripper.q;
-
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-import net.jodah.failsafe.function.CheckedRunnable;
-import tn.mnlr.vripper.jpa.domain.Image;
-import tn.mnlr.vripper.jpa.domain.Post;
-
-import java.util.Objects;
-
-@Slf4j
-public class DownloadJob implements CheckedRunnable {
-
-    @Getter
-    private final Image image;
-
-    @Getter
-    private final Post post;
-
-    @Getter
-    private final ImageFileData imageFileData = new ImageFileData();
-
-    @Getter
-    private boolean stopped = false;
-
-    @Getter
-    private boolean finished = false;
-
-    DownloadJob(Post post, Image image) {
-        this.image = image;
-        this.post = post;
-    }
-
-    @Override
-    public void run() throws Exception {
-        if (stopped) {
-            done();
-            return;
-        }
-        log.debug(String.format("Starting downloading %s", image.getUrl()));
-        image.getHost().download(post, image, imageFileData, this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        DownloadJob that = (DownloadJob) o;
-        return Objects.equals(image, that.image) &&
-                Objects.equals(post, that.post);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(image, post);
-    }
-
-    public void stop() {
-        this.stopped = true;
-    }
-
-    public void done() {
-        finished = true;
-    }
-}
@@ -1,47 +0,0 @@
-package tn.mnlr.vripper.q;
-
-import lombok.extern.slf4j.Slf4j;
-import net.jodah.failsafe.Failsafe;
-import tn.mnlr.vripper.SpringContext;
-import tn.mnlr.vripper.VripperApplication;
-import tn.mnlr.vripper.jpa.domain.enums.Status;
-import tn.mnlr.vripper.services.DataService;
-import tn.mnlr.vripper.services.MutexService;
-
-import java.util.concurrent.locks.ReentrantLock;
-
-@Slf4j
-public class ExecuteRunnable implements Runnable {
-
-    private final ExecutionService executionService;
-    private final DataService dataService;
-    private final MutexService mutexService;
-
-    private final DownloadJob downloadJob;
-
-    public ExecuteRunnable(final DownloadJob downloadJob) {
-        executionService = SpringContext.getBean(ExecutionService.class);
-        dataService = SpringContext.getBean(DataService.class);
-        mutexService = SpringContext.getBean(MutexService.class);
-        this.downloadJob = downloadJob;
-    }
-
-    @Override
-    public void run() {
-        mutexService.createPostLock(downloadJob.getPost().getPostId());
-        ReentrantLock mutex = mutexService.getPostLock(downloadJob.getPost().getPostId());
-        mutex.lock();
-        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()));
-                    mutex.unlock();
-                }).run(downloadJob);
-    }
-}
@@ -1,229 +0,0 @@
-package tn.mnlr.vripper.q;
-
-import lombok.NonNull;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import tn.mnlr.vripper.host.Host;
-import tn.mnlr.vripper.jpa.domain.Image;
-import tn.mnlr.vripper.jpa.domain.Post;
-import tn.mnlr.vripper.jpa.domain.enums.Status;
-import tn.mnlr.vripper.services.AppSettingsService;
-import tn.mnlr.vripper.services.DataService;
-import tn.mnlr.vripper.services.MutexService;
-import tn.mnlr.vripper.services.post.PostService;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
-@Service
-@Slf4j
-public class ExecutionService {
-
-    private static final List<Status> FINISHED = Arrays.asList(Status.ERROR, Status.COMPLETE, Status.STOPPED);
-    private final int MAX_POOL_SIZE = 12;
-
-    private final ConcurrentHashMap<Host, AtomicInteger> threadCount = new ConcurrentHashMap<>();
-    private final ExecutorService executor = Executors.newFixedThreadPool(MAX_POOL_SIZE);
-    private final BlockingQueue<DownloadJob> executionQueue = new LinkedBlockingQueue<>();
-    private final List<DownloadJob> executing = Collections.synchronizedList(new ArrayList<>());
-
-    private final PendingQ pendingQ;
-    private final AppSettingsService settings;
-    private final DataService dataService;
-    private final PostService postService;
-    private final MutexService mutexService;
-
-    private boolean pauseQ = false;
-    private Thread executionThread;
-    private Thread pollThread;
-
-    @Autowired
-    public ExecutionService(PendingQ pendingQ, AppSettingsService settings, DataService dataService, PostService postService, MutexService mutexService) {
-        this.pendingQ = pendingQ;
-        this.settings = settings;
-        this.dataService = dataService;
-        this.postService = postService;
-        this.mutexService = mutexService;
-    }
-
-    @PostConstruct
-    private void init() {
-        executionThread = new Thread(this::start, "Executor thread");
-        pollThread = new Thread(this::poll, "Polling thread");
-        pollThread.start();
-        executionThread.start();
-    }
-
-    @PreDestroy
-    private void destroy() throws InterruptedException {
-        log.info("Shutting down ExecutionService");
-        executionThread.interrupt();
-        pollThread.interrupt();
-        executor.shutdown();
-        dataService.findAllPosts().forEach(p -> {
-            log.debug(String.format("Stopping download jobs for %s", p));
-            this.stopRunning(p.getPostId());
-        });
-        executor.awaitTermination(10, TimeUnit.SECONDS);
-    }
-
-    private void stopRunning(@NonNull String postId) {
-        List<DownloadJob> stopping = new ArrayList<>();
-        Iterator<DownloadJob> iterator = executing.iterator();
-        while (iterator.hasNext()) {
-            DownloadJob downloadJob = iterator.next();
-            if (postId.equals(downloadJob.getPost().getPostId())) {
-                downloadJob.stop();
-                iterator.remove();
-                stopping.add(downloadJob);
-            }
-        }
-
-        while (!stopping.isEmpty()) {
-            stopping.removeIf(DownloadJob::isFinished);
-            try {
-                Thread.sleep(200);
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-            }
-        }
-    }
-
-    public void stopAll(List<String> posIds) {
-        if (posIds != null) {
-            posIds.forEach(this::stop);
-        } else {
-            dataService.findAllPosts().forEach(p -> this.stop(p.getPostId()));
-        }
-    }
-
-    public void restartAll(List<String> posIds) {
-        if (posIds != null) {
-            posIds.forEach(this::restart);
-        } else {
-            dataService.findAllPosts().forEach(p -> this.restart(p.getPostId()));
-        }
-    }
-
-    private void restart(@NonNull String postId) {
-        if (isPending(postId)) {
-            log.warn(String.format("Cannot restart, jobs are currently running for post id %s", postId));
-            return;
-        }
-        List<Image> images = dataService.findByPostIdAndIsNotCompleted(postId);
-        if (images.isEmpty()) {
-            return;
-        }
-        Post post = dataService.findPostByPostId(postId).orElseThrow();
-        post.setStatus(Status.PENDING);
-        dataService.updatePostStatus(post.getStatus(), post.getId());
-        log.debug(String.format("Restarting %d jobs for post id %s", images.size(), postId));
-        for (Image image : images) {
-            try {
-                pendingQ.put(post, image);
-            } catch (InterruptedException e) {
-                log.warn("Thread was interrupted", e);
-                Thread.currentThread().interrupt();
-            }
-        }
-    }
-
-    private boolean isPending(String postId) {
-        return pendingQ.isPending(postId);
-    }
-
-    private void stop(String postId) {
-        try {
-            pauseQ = true;
-            final Post post = dataService.findPostByPostId(postId).orElseThrow();
-            if (post == null) {
-                return;
-            }
-            if (FINISHED.contains(post.getStatus())) {
-                return;
-            }
-            pendingQ.stop(post);
-            stopRunning(postId);
-            dataService.stopImagesByPostIdAndIsNotCompleted(postId);
-            dataService.finishPost(post);
-            postService.stopFetchingMetadata(post);
-        } finally {
-            pauseQ = false;
-        }
-    }
-
-    private boolean canRun(Host host) {
-        boolean canRun;
-        AtomicInteger count = threadCount.get(host);
-        if (count == null) {
-            threadCount.put(host, new AtomicInteger(0));
-        }
-        canRun = threadCount.get(host).get() < settings.getSettings().getMaxThreads() && (settings.getSettings().getMaxTotalThreads() == 0 ? threadCount.values().stream().mapToInt(AtomicInteger::get).sum() < MAX_POOL_SIZE : threadCount.values().stream().mapToInt(AtomicInteger::get).sum() < settings.getSettings().getMaxTotalThreads());
-        if (canRun && !pauseQ) {
-            threadCount.get(host).incrementAndGet();
-            return true;
-        }
-        return false;
-    }
-
-    private void poll() {
-        while (!Thread.interrupted()) {
-            try {
-                List<DownloadJob> peek = pendingQ.peek();
-                for (DownloadJob downloadJob : peek) {
-                    if (canRun(downloadJob.getImage().getHost())) {
-                        executionQueue.offer(downloadJob);
-                        pendingQ.remove(downloadJob);
-                    }
-                }
-                synchronized (threadCount) {
-                    threadCount.wait(2_000);
-                }
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                break;
-            }
-        }
-    }
-
-    private void start() {
-        while (!Thread.interrupted()) {
-            try {
-                push(executionQueue.take());
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                break;
-            } catch (Exception e) {
-                log.error("Execution Service failed", e);
-                break;
-            }
-        }
-    }
-
-    private void push(DownloadJob downloadJob) {
-        log.debug(String.format("Scheduling a job for %s", downloadJob.getImage().getUrl()));
-        executor.execute(new ExecuteRunnable(downloadJob));
-        executing.add(downloadJob);
-    }
-
-    public synchronized void afterJobFinish(DownloadJob downloadJob) {
-        int count = pendingQ.decrement(downloadJob.getPost().getPostId());
-        if (count == 0) {
-            dataService.finishPost(downloadJob.getPost());
-            mutexService.removePostLock(downloadJob.getPost().getPostId());
-        }
-        threadCount.get(downloadJob.getImage().getHost()).decrementAndGet();
-        executing.remove(downloadJob);
-        synchronized (threadCount) {
-            threadCount.notify();
-        }
-    }
-
-    public int runningCount() {
-        return executing.size();
-    }
-}
@@ -1,16 +0,0 @@
-package tn.mnlr.vripper.q;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.http.client.methods.HttpUriRequest;
-
-@Getter
-@Setter
-public class ImageFileData {
-
-    private String pageUrl;
-    private String imageName;
-    private String fileName;
-    private String imageUrl;
-    private HttpUriRequest imageRequest;
-}
@@ -1,115 +0,0 @@
-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;
-    }
-}
@@ -1,246 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import tn.mnlr.vripper.SpringContext;
-import tn.mnlr.vripper.exception.ValidationException;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import static java.nio.file.StandardOpenOption.*;
-
-@Service
-@Getter
-@Setter
-@Slf4j
-public class AppSettingsService {
-
-    private final String MAX_TOTAL_THREADS = "MAX_TOTAL_THREADS";
-    private final String baseDir;
-
-    private final Path configPath;
-    private final ObjectMapper om = new ObjectMapper();
-
-    private Settings settings = new Settings();
-
-    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();
-    }
-
-    public void newSettings(Settings settings) {
-
-        if (settings.getVLogin()) {
-            if (!this.settings.getVPassword().equals(settings.getVPassword())) {
-                settings.setVPassword(settings.getVPassword());
-            }
-        } else {
-            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();
-        }
-
-        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() {
-        try {
-            // force disable gallery
-            settings.setViewPhotos(false);
-
-            Files.write(configPath, om.writeValueAsBytes(settings), CREATE, WRITE, TRUNCATE_EXISTING, SYNC);
-        } catch (IOException e) {
-            log.error("Failed to store user settings", e);
-        }
-    }
-
-    public void check(Settings settings) throws ValidationException {
-
-        Path path;
-        try {
-            path = Paths.get(settings.getDownloadPath());
-        } catch (InvalidPathException e) {
-            throw new ValidationException(String.format("%s is invalid", settings.getDownloadPath()));
-        }
-        if (!Files.exists(path)) {
-            throw new ValidationException(String.format("%s does not exist", settings.getDownloadPath()));
-        } else if (!Files.isDirectory(path)) {
-            throw new ValidationException(String.format("%s is not a directory", settings.getDownloadPath()));
-        }
-
-        if (settings.getMaxTotalThreads() < 0 || settings.getMaxTotalThreads() > 12) {
-            throw new ValidationException(String.format("Invalid max global concurrent download settings, values must be in [%d,%d]", 0, 12));
-        }
-
-        if (settings.getMaxThreads() < 1 || settings.getMaxThreads() > 4) {
-            throw new ValidationException(String.format("Invalid max concurrent download settings, values must be in [%d,%d]", 1, 4));
-        }
-    }
-
-    public Theme getTheme() {
-        return new Theme(this.settings.getDarkTheme());
-    }
-
-    public void setTheme(Theme theme) {
-        this.settings.setDarkTheme(theme.darkTheme);
-        save();
-    }
-
-    @Getter
-    @NoArgsConstructor
-    public static class Theme {
-
-        @JsonProperty("darkTheme")
-        private boolean darkTheme;
-
-        Theme(boolean darkTheme) {
-            this.darkTheme = darkTheme;
-        }
-    }
-
-    @Getter
-    @Setter
-    @NoArgsConstructor
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    public static class Settings {
-
-        @JsonProperty("downloadPath")
-        private String downloadPath;
-        @JsonProperty("maxThreads")
-        private Integer maxThreads;
-        @JsonProperty("maxTotalThreads")
-        private Integer maxTotalThreads;
-        @JsonProperty("autoStart")
-        private Boolean autoStart;
-        @JsonProperty("vLogin")
-        private Boolean vLogin;
-        @JsonProperty("vUsername")
-        private String vUsername;
-        @JsonProperty("vPassword")
-        private String vPassword;
-        @JsonProperty("vThanks")
-        private Boolean vThanks;
-        @JsonProperty("desktopClipboard")
-        private Boolean desktopClipboard;
-        @JsonProperty("forceOrder")
-        private Boolean forceOrder;
-        @JsonProperty("subLocation")
-        private Boolean subLocation;
-        @JsonProperty("threadSubLocation")
-        private Boolean threadSubLocation;
-        @JsonProperty("clearCompleted")
-        private Boolean clearCompleted;
-        @JsonProperty("viewPhotos")
-        private Boolean viewPhotos;
-        @JsonProperty("darkTheme")
-        private Boolean darkTheme;
-
-        public void setVPassword(String vPassword) {
-            if (vPassword == null || vPassword.isEmpty()) {
-                this.vPassword = "";
-            } else {
-                this.vPassword = DigestUtils.md5Hex(vPassword);
-            }
-        }
-    }
-}
@@ -1,29 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import io.reactivex.Scheduler;
-import io.reactivex.schedulers.Schedulers;
-import lombok.Getter;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.PreDestroy;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-@Service
-public class CommonExecutor {
-    @Getter
-    private final ExecutorService generalExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
-    private final ExecutorService schedulerExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
-
-    @Getter
-    private final Scheduler scheduler = Schedulers.from(schedulerExecutor);
-
-    @PreDestroy
-    private void destroy() throws InterruptedException {
-        generalExecutor.shutdown();
-        generalExecutor.awaitTermination(10, TimeUnit.SECONDS);
-        schedulerExecutor.shutdown();
-        schedulerExecutor.awaitTermination(10, TimeUnit.SECONDS);
-    }
-}
@@ -1,73 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import org.apache.http.client.config.CookieSpecs;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.client.LaxRedirectStrategy;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-
-import java.net.URI;
-import java.util.concurrent.TimeUnit;
-
-@Service
-@EnableScheduling
-public class ConnectionManager {
-
-    private ConnectionManager() {
-        buildConnectionPool();
-    }
-
-    private PoolingHttpClientConnectionManager pcm;
-
-    private RequestConfig rc = RequestConfig.custom()
-            .setConnectionRequestTimeout(5_000)
-            .setConnectTimeout(5_000)
-            .setSocketTimeout(5_000)
-            .setCookieSpec(CookieSpecs.STANDARD)
-            .build();
-
-    private void buildConnectionPool() {
-
-        pcm = new PoolingHttpClientConnectionManager();
-        pcm.setMaxTotal(50);
-        pcm.setDefaultMaxPerRoute(4);
-    }
-
-    @Scheduled(fixedDelay = 1000)
-    private void idleConnectionMonitoring() {
-        pcm.closeExpiredConnections();
-        pcm.closeIdleConnections(30, TimeUnit.SECONDS);
-    }
-
-    public HttpClientBuilder getClient() {
-        return HttpClients.custom()
-                .setConnectionManager(pcm)
-                .setRedirectStrategy(new LaxRedirectStrategy())
-                .disableAutomaticRetries()
-                .setDefaultRequestConfig(rc);
-    }
-
-    public HttpGet buildHttpGet(String url) {
-        HttpGet httpGet = new HttpGet(url.replace(" ", "+"));
-        httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36");
-        return httpGet;
-    }
-
-    public HttpPost buildHttpPost(String url) {
-        HttpPost httpPost = new HttpPost(url.replace(" ", "+"));
-        httpPost.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36");
-        return httpPost;
-    }
-
-    public HttpGet buildHttpGet(URI uri) {
-        HttpGet httpGet = new HttpGet(uri);
-        httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36");
-        return httpGet;
-    }
-}
@@ -0,0 +1,149 @@
+package tn.mnlr.vripper.services;
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import net.jodah.failsafe.RetryPolicy;
+import org.apache.http.client.config.CookieSpecs;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.AbstractExecutionAwareRequest;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.client.LaxRedirectStrategy;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import reactor.core.Disposable;
+import reactor.core.publisher.Flux;
+import tn.mnlr.vripper.download.DownloadJob;
+
+import javax.annotation.PreDestroy;
+import java.net.URI;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+@Service
+@EnableScheduling
+@Slf4j
+public class ConnectionService {
+
+  private final Disposable disposable;
+  private PoolingHttpClientConnectionManager pcm;
+  private RequestConfig rc;
+
+  @Getter private RetryPolicy<Object> retryPolicy;
+
+  private int connectionTimeout;
+  private int maxAttempts;
+
+  public ConnectionService(SettingsService settingsService) {
+    connectionTimeout = settingsService.getSettings().getConnectionTimeout();
+    maxAttempts = settingsService.getSettings().getMaxAttempts();
+    Flux<SettingsService.Settings> settingsFlux = settingsService.getSettingsFlux();
+    disposable =
+        settingsFlux.subscribe(
+            settings -> {
+              if (connectionTimeout != settings.getConnectionTimeout()) {
+                connectionTimeout = settings.getConnectionTimeout();
+                buildRequestConfig();
+              }
+              if (maxAttempts != settings.getMaxAttempts()) {
+                maxAttempts = settings.getMaxAttempts();
+                buildRetryPolicy();
+              }
+            });
+
+    buildRequestConfig();
+    buildRetryPolicy();
+    buildConnectionPool();
+  }
+
+  @PreDestroy
+  private void destroy() {
+    disposable.dispose();
+  }
+
+  private void buildRetryPolicy() {
+    retryPolicy =
+        new RetryPolicy<>()
+            .withDelay(2, 5, ChronoUnit.SECONDS)
+            .withMaxAttempts(maxAttempts)
+            .onFailedAttempt(
+                e ->
+                    log.warn(
+                        String.format("#%d tries failed", e.getAttemptCount()),
+                        e.getLastFailure()));
+  }
+
+  private void buildConnectionPool() {
+    pcm = new PoolingHttpClientConnectionManager();
+    pcm.setMaxTotal(Integer.MAX_VALUE);
+    pcm.setDefaultMaxPerRoute(Integer.MAX_VALUE);
+  }
+
+  private void buildRequestConfig() {
+    rc =
+        RequestConfig.custom()
+            .setConnectionRequestTimeout(connectionTimeout * 1000)
+            .setConnectTimeout(connectionTimeout * 1000)
+            .setSocketTimeout(connectionTimeout * 1000)
+            .setCookieSpec(CookieSpecs.STANDARD)
+            .build();
+  }
+
+  @Scheduled(fixedDelay = 5_000)
+  private void idleConnectionMonitoring() {
+    pcm.closeExpiredConnections();
+    pcm.closeIdleConnections(30, TimeUnit.SECONDS);
+  }
+
+  public HttpClientBuilder getClient() {
+    return HttpClients.custom()
+        .setConnectionManager(pcm)
+        .setRedirectStrategy(new LaxRedirectStrategy())
+        .disableAutomaticRetries()
+        .setDefaultRequestConfig(rc);
+  }
+
+  public HttpGet buildHttpGet(String url, final HttpClientContext context) {
+    HttpGet httpGet = new HttpGet(url.replace(" ", "+"));
+    httpGet.addHeader(
+        "User-Agent",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36");
+    addToContext(context, httpGet);
+    return httpGet;
+  }
+
+  public HttpPost buildHttpPost(String url, final HttpClientContext context) {
+    HttpPost httpPost = new HttpPost(url.replace(" ", "+"));
+    httpPost.addHeader(
+        "User-Agent",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36");
+    addToContext(context, httpPost);
+    return httpPost;
+  }
+
+  public HttpGet buildHttpGet(URI uri, final HttpClientContext context) {
+    HttpGet httpGet = new HttpGet(uri);
+    httpGet.addHeader(
+        "User-Agent",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36");
+    addToContext(context, httpGet);
+    return httpGet;
+  }
+
+  public void addToContext(HttpClientContext context, AbstractExecutionAwareRequest request) {
+    if (context != null) {
+      List<AbstractExecutionAwareRequest> requests =
+          (List<AbstractExecutionAwareRequest>)
+              context.getAttribute(DownloadJob.ContextAttributes.OPEN_CONNECTION.toString());
+      if (requests != null) {
+        requests.add(request);
+      }
+    }
+  }
+}
@@ -1,21 +1,17 @@
 package tn.mnlr.vripper.services;

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

 import java.util.Collection;
 import java.util.List;
@@ -26,231 +22,212 @@ import java.util.Optional;
@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 IPostRepository postRepository;
+  private final IImageRepository imageRepository;
+  private final IQueuedRepository queuedRepository;
+  private final IMetadataRepository metadataRepository;
+  private final SettingsService settingsService;
+  private final EventRepository eventRepository;

-    private final PublishProcessor<Long> liveGrabQueue = PublishProcessor.create();
-    private final PublishProcessor<Long> liveImageUpdates = PublishProcessor.create();
-    private final PublishProcessor<Long> livePostsState = PublishProcessor.create();
+  @Autowired
+  public DataService(
+      IPostRepository postRepository,
+      IImageRepository imageRepository,
+      IQueuedRepository queuedRepository,
+      IMetadataRepository metadataRepository,
+      SettingsService settingsService,
+      EventRepository eventRepository) {
+    this.postRepository = postRepository;
+    this.imageRepository = imageRepository;
+    this.queuedRepository = queuedRepository;
+    this.metadataRepository = metadataRepository;
+    this.settingsService = settingsService;
+    this.eventRepository = eventRepository;
+  }

-    private final PublishProcessor<String> postRemove = PublishProcessor.create();
-    private final PublishProcessor<String> queueRemove = PublishProcessor.create();
+  private void save(Post post) {
+    postRepository.save(post);
+  }

-    public Observable<Long> liveQueue() {
-        return liveGrabQueue.toObservable();
-    }
+  private void save(Queued queued) {
+    queuedRepository.save(queued);
+  }

-    public Observable<Long> livePost() {
-        return livePostsState.toObservable();
-    }
+  private void save(Image image) {
+    imageRepository.save(image);
+  }

-    public Observable<Long> liveImage() {
-        return liveImageUpdates.toObservable();
-    }
+  public boolean exists(String postId) {
+    return postRepository.existByPostId(postId);
+  }

-    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 newPost(Post post, Collection<Image> images) {
+    save(post);
+    images.forEach(
+        image -> {
+          image.setPostIdRef(post.getId());
+          save(image);
        });
-    }
+  }

-    public void setDownloadingToStopped() {
-        postRepository.setDownloadingToStopped();
-    }
+  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());
+  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) {
+    postRepository.updateDone(done, id);
+  }
+
+  public void finishPost(@NonNull Post post) {
+    if (!imageRepository.findByPostIdAndIsError(post.getPostId()).isEmpty()) {
+      post.setStatus(Status.ERROR);
+      updatePostStatus(post.getStatus(), post.getId());
+    } else {
+      if (post.getDone() < post.getTotal()) {
+        post.setStatus(Status.STOPPED);
+        updatePostStatus(post.getStatus(), post.getId());
+      } else {
+        post.setStatus(Status.COMPLETE);
+        updatePostStatus(post.getStatus(), post.getId());
+        if (settingsService.getSettings().getClearCompleted()) {
+          remove(post.getPostId());
        }
+      }
    }
+  }

-    private void updatePostDone(int done, Long id) {
-        livePostsState.onNext(id);
-        postRepository.updateDone(done, id);
+  private void remove(@NonNull final String postId) {
+    imageRepository.deleteAllByPostId(postId);
+    metadataRepository.deleteByPostId(postId);
+    postRepository.deleteByPostId(postId);
+  }
+
+  public void newQueueLink(@NonNull final Queued queued) {
+    save(queued);
+  }
+
+  public void removeQueueLink(@NonNull final String threadId) {
+    queuedRepository.deleteByThreadId(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 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());
-                }
-            }
-        }
+  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 List<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 List<Queued> findAllQueued() {
+    return queuedRepository.findAll();
+  }
+
+  public Optional<Post> findById(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 synchronized void setMetadata(Post post, Metadata metadata) {
+    if (metadataRepository.findByPostId(post.getPostId()).isEmpty()) {
+      metadata.setPostIdRef(post.getId());
+      metadataRepository.save(metadata);
    }
+  }

-    private void remove(@NonNull final String postId) {
-        imageRepository.deleteAllByPostId(postId);
-        metadataRepository.deleteByPostId(postId);
-        postRepository.deleteByPostId(postId);
-        postRemove.onNext(postId);
-    }
+  public Optional<Metadata> findMetadataByPostId(String postId) {
+    return metadataRepository.findByPostId(postId);
+  }

-    public void newQueueLink(@NonNull final Queued queued) {
-        save(queued);
-    }
+  public void updateImageStatus(Status status, Long id) {
+    imageRepository.updateStatus(status, id);
+  }

-    public void removeQueueLink(@NonNull final String threadId) {
-        queuedRepository.deleteByThreadId(threadId);
-        queueRemove.onNext(threadId);
-    }
+  public void updateImageCurrent(long current, Long id) {
+    imageRepository.updateCurrent(current, id);
+  }

-    public List<String> clearCompleted() {
-        List<String> completed = postRepository.findCompleted();
-        completed.forEach(this::remove);
-        return completed;
-    }
+  public void updateImageTotal(long total, Long id) {
+    imageRepository.updateTotal(total, id);
+  }

-    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 void updatePostStatus(Status status, Long id) {
+    postRepository.updateStatus(status, id);
+  }

-    public List<Image> findByPostIdAndIsNotCompleted(@NonNull String postId) {
-        return imageRepository.findByPostIdAndIsNotCompleted(postId);
+  public void updateDownloadDirectory(String postFolderName, Long id) {
+    postRepository.updateFolderName(postFolderName, id);
+  }

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

-    public long countErrorImages() {
-        return imageRepository.countError();
-    }
+  public void updatePostThanked(boolean thanked, Long id) {
+    postRepository.updateThanked(thanked, id);
+  }

-    public List<Image> findImagesByPostId(String postId) {
-        return imageRepository.findByPostId(postId);
-    }
+  public Optional<Event> findEventById(Long id) {
+    return eventRepository.findById(id);
+  }

-    public Iterable<Post> findAllPosts() {
-        return postRepository.findAll();
-    }
+  public List<Event> findAllEvents() {
+    return eventRepository.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);
-    }
+  public void clearQueueLinks() {
+    queuedRepository.deleteAll();
+  }
 }
@@ -1,25 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import lombok.Getter;
-
-@Getter
-public class DownloadSpeed {
-
-    private final String speed;
-
-    public DownloadSpeed(long bytes) {
-        speed = formatSI(bytes);
-    }
-
-    private String formatSI(long bytes) {
-        return humanReadableByteCount(bytes, 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);
-    }
-}
@@ -1,41 +1,48 @@
 package tn.mnlr.vripper.services;

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

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

@Service
@EnableScheduling
 public class DownloadSpeedService {

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

-    @Getter
-    private long currentValue;
+  public Flux<Long> getReadBytesPerSecond() {
+    return sink.asFlux();
+  }

-    @Getter
-    private final PublishProcessor<Long> readBytesPerSecond = PublishProcessor.create();
-
-    private boolean allowWrite = false;
-
-    public void increase(long read) {
-        if (allowWrite) {
-            this.read.addAndGet(read);
-        }
+  public void increase(long read) {
+    if (allowWrite) {
+      this.read.addAndGet(read);
    }
+  }

-    @Scheduled(fixedDelay = 1000)
-    private void calc() {
-        allowWrite = false;
-        long newValue = read.getAndSet(0);
-        if (newValue != currentValue) {
-            currentValue = newValue;
-            readBytesPerSecond.onNext(currentValue);
-        }
-        allowWrite = true;
+  @Scheduled(fixedDelay = 1000)
+  private void calc() {
+    allowWrite = false;
+    long newValue = read.getAndSet(0);
+    if (newValue != currentValue) {
+      currentValue = newValue;
+      sink.emitNext(currentValue, EmitHandler.RETRY);
    }
+    allowWrite = true;
+  }
+
+  @PreDestroy
+  private void destroy() {
+    sink.emitComplete(EmitHandler.RETRY);
+  }
 }
@@ -1,32 +0,0 @@
-package tn.mnlr.vripper.services;
-
-import lombok.Getter;
-
-import java.util.Objects;
-
-@Getter
-public class GlobalState {
-
-    private final long running;
-    private final long remaining;
-    private final long error;
-
-    GlobalState(long running, long remaining, long error) {
-        this.running = running;
-        this.remaining = remaining;
-        this.error = error;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        GlobalState that = (GlobalState) o;
-        return running == that.running && remaining == that.remaining && error == that.error;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(running, remaining, error);
-    }
-}
@@ -1,44 +1,54 @@
 package tn.mnlr.vripper.services;

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

@Service
@EnableScheduling
 public class GlobalStateService {

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

-    @Getter
-    private GlobalState currentState;
+  @Autowired
+  public GlobalStateService(
+      PendingQueue pendingQueue, DownloadService downloadService, DataService dataService) {
+    this.pendingQueue = pendingQueue;
+    this.downloadService = downloadService;
+    this.dataService = dataService;
+  }

-    @Getter
-    private final PublishProcessor<GlobalState> liveGlobalState = PublishProcessor.create();
+  public Flux<GlobalState> getGlobalState() {
+    return sink.asFlux();
+  }

-    @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(
+            downloadService.runningCount(), pendingQueue.size(), dataService.countErrorImages());
+    if (!newGlobalState.equals(currentState)) {
+      currentState = newGlobalState;
+      sink.emitNext(currentState, EmitHandler.RETRY);
    }
+  }

-    @Scheduled(fixedDelay = 3000)
-    private void interval() {
-        GlobalState newGlobalState = new GlobalState(
-                executionService.runningCount(),
-                pendingQ.size(),
-                dataService.countErrorImages());
-        if (!newGlobalState.equals(currentState)) {
-            currentState = newGlobalState;
-            liveGlobalState.onNext(currentState);
-        }
-    }
+  @PreDestroy
+  private void destroy() {
+    sink.emitComplete(EmitHandler.RETRY);
+  }
 }
@@ -0,0 +1,113 @@
+package tn.mnlr.vripper.services;
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.Header;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.w3c.dom.Document;
+import tn.mnlr.vripper.exception.HostException;
+import tn.mnlr.vripper.exception.HtmlProcessorException;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+@Service
+@Slf4j
+public class HostService {
+
+  private final ConnectionService cm;
+  private final HtmlProcessorService htmlProcessorService;
+
+  @Autowired
+  public HostService(ConnectionService cm, HtmlProcessorService htmlProcessorService) {
+    this.cm = cm;
+    this.htmlProcessorService = htmlProcessorService;
+  }
+
+  public Response getResponse(final String url, final HttpClientContext context)
+      throws HostException {
+    String basePage;
+
+    HttpClient client = cm.getClient().build();
+    HttpGet httpGet = cm.buildHttpGet(url, context);
+    Header[] headers;
+    log.debug(String.format("Requesting %s", url));
+    try (CloseableHttpResponse response =
+        (CloseableHttpResponse) client.execute(httpGet, context)) {
+      if (response.getStatusLine().getStatusCode() / 100 != 2) {
+        throw new HostException(
+            String.format(
+                "Unexpected response code: %d", response.getStatusLine().getStatusCode()));
+      }
+      headers = response.getAllHeaders();
+      basePage = EntityUtils.toString(response.getEntity());
+      log.debug(String.format("%s response: %n%s", url, basePage));
+      EntityUtils.consumeQuietly(response.getEntity());
+    } catch (IOException e) {
+      throw new HostException(e);
+    }
+
+    try {
+      log.debug(String.format("Cleaning %s response", url));
+      return new Response(htmlProcessorService.clean(basePage), headers);
+    } catch (HtmlProcessorException e) {
+      throw new HostException(e);
+    }
+  }
+
+  public String appendUri(String uri, String appendQuery) throws URISyntaxException {
+    URI oldUri = new URI(uri);
+
+    String newQuery = oldUri.getQuery();
+    if (newQuery == null) {
+      newQuery = appendQuery;
+    } else {
+      newQuery += "&" + appendQuery;
+    }
+
+    return new URI(
+            oldUri.getScheme(),
+            oldUri.getAuthority(),
+            oldUri.getPath(),
+            newQuery,
+            oldUri.getFragment())
+        .toString();
+  }
+
+  public String getDefaultImageName(final String imgUrl) {
+    String imageTitle = imgUrl.substring(imgUrl.lastIndexOf('/') + 1);
+    log.debug(String.format("Extracting name from url %s: %s", imgUrl, imageTitle));
+    return imgUrl;
+  }
+
+  @Getter
+  public static class Response {
+
+    private final Document document;
+    private final Header[] headers;
+
+    protected Response(Document document, Header[] headers) {
+      this.document = document;
+      this.headers = headers;
+    }
+  }
+
+  @Getter
+  public static class NameUrl {
+
+    private final String name;
+    private final String url;
+
+    public NameUrl(String name, String url) {
+      this.name = name;
+      this.url = url;
+    }
+  }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
death-claw	06d636329e	v3.3.8	2021-05-05 18:31:13 +01:00
death-claw	85313600fc	Fix fonts path	2021-05-05 18:29:50 +01:00
death-claw	7d451397f9	v3.3.7	2021-05-05 18:16:00 +01:00
death-claw	1c94b93597	Fix imagebam host and code format	2021-05-05 18:14:25 +01:00
death-claw	8f09596453	Fix electron build	2021-03-20 11:35:46 +01:00
death-claw	6ce05e78b3	v3.3.6	2021-03-20 11:28:20 +01:00
death-claw	67a375150c	Optimize build size	2021-03-20 11:27:06 +01:00
death-claw	fba5f670a0	v3.3.5	2021-03-18 09:31:22 +01:00
death-claw	7d083630cc	Bug fix	2021-03-18 09:29:45 +01:00
death-claw	335cbf70b4	v3.3.4	2021-03-18 09:12:48 +01:00
death-claw	e25d306f1d	Bug fixes	2021-03-18 09:11:01 +01:00
death-claw	f395338a9d	Update build plugins	2021-03-13 17:08:13 +01:00
death-claw	58a40682cc	v3.3.3	2021-03-13 16:21:36 +01:00
death-claw	ccc4032bb0	Remove unnecessary event logs	2021-03-13 16:15:56 +01:00
death-claw	1c5b8a0397	v3.3.2	2021-03-11 19:05:09 +01:00
death-claw	cc2ce9482d	Fix a bug with event logs Change event names and add some icons	2021-03-11 19:02:01 +01:00
death-claw	41f1775360	v3.3.1	2021-02-18 16:04:34 +01:00
death-claw	733f1a08ac	Add about menu Fix README.md	2021-02-18 16:01:06 +01:00
death-claw	0cb0ee0100	v3.3.0	2021-02-16 19:15:58 +01:00
death-claw	cb88e39c83	Add support for proxies Add a Event Logs Fix bugs with the database	2021-02-16 19:13:02 +01:00
death-claw	6375c0aed6	v3.2.3	2021-01-13 20:15:13 +01:00
death-claw	40ca4cf86b	Finished posts are not cleared from the UI	2021-01-13 20:11:47 +01:00
death-clawandGitHub	b3a798388b	Update README.md	2021-01-13 12:54:51 +01:00
death-claw	6e69b2bce8	v3.2.2	2021-01-13 09:51:56 +01:00
death-claw	bb6dcd77b9	Set total download to max value	2021-01-13 09:49:38 +01:00
death-claw	42e1aa73e2	v3.2.1	2021-01-12 20:02:17 +01:00
death-claw	26fde22af2	Code reformat	2021-01-12 19:37:12 +01:00
death-claw	798f39d54f	Add settings for connection timeout Add settings for maximum attempts Enhance posts rename logic Dependencies update Switch reactive from rx-java to reactor	2021-01-12 19:32:43 +01:00
death-claw	3a21dfac38	Remove unused font	2021-01-06 14:55:49 +01:00
death-claw	e8355b88b9	v3.2	2020-11-16 19:40:36 +01:00
death-claw	379660236d	Commit missing files	2020-11-16 19:31:59 +01:00
death-claw	c86ee91c27	v3.1.0	2020-11-16 16:44:26 +01:00
death-claw	ff9d253242	UI revamp Fix bugs	2020-11-16 16:42:30 +01:00
death-claw	53b45e00ba	v3.0.11	2020-10-31 15:09:19 +01:00
death-claw	247b12a525	Add support for vipr.im	2020-10-31 15:06:26 +01:00
death-claw	7a8d332e6e	v3.0.10	2020-10-04 16:31:57 +01:00
death-claw	749a6f18d2	Fix bug on settings update	2020-10-04 16:27:26 +01:00
death-claw	4107048f12	v3.0.9	2020-09-27 10:14:08 +01:00
death-claw	f5d9ab85a2	Revert to appending post id to download folders Fix a bug that lead to adding duplicate posts Remove old unused settings	2020-09-27 10:12:29 +01:00
death-claw	b82ee7b494	v3.0.8	2020-08-22 19:01:08 +01:00
death-claw	8a31dfc012	Bug fix which breaks concurrent downloads	2020-08-22 18:59:44 +01:00
death-claw	734c1b72c7	v3.0.7	2020-08-22 16:45:43 +01:00
death-claw	7abb7df1f6	Fix MacOs build	2020-08-22 16:44:24 +01:00
death-claw	0a7fa99a64	v3.0.6	2020-08-18 08:33:57 +01:00
death-claw	691026c8a9	Fix TurboImageHost	2020-08-18 08:32:33 +01:00
death-claw	3ef004b947	v3.0.5	2020-08-17 20:06:12 +01:00
death-claw	1b22a93e28	Update packages Host class refactoring	2020-08-17 20:04:39 +01:00
death-claw	2639df0aaa	Update packages Host class refactoring	2020-08-17 20:04:23 +01:00
death-claw	d5ae5d57d1	v3.0.4	2020-08-16 16:11:11 +01:00
death-claw	537d76d7be	Improve rename UI	2020-08-16 16:06:17 +01:00