version bump

fixes #225 (#226 )
version bump
2026-08-19 08:35:41 +02:00 · 2025-03-22 22:52:14 +01:00 · 2025-03-22 22:18:59 +01:00 · 2025-03-21 16:41:49 +01:00 · 2025-03-21 16:40:38 +01:00 · 2025-03-11 16:08:48 +01:00
270 changed files with 22426 additions and 14345 deletions
@@ -8,12 +8,12 @@ jobs:
  build:
    strategy:
      matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        os: [ ubuntu-latest, windows-latest, macos-13, macos-latest ]
    runs-on: ${{ matrix.os }}
    steps:
    - uses: actions/checkout@v3

-    - name: Set up JDK 21
+    - name: Set up jdk21
      uses: actions/setup-java@v3
      with:
        java-version: '21'
@@ -21,37 +21,29 @@ jobs:
        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
        settings-path: ${{ github.workspace }} # location for the settings.xml file

-    - name: Build parent project
-      run: mvn -N -q install --file pom.xml
-
-    - name: Build Core Jar
-      run: mvn -B -q install --file vripper-core/pom.xml
-
-    - name: Build GUI Jar
-      run: mvn -B -q install --file vripper-gui/pom.xml
-
-    - name: Rename GUI Jar
-      run: mv vripper-gui/target/vripper-gui-${{ github.event.release.tag_name }}-jar-with-dependencies.jar vripper-gui/target/vripper-noarch-gui-${{ github.event.release.tag_name }}.jar
+    - name: Build gui jar
+      run: |
+        mvn -N -q install --file pom.xml
+        mvn -B -q install --file vripper-core/pom.xml
+        mvn -B -q install --file vripper-gui/pom.xml
+        mv vripper-gui/target/vripper-gui-${{ github.event.release.tag_name }}-jar-with-dependencies.jar vripper-gui/target/vripper-noarch-gui-${{ github.event.release.tag_name }}.jar

    - if: matrix.os == 'ubuntu-latest'
-      name: Release GUI Jar
+      name: Release gui Jar
      uses: softprops/action-gh-release@v1
      with:
        files: vripper-gui/target/vripper-noarch-gui-${{ github.event.release.tag_name }}.jar

    # Start building WEB jar in ubuntu only
    - if: matrix.os == 'ubuntu-latest'
-      name: Build WEB Jar
+      name: Build web Jar
      run: |
        mvn -B -q install --file vripper-web-ui/pom.xml
        mvn -B -q install --file vripper-web/pom.xml
+        mv vripper-web/target/vripper-web-${{ github.event.release.tag_name }}.jar vripper-web/target/vripper-noarch-web-${{ github.event.release.tag_name }}.jar

    - if: matrix.os == 'ubuntu-latest'
-      name: Rename WEB Jar
-      run: mv vripper-web/target/vripper-web-${{ github.event.release.tag_name }}.jar vripper-web/target/vripper-noarch-web-${{ github.event.release.tag_name }}.jar
-
-    - if: matrix.os == 'ubuntu-latest'
-      name: Release WEB Jar
+      name: Release web Jar
      uses: softprops/action-gh-release@v1
      with:
        files: vripper-web/target/vripper-noarch-web-${{ github.event.release.tag_name }}.jar
@@ -62,7 +54,7 @@ jobs:
        cp vripper-gui/target/vripper-noarch-gui-${{ github.event.release.tag_name }}.jar jpackage/jar/vripper-gui.jar
        
    - if: matrix.os == 'ubuntu-latest'
-      name: Package Linux
+      name: Package for Linux
      run: |
        cd jpackage
        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-app-image.cfg" --icon icon.png
@@ -72,7 +64,7 @@ jobs:
        mv dist/vripper_${{ github.event.release.tag_name }}-1_amd64.deb dist/vripper-linux-${{ github.event.release.tag_name }}_amd64.deb

    - if: matrix.os == 'windows-latest'
-      name: Package Windows
+      name: Package for Windows
      run: |
        cd jpackage
        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-app-image.cfg" --icon icon.ico
@@ -83,14 +75,24 @@ jobs:
        ren VRipper-${{ github.event.release.tag_name }}.exe vripper-windows-installer-${{ github.event.release.tag_name }}.exe

    - if: matrix.os == 'macos-latest'
-      name: Package macOS
+      name: Package for macOS(arm64)
      run: |
        cd jpackage
        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-app-image.cfg" --icon icon.icns
        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-macos.cfg" --type pkg
        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-macos.cfg" --type dmg
-        mv dist/VRipper-${{ github.event.release.tag_name }}.pkg dist/vripper-macos-${{ github.event.release.tag_name }}.pkg
-        mv dist/VRipper-${{ github.event.release.tag_name }}.dmg dist/vripper-macos-${{ github.event.release.tag_name }}.dmg
+        mv dist/VRipper-${{ github.event.release.tag_name }}.pkg dist/vripper-macos-${{ github.event.release.tag_name }}.arm64.pkg
+        mv dist/VRipper-${{ github.event.release.tag_name }}.dmg dist/vripper-macos-${{ github.event.release.tag_name }}.arm64.dmg
+    
+    - if: matrix.os == 'macos-13'
+      name: Package for macOS(x86_64)
+      run: |
+        cd jpackage
+        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-app-image.cfg" --icon icon.icns
+        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-macos.cfg" --type pkg
+        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-macos.cfg" --type dmg
+        mv dist/VRipper-${{ github.event.release.tag_name }}.pkg dist/vripper-macos-${{ github.event.release.tag_name }}.x86_64.pkg
+        mv dist/VRipper-${{ github.event.release.tag_name }}.dmg dist/vripper-macos-${{ github.event.release.tag_name }}.x86_64.dmg

    - if: matrix.os == 'ubuntu-latest'
      name: Zip Ubuntu portable
@@ -111,13 +113,22 @@ jobs:
        filename: 'vripper-windows-portable-${{ github.event.release.tag_name }}.zip'

    - if: matrix.os == 'macos-latest'
-      name: Zip MacOS portable
+      name: Zip macOS(arm64) portable
      uses: thedoctor0/zip-release@0.7.1
      with:
        type: 'zip'
        directory: 'jpackage/dist'
        path: 'VRipper.app'
-        filename: 'vripper-macos-portable-${{ github.event.release.tag_name }}.zip'
+        filename: 'vripper-macos-portable-${{ github.event.release.tag_name }}.arm64.zip'
+    
+    - if: matrix.os == 'macos-13'
+      name: Zip macOS(x86_64) portable
+      uses: thedoctor0/zip-release@0.7.1
+      with:
+        type: 'zip'
+        directory: 'jpackage/dist'
+        path: 'VRipper.app'
+        filename: 'vripper-macos-portable-${{ github.event.release.tag_name }}.x86_64.zip'

    - if: matrix.os == 'ubuntu-latest'
      name: Release packages for Linux
@@ -138,10 +149,19 @@ jobs:
          jpackage/dist/vripper-windows-portable-${{ github.event.release.tag_name }}.zip

    - if: matrix.os == 'macos-latest'
-      name: Release packages for macOS
+      name: Release packages for macOS(arm64)
      uses: softprops/action-gh-release@v1
      with:
        files: |
-          jpackage/dist/vripper-macos-${{ github.event.release.tag_name }}.pkg
-          jpackage/dist/vripper-macos-${{ github.event.release.tag_name }}.dmg
-          jpackage/dist/vripper-macos-portable-${{ github.event.release.tag_name }}.zip
+          jpackage/dist/vripper-macos-${{ github.event.release.tag_name }}.arm64.pkg
+          jpackage/dist/vripper-macos-${{ github.event.release.tag_name }}.arm64.dmg
+          jpackage/dist/vripper-macos-portable-${{ github.event.release.tag_name }}.arm64.zip
+          
+    - if: matrix.os == 'macos-13'
+      name: Release packages for macOS(x86_64)
+      uses: softprops/action-gh-release@v1
+      with:
+        files: |
+          jpackage/dist/vripper-macos-${{ github.event.release.tag_name }}.x86_64.pkg
+          jpackage/dist/vripper-macos-${{ github.event.release.tag_name }}.x86_64.dmg
+          jpackage/dist/vripper-macos-portable-${{ github.event.release.tag_name }}.x86_64.zip
@@ -4,4 +4,5 @@
 /**/*/build-dir
 /**/*/java-runtime
 .idea
-.vripper
+.vripper
+.flattened-pom.xml
@@ -1,25 +1,43 @@
 # VRipper!

-This is my spin for a cross-platform gallery ripper for [vipergirls.to](https://vipergirls.to).
+This is my spin for a cross-platform gallery ripper for [vipergirls.to](https://vipergirls.to)

+![GitHub Image](/image.png)

-![1Jw0oq8h_o](https://github.com/UncleRoger33/vripper-project/assets/66418211/80b44389-7620-4e05-8696-4b62fa626b1b)
+## Donation
+To support this project, you can make a donation to its current maintainer

+[!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://buymeacoffee.com/devclaw)
+
+Or with Cryptocurrency
+
+ETH: 0xDdac82B16dC5E3D742fc915ffF583D8548A301cA
+
+BTC: bc1qcqudnkrndwyadsjwrxww42svkf8trnzx3c8vlr

 ## Requirements
-Direct access to vipergirls.to (or one of its [alternative domains](https://vipergirls.to/threads/5887340)), consider using a VPN otherwise.
+Direct access to `vipergirls.to` domain.

 ## Installing VRipper

-<img src="https://github.com/stashapp/stash/raw/develop/docs/readme_assets/windows_logo.svg" width="100%" height="75"> Windows | <img src="https://github.com/stashapp/stash/raw/develop/docs/readme_assets/mac_logo.svg" width="100%" height="75"> macOS | <img src="https://github.com/stashapp/stash/raw/develop/docs/readme_assets/linux_logo.svg" width="100%" height="75"> Linux  | <img src="https://images.vexels.com/media/users/3/166401/isolated/preview/b82aa7ac3f736dd78570dd3fa3fa9e24-java-programming-language-icon-by-vexels.png" width="100%" height="75"> Java
-:---:|:---:|:---:|:---:
-[Installer (EXE)](https://github.com/death-claw/vripper-project/releases/download/5.3.0/vripper-windows-installer-5.3.0.exe) <br /> [Installer (MSI)](https://github.com/death-claw/vripper-project/releases/download/5.3.0/vripper-windows-installer-5.3.0.msi) <br /> [Portable (ZIP)](https://github.com/death-claw/vripper-project/releases/download/5.3.0/vripper-windows-portable-5.3.0.zip) | [Installer (DMG)](https://github.com/death-claw/vripper-project/releases/download/5.3.0/vripper-macos-5.3.0.dmg) <br /> [Installer (PKG)](https://github.com/death-claw/vripper-project/releases/download/5.3.0/vripper-macos-5.3.0.pkg) <br /> [Portable (ZIP)](https://github.com/death-claw/vripper-project/releases/download/5.3.0/vripper-macos-portable-5.3.0.zip)  | [Linux (amd64) (DEB)](https://github.com/death-claw/vripper-project/releases/download/5.3.0/vripper-linux-5.3.0_amd64.deb) <br /> [Linux (x86_64) (RPM)](https://github.com/death-claw/vripper-project/releases/download/5.3.0/vripper-linux-5.3.0.x86_64.rpm) <br /> [Portable (ZIP)](https://github.com/death-claw/vripper-project/releases/download/5.3.0/vripper-linux-portable-5.3.0.zip) | [Java GUI (noarch)](https://github.com/death-claw/vripper-project/releases/download/5.3.0/vripper-noarch-gui-5.3.0.jar) <br /> [Java Web (noarch)](https://github.com/death-claw/vripper-project/releases/download/5.3.0/vripper-noarch-web-5.3.0.jar)
+<img src="https://github.com/stashapp/stash/raw/develop/docs/readme_assets/windows_logo.svg" width="100%" height="75"> Windows | <img src="https://github.com/stashapp/stash/raw/develop/docs/readme_assets/mac_logo.svg" width="100%" height="75"> macOS (Intel) | <img src="https://github.com/stashapp/stash/raw/develop/docs/readme_assets/mac_logo.svg" width="100%" height="75"> macOS (Apple silicon) | <img src="https://github.com/stashapp/stash/raw/develop/docs/readme_assets/linux_logo.svg" width="100%" height="75"> Linux  | <img src="https://images.vexels.com/media/users/3/166401/isolated/preview/b82aa7ac3f736dd78570dd3fa3fa9e24-java-programming-language-icon-by-vexels.png" width="100%" height="75"> Java
+:---:|:---:|:---:|:---:|:---:
+[Installer (EXE)](https://github.com/death-claw/vripper-project/releases/download/6.5.2/vripper-windows-installer-6.5.2.exe) <br /> [Installer (MSI)](https://github.com/death-claw/vripper-project/releases/download/6.5.2/vripper-windows-installer-6.5.2.msi) <br /> [Portable (ZIP)](https://github.com/death-claw/vripper-project/releases/download/6.5.2/vripper-windows-portable-6.5.2.zip) | [Installer (DMG)](https://github.com/death-claw/vripper-project/releases/download/6.5.2/vripper-macos-6.5.2.x86_64.dmg) <br /> [Installer (PKG)](https://github.com/death-claw/vripper-project/releases/download/6.5.2/vripper-macos-6.5.2.x86_64.pkg) <br /> [Portable (ZIP)](https://github.com/death-claw/vripper-project/releases/download/6.5.2/vripper-macos-portable-6.5.2.x86_64.zip) | [Installer (DMG)](https://github.com/death-claw/vripper-project/releases/download/6.5.2/vripper-macos-6.5.2.arm64.dmg) <br /> [Installer (PKG)](https://github.com/death-claw/vripper-project/releases/download/6.5.2/vripper-macos-6.5.2.arm64.pkg) <br /> [Portable (ZIP)](https://github.com/death-claw/vripper-project/releases/download/6.5.2/vripper-macos-portable-6.5.2.arm64.zip)  | [Linux (amd64) (DEB)](https://github.com/death-claw/vripper-project/releases/download/6.5.2/vripper-linux-6.5.2_amd64.deb) <br /> [Linux (x86_64) (RPM)](https://github.com/death-claw/vripper-project/releases/download/6.5.2/vripper-linux-6.5.2.x86_64.rpm) <br /> [Portable (ZIP)](https://github.com/death-claw/vripper-project/releases/download/6.5.2/vripper-linux-portable-6.5.2.zip) | [Java GUI (noarch)](https://github.com/death-claw/vripper-project/releases/download/6.5.2/vripper-noarch-gui-6.5.2.jar) <br /> [Java Web (noarch)](https://github.com/death-claw/vripper-project/releases/download/6.5.2/vripper-noarch-web-6.5.2.jar)

 Source code and previous versions are available on the [Releases page](https://github.com/death-claw/vripper-project/releases).  

-Application data (application logs, settings and persisted data) is stored in `HOME_FOLDER/vripper (Windows)` or `HOME_FOLDER/.config/vripper (Linux and macOS)`
+Application data (application logs, settings and persisted data) is stored in:  
+* Windows --> `C:\USERS\<your Windows username>\vripper` 
+* Linux and macOS --> `HOME_FOLDER/.config/vripper`


+## Important Note About Proxies
+The use of proxies within VRipper is worthless, please stop using them **for now**. You will get **403 error** codes.  
+
+**403** is a response code coming from Cloudflare to block VRipper from accessing the site, Cloudflare is doing the job it is supposed to do, which is blocking automated requests from accessing the site. 
+
+If your ISP is blocking access to `vipergirls.to` domain, consider using a VPN or [Cloudflare WARP](https://one.one.one.one/) to bypass the block.
+
 ## Supported Image Hosts
 The following hosts are supported:
 * acidimg.cc  
@@ -1,6 +1,6 @@
 --input jar
 --main-jar vripper-gui.jar
--add-modules java.base,java.desktop,java.sql,jdk.unsupported,jdk.crypto.ec,java.security.jgss
+--add-modules java.base,java.desktop,java.sql,jdk.unsupported,jdk.crypto.ec,java.security.jgss,java.net.http
 --jlink-options "--strip-native-commands --strip-debug --no-man-pages --no-header-files --compress=zip-6"
 --name VRipper
 --description "Image ripper tool for vipergirls"
@@ -1,181 +1,226 @@
 <?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"
-  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>
-  <groupId>me.vripper</groupId>
-  <artifactId>vripper-project</artifactId>
-  <packaging>pom</packaging>
-  <version>${revision}</version>
-  <properties>
-    <java.version>21</java.version>
-    <maven.deploy.skip>false</maven.deploy.skip>
-    <timestamp>${maven.build.timestamp}</timestamp>
-    <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
-    <maven.compiler.source>${java.version}</maven.compiler.source>
-    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <revision>5.4.0</revision>
-    <kotlin.version>1.9.22</kotlin.version>
-    <slf4j.version>2.0.12</slf4j.version>
-    <logback.version>1.5.0</logback.version>
-    <kotlinx-coroutines.version>1.8.0</kotlinx-coroutines.version>
-    <exposed.version>0.47.0</exposed.version>
-    <snakeyaml.version>2.0</snakeyaml.version>
-    <koin.version>3.5.3</koin.version>
-    <h2.version>2.2.224</h2.version>
-    <htmlcleaner.version>2.29</htmlcleaner.version>
-    <failsafe.version>2.4.4</failsafe.version>
-    <caffeine.version>3.1.8</caffeine.version>
-    <jna-platform.version>5.14.0</jna-platform.version>
-    <kotlinx-serialization-json.version>1.6.2</kotlinx-serialization-json.version>
-    <httpclient5.version>5.3.1</httpclient5.version>
-    <commons-codec.version>1.16.1</commons-codec.version>
-    <liquibase-core.version>4.26.0</liquibase-core.version>
-    <liquibase-slf4j.version>5.0.0</liquibase-slf4j.version>
-  </properties>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>flatten-maven-plugin</artifactId>
-        <version>1.1.0</version>
-        <configuration>
-          <updatePomFile>true</updatePomFile>
-          <flattenMode>resolveCiFriendliesOnly</flattenMode>
-        </configuration>
-        <executions>
-          <execution>
-            <id>flatten</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>flatten</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>flatten.clean</id>
-            <phase>clean</phase>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <modules>
-    <module>vripper-core</module>
-    <module>vripper-web-ui</module>
-    <module>vripper-web</module>
-    <module>vripper-gui</module>
-  </modules>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <artifactId>logback-classic</artifactId>
-        <groupId>ch.qos.logback</groupId>
-        <version>${logback.version}</version>
-      </dependency>
-      <dependency>
-        <artifactId>logback-core</artifactId>
-        <groupId>ch.qos.logback</groupId>
-        <version>${logback.version}</version>
-      </dependency>
-      <dependency>
-        <artifactId>kotlin-stdlib</artifactId>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <version>${kotlin.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jetbrains.kotlinx</groupId>
-        <artifactId>kotlinx-coroutines-core-jvm</artifactId>
-        <version>${kotlinx-coroutines.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jetbrains.exposed</groupId>
-        <artifactId>exposed-jdbc</artifactId>
-        <version>${exposed.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jetbrains.exposed</groupId>
-        <artifactId>exposed-java-time</artifactId>
-        <version>${exposed.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.yaml</groupId>
-        <artifactId>snakeyaml</artifactId>
-        <version>${snakeyaml.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.insert-koin</groupId>
-        <artifactId>koin-core-jvm</artifactId>
-        <version>${koin.version}</version>
-      </dependency>
-      <dependency>
-        <artifactId>h2</artifactId>
-        <groupId>com.h2database</groupId>
-        <version>${h2.version}</version>
-      </dependency>
-      <dependency>
-        <artifactId>htmlcleaner</artifactId>
-        <groupId>net.sourceforge.htmlcleaner</groupId>
-        <version>${htmlcleaner.version}</version>
-      </dependency>
-      <dependency>
-        <artifactId>failsafe</artifactId>
-        <groupId>net.jodah</groupId>
-        <version>${failsafe.version}</version>
-      </dependency>
-      <dependency>
-        <artifactId>caffeine</artifactId>
-        <groupId>com.github.ben-manes.caffeine</groupId>
-        <version>${caffeine.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>net.java.dev.jna</groupId>
-        <artifactId>jna-platform</artifactId>
-        <version>${jna-platform.version}</version>
-      </dependency>
-      <dependency>
-        <artifactId>kotlin-reflect</artifactId>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <version>${kotlin.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jetbrains.kotlinx</groupId>
-        <artifactId>kotlinx-serialization-json</artifactId>
-        <version>${kotlinx-serialization-json.version}</version>
-      </dependency>
-      <dependency>
-        <artifactId>jcl-over-slf4j</artifactId>
-        <groupId>org.slf4j</groupId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <artifactId>httpclient5</artifactId>
-        <groupId>org.apache.httpcomponents.client5</groupId>
-        <version>${httpclient5.version}</version>
-      </dependency>
-      <dependency>
-        <artifactId>commons-codec</artifactId>
-        <groupId>commons-codec</groupId>
-        <version>${commons-codec.version}</version>
-      </dependency>
-      <dependency>
-        <artifactId>liquibase-core</artifactId>
-        <groupId>org.liquibase</groupId>
-        <version>${liquibase-core.version}</version>
-      </dependency>
-      <dependency>
-        <artifactId>liquibase-slf4j</artifactId>
-        <groupId>com.mattbertolini</groupId>
-        <version>${liquibase-slf4j.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+         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">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>me.vripper</groupId>
+    <artifactId>vripper-project</artifactId>
+    <packaging>pom</packaging>
+    <version>${revision}</version>
+    <properties>
+        <java.version>21</java.version>
+        <maven.deploy.skip>false</maven.deploy.skip>
+        <timestamp>${maven.build.timestamp}</timestamp>
+        <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <revision>6.5.2</revision>
+        <kotlin.version>2.0.21</kotlin.version>
+        <slf4j.version>2.0.16</slf4j.version>
+        <logback.version>1.5.12</logback.version>
+        <kotlinx-coroutines.version>1.9.0</kotlinx-coroutines.version>
+        <exposed.version>0.55.0</exposed.version>
+        <snakeyaml.version>2.0</snakeyaml.version>
+        <koin.version>4.0.0</koin.version>
+        <h2.version>2.2.224</h2.version>
+        <htmlcleaner.version>2.29</htmlcleaner.version>
+        <failsafe.version>3.3.2</failsafe.version>
+        <caffeine.version>3.1.8</caffeine.version>
+        <jna-platform.version>5.14.0</jna-platform.version>
+        <kotlinx-serialization-json.version>1.7.3</kotlinx-serialization-json.version>
+        <httpclient5.version>5.4</httpclient5.version>
+        <httpcore5.version>5.3</httpcore5.version>
+        <liquibase-core.version>4.29.2</liquibase-core.version>
+        <liquibase-slf4j.version>5.0.0</liquibase-slf4j.version>
+        <grpc.kotlin.version>1.4.1</grpc.kotlin.version>
+        <java.grpc.version>1.68.1</java.grpc.version>
+        <protobuf.version>3.25.5</protobuf.version>
+        <sqlite-jdbc.version>3.47.0.0</sqlite-jdbc.version>
+        <bucket4j_jdk17-core.version>8.14.0</bucket4j_jdk17-core.version>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.1.0</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <modules>
+        <module>vripper-core</module>
+        <module>vripper-web-ui</module>
+        <module>vripper-web</module>
+        <module>vripper-gui</module>
+    </modules>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <artifactId>logback-classic</artifactId>
+                <groupId>ch.qos.logback</groupId>
+                <version>${logback.version}</version>
+            </dependency>
+            <dependency>
+                <artifactId>logback-core</artifactId>
+                <groupId>ch.qos.logback</groupId>
+                <version>${logback.version}</version>
+            </dependency>
+            <dependency>
+                <artifactId>kotlin-stdlib</artifactId>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <version>${kotlin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlinx</groupId>
+                <artifactId>kotlinx-coroutines-core-jvm</artifactId>
+                <version>${kotlinx-coroutines.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlinx</groupId>
+                <artifactId>kotlinx-coroutines-javafx</artifactId>
+                <version>${kotlinx-coroutines.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.exposed</groupId>
+                <artifactId>exposed-jdbc</artifactId>
+                <version>${exposed.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.exposed</groupId>
+                <artifactId>exposed-java-time</artifactId>
+                <version>${exposed.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.insert-koin</groupId>
+                <artifactId>koin-core-jvm</artifactId>
+                <version>${koin.version}</version>
+            </dependency>
+            <dependency>
+                <artifactId>h2</artifactId>
+                <groupId>com.h2database</groupId>
+                <version>${h2.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.xerial</groupId>
+                <artifactId>sqlite-jdbc</artifactId>
+                <version>${sqlite-jdbc.version}</version>
+            </dependency>
+            <dependency>
+                <artifactId>htmlcleaner</artifactId>
+                <groupId>net.sourceforge.htmlcleaner</groupId>
+                <version>${htmlcleaner.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>dev.failsafe</groupId>
+                <artifactId>failsafe</artifactId>
+                <version>${failsafe.version}</version>
+            </dependency>
+            <dependency>
+                <artifactId>caffeine</artifactId>
+                <groupId>com.github.ben-manes.caffeine</groupId>
+                <version>${caffeine.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna-platform</artifactId>
+                <version>${jna-platform.version}</version>
+            </dependency>
+            <dependency>
+                <artifactId>kotlin-reflect</artifactId>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <version>${kotlin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlinx</groupId>
+                <artifactId>kotlinx-serialization-json</artifactId>
+                <version>${kotlinx-serialization-json.version}</version>
+            </dependency>
+            <dependency>
+                <artifactId>jcl-over-slf4j</artifactId>
+                <groupId>org.slf4j</groupId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <artifactId>httpclient5</artifactId>
+                <groupId>org.apache.httpcomponents.client5</groupId>
+                <version>${httpclient5.version}</version>
+            </dependency>
+            <dependency>
+                <artifactId>httpcore5</artifactId>
+                <groupId>org.apache.httpcomponents.core5</groupId>
+                <version>${httpcore5.version}</version>
+            </dependency>
+            <dependency>
+                <artifactId>httpcore5-h2</artifactId>
+                <groupId>org.apache.httpcomponents.core5</groupId>
+                <version>${httpcore5.version}</version>
+            </dependency>
+            <dependency>
+                <artifactId>liquibase-core</artifactId>
+                <groupId>org.liquibase</groupId>
+                <version>${liquibase-core.version}</version>
+            </dependency>
+            <dependency>
+                <artifactId>liquibase-slf4j</artifactId>
+                <groupId>com.mattbertolini</groupId>
+                <version>${liquibase-slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-kotlin-stub</artifactId>
+                <version>${grpc.kotlin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-protobuf</artifactId>
+                <version>${java.grpc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-netty-shaded</artifactId>
+                <version>${java.grpc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-kotlin</artifactId>
+                <version>${protobuf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.bucket4j</groupId>
+                <artifactId>bucket4j_jdk17-core</artifactId>
+                <version>${bucket4j_jdk17-core.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>
@@ -35,10 +35,6 @@
            <groupId>org.jetbrains.kotlinx</groupId>
            <artifactId>kotlinx-coroutines-core-jvm</artifactId>
        </dependency>
-        <dependency>
-            <artifactId>kotlin-reflect</artifactId>
-            <groupId>org.jetbrains.kotlin</groupId>
-        </dependency>
        <dependency>
            <groupId>org.jetbrains.exposed</groupId>
            <artifactId>exposed-jdbc</artifactId>
@@ -55,6 +51,10 @@
            <artifactId>h2</artifactId>
            <groupId>com.h2database</groupId>
        </dependency>
+        <dependency>
+            <groupId>org.xerial</groupId>
+            <artifactId>sqlite-jdbc</artifactId>
+        </dependency>
        <dependency>
            <artifactId>httpclient5</artifactId>
            <groupId>org.apache.httpcomponents.client5</groupId>
@@ -69,16 +69,12 @@
        </dependency>
        <dependency>
            <artifactId>failsafe</artifactId>
-            <groupId>net.jodah</groupId>
+            <groupId>dev.failsafe</groupId>
        </dependency>
        <dependency>
            <artifactId>caffeine</artifactId>
            <groupId>com.github.ben-manes.caffeine</groupId>
        </dependency>
-        <dependency>
-            <artifactId>commons-codec</artifactId>
-            <groupId>commons-codec</groupId>
-        </dependency>
        <dependency>
            <groupId>net.java.dev.jna</groupId>
            <artifactId>jna-platform</artifactId>
@@ -92,19 +88,46 @@
            <groupId>com.mattbertolini</groupId>
            <scope>runtime</scope>
        </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>io.projectreactor</groupId>-->
-        <!--            <artifactId>reactor-core</artifactId>-->
-        <!--        </dependency>-->
-      <dependency>
-        <groupId>org.jetbrains.kotlinx</groupId>
-        <artifactId>kotlinx-serialization-json</artifactId>
-      </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-serialization-json</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-kotlin-stub</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-protobuf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-kotlin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.bucket4j</groupId>
+            <artifactId>bucket4j_jdk17-core</artifactId>
+        </dependency>
    </dependencies>

    <build>
        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
        <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>version</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>version</include>
+                </includes>
+            </resource>
+        </resources>
        <plugins>
            <plugin>
                <groupId>org.jetbrains.kotlin</groupId>
@@ -113,25 +136,85 @@
                <executions>
                    <execution>
                        <id>compile</id>
-                        <phase>compile</phase>
+                        <phase>process-sources</phase>
                        <goals>
                            <goal>compile</goal>
                        </goals>
                    </execution>
                </executions>
-              <configuration>
-                <jvmTarget>1.8</jvmTarget>
-                <compilerPlugins>
-                  <plugin>kotlinx-serialization</plugin>
-                </compilerPlugins>
-              </configuration>
-              <dependencies>
-                <dependency>
-                  <groupId>org.jetbrains.kotlin</groupId>
-                  <artifactId>kotlin-maven-serialization</artifactId>
-                  <version>${kotlin.version}</version>
-                </dependency>
-              </dependencies>
+                <configuration>
+                    <jvmTarget>21</jvmTarget>
+                    <compilerPlugins>
+                        <plugin>kotlinx-serialization</plugin>
+                    </compilerPlugins>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-maven-serialization</artifactId>
+                        <version>${kotlin.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>kr.motd.maven</groupId>
+                <artifactId>os-maven-plugin</artifactId>
+                <version>1.7.1</version>
+                <executions>
+                    <execution>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>detect</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.xolstice.maven.plugins</groupId>
+                <artifactId>protobuf-maven-plugin</artifactId>
+                <version>0.6.1</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <goals>
+                            <goal>compile</goal>
+                            <goal>compile-custom</goal>
+                        </goals>
+                        <configuration>
+                            <protocArtifact>
+                                com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
+                            </protocArtifact>
+                            <pluginId>grpc-java</pluginId>
+                            <pluginArtifact>
+                                io.grpc:protoc-gen-grpc-java:${java.grpc.version}:exe:${os.detected.classifier}
+                            </pluginArtifact>
+                            <protocPlugins>
+                                <protocPlugin>
+                                    <id>grpc-kotlin</id>
+                                    <groupId>io.grpc</groupId>
+                                    <artifactId>protoc-gen-grpc-kotlin</artifactId>
+                                    <version>${grpc.kotlin.version}</version>
+                                    <classifier>jdk8</classifier>
+                                    <mainClass>io.grpc.kotlin.generator.GeneratorRunner</mainClass>
+                                </protocPlugin>
+                            </protocPlugins>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>compile-kt</id>
+                        <goals>
+                            <goal>compile-custom</goal>
+                        </goals>
+                        <configuration>
+                            <protocArtifact>
+                                com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
+                            </protocArtifact>
+                            <outputDirectory>${project.build.directory}/generated-sources/protobuf/kotlin
+                            </outputDirectory>
+                            <pluginId>kotlin</pluginId>
+                        </configuration>
+                    </execution>
+                </executions>
            </plugin>
            <plugin>
                <artifactId>maven-jar-plugin</artifactId>
@@ -1,11 +1,17 @@
 package me.vripper

-import me.vripper.download.DownloadService
+import me.vripper.data.repositories.ImageRepository
+import me.vripper.data.repositories.MetadataRepository
+import me.vripper.data.repositories.PostRepository
+import me.vripper.data.repositories.ThreadRepository
+import me.vripper.data.repositories.impl.ImageRepositoryImpl
+import me.vripper.data.repositories.impl.MetadataRepositoryImpl
+import me.vripper.data.repositories.impl.PostRepositoryImpl
+import me.vripper.data.repositories.impl.ThreadRepositoryImpl
 import me.vripper.event.EventBus
 import me.vripper.host.*
-import me.vripper.repositories.*
-import me.vripper.repositories.impl.*
 import me.vripper.services.*
+import org.koin.core.qualifier.named
 import org.koin.dsl.bind
 import org.koin.dsl.module

@@ -16,11 +22,14 @@ val coreModule = module {
    single<SettingsService> {
        SettingsService(get())
    }
+    single<LogService> {
+        LogService(get())
+    }
    single<ImageRepository> {
        ImageRepositoryImpl()
    }
-    single<PostDownloadStateRepository> {
-        PostDownloadStateRepositoryImpl()
+    single<PostRepository> {
+        PostRepositoryImpl()
    }
    single<MetadataRepository> {
        MetadataRepositoryImpl()
@@ -28,35 +37,38 @@ val coreModule = module {
    single<ThreadRepository> {
        ThreadRepositoryImpl()
    }
-    single<LogRepository> {
-        LogRepositoryImpl(get())
-    }
    single<DataTransaction> {
-        DataTransaction(get(), get(), get(), get(), get(), get(), get())
+        DataTransaction(get(), get(), get(), get(), get(), get())
    }
    single<RetryPolicyService> {
        RetryPolicyService(get(), get())
    }
    single<HTTPService> {
-        HTTPService(get(), get())
+        HTTPService(get())
    }
    single<VGAuthService> {
-        VGAuthService(get(), get(), get())
+        VGAuthService(get(), get())
    }
    single<ThreadCacheService> {
-        ThreadCacheService(get())
+        ThreadCacheService(get(), get())
    }
    single<DownloadService> {
-        DownloadService(get(), get(), get(), get(), get())
+        DownloadService(get(), get(), get(), get())
    }
    single<DownloadSpeedService> {
        DownloadSpeedService(get())
    }
+
    single<AppEndpointService> {
-        AppEndpointService(get(), get(), get(), get())
+        AppEndpointService(get(), get(), get(), get(), get(), get())
    }
+
+    single((named("localAppEndpointService"))) {
+        AppEndpointService(get(), get(), get(), get(), get(), get())
+    } bind IAppEndpointService::class
+
    single<MetadataService> {
-        MetadataService(get(), get(), get(), get())
+        MetadataService(get(), get())
    }
    single {
        AcidimgHost(get(), get(), get())
@@ -0,0 +1,16 @@
+package me.vripper
+
+import ch.qos.logback.classic.spi.ILoggingEvent
+import ch.qos.logback.core.AppenderBase
+import org.apache.commons.collections4.queue.CircularFifoQueue
+
+class RingAppender : AppenderBase<ILoggingEvent>() {
+
+    object Static {
+        val events = CircularFifoQueue<ILoggingEvent>()
+    }
+
+    override fun append(event: ILoggingEvent) {
+        Static.events.offer(event)
+    }
+}
@@ -0,0 +1,20 @@
+package me.vripper.data.repositories
+
+import me.vripper.entities.ImageEntity
+import java.util.*
+
+internal interface ImageRepository {
+    fun save(imageEntity: ImageEntity): ImageEntity
+    fun save(imageEntityList: List<ImageEntity>)
+    fun deleteAllByPostId(postId: Long)
+    fun findByPostId(postId: Long): List<ImageEntity>
+    fun countError(): Int
+    fun findByPostIdAndIsNotCompleted(postId: Long): List<ImageEntity>
+    fun stopByPostIdAndIsNotCompleted(postId: Long): Int
+    fun stopByPostIdAndIsNotCompleted(): Int
+    fun findByPostIdAndIsError(postId: Long): List<ImageEntity>
+    fun findById(id: Long): Optional<ImageEntity>
+    fun update(imageEntity: ImageEntity)
+    fun update(imageEntities: List<ImageEntity>)
+    fun deleteAllByPostId(postIds: List<Long>)
+}
@@ -0,0 +1,11 @@
+package me.vripper.data.repositories
+
+import me.vripper.entities.MetadataEntity
+import java.util.*
+
+internal interface MetadataRepository {
+    fun save(metadataEntity: MetadataEntity): MetadataEntity
+    fun findByPostId(postId: Long): Optional<MetadataEntity>
+    fun deleteByPostId(postId: Long): Int
+    fun deleteAllByPostId(postIds: List<Long>)
+}
@@ -0,0 +1,20 @@
+package me.vripper.data.repositories
+
+import me.vripper.entities.PostEntity
+
+internal interface PostRepository {
+    fun save(postEntities: List<PostEntity>): List<PostEntity>
+    fun findByPostId(postId: Long): PostEntity?
+    fun findById(id: Long): PostEntity?
+    fun findCompleted(): List<Long>
+    fun findAll(): List<PostEntity>
+    fun existByPostId(postId: Long): Boolean
+    fun setDownloadingToStopped(): Int
+    fun deleteByPostId(postId: Long): Int
+    fun update(postEntity: PostEntity)
+    fun update(postEntities: List<PostEntity>)
+    fun findMaxRank(): Int?
+    fun deleteAll(postIds: List<Long>)
+    fun stopAll()
+    fun findAllNonCompletedPostIds(): List<Long>
+}
@@ -0,0 +1,14 @@
+package me.vripper.data.repositories
+
+import me.vripper.entities.ThreadEntity
+import java.util.*
+
+internal interface ThreadRepository {
+    fun save(threadEntity: ThreadEntity): ThreadEntity
+    fun update(threadEntity: ThreadEntity)
+    fun findByThreadId(threadId: Long): Optional<ThreadEntity>
+    fun findAll(): List<ThreadEntity>
+    fun findById(id: Long): Optional<ThreadEntity>
+    fun deleteByThreadId(threadId: Long): Int
+    fun deleteAll()
+}
@@ -1,34 +1,34 @@
-package me.vripper.repositories.impl
+package me.vripper.data.repositories.impl

-import me.vripper.entities.Image
-import me.vripper.entities.domain.Status
-import me.vripper.repositories.ImageRepository
-import me.vripper.tables.ImageTable
+import me.vripper.data.repositories.ImageRepository
+import me.vripper.data.tables.ImageTable
+import me.vripper.entities.ImageEntity
+import me.vripper.entities.Status
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.transactions.TransactionManager
 import java.sql.Connection
 import java.util.*

-class ImageRepositoryImpl : ImageRepository {
-    override fun save(image: Image): Image {
+internal class ImageRepositoryImpl : ImageRepository {
+    override fun save(imageEntity: ImageEntity): ImageEntity {
        val id = ImageTable.insertAndGetId {
-            it[downloaded] = image.downloaded
-            it[host] = image.host
-            it[index] = image.index
-            it[postId] = image.postId
-            it[status] = image.status.name
-            it[size] = image.size
-            it[url] = image.url
-            it[thumbUrl] = image.thumbUrl
-            it[postIdRef] = image.postIdRef
-            it[filename] = image.filename
+            it[downloaded] = imageEntity.downloaded
+            it[host] = imageEntity.host
+            it[index] = imageEntity.index
+            it[postId] = imageEntity.postId
+            it[status] = imageEntity.status.name
+            it[size] = imageEntity.size
+            it[url] = imageEntity.url
+            it[thumbUrl] = imageEntity.thumbUrl
+            it[postIdRef] = imageEntity.postIdRef
+            it[filename] = imageEntity.filename
        }.value
-        return image.copy(id = id)
+        return imageEntity.copy(id = id)
    }

-    override fun save(imageList: List<Image>) {
-        ImageTable.batchInsert(imageList, shouldReturnGeneratedValues = false) {
+    override fun save(imageEntityList: List<ImageEntity>) {
+        ImageTable.batchInsert(imageEntityList, shouldReturnGeneratedValues = false) {
            this[ImageTable.downloaded] = it.downloaded
            this[ImageTable.host] = it.host
            this[ImageTable.index] = it.index
@@ -46,22 +46,22 @@ class ImageRepositoryImpl : ImageRepository {
        ImageTable.deleteWhere { ImageTable.postId eq postId }
    }

-    override fun findByPostId(postId: Long): List<Image> {
-        return ImageTable.select {
+    override fun findByPostId(postId: Long): List<ImageEntity> {
+        return ImageTable.selectAll().where {
            ImageTable.postId eq postId
        }.map(this::transform)
    }

    override fun countError(): Int {
        return ImageTable
-            .slice(ImageTable.id)
-            .select { ImageTable.status eq Status.ERROR.name }
+            .select(ImageTable.id)
+            .where { ImageTable.status eq Status.ERROR.name }
            .count().toInt()
    }

-    override fun findByPostIdAndIsNotCompleted(postId: Long): List<Image> {
+    override fun findByPostIdAndIsNotCompleted(postId: Long): List<ImageEntity> {
        return ImageTable
-            .select {
+            .selectAll().where {
                (ImageTable.postId eq postId) and (ImageTable.status neq Status.FINISHED.name)
            }.map(this::transform)
    }
@@ -78,14 +78,14 @@ class ImageRepositoryImpl : ImageRepository {
        }
    }

-    override fun findByPostIdAndIsError(postId: Long): List<Image> {
-        return ImageTable.select {
+    override fun findByPostIdAndIsError(postId: Long): List<ImageEntity> {
+        return ImageTable.selectAll().where {
            (ImageTable.postId eq postId) and (ImageTable.status eq Status.ERROR.name)
        }.map(this::transform)
    }

-    override fun findById(id: Long): Optional<Image> {
-        val result = ImageTable.select {
+    override fun findById(id: Long): Optional<ImageEntity> {
+        val result = ImageTable.selectAll().where {
            ImageTable.id eq id
        }.map(this::transform)
        return if (result.isEmpty()) {
@@ -95,17 +95,17 @@ class ImageRepositoryImpl : ImageRepository {
        }
    }

-    override fun update(image: Image) {
-        ImageTable.update({ ImageTable.id eq image.id }) {
-            it[status] = image.status.name
-            it[downloaded] = image.downloaded
-            it[size] = image.size
-            it[filename] = image.filename
+    override fun update(imageEntity: ImageEntity) {
+        ImageTable.update({ ImageTable.id eq imageEntity.id }) {
+            it[status] = imageEntity.status.name
+            it[downloaded] = imageEntity.downloaded
+            it[size] = imageEntity.size
+            it[filename] = imageEntity.filename
        }
    }

-    override fun update(images: List<Image>) {
-        ImageTable.batchUpsert(images, shouldReturnGeneratedValues = false) {
+    override fun update(imageEntities: List<ImageEntity>) {
+        ImageTable.batchUpsert(imageEntities, shouldReturnGeneratedValues = false) {
            this[ImageTable.id] = it.id
            this[ImageTable.downloaded] = it.downloaded
            this[ImageTable.host] = it.host
@@ -122,7 +122,7 @@ class ImageRepositoryImpl : ImageRepository {

    override fun deleteAllByPostId(postIds: List<Long>) {
        val conn = TransactionManager.current().connection.connection as Connection
-        conn.prepareStatement("CREATE LOCAL TEMPORARY TABLE IMAGES_DELETE(POST_ID BIGINT PRIMARY KEY)")
+        conn.prepareStatement("CREATE TEMPORARY TABLE IMAGES_DELETE(POST_ID BIGINT PRIMARY KEY)")
            .use {
                it.execute()
            }
@@ -140,10 +140,12 @@ class ImageRepositoryImpl : ImageRepository {
                it.execute()
            }

-        conn.prepareStatement("TRUNCATE TABLE IMAGES_DELETE")
+        conn.prepareStatement("DELETE FROM IMAGES_DELETE").use {
+            it.execute()
+        }
    }

-    private fun transform(resultRow: ResultRow): Image {
+    private fun transform(resultRow: ResultRow): ImageEntity {
        val id = resultRow[ImageTable.id].value
        val postId = resultRow[ImageTable.postId]
        val url = resultRow[ImageTable.url]
@@ -155,7 +157,7 @@ class ImageRepositoryImpl : ImageRepository {
        val status = Status.valueOf(resultRow[ImageTable.status])
        val postIdRef = resultRow[ImageTable.postIdRef]
        val filename = resultRow[ImageTable.filename]
-        return Image(
+        return ImageEntity(
            id,
            postId,
            url,
@@ -1,33 +1,33 @@
-package me.vripper.repositories.impl
+package me.vripper.data.repositories.impl

 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import me.vripper.entities.Metadata
-import me.vripper.repositories.MetadataRepository
-import me.vripper.tables.MetadataTable
+import me.vripper.data.repositories.MetadataRepository
+import me.vripper.data.tables.MetadataTable
+import me.vripper.entities.MetadataEntity
 import org.jetbrains.exposed.sql.ResultRow
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.deleteWhere
 import org.jetbrains.exposed.sql.insert
-import org.jetbrains.exposed.sql.select
+import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.TransactionManager
 import java.sql.Connection
 import java.util.*

-class MetadataRepositoryImpl: MetadataRepository {
+internal class MetadataRepositoryImpl : MetadataRepository {

-    override fun save(metadata: Metadata): Metadata {
+    override fun save(metadataEntity: MetadataEntity): MetadataEntity {
        MetadataTable.insert {
-            it[postId] = metadata.postId
-            it[data] = Json.encodeToString(metadata.data)
+            it[postId] = metadataEntity.postId
+            it[data] = Json.encodeToString(metadataEntity.data)
        }

-        return metadata
+        return metadataEntity
    }

-    override fun findByPostId(postId: Long): Optional<Metadata> {
+    override fun findByPostId(postId: Long): Optional<MetadataEntity> {

-        val result = MetadataTable.select {
+        val result = MetadataTable.selectAll().where {
            MetadataTable.postId eq postId
        }.map(::transform)

@@ -38,10 +38,10 @@ class MetadataRepositoryImpl: MetadataRepository {
        }
    }

-    private fun transform(row: ResultRow): Metadata {
+    private fun transform(row: ResultRow): MetadataEntity {
        val id = row[MetadataTable.postId]
-        val data = Json.decodeFromString(row[MetadataTable.data]) as Metadata.Data
-        return Metadata(id, data)
+        val data = Json.decodeFromString(row[MetadataTable.data]) as MetadataEntity.Data
+        return MetadataEntity(id, data)
    }

    override fun deleteByPostId(postId: Long): Int {
@@ -50,7 +50,7 @@ class MetadataRepositoryImpl: MetadataRepository {

    override fun deleteAllByPostId(postIds: List<Long>) {
        val conn = TransactionManager.current().connection.connection as Connection
-        conn.prepareStatement("CREATE LOCAL TEMPORARY TABLE METADATA_DELETE(POST_ID BIGINT PRIMARY KEY)")
+        conn.prepareStatement("CREATE TEMPORARY TABLE METADATA_DELETE(POST_ID BIGINT PRIMARY KEY)")
            .use {
                it.execute()
            }
@@ -68,6 +68,8 @@ class MetadataRepositoryImpl: MetadataRepository {
                it.execute()
            }

-        conn.prepareStatement("TRUNCATE TABLE METADATA_DELETE")
+        conn.prepareStatement("DELETE FROM METADATA_DELETE").use {
+            it.execute()
+        }
    }
 }
@@ -1,22 +1,21 @@
-package me.vripper.repositories.impl
+package me.vripper.data.repositories.impl

-import me.vripper.entities.Post
-import me.vripper.entities.domain.Status
-import me.vripper.repositories.PostDownloadStateRepository
-import me.vripper.tables.PostTable
+import me.vripper.data.repositories.PostRepository
+import me.vripper.data.tables.PostTable
+import me.vripper.entities.PostEntity
+import me.vripper.entities.Status
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.transactions.TransactionManager
 import java.sql.Connection
-import java.util.*

-class PostDownloadStateRepositoryImpl :
-    PostDownloadStateRepository {
+internal class PostRepositoryImpl :
+    PostRepository {

    private val delimiter = ";"

-    override fun save(posts: List<Post>): List<Post> {
-        return PostTable.batchInsert(posts, shouldReturnGeneratedValues = true) { post ->
+    override fun save(postEntities: List<PostEntity>): List<PostEntity> {
+        return PostTable.batchInsert(postEntities, shouldReturnGeneratedValues = true) { post ->
            this[PostTable.status] = post.status.name
            this[PostTable.done] = post.done
            this[PostTable.total] = post.total
@@ -37,41 +36,32 @@ class PostDownloadStateRepositoryImpl :
        }.map(::transform)
    }

-    override fun findByPostId(postId: Long): Optional<Post> {
-        val result = PostTable.select {
+    override fun findByPostId(postId: Long): PostEntity? {
+        val result = PostTable.selectAll().where {
            PostTable.postId eq postId
        }.map(::transform)
-        return if (result.isEmpty()) {
-            Optional.empty()
-        } else {
-            Optional.of(result.first())
-        }
+        return result.firstOrNull()
    }

    override fun findCompleted(): List<Long> {
-        return PostTable.slice(PostTable.postId).select {
+        return PostTable.select(PostTable.postId).where {
            (PostTable.status eq Status.FINISHED.name) and (PostTable.done greaterEq PostTable.total)
        }.map { it[PostTable.postId] }
    }

-    override fun findById(id: Long): Optional<Post> {
-        val result = PostTable.select {
+    override fun findById(id: Long): PostEntity? {
+        val result = PostTable.selectAll().where {
            PostTable.id eq id
        }.map { transform(it) }
-
-        return if (result.isEmpty()) {
-            Optional.empty()
-        } else {
-            Optional.of(result.first())
-        }
+        return result.firstOrNull()
    }

-    override fun findAll(): List<Post> {
+    override fun findAll(): List<PostEntity> {
        return PostTable.selectAll().map { transform(it) }
    }

    override fun existByPostId(postId: Long): Boolean {
-        return PostTable.slice(PostTable.id).select { PostTable.postId eq postId }.count() > 0
+        return PostTable.select(PostTable.id).where { PostTable.postId eq postId }.count() > 0
    }

    override fun setDownloadingToStopped(): Int {
@@ -84,19 +74,19 @@ class PostDownloadStateRepositoryImpl :
        return PostTable.deleteWhere { PostTable.postId eq postId }
    }

-    override fun update(post: Post) {
-        PostTable.update({ PostTable.id eq post.id }) {
-            it[status] = post.status.name
-            it[done] = post.done
-            it[rank] = post.rank
-            it[size] = post.size
-            it[downloaded] = post.downloaded
-            it[folderName] = post.folderName
+    override fun update(postEntity: PostEntity) {
+        PostTable.update({ PostTable.id eq postEntity.id }) {
+            it[status] = postEntity.status.name
+            it[done] = postEntity.done
+            it[rank] = postEntity.rank
+            it[size] = postEntity.size
+            it[downloaded] = postEntity.downloaded
+            it[folderName] = postEntity.folderName
        }
    }

-    override fun update(posts: List<Post>) {
-        PostTable.batchUpsert(posts, shouldReturnGeneratedValues = false) { post ->
+    override fun update(postEntities: List<PostEntity>) {
+        PostTable.batchUpsert(postEntities, shouldReturnGeneratedValues = false) { post ->
            this[PostTable.id] = post.id
            this[PostTable.status] = post.status.name
            this[PostTable.done] = post.done
@@ -118,15 +108,14 @@ class PostDownloadStateRepositoryImpl :
    }

    override fun findMaxRank(): Int? {
-        return PostTable.slice(PostTable.rank.max())
-            .selectAll()
+        return PostTable.select(PostTable.rank.max())
            .firstOrNull()
            ?.get(PostTable.rank.max())
    }

    override fun deleteAll(postIds: List<Long>) {
        val conn = TransactionManager.current().connection.connection as Connection
-        conn.prepareStatement("CREATE LOCAL TEMPORARY TABLE POSTS_DELETE(POST_ID BIGINT PRIMARY KEY)")
+        conn.prepareStatement("CREATE TEMPORARY TABLE POSTS_DELETE(POST_ID BIGINT PRIMARY KEY)")
            .use {
                it.execute()
            }
@@ -144,7 +133,9 @@ class PostDownloadStateRepositoryImpl :
                it.execute()
            }

-        conn.prepareStatement("TRUNCATE TABLE POSTS_DELETE")
+        conn.prepareStatement("DELETE FROM POSTS_DELETE").use {
+            it.execute()
+        }
    }

    override fun stopAll() {
@@ -154,12 +145,12 @@ class PostDownloadStateRepositoryImpl :
    }

    override fun findAllNonCompletedPostIds(): List<Long> {
-        return PostTable.slice(PostTable.postId).select {
+        return PostTable.select(PostTable.postId).where {
            PostTable.status neq Status.FINISHED.name
        }.map { it[PostTable.postId] }
    }

-    private fun transform(resultRow: ResultRow): Post {
+    private fun transform(resultRow: ResultRow): PostEntity {
        val id = resultRow[PostTable.id].value
        val status = Status.valueOf(resultRow[PostTable.status])
        val postId = resultRow[PostTable.postId]
@@ -179,7 +170,7 @@ class PostDownloadStateRepositoryImpl :
        val rank = resultRow[PostTable.rank]
        val size = resultRow[PostTable.size]
        val downloaded = resultRow[PostTable.downloaded]
-        return Post(
+        return PostEntity(
            id,
            postTitle,
            threadTitle,
@@ -1,33 +1,33 @@
-package me.vripper.repositories.impl
+package me.vripper.data.repositories.impl

-import me.vripper.entities.Thread
-import me.vripper.repositories.ThreadRepository
-import me.vripper.tables.ThreadTable
+import me.vripper.data.repositories.ThreadRepository
+import me.vripper.data.tables.ThreadTable
+import me.vripper.entities.ThreadEntity
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import java.util.*

-class ThreadRepositoryImpl : ThreadRepository {
+internal class ThreadRepositoryImpl : ThreadRepository {

-    override fun save(thread: Thread): Thread {
+    override fun save(threadEntity: ThreadEntity): ThreadEntity {
        val id = ThreadTable.insertAndGetId {
-            it[title] = thread.title
-            it[total] = thread.total
-            it[url] = thread.link
-            it[threadId] = thread.threadId
+            it[title] = threadEntity.title
+            it[total] = threadEntity.total
+            it[url] = threadEntity.link
+            it[threadId] = threadEntity.threadId
        }.value
-        return thread.copy(id = id)
+        return threadEntity.copy(id = id)
    }

-    override fun update(thread: Thread) {
-        ThreadTable.update({ ThreadTable.id eq thread.id }) {
-            it[title] = thread.title
-            it[total] = thread.total
+    override fun update(threadEntity: ThreadEntity) {
+        ThreadTable.update({ ThreadTable.id eq threadEntity.id }) {
+            it[title] = threadEntity.title
+            it[total] = threadEntity.total
        }
    }

-    override fun findByThreadId(threadId: Long): Optional<Thread> {
-        val result = ThreadTable.select {
+    override fun findByThreadId(threadId: Long): Optional<ThreadEntity> {
+        val result = ThreadTable.selectAll().where {
            ThreadTable.threadId eq threadId
        }.map(this::transform)
        return if (result.isEmpty()) {
@@ -37,12 +37,12 @@ class ThreadRepositoryImpl : ThreadRepository {
        }
    }

-    override fun findAll(): List<Thread> {
+    override fun findAll(): List<ThreadEntity> {
        return ThreadTable.selectAll().map(this::transform)
    }

-    override fun findById(id: Long): Optional<Thread> {
-        val result = ThreadTable.select {
+    override fun findById(id: Long): Optional<ThreadEntity> {
+        val result = ThreadTable.selectAll().where {
            ThreadTable.id eq id
        }.map(this::transform)
        return if (result.isEmpty()) {
@@ -60,12 +60,12 @@ class ThreadRepositoryImpl : ThreadRepository {
        ThreadTable.deleteAll()
    }

-    private fun transform(resultRow: ResultRow): Thread {
+    private fun transform(resultRow: ResultRow): ThreadEntity {
        val id = resultRow[ThreadTable.id].value
        val title = resultRow[ThreadTable.title]
        val url = resultRow[ThreadTable.url]
        val threadId = resultRow[ThreadTable.threadId]
        val total = resultRow[ThreadTable.total]
-        return Thread(id, title, url, threadId, total)
+        return ThreadEntity(id, title, url, threadId, total)
    }
 }
@@ -1,8 +1,8 @@
-package me.vripper.tables
+package me.vripper.data.tables

 import org.jetbrains.exposed.dao.id.LongIdTable

-object ImageTable : LongIdTable(name = "IMAGE", columnName = "ID") {
+internal object ImageTable : LongIdTable(name = "IMAGE", columnName = "ID") {
    val downloaded = long("DOWNLOADED")
    val host = byte("HOST")
    val index = integer("INDEX")
@@ -12,5 +12,5 @@ object ImageTable : LongIdTable(name = "IMAGE", columnName = "ID") {
    val size = long("SIZE")
    val url = varchar("URL", 200)
    val thumbUrl = varchar("THUMB_URL", 200)
-    val postIdRef = long("POST_ID_REF").references(PostTable.id, fkName = "IMAGE_POST_ID_REF_POST_ID_FK")
+    val postIdRef = long("POST_ID_REF").references(id, fkName = "IMAGE_POST_ID_REF_POST_ID_FK")
 }
@@ -1,8 +1,8 @@
-package me.vripper.tables
+package me.vripper.data.tables

 import org.jetbrains.exposed.sql.Table

-object MetadataTable : Table(name = "METADATA") {
+internal object MetadataTable : Table(name = "METADATA") {
    val postId = long("POST_ID")
    val data = varchar("DATA", 1_000_000)
 }
@@ -1,10 +1,10 @@
-package me.vripper.tables
+package me.vripper.data.tables

 import org.jetbrains.exposed.dao.id.LongIdTable
 import org.jetbrains.exposed.sql.javatime.datetime
 import java.time.LocalDateTime

-object PostTable : LongIdTable(name = "POST", columnName = "ID") {
+internal object PostTable : LongIdTable(name = "POST", columnName = "ID") {
    val done = integer("DONE")
    val hosts = varchar("HOSTS", 255)
    val outputPath = varchar("OUTPUT_PATH", 260)
@@ -1,8 +1,8 @@
-package me.vripper.tables
+package me.vripper.data.tables

 import org.jetbrains.exposed.dao.id.LongIdTable

-object ThreadTable : LongIdTable("THREAD", columnName = "ID") {
+internal object ThreadTable : LongIdTable("THREAD", columnName = "ID") {
    val total = integer("TOTAL").default(0)
    val url = varchar("URL", 200)
    val threadId = long("THREAD_ID")
@@ -1,294 +0,0 @@
-package me.vripper.download
-
-import kotlinx.coroutines.*
-import me.vripper.entities.Image
-import me.vripper.entities.LogEntry
-import me.vripper.entities.Post
-import me.vripper.entities.domain.Status
-import me.vripper.event.ErrorCountEvent
-import me.vripper.event.EventBus
-import me.vripper.event.QueueStateEvent
-import me.vripper.event.StoppedEvent
-import me.vripper.host.Host
-import me.vripper.model.ErrorCount
-import me.vripper.model.QueueState
-import me.vripper.services.DataTransaction
-import me.vripper.services.RetryPolicyService
-import me.vripper.services.SettingsService
-import me.vripper.services.VGAuthService
-import me.vripper.utilities.GLOBAL_EXECUTOR
-import me.vripper.utilities.formatToString
-import net.jodah.failsafe.Failsafe
-import net.jodah.failsafe.RetryPolicy
-import org.jetbrains.exposed.sql.transactions.transaction
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.locks.ReentrantLock
-import kotlin.concurrent.withLock
-
-class DownloadService(
-    private val settingsService: SettingsService,
-    private val dataTransaction: DataTransaction,
-    private val retryPolicyService: RetryPolicyService,
-    private val vgAuthService: VGAuthService,
-    private val eventBus: EventBus
-) {
-    private val maxPoolSize: Int = 24
-    private val log by me.vripper.delegate.LoggerDelegate()
-    private val running: MutableMap<Byte, MutableList<ImageDownloadRunnable>> = mutableMapOf()
-    private val pending: MutableMap<Byte, MutableList<ImageDownloadRunnable>> = mutableMapOf()
-    private val lock = ReentrantLock()
-    private val condition = lock.newCondition()
-    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
-
-    fun init() {
-        Thread.ofVirtual().name("Download Loop").unstarted(Runnable {
-            val accepted: MutableList<ImageDownloadRunnable> = mutableListOf()
-            val candidates: MutableList<ImageDownloadRunnable> = mutableListOf()
-            while (!Thread.currentThread().isInterrupted) {
-                lock.withLock {
-                    candidates.addAll(getCandidates(candidateCount()))
-                    candidates.forEach {
-                        if (canRun(it.context.image.host)) {
-                            accepted.add(it)
-                            running[it.context.image.host]!!.add(it)
-                            log.debug("${it.context.image.url} accepted to run")
-                        }
-                    }
-                    accepted.forEach {
-                        pending[it.context.image.host]?.remove(it)
-                        scheduleForDownload(it)
-                    }
-                    accepted.clear()
-                    candidates.clear()
-                    try {
-                        condition.await()
-                    } catch (e: InterruptedException) {
-                        Thread.currentThread().interrupt()
-                    }
-                }
-            }
-        }).start()
-    }
-
-    fun stop(postIds: List<Long> = emptyList()) {
-        if (postIds.isNotEmpty()) {
-            stopInternal(postIds)
-        } else {
-            stopAll()
-        }
-        coroutineScope.launch {
-            eventBus.publishEvent(StoppedEvent(postIds))
-        }
-    }
-
-    fun restartAll(postIds: List<Post> = emptyList()) {
-        if (postIds.isNotEmpty()) {
-            restart(postIds.associateWith { dataTransaction.findByPostIdAndIsNotCompleted(it.postId) })
-        } else {
-            restart(dataTransaction.findAllPosts()
-                .associateWith { dataTransaction.findByPostIdAndIsNotCompleted(it.postId) })
-        }
-    }
-
-    private fun restart(posts: Map<Post, List<Image>>) {
-        lock.withLock {
-            val toProcess = mutableMapOf<Post, List<Image>>()
-
-            for ((post, images) in posts) {
-                if (images.isEmpty()) {
-                    continue
-                }
-                if (isPending(post.postId)) {
-                    log.warn("Cannot restart, jobs are currently running for post id $posts")
-                    continue
-                }
-                toProcess[post] = images
-            }
-
-            toProcess.forEach { (post, images) ->
-                post.status = Status.PENDING
-                images.forEach { image ->
-                    with(image) {
-                        this.status = Status.PENDING
-                        this.downloaded = 0
-                    }
-                }
-            }
-
-            transaction {
-                dataTransaction.updatePosts(
-                    toProcess.keys.toList()
-                )
-                dataTransaction.updateImages(
-                    toProcess.values.flatten()
-                )
-            }
-
-            toProcess.keys.forEach {
-                vgAuthService.leaveThanks(it)
-            }
-
-
-            toProcess.entries.forEach { (post, images) ->
-                images.forEach { image ->
-                    log.debug("Enqueuing a job for ${image.url}")
-                    val imageDownloadRunnable = ImageDownloadRunnable(
-                        image, post.rank, settingsService.settings
-                    )
-                    pending.computeIfAbsent(
-                        image.host
-                    ) { mutableListOf() }
-                    pending[image.host]!!.add(imageDownloadRunnable)
-                }
-            }
-
-            condition.signal()
-        }
-    }
-
-    private fun isPending(postId: Long): Boolean {
-        return pending.values.flatten().any { it.context.image.postId == postId }
-    }
-
-    private fun isRunning(postId: Long): Boolean {
-        return running.values.flatten().any { it.context.image.postId == postId }
-    }
-
-    private fun stopAll() {
-        lock.withLock {
-            pending.values.clear()
-            running.values.flatten().forEach { obj: ImageDownloadRunnable -> obj.stop() }
-            dataTransaction.findAllNonCompletedPostIds().forEach {
-                dataTransaction.stopImagesByPostIdAndIsNotCompleted(it)
-                dataTransaction.finishPost(it)
-            }
-        }
-    }
-
-    private fun stopInternal(postIds: List<Long>) {
-        lock.withLock {
-            for (postId in postIds) {
-                pending.values.forEach { pending ->
-                    pending.removeIf { it.context.image.postId == postId }
-                }
-                running.values.flatten()
-                    .filter { p: ImageDownloadRunnable -> p.context.image.postId == postId }
-                    .forEach { obj: ImageDownloadRunnable -> obj.stop() }
-            }
-            postIds.forEach {
-                dataTransaction.stopImagesByPostIdAndIsNotCompleted(it)
-                dataTransaction.finishPost(it)
-            }
-        }
-    }
-
-    private fun canRun(host: Byte): Boolean {
-        val totalRunning = running.values.sumOf { it.size }
-        return (running[host]!!.size < settingsService.settings.connectionSettings.maxConcurrentPerHost && if (settingsService.settings.connectionSettings.maxGlobalConcurrent == 0) totalRunning < maxPoolSize else totalRunning < settingsService.settings.connectionSettings.maxGlobalConcurrent)
-    }
-
-    private fun candidateCount(): Map<Byte, Int> {
-        val map: MutableMap<Byte, Int> = mutableMapOf()
-        Host.getHosts().values.forEach { host: Byte ->
-            val imageDownloadRunnableList: List<ImageDownloadRunnable> = running.computeIfAbsent(
-                host
-            ) { mutableListOf() }
-            val count: Int =
-                settingsService.settings.connectionSettings.maxConcurrentPerHost - imageDownloadRunnableList.size
-            log.debug("Download slots for $host: $count")
-            map[host] = count
-        }
-        return map
-    }
-
-    private fun getCandidates(candidateCount: Map<Byte, Int>): List<ImageDownloadRunnable> {
-        val hostIntegerMap: MutableMap<Byte, Int> = candidateCount.toMutableMap()
-        val candidates: MutableList<ImageDownloadRunnable> = mutableListOf()
-        hosts@ for (host in pending.keys) {
-
-            val list: List<ImageDownloadRunnable> =
-                pending[host]!!.sortedWith(Comparator.comparingInt<ImageDownloadRunnable> { it.postRank }
-                    .thenComparingInt { it.context.image.index })
-
-            for (imageDownloadRunnable in list) {
-                val count = hostIntegerMap[host] ?: 0
-                if (count > 0) {
-                    candidates.add(imageDownloadRunnable)
-                    hostIntegerMap[host] = count - 1
-                } else {
-                    continue@hosts
-                }
-            }
-        }
-        return candidates
-    }
-
-    private fun scheduleForDownload(imageDownloadRunnable: ImageDownloadRunnable) {
-        log.debug("Scheduling a job for ${imageDownloadRunnable.context.image.url}")
-        CompletableFuture.runAsync({
-            coroutineScope.launch {
-                eventBus.publishEvent(QueueStateEvent(QueueState(runningCount(), pendingCount())))
-            }
-            Failsafe.with<Any, RetryPolicy<Any>>(retryPolicyService.buildRetryPolicyForDownload())
-                .onFailure {
-                    try {
-                        dataTransaction.saveLog(
-                            LogEntry(
-                                type = LogEntry.Type.DOWNLOAD,
-                                status = LogEntry.Status.ERROR,
-                                message = "Failed to download ${imageDownloadRunnable.context.image.url}\n ${it.failure.formatToString()}"
-                            )
-                        )
-                    } catch (exp: Exception) {
-                        log.error("Failed to save event", exp)
-                    }
-                    log.error(
-                        "Failed to download ${imageDownloadRunnable.context.image.url} after ${it.attemptCount} tries",
-                        it.failure
-                    )
-                    val image = imageDownloadRunnable.context.image
-                    image.status = Status.ERROR
-                    dataTransaction.updateImage(image)
-                }.onComplete {
-                    afterJobFinish(imageDownloadRunnable)
-                    coroutineScope.launch {
-                        eventBus.publishEvent(
-                            QueueStateEvent(
-                                QueueState(
-                                    runningCount(), pendingCount()
-                                )
-                            )
-                        )
-                    }
-                    coroutineScope.launch {
-                        eventBus.publishEvent(ErrorCountEvent(ErrorCount(dataTransaction.countImagesInError())))
-                    }
-                    log.debug(
-                        "Finished downloading ${imageDownloadRunnable.context.image.url}"
-                    )
-                }.run(imageDownloadRunnable::run)
-        }, GLOBAL_EXECUTOR)
-    }
-
-    private fun afterJobFinish(imageDownloadRunnable: ImageDownloadRunnable) {
-        lock.withLock {
-            val image = imageDownloadRunnable.context.image
-            running[image.host]!!.remove(imageDownloadRunnable)
-            if (!isPending(image.postId) && !isRunning(
-                    image.postId
-                ) && !imageDownloadRunnable.context.stopped
-            ) {
-                dataTransaction.finishPost(image.postId, true)
-            }
-            condition.signal()
-        }
-    }
-
-    private fun pendingCount(): Int {
-        return pending.values.sumOf { it.size }
-    }
-
-    private fun runningCount(): Int {
-        return running.values.sumOf { it.size }
-    }
-}
@@ -1,17 +0,0 @@
-package me.vripper.download
-
-import me.vripper.entities.Image
-import me.vripper.model.Settings
-import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase
-import org.apache.hc.client5.http.cookie.BasicCookieStore
-import org.apache.hc.client5.http.protocol.HttpClientContext
-import org.koin.core.component.KoinComponent
-
-class ImageDownloadContext(val image: Image, val settings: Settings) : KoinComponent {
-
-    val httpContext: HttpClientContext =
-        HttpClientContext.create().apply { cookieStore = BasicCookieStore() }
-    val requests = mutableListOf<HttpUriRequestBase>()
-    val postId = image.postIdRef
-    var stopped = false
-}
@@ -1,152 +0,0 @@
-package me.vripper.download
-
-import kotlinx.coroutines.*
-import me.vripper.entities.Image
-import me.vripper.entities.domain.Status
-import me.vripper.exception.DownloadException
-import me.vripper.exception.HostException
-import me.vripper.host.DownloadedImage
-import me.vripper.host.Host
-import me.vripper.host.ImageMimeType
-import me.vripper.model.Settings
-import me.vripper.services.*
-import me.vripper.utilities.PathUtils.getExtension
-import me.vripper.utilities.PathUtils.getFileNameWithoutExtension
-import me.vripper.utilities.PathUtils.sanitize
-import net.jodah.failsafe.function.CheckedRunnable
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
-import java.io.IOException
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.StandardCopyOption
-import java.util.*
-import kotlin.io.path.Path
-import kotlin.io.path.pathString
-
-class ImageDownloadRunnable(
-    private val image: Image, val postRank: Int, private val settings: Settings
-) : KoinComponent, CheckedRunnable {
-    private val log by me.vripper.delegate.LoggerDelegate()
-
-    private val dataTransaction: DataTransaction by inject()
-    private val hosts: List<Host> = getKoin().getAll()
-
-    val context: ImageDownloadContext = ImageDownloadContext(image, settings)
-    private var stopped: Boolean
-        get() = context.stopped
-        set(value) {
-            context.stopped = value
-        }
-
-    @Throws(DownloadException::class)
-    fun download() {
-        try {
-            image.status = Status.DOWNLOADING
-            image.downloaded = 0
-            dataTransaction.updateImage(image)
-            synchronized(image.postId.toString().intern()) {
-                val post = dataTransaction.findPostById(context.postId).orElseThrow()
-                if (post.status != Status.DOWNLOADING) {
-                    post.status = Status.DOWNLOADING
-                    dataTransaction.updatePost(post)
-                }
-            }
-            log.debug("Getting image url and name from ${image.url} using ${image.host}")
-            val host = hosts.first { it.isSupported(image.url) }
-            val downloadedImage = host.downloadInternal(image.url, context)
-            log.debug("Resolved name for ${image.url}: ${downloadedImage.name}")
-            log.debug("Downloaded image {} to {}", image.url, downloadedImage.path)
-            synchronized(image.postId.toString().intern()) {
-                val post = dataTransaction.findPostById(context.postId).orElseThrow()
-                val downloadDirectory = Path(post.downloadDirectory, post.folderName).pathString
-                checkImageTypeAndRename(
-                    downloadDirectory, downloadedImage, image.index
-                )
-                if (image.downloaded == image.size && image.size > 0) {
-                    image.status = Status.FINISHED
-                    post.done += 1
-                    post.downloaded += image.size
-                    dataTransaction.updatePost(post)
-                } else {
-                    image.status = Status.ERROR
-                }
-                dataTransaction.updateImage(image)
-            }
-        } catch (e: Exception) {
-            if (stopped) {
-                return
-            }
-            image.status = Status.ERROR
-            dataTransaction.updateImage(image)
-            throw DownloadException(e)
-        }
-    }
-
-    @Throws(HostException::class)
-    private fun checkImageTypeAndRename(
-        downloadDirectory: String, downloadedImage: DownloadedImage, index: Int
-    ) {
-        val existingExtension = getExtension(downloadedImage.name).lowercase()
-        val fileNameWithoutExtension = getFileNameWithoutExtension(downloadedImage.name)
-        val extension = when (downloadedImage.type) {
-            ImageMimeType.IMAGE_BMP -> "BMP"
-            ImageMimeType.IMAGE_GIF -> "GIF"
-            ImageMimeType.IMAGE_JPEG -> "JPG"
-            ImageMimeType.IMAGE_PNG -> "PNG"
-            ImageMimeType.IMAGE_WEBP -> "WEBP"
-        }
-        val filename =
-            if (existingExtension.isBlank()) "${sanitize(downloadedImage.name)}.$extension" else "${
-                sanitize(
-                    fileNameWithoutExtension
-                )
-            }.$extension"
-        try {
-            val downloadDestinationFolder = Path.of(downloadDirectory)
-            Files.createDirectories(downloadDestinationFolder)
-            val finalFilename = "${
-                if (settings.downloadSettings.forceOrder) String.format(
-                    "%03d_", index + 1
-                ) else ""
-            }$filename"
-            image.filename = finalFilename
-            val imageDownloadPath = downloadDestinationFolder.resolve(finalFilename)
-            Files.copy(downloadedImage.path, imageDownloadPath, StandardCopyOption.REPLACE_EXISTING)
-        } catch (e: Exception) {
-            throw HostException("Failed to rename the image", e)
-        } finally {
-            try {
-                Files.delete(downloadedImage.path)
-            } catch (e: IOException) {
-                log.warn(
-                    "Failed to delete temporary file ${downloadedImage.path}"
-                )
-            }
-        }
-    }
-
-    @Throws(Exception::class)
-    override fun run() {
-        if (stopped) {
-            return
-        }
-        download()
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other == null || javaClass != other.javaClass) return false
-        val that = other as ImageDownloadRunnable
-        return image.id == that.image.id
-    }
-
-    override fun hashCode(): Int {
-        return Objects.hash(image.id)
-    }
-
-    fun stop() {
-        context.requests.forEach { it.abort() }
-        stopped = true
-    }
-}
@@ -1,8 +1,9 @@
 package me.vripper.entities

-import me.vripper.entities.domain.Status
+import kotlinx.serialization.Serializable

-data class Image(
+@Serializable
+data class ImageEntity(
    val id: Long = -1,
    val postId: Long,
    val url: String,
@@ -19,7 +20,7 @@ data class Image(
        if (this === other) return true
        if (javaClass != other?.javaClass) return false

-        other as Image
+        other as ImageEntity

        if (url != other.url) return false

@@ -1,22 +0,0 @@
-package me.vripper.entities
-
-import java.time.LocalDateTime
-
-data class LogEntry(
-    val id: Long = -1,
-    val type: Type,
-    val status: Status,
-    val time: LocalDateTime = LocalDateTime.now(),
-    val message: String,
-) {
-
-    enum class Type(val stringValue: String) {
-        POST("Post"), THREAD("Thread"), THANKS("Thanks"), METADATA("Metadata"), SCAN("Scan"), DOWNLOAD(
-            "Download"
-        )
-    }
-
-    enum class Status(val stringValue: String) {
-        PENDING("Pending"), PROCESSING("Processing"), DONE("Done"), ERROR("Error")
-    }
-}
@@ -0,0 +1,14 @@
+package me.vripper.entities
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class LogEntryEntity(
+    val sequence: Long,
+    val timestamp: String,
+    val threadName: String,
+    val loggerName: String,
+    val levelString: String,
+    val formattedMessage: String,
+    val throwable: String,
+)
@@ -2,7 +2,8 @@ package me.vripper.entities

 import kotlinx.serialization.Serializable

-data class Metadata(val postId: Long, val data: Data) {
+@Serializable
+data class MetadataEntity(val postId: Long, val data: Data) {
    @Serializable
    data class Data(
        val postedBy: String,
@@ -1,11 +1,11 @@
 package me.vripper.entities

-import me.vripper.entities.domain.Status
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.Serializable
 import java.time.LocalDateTime
-import kotlin.io.path.Path
-import kotlin.io.path.pathString

-data class Post(
+@Serializable
+data class PostEntity(
    val id: Long = -1,
    val postTitle: String,
    val threadTitle: String,
@@ -17,7 +17,7 @@ data class Post(
    val total: Int,
    val hosts: Set<String>,
    val downloadDirectory: String,
-    val addedOn: LocalDateTime = LocalDateTime.now(),
+    @Contextual val addedOn: LocalDateTime = LocalDateTime.now(),
    var folderName: String,
    var status: Status = Status.STOPPED,
    var done: Int = 0,
@@ -26,15 +26,11 @@ data class Post(
    var downloaded: Long = 0,
 ) {

-    fun getDownloadFolder(): String {
-        return Path(downloadDirectory, folderName).pathString
-    }
-
    override fun equals(other: Any?): Boolean {
        if (this === other) return true
        if (javaClass != other?.javaClass) return false

-        other as Post
+        other as PostEntity

        return postId == other.postId
    }
@@ -1,4 +1,4 @@
-package me.vripper.entities.domain
+package me.vripper.entities

 enum class Status(val stringValue: String) {
    PENDING("Pending"), DOWNLOADING("Downloading"), FINISHED("Finished"), ERROR("Error"), STOPPED("Stopped")
@@ -1,6 +1,9 @@
 package me.vripper.entities

-data class Thread(
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ThreadEntity(
    val id: Long = -1,
    val title: String,
    val link: String,
@@ -11,7 +14,7 @@ data class Thread(
        if (this === other) return true
        if (javaClass != other?.javaClass) return false

-        other as Thread
+        other as ThreadEntity

        return threadId == other.threadId
    }
@@ -6,12 +6,12 @@ import me.vripper.model.ErrorCount
 import me.vripper.model.QueueState
 import me.vripper.model.Settings

-data class PostCreateEvent(val posts: List<Post>)
-data class PostUpdateEvent(val posts: List<Post>)
+data class PostCreateEvent(val postEntities: List<PostEntity>)
+data class PostUpdateEvent(val postEntities: List<PostEntity>)
 data class PostDeleteEvent(val postIds: List<Long>)
-data class ImageEvent(val images: List<Image>)
-data class ThreadCreateEvent(val thread: Thread)
-data class ThreadUpdateEvent(val thread: Thread)
+data class ImageEvent(val imageEntities: List<ImageEntity>)
+data class ThreadCreateEvent(val threadEntity: ThreadEntity)
+data class ThreadUpdateEvent(val threadEntity: ThreadEntity)
 data class ThreadDeleteEvent(val threadId: Long)
 class ThreadClearEvent
 data class VGUserLoginEvent(val username: String)
@@ -19,11 +19,7 @@ data class DownloadSpeedEvent(val downloadSpeed: DownloadSpeed)
 data class QueueStateEvent(val queueState: QueueState)
 data class ErrorCountEvent(val errorCount: ErrorCount)
 data class SettingsUpdateEvent(val settings: Settings)
-data class MetadataUpdateEvent(val metadata: Metadata)
-
-data class LogCreateEvent(val logEntry: LogEntry)
-data class LogUpdateEvent(val logEntry: LogEntry)
-data class LogDeleteEvent(val deleted: List<Long>)
-
+data class MetadataUpdateEvent(val metadataEntity: MetadataEntity)
+data class LogCreateEvent(val logEntryEntity: LogEntryEntity)
 data class LoadingTasks(val loading: Boolean)
 data class StoppedEvent(val postIds: List<Long>)
@@ -1,14 +1,15 @@
 package me.vripper.event

+import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow

 object EventBus {

-    private val _events = MutableSharedFlow<Any>()
+    private val _events = MutableSharedFlow<Any>(0, Int.MAX_VALUE, BufferOverflow.DROP_OLDEST)
    val events = _events.asSharedFlow()

-    suspend fun publishEvent(event: Any) {
-        _events.emit(event)
+    fun publishEvent(event: Any) {
+        _events.tryEmit(event)
    }
 }
@@ -1,10 +1,13 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
 import me.vripper.exception.HostException
 import me.vripper.exception.XpathException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
 import me.vripper.utilities.HtmlUtils
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.XpathUtils
 import org.apache.hc.client5.http.classic.methods.HttpPost
 import org.apache.hc.client5.http.entity.UrlEncodedFormEntity
@@ -12,12 +15,12 @@ import org.apache.hc.core5.http.message.BasicNameValuePair
 import org.w3c.dom.Document
 import org.w3c.dom.Node

-class AcidimgHost(
+internal class AcidimgHost(
    private val httpService: HTTPService,
    dataTransaction: DataTransaction,
    downloadSpeedService: DownloadSpeedService,
 ) : Host("acidimg.cc", 0, httpService, dataTransaction, downloadSpeedService) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    @Throws(HostException::class)
    override fun resolve(
@@ -45,7 +48,7 @@ class AcidimgHost(
                )
            )
        }.also { context.requests.add(it) }
-        log.debug(String.format("Requesting %s", httpPost))
+        log.debug(String.format("Requesting %s", httpPost.uri))
        val doc = try {
            httpService.client.execute(
                httpPost, context.httpContext
@@ -1,20 +1,23 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
 import me.vripper.exception.HostException
 import me.vripper.exception.XpathException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.XpathUtils
 import org.w3c.dom.Document
 import org.w3c.dom.Node
 import java.util.*

-class DPicMeHost(
+internal class DPicMeHost(
    httpService: HTTPService,
    dataTransaction: DataTransaction,
    downloadSpeedService: DownloadSpeedService,
 ) : Host("dpic.me", 1, httpService, dataTransaction, downloadSpeedService) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    @Throws(HostException::class)
    override fun resolve(
@@ -1,10 +1,17 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
+import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.runBlocking
 import me.vripper.exception.DownloadException
 import me.vripper.exception.HostException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
 import me.vripper.utilities.HtmlUtils
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.PathUtils.getFileNameWithoutExtension
 import org.apache.hc.client5.http.classic.methods.HttpGet
 import org.apache.hc.client5.http.classic.methods.HttpHead
@@ -12,17 +19,18 @@ import org.apache.hc.core5.http.ClassicHttpResponse
 import org.apache.hc.core5.http.Header
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.w3c.dom.Document
+import java.io.BufferedOutputStream
 import java.nio.file.Files
 import java.nio.file.Path

-abstract class Host(
+internal abstract class Host(
    val hostName: String,
    val hostId: Byte,
    private val httpService: HTTPService,
    private val dataTransaction: DataTransaction,
    private val downloadSpeedService: DownloadSpeedService
 ) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    companion object {
        private const val READ_BUFFER_SIZE = 8192
@@ -94,10 +102,10 @@ abstract class Host(
            "vripper_",
            ".tmp"
        )
-        return Files.newOutputStream(tempImage).use { fos ->
-            val image = context.image
+        return BufferedOutputStream(Files.newOutputStream(tempImage)).use { bos ->
+            val image = context.imageEntity
            synchronized(image.postId.toString().intern()) {
-                val post = dataTransaction.findPostById(context.postId).orElseThrow()
+                val post = dataTransaction.findPostById(context.postId)
                val size = if (image.size < 0) {
                    response.entity.contentLength
                } else {
@@ -118,14 +126,23 @@ abstract class Host(
            )
            val buffer = ByteArray(READ_BUFFER_SIZE)
            var read: Int
-            while (response.entity.content.read(buffer, 0, READ_BUFFER_SIZE)
-                    .also { read = it } != -1 && !context.stopped
+            val reporterJob = context.launchCoroutine {
+                while (isActive) {
+                    dataTransaction.updateImage(image, false)
+                    delay(100)
+                }
+            }
+            while (response.entity.content.read(buffer)
+                    .also { read = it } != -1
            ) {
-                fos.write(buffer, 0, read)
+                bos.write(buffer, 0, read)
                image.downloaded += read
-                dataTransaction.updateImage(image)
                downloadSpeedService.reportDownloadedBytes(read.toLong())
            }
+            runBlocking {
+                reporterJob.cancelAndJoin()
+            }
+            dataTransaction.updateImage(image)
            Pair(tempImage, mimeType)
        }
    }
@@ -155,7 +172,8 @@ abstract class Host(
        context: ImageDownloadContext,
        transformer: (ClassicHttpResponse) -> T
    ): T {
-        val httpGet = HttpGet(url).also { it.addHeader("Referer", context.image.url) }.also { context.requests.add(it) }
+        val httpGet =
+            HttpGet(url).also { it.addHeader("Referer", context.imageEntity.url) }.also { context.requests.add(it) }
        log.debug(String.format("Requesting %s", url))
        return httpService.client.execute(httpGet, context.httpContext) {
            if (it.code / 100 != 2) {
@@ -1,10 +1,13 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
 import me.vripper.exception.HostException
 import me.vripper.exception.XpathException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
 import me.vripper.utilities.HtmlUtils
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.XpathUtils
 import org.apache.hc.client5.http.impl.cookie.BasicClientCookie
 import org.w3c.dom.Document
@@ -14,12 +17,12 @@ import java.time.LocalDateTime
 import java.time.ZoneId
 import java.util.*

-class ImageBamHost(
+internal class ImageBamHost(
    httpService: HTTPService,
    dataTransaction: DataTransaction,
    downloadSpeedService: DownloadSpeedService,
 ) : Host("imagebam.com", 2, httpService, dataTransaction, downloadSpeedService) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    @Throws(HostException::class)
    override fun resolve(
@@ -1,20 +1,23 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
 import me.vripper.exception.HostException
 import me.vripper.exception.XpathException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.XpathUtils
 import org.w3c.dom.Document
 import org.w3c.dom.Node
 import java.util.*

-class ImageTwistHost(
+internal class ImageTwistHost(
    httpService: HTTPService,
    dataTransaction: DataTransaction,
    downloadSpeedService: DownloadSpeedService,
 ) : Host("imagetwist.com", 3, httpService, dataTransaction, downloadSpeedService) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    @Throws(HostException::class)
    override fun resolve(
@@ -1,20 +1,23 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
 import me.vripper.exception.HostException
 import me.vripper.exception.XpathException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
 import me.vripper.utilities.HtmlUtils
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.XpathUtils
 import org.w3c.dom.Document
 import org.w3c.dom.Node

-class ImageVenueHost(
+internal class ImageVenueHost(
    httpService: HTTPService,
    dataTransaction: DataTransaction,
    downloadSpeedService: DownloadSpeedService,
 ) : Host("imagevenue.com", 4, httpService, dataTransaction, downloadSpeedService) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    @Throws(HostException::class)
    override fun resolve(
@@ -68,6 +71,6 @@ class ImageVenueHost(

    companion object {
        private const val CONTINUE_BUTTON_XPATH = "//a[@title='Continue to ImageVenue']"
-        private const val IMG_XPATH = "//a[@data-toggle='full']/img"
+        private const val IMG_XPATH = "//a[@data-toggle='full']/img[@id='main-image']"
    }
 }
@@ -1,18 +1,21 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
 import me.vripper.exception.HostException
 import me.vripper.exception.XpathException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.XpathUtils
 import org.w3c.dom.Document

-class ImageZillaHost(
+internal class ImageZillaHost(
    httpService: HTTPService,
    dataTransaction: DataTransaction,
    downloadSpeedService: DownloadSpeedService,
 ) : Host("imagezilla.net", 5, httpService, dataTransaction, downloadSpeedService) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    @Throws(HostException::class)
    override fun resolve(
@@ -1,19 +1,22 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
 import me.vripper.exception.HostException
 import me.vripper.exception.XpathException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.XpathUtils
 import org.w3c.dom.Document
 import org.w3c.dom.Node

-class ImgSpiceHost(
+internal class ImgSpiceHost(
    httpService: HTTPService,
    dataTransaction: DataTransaction,
    downloadSpeedService: DownloadSpeedService,
 ) : Host("imgspice.com", 7, httpService, dataTransaction, downloadSpeedService) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    @Throws(HostException::class)
    override fun resolve(
@@ -1,19 +1,22 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
 import me.vripper.exception.HostException
 import me.vripper.exception.XpathException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.XpathUtils
 import org.w3c.dom.Document
 import org.w3c.dom.Node

-class ImgboxHost(
+internal class ImgboxHost(
    httpService: HTTPService,
    dataTransaction: DataTransaction,
    downloadSpeedService: DownloadSpeedService,
 ) : Host("imgbox.com", 6, httpService, dataTransaction, downloadSpeedService) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    @Throws(HostException::class)
    override fun resolve(
@@ -1,11 +1,14 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
 import me.vripper.exception.HostException
 import me.vripper.exception.HtmlProcessorException
 import me.vripper.exception.XpathException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
 import me.vripper.utilities.HtmlUtils
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.XpathUtils
 import org.apache.hc.client5.http.classic.methods.HttpPost
 import org.apache.hc.client5.http.entity.UrlEncodedFormEntity
@@ -14,12 +17,12 @@ import org.w3c.dom.Document
 import org.w3c.dom.Node
 import java.io.IOException

-class ImxHost(
+internal class ImxHost(
    private val httpService: HTTPService,
    dataTransaction: DataTransaction,
    downloadSpeedService: DownloadSpeedService,
 ) : Host("imx.to", 8, httpService, dataTransaction, downloadSpeedService) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    @Throws(HostException::class)
    override fun resolve(
@@ -1,22 +1,25 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
 import me.vripper.exception.HostException
 import me.vripper.exception.XpathException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
 import me.vripper.utilities.HtmlUtils
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.XpathUtils
 import org.w3c.dom.Document
 import org.w3c.dom.Node
 import java.net.URI
 import java.net.URISyntaxException

-class PimpandhostHost(
+internal class PimpandhostHost(
    httpService: HTTPService,
    dataTransaction: DataTransaction,
    downloadSpeedService: DownloadSpeedService,
 ) : Host("pimpandhost.com", 9, httpService, dataTransaction, downloadSpeedService) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    @Throws(HostException::class)
    override fun resolve(
@@ -1,19 +1,22 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
 import me.vripper.exception.HostException
 import me.vripper.exception.XpathException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.XpathUtils
 import org.w3c.dom.Document
 import org.w3c.dom.Node

-class PixRouteHost(
+internal class PixRouteHost(
    httpService: HTTPService,
    dataTransaction: DataTransaction,
    downloadSpeedService: DownloadSpeedService,
 ) : Host("pixroute.com", 11, httpService, dataTransaction, downloadSpeedService) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    @Throws(HostException::class)
    override fun resolve(
@@ -1,19 +1,22 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
 import me.vripper.exception.HostException
 import me.vripper.exception.XpathException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.XpathUtils
 import org.w3c.dom.Document
 import org.w3c.dom.Node

-class PixhostHost(
+internal class PixhostHost(
    httpService: HTTPService,
    dataTransaction: DataTransaction,
    downloadSpeedService: DownloadSpeedService,
 ) : Host("pixhost.to", 10, httpService, dataTransaction, downloadSpeedService) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    @Throws(HostException::class)
    override fun resolve(
@@ -1,18 +1,21 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
 import me.vripper.exception.HostException
 import me.vripper.exception.XpathException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.XpathUtils
 import org.w3c.dom.Document

-class PixxxelsHost(
+internal class PixxxelsHost(
    httpService: HTTPService,
    dataTransaction: DataTransaction,
    downloadSpeedService: DownloadSpeedService,
 ) : Host("pixxxels.cc", 12, httpService, dataTransaction, downloadSpeedService) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    @Throws(HostException::class)
    override fun resolve(
@@ -1,20 +1,23 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
 import me.vripper.exception.HostException
 import me.vripper.exception.XpathException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.XpathUtils
 import org.w3c.dom.Document
 import org.w3c.dom.Node
 import java.util.*

-class PostImgHost(
+internal class PostImgHost(
    httpService: HTTPService,
    dataTransaction: DataTransaction,
    downloadSpeedService: DownloadSpeedService,
 ) : Host("postimg.cc", 13, httpService, dataTransaction, downloadSpeedService) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    @Throws(HostException::class)
    override fun resolve(
@@ -1,19 +1,22 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
 import me.vripper.exception.HostException
 import me.vripper.exception.XpathException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.XpathUtils
 import org.w3c.dom.Document
 import org.w3c.dom.Node

-class TurboImageHost(
+internal class TurboImageHost(
    httpService: HTTPService,
    dataTransaction: DataTransaction,
    downloadSpeedService: DownloadSpeedService,
 ) : Host("turboimagehost.com", 14, httpService, dataTransaction, downloadSpeedService) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    @Throws(HostException::class)
    override fun resolve(
@@ -1,20 +1,23 @@
 package me.vripper.host

-import me.vripper.download.ImageDownloadContext
 import me.vripper.exception.HostException
 import me.vripper.exception.XpathException
-import me.vripper.services.*
+import me.vripper.services.DataTransaction
+import me.vripper.services.DownloadService.ImageDownloadContext
+import me.vripper.services.DownloadSpeedService
+import me.vripper.services.HTTPService
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.XpathUtils
 import org.w3c.dom.Document
 import org.w3c.dom.Node
 import java.util.*

-class ViprImHost(
+internal class ViprImHost(
    httpService: HTTPService,
    dataTransaction: DataTransaction,
    downloadSpeedService: DownloadSpeedService,
 ) : Host("vipr.im", 15, httpService, dataTransaction, downloadSpeedService) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()

    @Throws(HostException::class)
    override fun resolve(
@@ -1,26 +1,30 @@
 package me.vripper.listeners

-import me.vripper.download.DownloadService
 import me.vripper.services.*
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject

 open class OnStartupListener : KoinComponent {
    private val dataTransaction: DataTransaction by inject()
-    private val downloadService: DownloadService by inject()
-    private val httpService: HTTPService by inject()
-    private val retryPolicyService: RetryPolicyService by inject()
+    private val metadataService: MetadataService by inject()
+    private val settingsService: SettingsService by inject()
    private val vgAuthService: VGAuthService by inject()
    private val downloadSpeedService: DownloadSpeedService by inject()
-    private val metadataService: MetadataService by inject()
+    private val httpService: HTTPService by inject()
+    private val retryPolicyService: RetryPolicyService by inject()
+    private val threadCacheService: ThreadCacheService by inject()
+    private val downloadService: DownloadService by inject()

    open fun run() {
        dataTransaction.setDownloadingToStopped()
+        dataTransaction.stopImagesByPostIdAndIsNotCompleted()
+        vgAuthService.init()
        httpService.init()
        retryPolicyService.init()
-        vgAuthService.init()
-        downloadService.init()
-        downloadSpeedService.init()
+        threadCacheService.init()
+        settingsService.init()
        metadataService.init()
+        downloadSpeedService.init()
+        downloadService.init()
    }
 }
@@ -1,3 +1,6 @@
 package me.vripper.model

+import kotlinx.serialization.Serializable
+
+@Serializable
 data class DownloadSpeed(val speed: Long)
@@ -1,3 +1,6 @@
 package me.vripper.model

+import kotlinx.serialization.Serializable
+
+@Serializable
 data class ErrorCount(val count: Int)
@@ -0,0 +1,5 @@
+package me.vripper.model
+
+import me.vripper.entities.ImageEntity
+
+typealias Image = ImageEntity
@@ -1,5 +0,0 @@
-package me.vripper.model
-
-import me.vripper.host.Host
-
-data class ImageItem(val mainLink: String, val thumbLink: String, val host: Host)
@@ -0,0 +1,5 @@
+package me.vripper.model
+
+import me.vripper.entities.LogEntryEntity
+
+typealias LogEntry = LogEntryEntity
@@ -0,0 +1,5 @@
+package me.vripper.model
+
+import me.vripper.entities.MetadataEntity
+
+typealias Metadata = MetadataEntity
@@ -0,0 +1,35 @@
+package me.vripper.model
+
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.Serializable
+import me.vripper.entities.Status
+import java.time.LocalDateTime
+import kotlin.io.path.Path
+import kotlin.io.path.pathString
+
+@Serializable
+data class Post(
+    val id: Long = -1,
+    val postTitle: String,
+    val threadTitle: String,
+    val forum: String,
+    val url: String,
+    val token: String,
+    val postId: Long,
+    val threadId: Long,
+    val total: Int,
+    val hosts: Set<String>,
+    val downloadDirectory: String,
+    @Contextual val addedOn: LocalDateTime = LocalDateTime.now(),
+    var folderName: String,
+    var status: Status = Status.STOPPED,
+    var done: Int = 0,
+    var rank: Int = Int.MAX_VALUE,
+    var size: Long = -1,
+    var downloaded: Long = 0,
+    val previews: List<String>,
+    val postedBy: String,
+    val resolvedNames: List<String>
+) {
+    fun getDownloadFolder() = Path(downloadDirectory, folderName).pathString
+}
@@ -0,0 +1,14 @@
+package me.vripper.model
+
+data class PostSelection(
+    val threadId: Long,
+    val threadTitle: String,
+    val postId: Long,
+    val number: Int,
+    val title: String,
+    val imageCount: Int,
+    val url: String,
+    val hosts: String,
+    val forum: String,
+    val previews: List<String>
+)
@@ -1,5 +1,8 @@
 package me.vripper.model

+import kotlinx.serialization.Serializable
+
+@Serializable
 data class QueueState(
    val running: Int,
    val remaining: Int
@@ -1,6 +1,9 @@
 package me.vripper.model

 import kotlinx.serialization.Serializable
+import me.vripper.utilities.ApplicationProperties.VRIPPER_DIR
+import java.nio.file.Files
+import kotlin.io.path.pathString

@Serializable
 data class Settings(
@@ -17,11 +20,13 @@ data class ViperSettings(
    val password: String = "",
    val thanks: Boolean = false,
    val host: String = "https://vipergirls.to",
+    val requestLimit: Long = 2,
+    val fetchMetadata: Boolean = false,
 )

@Serializable
 data class DownloadSettings(
-    val downloadPath: String = System.getProperty("user.home"),
+    val downloadPath: String = VRIPPER_DIR.resolve("downloads").also { Files.createDirectories(it) }.pathString,
    val autoStart: Boolean = true,
    val autoQueueThreshold: Int = 1,
    val forceOrder: Boolean = false,
@@ -41,8 +46,7 @@ data class ConnectionSettings(

@Serializable
 data class SystemSettings(
-    val tempPath: String = System.getProperty("java.io.tmpdir"),
-    val cachePath: String = System.getProperty("java.io.tmpdir"),
+    val tempPath: String = VRIPPER_DIR.resolve("temp").also { Files.createDirectories(it) }.pathString,
    val enableClipboardMonitoring: Boolean = false,
    val clipboardPollingRate: Int = 500,
    val maxEventLog: Int = 1_000,
@@ -0,0 +1,5 @@
+package me.vripper.model
+
+import me.vripper.entities.ThreadEntity
+
+typealias Thread = ThreadEntity
@@ -1,9 +0,0 @@
-package me.vripper.model
-
-data class ThreadItem(
-    val threadId: Long,
-    val title: String,
-    val securityToken: String,
-    val forum: String,
-    val postItemList: List<PostItem>
-)
@@ -1,75 +0,0 @@
-package me.vripper.parser
-
-import me.vripper.entities.LogEntry
-import me.vripper.exception.DownloadException
-import me.vripper.exception.PostParseException
-import me.vripper.model.PostItem
-import me.vripper.services.*
-import me.vripper.utilities.Tasks
-import me.vripper.utilities.formatToString
-import net.jodah.failsafe.Failsafe
-import net.jodah.failsafe.function.CheckedSupplier
-import org.apache.hc.client5.http.classic.HttpClient
-import org.apache.hc.client5.http.classic.methods.HttpGet
-import org.apache.hc.core5.net.URIBuilder
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
-import javax.xml.parsers.SAXParserFactory
-
-class PostLookupAPIParser(private val threadId: Long, private val postId: Long) : KoinComponent {
-    private val log by me.vripper.delegate.LoggerDelegate()
-    private val settingsService: SettingsService by inject()
-    private val retryPolicyService: RetryPolicyService by inject()
-    private val httpService: HTTPService by inject()
-    private val vgAuthService: VGAuthService by inject()
-    private val dataTransaction: DataTransaction by inject()
-
-    @Throws(PostParseException::class)
-    fun parse(): PostItem {
-        log.debug("Parsing post $postId")
-        val httpGet =
-            HttpGet(URIBuilder("${settingsService.settings.viperSettings.host}/vr.php").also {
-                it.setParameter(
-                    "p", postId.toString()
-                )
-            }.build())
-        val threadLookupAPIResponseHandler = ThreadLookupAPIResponseHandler()
-        log.debug("Requesting {}", httpGet)
-        Tasks.increment()
-        return try {
-            Failsafe.with(retryPolicyService.buildGenericRetryPolicy<Any>()).onFailure {
-                log.error(
-                    "parsing failed for thread $threadId, post $postId", it.failure
-                )
-                dataTransaction.saveLog(
-                    LogEntry(
-                        type = LogEntry.Type.POST, status = LogEntry.Status.ERROR, message = """
-                    Failed to process thread $threadId, post $postId
-                    ${it.failure.formatToString()}
-                    """.trimIndent()
-                    )
-                )
-            }.get(CheckedSupplier {
-                val connection: HttpClient = httpService.client
-                connection.execute(
-                    httpGet, vgAuthService.context
-                ) { response ->
-                    if (response.code / 100 != 2) {
-                        throw DownloadException("Unexpected response code '${response.code}' for $httpGet")
-                    }
-                    factory.newSAXParser()
-                        .parse(response.entity.content, threadLookupAPIResponseHandler)
-                    threadLookupAPIResponseHandler.result.postItemList.first()
-                }
-            })
-        } catch (e: Exception) {
-            throw PostParseException(e)
-        } finally {
-            Tasks.decrement()
-        }
-    }
-
-    companion object {
-        private val factory = SAXParserFactory.newInstance()
-    }
-}
@@ -1,79 +0,0 @@
-package me.vripper.parser
-
-import me.vripper.entities.LogEntry
-import me.vripper.exception.DownloadException
-import me.vripper.exception.PostParseException
-import me.vripper.model.ThreadItem
-import me.vripper.services.*
-import me.vripper.utilities.Tasks
-import me.vripper.utilities.formatToString
-import net.jodah.failsafe.Failsafe
-import net.jodah.failsafe.function.CheckedSupplier
-import org.apache.hc.client5.http.classic.methods.HttpGet
-import org.apache.hc.core5.net.URIBuilder
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
-import java.io.BufferedInputStream
-import java.util.*
-import javax.xml.parsers.SAXParserFactory
-
-class ThreadLookupAPIParser(private val threadId: Long) : KoinComponent {
-    private val log by me.vripper.delegate.LoggerDelegate()
-    private val cm: HTTPService by inject()
-    private val retryPolicyService: RetryPolicyService by inject()
-    private val vgAuthService: VGAuthService by inject()
-    private val settingsService: SettingsService by inject()
-    private val dataTransaction: DataTransaction by inject()
-
-    @Throws(PostParseException::class)
-    fun parse(): ThreadItem {
-        log.debug("Parsing thread $threadId")
-        val httpGet =
-            HttpGet(URIBuilder(settingsService.settings.viperSettings.host + "/vr.php").also {
-                it.setParameter(
-                    "t",
-                    threadId.toString()
-                )
-            }.build())
-        val threadLookupAPIResponseHandler = ThreadLookupAPIResponseHandler()
-        log.debug("Requesting {}", httpGet)
-        Tasks.increment()
-        return try {
-            Failsafe.with(retryPolicyService.buildGenericRetryPolicy<Any>()).onFailure {
-                log.error(
-                    "parsing failed for thread $threadId",
-                    it.failure
-                )
-                dataTransaction.saveLog(
-                    LogEntry(
-                        type = LogEntry.Type.THREAD, status = LogEntry.Status.ERROR, message = """
-                    Failed to process thread $threadId
-                    ${it.failure.formatToString()}
-                    """.trimIndent()
-                    )
-                )
-            }.get(CheckedSupplier {
-                cm.client.execute(
-                    httpGet, vgAuthService.context
-                ) { response ->
-                    if (response.code / 100 != 2) {
-                        throw DownloadException("Unexpected response code '${response.code}' for $httpGet")
-                    }
-                    factory.newSAXParser().parse(
-                        BufferedInputStream(response.entity.content),
-                        threadLookupAPIResponseHandler
-                    )
-                    threadLookupAPIResponseHandler.result
-                }
-            })
-        } catch (e: Exception) {
-            throw PostParseException(e)
-        } finally {
-            Tasks.decrement()
-        }
-    }
-
-    companion object {
-        private val factory = SAXParserFactory.newInstance()
-    }
-}
@@ -1,20 +0,0 @@
-package me.vripper.repositories
-
-import me.vripper.entities.Image
-import java.util.*
-
-interface ImageRepository {
-    fun save(image: Image): Image
-    fun save(imageList: List<Image>)
-    fun deleteAllByPostId(postId: Long)
-    fun findByPostId(postId: Long): List<Image>
-    fun countError(): Int
-    fun findByPostIdAndIsNotCompleted(postId: Long): List<Image>
-    fun stopByPostIdAndIsNotCompleted(postId: Long): Int
-    fun stopByPostIdAndIsNotCompleted(): Int
-    fun findByPostIdAndIsError(postId: Long): List<Image>
-    fun findById(id: Long): Optional<Image>
-    fun update(image: Image)
-    fun update(images: List<Image>)
-    fun deleteAllByPostId(postIds: List<Long>)
-}
@@ -1,14 +0,0 @@
-package me.vripper.repositories
-
-import me.vripper.entities.LogEntry
-import java.util.*
-
-interface LogRepository {
-    fun save(logEntry: LogEntry): LogEntry
-    fun update(logEntry: LogEntry)
-    fun findAll(): List<LogEntry>
-    fun findById(id: Long): Optional<LogEntry>
-
-    fun deleteOldest(): List<Long>
-    fun deleteAll()
-}
@@ -1,11 +0,0 @@
-package me.vripper.repositories
-
-import me.vripper.entities.Metadata
-import java.util.*
-
-interface MetadataRepository {
-    fun save(metadata: Metadata): Metadata
-    fun findByPostId(postId: Long): Optional<Metadata>
-    fun deleteByPostId(postId: Long): Int
-    fun deleteAllByPostId(postIds: List<Long>)
-}
@@ -1,21 +0,0 @@
-package me.vripper.repositories
-
-import me.vripper.entities.Post
-import java.util.*
-
-interface PostDownloadStateRepository {
-    fun save(posts: List<Post>): List<Post>
-    fun findByPostId(postId: Long): Optional<Post>
-    fun findById(id: Long): Optional<Post>
-    fun findCompleted(): List<Long>
-    fun findAll(): List<Post>
-    fun existByPostId(postId: Long): Boolean
-    fun setDownloadingToStopped(): Int
-    fun deleteByPostId(postId: Long): Int
-    fun update(post: Post)
-    fun update(posts: List<Post>)
-    fun findMaxRank(): Int?
-    fun deleteAll(postIds: List<Long>)
-    fun stopAll()
-    fun findAllNonCompletedPostIds(): List<Long>
-}
@@ -1,14 +0,0 @@
-package me.vripper.repositories
-
-import me.vripper.entities.Thread
-import java.util.*
-
-interface ThreadRepository {
-    fun save(thread: Thread): Thread
-    fun update(thread: Thread)
-    fun findByThreadId(threadId: Long): Optional<Thread>
-    fun findAll(): List<Thread>
-    fun findById(id: Long): Optional<Thread>
-    fun deleteByThreadId(threadId: Long): Int
-    fun deleteAll()
-}
@@ -1,74 +0,0 @@
-package me.vripper.repositories.impl
-
-import me.vripper.entities.LogEntry
-import me.vripper.repositories.LogRepository
-import me.vripper.services.SettingsService
-import me.vripper.tables.LogTable
-import org.jetbrains.exposed.sql.*
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.notInSubQuery
-import java.util.*
-
-class LogRepositoryImpl(val settingsService: SettingsService) : LogRepository {
-
-    @Synchronized
-    override fun save(logEntry: LogEntry): LogEntry {
-        val id = LogTable.insertAndGetId {
-            it[type] = logEntry.type.name
-            it[status] = logEntry.status.name
-            it[time] = logEntry.time
-            it[message] = logEntry.message.take(500)
-        }.value
-        return logEntry.copy(id = id)
-    }
-
-    override fun update(logEntry: LogEntry) {
-        LogTable.update({ LogTable.id eq logEntry.id }) {
-            it[type] = logEntry.type.name
-            it[status] = logEntry.status.name
-            it[message] = logEntry.message.take(500)
-        }
-    }
-
-    override fun findById(id: Long): Optional<LogEntry> {
-        val result = LogTable.select {
-            LogTable.id eq id
-        }.map(::transform)
-
-        return if (result.isEmpty()) {
-            Optional.empty()
-        } else {
-            Optional.of(result.first())
-        }
-    }
-
-    override fun findAll(): List<LogEntry> {
-        return LogTable.selectAll().map(::transform)
-    }
-
-    override fun deleteOldest(): List<Long> {
-        val sub = LogTable.slice(LogTable.id).selectAll().orderBy(LogTable.time to SortOrder.DESC)
-            .limit(settingsService.settings.systemSettings.maxEventLog)
-        val ids = LogTable.select { LogTable.id notInSubQuery sub }.map { it[LogTable.id].value }
-        LogTable.deleteWhere { LogTable.id notInSubQuery sub }
-        return ids
-    }
-
-    override fun deleteAll() {
-        LogTable.deleteAll()
-    }
-
-    private fun transform(resultRow: ResultRow): LogEntry {
-        val id = resultRow[LogTable.id].value
-        val type = LogEntry.Type.valueOf(resultRow[LogTable.type])
-        val status = LogEntry.Status.valueOf(resultRow[LogTable.status])
-        val time = resultRow[LogTable.time]
-        val message = resultRow[LogTable.message]
-        return LogEntry(
-            id,
-            type,
-            status,
-            time,
-            message
-        )
-    }
-}
@@ -1,173 +1,458 @@
 package me.vripper.services

-import me.vripper.download.DownloadService
-import me.vripper.entities.LogEntry
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.time.sample
+import kotlinx.serialization.json.Json
+import me.vripper.entities.*
+import me.vripper.event.*
 import me.vripper.exception.PostParseException
-import me.vripper.model.PostItem
-import me.vripper.model.ThreadPostId
-import me.vripper.services.*
-import me.vripper.tasks.AddPostRunnable
-import me.vripper.tasks.ThreadLookupRunnable
-import me.vripper.utilities.GLOBAL_EXECUTOR
+import me.vripper.model.*
+import me.vripper.tasks.AddPostTask
+import me.vripper.tasks.ThreadLookupTask
+import me.vripper.utilities.ApplicationProperties
+import me.vripper.utilities.ApplicationProperties.VRIPPER_DIR
+import me.vripper.utilities.LoggerDelegate
 import me.vripper.utilities.PathUtils
-import java.util.*
-import java.util.concurrent.CompletableFuture
+import me.vripper.utilities.taskRunner
+import org.h2.jdbc.JdbcSQLNonTransientConnectionException
+import java.sql.DriverManager
+import java.time.Duration
+import java.util.concurrent.locks.ReentrantLock
 import java.util.regex.Pattern
+import kotlin.concurrent.withLock
 import kotlin.io.path.Path
 import kotlin.io.path.exists
+import kotlin.jvm.optionals.getOrNull

-class AppEndpointService(
+internal class AppEndpointService(
    private val downloadService: DownloadService,
    private val dataTransaction: DataTransaction,
    private val threadCacheService: ThreadCacheService,
-    private val settingsService: SettingsService
-) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val settingsService: SettingsService,
+    private val vgAuthService: VGAuthService,
+    private val logService: LogService,
+) : IAppEndpointService {

-    @Synchronized
-    fun scanLinks(postLinks: String) {
-        if (postLinks.isBlank()) {
-            log.warn("Nothing to scan")
-            return
-        }
-        val urlList = postLinks.split(Pattern.compile("\\r?\\n")).dropLastWhile { it.isEmpty() }.map { it.trim() }
-            .filter { it.isNotEmpty() }
-        for (link in urlList) {
-            log.debug("Starting to process thread: $link")
-            if (!link.startsWith(settingsService.settings.viperSettings.host)) {
-                continue
+    private val log by LoggerDelegate()
+    private val lock = ReentrantLock()
+
+    override suspend fun scanLinks(postLinks: String) {
+        lock.withLock {
+            if (postLinks.isBlank()) {
+                return
            }
-            var threadId: Long
-            var postId: Long?
-            val m = Pattern.compile(
-                Pattern.quote(settingsService.settings.viperSettings.host) + "/threads/(\\d+)((.*p=)(\\d+))?"
-            ).matcher(link)
-            if (m.find()) {
-                threadId = m.group(1).toLong()
-                postId = m.group(4)?.toLong()
-                if (postId == null) {
-                    CompletableFuture.runAsync(
-                        ThreadLookupRunnable(
-                            threadId, settingsService.settings
-                        ),
-                        GLOBAL_EXECUTOR
-                    )
+            val urlList = postLinks.split(Pattern.compile("\\r?\\n")).dropLastWhile { it.isBlank() }.map { it.trim() }
+                .filter { it.isNotEmpty() }
+            for (link in urlList) {
+                log.debug("Scanning: $link")
+                if (!link.startsWith(settingsService.settings.viperSettings.host)) {
+                    continue
+                }
+                var threadId: Long
+                var postId: Long?
+                val m = Pattern.compile(
+                    Pattern.quote(settingsService.settings.viperSettings.host) + "/threads/(\\d+)((.*p=)(\\d+))?"
+                ).matcher(link)
+                if (m.find()) {
+                    threadId = m.group(1).toLong()
+                    postId = m.group(4)?.toLong()
+                    if (postId == null) {
+                        taskRunner.submit(
+                            ThreadLookupTask(
+                                threadId, settingsService.settings
+                            )
+                        )
+                    } else {
+                        taskRunner.submit(
+                            AddPostTask(
+                                listOf(ThreadPostId(threadId, postId))
+                            )
+                        )
+                    }
                } else {
-                    CompletableFuture.runAsync(
-                        AddPostRunnable(
-                            listOf(ThreadPostId(threadId, postId))
-                        ),
-                        GLOBAL_EXECUTOR
+                    log.error("Invalid link $link, link is missing the threadId")
+                    continue
+                }
+            }
+        }
+    }
+
+    override suspend fun restartAll(posIds: List<Long>) {
+        lock.withLock {
+            downloadService.restartAll(posIds.filter { dataTransaction.exists(it) }
+                .map { dataTransaction.findPostByPostId(it) })
+        }
+    }
+
+    override suspend fun download(posts: List<ThreadPostId>) {
+        taskRunner.submit(AddPostTask(posts))
+    }
+
+    override suspend fun stopAll(postIdList: List<Long>) {
+        lock.withLock {
+            downloadService.stop(postIdList)
+        }
+    }
+
+    override suspend fun remove(postIdList: List<Long>) {
+        lock.withLock {
+            downloadService.stop(postIdList)
+            dataTransaction.removeAll(postIdList)
+        }
+    }
+
+    override suspend fun clearCompleted(): List<Long> {
+        lock.withLock {
+            return dataTransaction.clearCompleted()
+        }
+    }
+
+    override suspend fun grab(threadId: Long): List<PostSelection> {
+        lock.withLock {
+            return try {
+                val thread = dataTransaction.findThreadByThreadId(threadId).orElseThrow {
+                    PostParseException(
+                        String.format(
+                            "Unable to find links for threadId = %s", threadId
+                        )
                    )
                }
-            } else {
-                log.error("Cannot retrieve thread id from URL $link")
-                dataTransaction.saveLog(
-                    LogEntry(
-                        type = LogEntry.Type.SCAN,
-                        status = LogEntry.Status.ERROR,
-                        message = "Invalid link $link, link is missing the threadId"
+                val threadLookupResult = threadCacheService[thread.threadId]
+                if (threadLookupResult.error.isNotBlank()) {
+                    throw PostParseException("Error occurred for threadId = $threadId, ${threadLookupResult.error}")
+                }
+                threadLookupResult.postItemList.map { postItem ->
+                    PostSelection(
+                        postItem.threadId,
+                        postItem.threadTitle,
+                        postItem.postId,
+                        postItem.number,
+                        postItem.title,
+                        postItem.imageCount,
+                        postItem.url,
+                        postItem.hosts.joinToString(", ") { "${it.first} (${it.second})" },
+                        postItem.forum,
+                        postItem.imageItemList.map { it.thumbLink })
+                }.ifEmpty {
+                    throw PostParseException(
+                        "Nothing found for threadId = $threadId"
                    )
-                )
-                continue
+                }
+            } catch (e: Exception) {
+                log.error(e.message)
+                throw e
            }
        }
    }

-    @Synchronized
-    fun restartAll(posIds: List<Long> = listOf()) {
-        downloadService.restartAll(posIds.map { dataTransaction.findPostByPostId(it) }.filter { it.isPresent }
-            .map { it.get() })
+    override suspend fun threadRemove(threadIdList: List<Long>) {
+        lock.withLock {
+            threadIdList.forEach {
+                dataTransaction.removeThread(it)
+            }
+        }
    }

-    @Synchronized
-    fun download(posts: List<ThreadPostId>) {
-        CompletableFuture.runAsync(
-            AddPostRunnable(posts), GLOBAL_EXECUTOR
+    override suspend fun threadClear() {
+        lock.withLock {
+            dataTransaction.clearQueueLinks()
+        }
+    }
+
+    override suspend fun renameToFirst(postIds: List<Long>) {
+        postIds.forEach { postId ->
+            dataTransaction
+                .findMetadataByPostId(postId)
+                .map { it.data.resolvedNames }
+                .filter { it.isNotEmpty() }
+                .getOrNull()?.let { rename(postId, it.first()) }
+        }
+    }
+
+    override fun ready(): Boolean {
+        return true
+    }
+
+    override suspend fun rename(postId: Long, newName: String) {
+        taskRunner.submit {
+            synchronized(postId.toString().intern()) {
+                if (dataTransaction.exists(postId)) {
+                    dataTransaction.findPostByPostId(postId).let { post ->
+                        if (Path(post.downloadDirectory, post.folderName).exists()) {
+                            PathUtils.rename(
+                                dataTransaction.findImagesByPostId(postId),
+                                post.downloadDirectory,
+                                post.folderName,
+                                newName
+                            )
+                        }
+                        post.folderName = PathUtils.sanitize(newName)
+                        dataTransaction.updatePost(post)
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onNewPosts(): Flow<Post> =
+        EventBus.events.filterIsInstance(PostCreateEvent::class).map { it.postEntities.map(::mapper) }
+            .flatMapConcat { it.asFlow() }
+
+
+    override fun onUpdatePosts() =
+        EventBus.events.filterIsInstance(PostUpdateEvent::class).map { it.postEntities.map(::mapper) }
+            .flatMapConcat { it.asFlow() }
+
+
+    override fun onDeletePosts() =
+        EventBus.events.filterIsInstance(PostDeleteEvent::class).flatMapConcat { it.postIds.asFlow() }
+
+
+    override fun onUpdateMetadata() =
+        EventBus.events.filterIsInstance(MetadataUpdateEvent::class).map { it.metadataEntity }
+
+
+    override suspend fun findAllPosts(): List<Post> {
+        return dataTransaction.findAllPosts().map(::mapper)
+    }
+
+    private fun mapper(postEntity: PostEntity): Post {
+        val metadata: Metadata? = dataTransaction.findMetadataByPostId(postEntity.postId).orElse(null)
+        val images = dataTransaction.findImagesByPostId(postEntity.postId)
+        return Post(
+            postEntity.id,
+            postEntity.postTitle,
+            postEntity.threadTitle,
+            postEntity.forum,
+            postEntity.url,
+            postEntity.token,
+            postEntity.postId,
+            postEntity.threadId,
+            postEntity.total,
+            postEntity.hosts,
+            postEntity.downloadDirectory,
+            postEntity.addedOn,
+            postEntity.folderName,
+            postEntity.status,
+            postEntity.done,
+            postEntity.rank,
+            postEntity.size,
+            postEntity.downloaded,
+            images.take(4).map { it.thumbUrl },
+            metadata?.data?.postedBy ?: "",
+            metadata?.data?.resolvedNames ?: emptyList(),
        )
    }

-    @Synchronized
-    fun stopAll(postIdList: List<Long> = emptyList()) {
-        downloadService.stop(postIdList)
+    override suspend fun findPost(postId: Long): Post {
+        return mapper(dataTransaction.findPostByPostId(postId))
    }

-    @Synchronized
-    fun remove(postIdList: List<Long>) {
-        downloadService.stop(postIdList)
-        dataTransaction.removeAll(postIdList)
+    override suspend fun findImagesByPostId(postId: Long): List<Image> {
+        return dataTransaction.findImagesByPostId(postId)
    }

-    @Synchronized
-    fun clearCompleted(): List<Long> {
-        return dataTransaction.clearCompleted()
+    override fun onUpdateImagesByPostId(postId: Long): Flow<Image> =
+        EventBus.events.filterIsInstance(ImageEvent::class).map {
+            it.imageEntities.filter { imageEntity: Image -> imageEntity.postId == postId }
+        }.filter { it.isNotEmpty() }.flatMapConcat { it.asFlow() }
+
+    override fun onUpdateImages(): Flow<Image> =
+        EventBus.events.filterIsInstance(ImageEvent::class).flatMapConcat { it.imageEntities.asFlow() }
+
+    override fun onStopped(): Flow<Long> =
+        EventBus.events.filterIsInstance(StoppedEvent::class).flatMapConcat { it.postIds.asFlow() }
+
+    override fun onNewLog() = EventBus.events.filterIsInstance(LogCreateEvent::class).map { it.logEntryEntity }
+
+    override suspend fun initLogger() = logService.init()
+
+    override fun onNewThread(): Flow<Thread> =
+        EventBus.events.filterIsInstance(ThreadCreateEvent::class).map { it.threadEntity }
+
+
+    override fun onUpdateThread(): Flow<Thread> =
+        EventBus.events.filterIsInstance(ThreadUpdateEvent::class).map { it.threadEntity }
+
+
+    override fun onDeleteThread(): Flow<Long> =
+        EventBus.events.filterIsInstance(ThreadDeleteEvent::class).map { it.threadId }
+
+
+    override fun onClearThreads(): Flow<Unit> = EventBus.events.filterIsInstance(ThreadClearEvent::class).map { }
+
+
+    override suspend fun findAllThreads(): List<Thread> {
+        return dataTransaction.findAllThreads()
    }

-    @Synchronized
-    @Throws(PostParseException::class)
-    fun grab(threadId: Long): List<PostItem> {
-        return try {
-            val thread = dataTransaction.findThreadByThreadId(threadId).orElseThrow {
-                PostParseException(
-                    String.format(
-                        "Unable to find links for threadId = %s", threadId
-                    )
-                )
-            }
-            val threadLookupResult = threadCacheService[thread.threadId]
-            threadLookupResult.postItemList.ifEmpty {
-                log.error(
-                    String.format(
-                        "Failed to get links for threadId = %s", threadId
-                    )
-                )
-                throw PostParseException(
-                    String.format(
-                        "Failed to get links for threadId = %s", threadId
-                    )
-                )
-            }
-        } catch (e: Exception) {
-            throw PostParseException(
-                String.format(
-                    "Failed to get links for threadId = %s, %s", threadId, e.message
-                )
-            )
+    override fun onDownloadSpeed(): Flow<DownloadSpeed> =
+        EventBus.events.filterIsInstance(DownloadSpeedEvent::class).map { it.downloadSpeed }
+
+    override fun onVGUserUpdate(): Flow<String> =
+        EventBus.events.filterIsInstance(VGUserLoginEvent::class).map { it.username }
+
+    override fun onQueueStateUpdate(): Flow<QueueState> =
+        EventBus.events.filterIsInstance(QueueStateEvent::class).map { it.queueState }
+
+    override fun onErrorCountUpdate(): Flow<ErrorCount> =
+        EventBus.events.filterIsInstance(ErrorCountEvent::class).map { it.errorCount }
+
+    override fun onTasksRunning(): Flow<Boolean> =
+        EventBus.events.filterIsInstance(LoadingTasks::class).sample(Duration.ofMillis(500)).map { it.loading }
+
+    override suspend fun getSettings(): Settings = settingsService.settings
+
+    override suspend fun saveSettings(settings: Settings) = settingsService.newSettings(settings)
+
+    override suspend fun getProxies(): List<String> = settingsService.getProxies()
+
+    override fun onUpdateSettings(): Flow<Settings> =
+        EventBus.events.filterIsInstance(SettingsUpdateEvent::class).map { it.settings }
+
+    override suspend fun loggedInUser(): String = vgAuthService.loggedUser
+
+    override suspend fun getVersion(): String = ApplicationProperties.VERSION
+
+    override suspend fun dbMigration(): String {
+
+        val conn = try {
+            DriverManager
+                .getConnection("jdbc:h2:file:$VRIPPER_DIR/vripper;DB_CLOSE_DELAY=-1;IFEXISTS=TRUE")
+        } catch (_: JdbcSQLNonTransientConnectionException) {
+            return "Old database not found, nothing to do"
        }
-    }

-    @Synchronized
-    fun threadRemove(threadIdList: List<Long>) {
-        threadIdList.forEach {
-            dataTransaction.removeThread(it)
-        }
-    }
+        var postsCount = 0;
+        var threadCount = 0;

-    @Synchronized
-    fun threadClear() {
-        dataTransaction.clearQueueLinks()
-    }
+        conn.use { conn ->
+            conn.prepareStatement("select * from post").use {
+                it.executeQuery().use {
+                    while (it.next()) {
+                        val done = it.getInt("DONE")
+                        val hosts = it.getString("HOSTS")
+                        val outputPath = it.getString("OUTPUT_PATH")
+                        val postId = it.getLong("POST_ID")
+                        val status = it.getString("STATUS")
+                        val threadId = it.getLong("THREAD_ID")
+                        val postTitle = it.getString("POST_TITLE")
+                        val threadTitle = it.getString("THREAD_TITLE")
+                        val forum = it.getString("FORUM")
+                        val total = it.getInt("TOTAL")
+                        val size = it.getLong("SIZE")
+                        val downloaded = it.getLong("DOWNLOADED")
+                        val url = it.getString("URL")
+                        val token = it.getString("TOKEN")
+                        val addedAt = it.getTimestamp("ADDED_AT")
+                        val folderName = it.getString("FOLDER_NAME") ?: ""

-    fun logClear() {
-        dataTransaction.deleteAllLogs()
-    }
+                        val exists = dataTransaction.exists(postId)
+                        if (exists) {
+                            continue
+                        }

-    fun rename(postId: Long, newName: String) {
-        CompletableFuture.runAsync({
-            synchronized(postId.toString().intern()) {
-                dataTransaction.findPostByPostId(postId).ifPresent { post ->
-                    if (Path(post.downloadDirectory, post.folderName).exists()) {
-                        PathUtils.rename(
-                            dataTransaction.findImagesByPostId(postId),
-                            post.downloadDirectory,
-                            post.folderName,
-                            newName
+                        val post = PostEntity(
+                            postTitle = postTitle,
+                            threadTitle = threadTitle,
+                            forum = forum,
+                            url = url,
+                            token = token,
+                            postId = postId,
+                            threadId = threadId,
+                            total = total,
+                            hosts = hosts.split(";").dropLastWhile { it.isEmpty() }.toSet(),
+                            downloadDirectory = outputPath,
+                            addedOn = addedAt.toLocalDateTime(),
+                            folderName = folderName,
+                            status = Status.valueOf(status),
+                            done = done,
+                            size = size,
+                            downloaded = downloaded,
                        )
+
+                        val images = mutableListOf<ImageEntity>()
+
+                        // load images
+                        conn.prepareStatement("select * from image where post_id = ?").use { statement ->
+                            statement.setLong(1, postId)
+                            statement.executeQuery().use { set ->
+                                while (set.next()) {
+                                    val downloaded = set.getLong("DOWNLOADED")
+                                    val host = set.getByte("HOST")
+                                    val index = set.getInt("INDEX")
+                                    val status = Status.valueOf(set.getString("STATUS"))
+                                    val size = set.getLong("SIZE")
+                                    val url = set.getString("URL")
+                                    val thumbUrl = set.getString("THUMB_URL")
+                                    val fileName = set.getString("FILENAME") ?: ""
+
+                                    ImageEntity(
+                                        postId = postId,
+                                        url = url,
+                                        thumbUrl = thumbUrl,
+                                        host = host,
+                                        index = index,
+                                        size = size,
+                                        downloaded = downloaded,
+                                        status = status,
+                                        filename = fileName,
+                                    ).also { images.add(it) }
+                                }
+                            }
+                        }
+
+                        dataTransaction.saveAndNotify(post, images)
+
+                        //load meta
+                        conn.prepareStatement("select * from metadata where post_id = ?").use { statement ->
+                            statement.setLong(1, postId)
+                            statement.executeQuery().use { set ->
+                                if (set.next()) {
+                                    val data = Json.decodeFromString(set.getString("DATA")) as MetadataEntity.Data
+                                    val metadata = MetadataEntity(
+                                        postId = postId,
+                                        data = data
+                                    )
+                                    dataTransaction.saveMetadata(metadata)
+                                }
+                            }
+                        }
+                        postsCount++
                    }
-                    post.folderName = PathUtils.sanitize(newName)
-                    dataTransaction.updatePost(post)
                }
            }
-        }, GLOBAL_EXECUTOR)
+
+            conn.prepareStatement("select * from thread").use { statement ->
+                statement.executeQuery().use { set ->
+                    while (set.next()) {
+                        val total = set.getInt("TOTAL")
+                        val url = set.getString("URL")
+                        val threadId = set.getLong("THREAD_ID")
+                        val title = set.getString("TITLE")
+
+                        if (dataTransaction.findThreadByThreadId(threadId).isPresent) {
+                            continue
+                        }
+
+                        val threadEntity = ThreadEntity(
+                            title = title,
+                            link = url,
+                            threadId = threadId,
+                            total = total,
+                        )
+
+                        dataTransaction.save(threadEntity)
+                        threadCount++
+                    }
+                }
+            }
+        }
+
+        return if (postsCount == 0 && threadCount == 0) {
+            "Nothing to do, everything was imported"
+        } else {
+            "Successfully imported $postsCount posts and $threadCount threads"
+        }
    }
 }
@@ -1,91 +1,108 @@
 package me.vripper.services

-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.launch
+import com.github.benmanes.caffeine.cache.Caffeine
+import com.github.benmanes.caffeine.cache.LoadingCache
+import me.vripper.data.repositories.ImageRepository
+import me.vripper.data.repositories.MetadataRepository
+import me.vripper.data.repositories.PostRepository
+import me.vripper.data.repositories.ThreadRepository
 import me.vripper.entities.*
-import me.vripper.entities.domain.Status
 import me.vripper.event.*
 import me.vripper.model.ErrorCount
-import me.vripper.model.PostItem
-import me.vripper.repositories.*
 import me.vripper.utilities.PathUtils
 import me.vripper.utilities.PathUtils.sanitize
+import me.vripper.vgapi.PostItem
 import org.jetbrains.exposed.sql.transactions.transaction
 import java.util.*
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicInteger
 import kotlin.io.path.pathString

-class DataTransaction(
+internal class DataTransaction(
    private val settingsService: SettingsService,
-    private val postDownloadStateRepository: PostDownloadStateRepository,
+    private val postRepository: PostRepository,
    private val imageRepository: ImageRepository,
    private val threadRepository: ThreadRepository,
    private val metadataRepository: MetadataRepository,
-    private val logRepository: LogRepository,
    private val eventBus: EventBus,
 ) {

-    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
+    private val nextRank = AtomicInteger(transaction { getQueuePosition() }?.plus(1) ?: 0)
+    private val postEntityIdCache: LoadingCache<Long, PostEntity> =
+        Caffeine.newBuilder().expireAfterAccess(5, TimeUnit.MINUTES).build { id ->
+            transaction { postRepository.findById(id) }
+        }

-    private fun save(posts: List<Post>): List<Post> {
-        return transaction { postDownloadStateRepository.save(posts) }
+    private val postPostIdCache: LoadingCache<Long, PostEntity> =
+        Caffeine.newBuilder().expireAfterAccess(5, TimeUnit.MINUTES).build { id ->
+            transaction { postRepository.findByPostId(id) }
+        }
+
+    private fun save(postEntities: List<PostEntity>): List<PostEntity> {
+        return transaction { postRepository.save(postEntities) }
    }

-    fun updatePosts(posts: List<Post>) {
-        transaction { postDownloadStateRepository.update(posts) }
-        coroutineScope.launch {
-            eventBus.publishEvent(PostUpdateEvent(posts))
+    fun saveAndNotify(postEntity: PostEntity, images: List<ImageEntity>) {
+        val savedPost = transaction {
+            val savedPost =
+                postRepository.save(listOf(postEntity.copy(rank = nextRank.andIncrement))).first()
+            save(images.map { it.copy(postIdRef = savedPost.id) })
+            savedPost
        }
+        eventBus.publishEvent(PostCreateEvent(listOf(savedPost)))
    }

-    fun updatePost(post: Post) {
-        transaction { postDownloadStateRepository.update(post) }
-        coroutineScope.launch {
-            eventBus.publishEvent(PostUpdateEvent(listOf(post)))
+    fun updatePosts(postEntities: List<PostEntity>) {
+        transaction { postRepository.update(postEntities) }
+        postEntities.forEach { postEntity ->
+            postPostIdCache.put(postEntity.postId, postEntity)
+            postEntityIdCache.put(postEntity.id, postEntity)
        }
+        eventBus.publishEvent(PostUpdateEvent(postEntities))
    }

-    fun save(thread: Thread) {
-        val savedThread = transaction { threadRepository.save(thread) }
-        coroutineScope.launch {
-            eventBus.publishEvent(ThreadCreateEvent(savedThread))
-        }
+    fun updatePost(postEntity: PostEntity) {
+        transaction { postRepository.update(postEntity) }
+        postPostIdCache.put(postEntity.postId, postEntity)
+        postEntityIdCache.put(postEntity.id, postEntity)
+        eventBus.publishEvent(PostUpdateEvent(listOf(postEntity)))
    }

-    fun update(thread: Thread) {
-        transaction { threadRepository.update(thread) }
-        coroutineScope.launch {
-            eventBus.publishEvent(ThreadUpdateEvent(thread))
-        }
+    fun save(threadEntity: ThreadEntity) {
+        val savedThread = transaction { threadRepository.save(threadEntity) }
+        eventBus.publishEvent(ThreadCreateEvent(savedThread))
    }

-    fun updateImages(images: List<Image>) {
-        transaction { imageRepository.update(images) }
-        coroutineScope.launch {
-            eventBus.publishEvent(ImageEvent(images))
-        }
+    fun update(threadEntity: ThreadEntity) {
+        transaction { threadRepository.update(threadEntity) }
+        eventBus.publishEvent(ThreadUpdateEvent(threadEntity))
    }

-    fun updateImage(image: Image) {
-        transaction { imageRepository.update(image) }
-        coroutineScope.launch {
-            eventBus.publishEvent(ImageEvent(listOf(image)))
+    fun updateImages(imageEntities: List<ImageEntity>) {
+        transaction { imageRepository.update(imageEntities) }
+        eventBus.publishEvent(ImageEvent(imageEntities))
+    }
+
+    fun updateImage(imageEntity: ImageEntity, persist: Boolean = true) {
+        if (persist) {
+            transaction {
+                imageRepository.update(imageEntity)
+            }
        }
+        eventBus.publishEvent(ImageEvent(listOf(imageEntity)))
    }

    fun exists(postId: Long): Boolean {
-        return transaction { postDownloadStateRepository.existByPostId(postId) }
+        if (postPostIdCache.getIfPresent(postId) != null) {
+            return true
+        }
+        return transaction { postRepository.existByPostId(postId) }
    }

    @Synchronized
-    fun newPosts(postItems: List<PostItem>): List<Post> {
-        var queuePosition = transaction {
-            getQueuePosition()?.plus(1) ?: 0
-        }
-
+    fun newPosts(postItems: List<PostItem>): List<PostEntity> {
        val posts = postItems.associate { postItem ->
-            val post = Post(
+            val postEntity = PostEntity(
                postTitle = postItem.title,
                url = postItem.url,
                token = postItem.securityToken,
@@ -95,7 +112,7 @@ class DataTransaction(
                hosts = postItem.hosts.map { "${it.first} (${it.second})" }.toSet(),
                threadTitle = postItem.threadTitle,
                forum = postItem.forum,
-                rank = queuePosition++,
+                rank = nextRank.andIncrement,
                downloadDirectory = PathUtils.calculateDownloadPath(
                    postItem.forum,
                    postItem.threadTitle,
@@ -105,8 +122,8 @@ class DataTransaction(
                    postItem.title
                )
            )
-            val images = postItem.imageItemList.mapIndexed { index, imageItem ->
-                Image(
+            val imageEntities = postItem.imageItemList.mapIndexed { index, imageItem ->
+                ImageEntity(
                    postId = postItem.postId,
                    url = imageItem.mainLink,
                    thumbUrl = imageItem.thumbLink,
@@ -114,7 +131,7 @@ class DataTransaction(
                    index = index,
                )
            }
-            Pair(post, images)
+            Pair(postEntity, imageEntities)
        }


@@ -127,22 +144,20 @@ class DataTransaction(
            }
            savedPosts
        }
-        coroutineScope.launch {
-            eventBus.publishEvent(PostCreateEvent(savedPosts))
-        }
+        eventBus.publishEvent(PostCreateEvent(savedPosts))
        return savedPosts
    }

    private fun getQueuePosition(): Int? {
-        return postDownloadStateRepository.findMaxRank()
+        return postRepository.findMaxRank()
    }

-    private fun save(images: List<Image>) {
-        transaction { imageRepository.save(images) }
+    private fun save(imageEntities: List<ImageEntity>) {
+        transaction { imageRepository.save(imageEntities) }
    }

    fun finishPost(postId: Long, automatic: Boolean = false) {
-        val post = findPostByPostId(postId).orElseThrow()
+        val post = findPostByPostId(postId)
        val imagesInErrorStatus = findByPostIdAndIsError(post.postId)
        if (imagesInErrorStatus.isNotEmpty()) {
            post.status = Status.ERROR
@@ -163,7 +178,7 @@ class DataTransaction(
        }
    }

-    private fun findByPostIdAndIsError(postId: Long): List<Image> {
+    private fun findByPostIdAndIsError(postId: Long): List<ImageEntity> {
        return transaction { imageRepository.findByPostIdAndIsError(postId) }

    }
@@ -173,27 +188,24 @@ class DataTransaction(
        transaction {
            metadataRepository.deleteAllByPostId(postIds)
            imageRepository.deleteAllByPostId(postIds)
-            postDownloadStateRepository.deleteAll(postIds)
+            postRepository.deleteAll(postIds)
            sortPostsByRank()
        }
-
-        coroutineScope.launch {
-            eventBus.publishEvent(PostDeleteEvent(postIds = postIds))
-        }
-        coroutineScope.launch {
-            eventBus.publishEvent(ErrorCountEvent(ErrorCount(countImagesInError())))
+        postIds.forEach { postId ->
+            postPostIdCache.get(postId)?.let { postEntityIdCache.invalidate(it.id) }
+            postPostIdCache.invalidate(postId)
        }
+        eventBus.publishEvent(PostDeleteEvent(postIds = postIds))
+        eventBus.publishEvent(ErrorCountEvent(ErrorCount(countImagesInError())))
    }

    fun removeThread(threadId: Long) {
        transaction { threadRepository.deleteByThreadId(threadId) }
-        coroutineScope.launch {
-            eventBus.publishEvent(ThreadDeleteEvent(threadId))
-        }
+        eventBus.publishEvent(ThreadDeleteEvent(threadId))
    }

    fun clearCompleted(): List<Long> {
-        val completed = transaction { postDownloadStateRepository.findCompleted() }
+        val completed = transaction { postRepository.findCompleted() }
        remove(completed)
        return completed
    }
@@ -202,7 +214,7 @@ class DataTransaction(
        if (postIds.isNotEmpty()) {
            remove(postIds)
        } else {
-            remove(findAllPosts().map(Post::postId))
+            remove(findAllPosts().map(PostEntity::postId))
        }
    }

@@ -210,60 +222,64 @@ class DataTransaction(
        transaction { imageRepository.stopByPostIdAndIsNotCompleted(postId) }
    }

-    fun saveMetadata(metadata: Metadata) {
-        transaction { metadataRepository.save(metadata) }
-        coroutineScope.launch {
-            eventBus.publishEvent(MetadataUpdateEvent(metadata))
-        }
+    fun stopImagesByPostIdAndIsNotCompleted() {
+        transaction { imageRepository.stopByPostIdAndIsNotCompleted() }
+    }
+
+    fun saveMetadata(metadataEntity: MetadataEntity) {
+        transaction { metadataRepository.save(metadataEntity) }
+        eventBus.publishEvent(MetadataUpdateEvent(metadataEntity))
    }

    fun clearQueueLinks() {
        transaction { threadRepository.deleteAll() }
-        coroutineScope.launch {
-            eventBus.publishEvent(ThreadClearEvent())
-        }
+        eventBus.publishEvent(ThreadClearEvent())
    }

    @Synchronized
    fun sortPostsByRank() {
-        val posts = findAllPosts().sortedWith(Comparator.comparing(Post::addedOn))
-        for (i in posts.indices) {
-            posts[i].rank = i
+        val postsToUpdate = mutableListOf<PostEntity>()
+        val postEntities = findAllPosts().sortedWith(Comparator.comparing(PostEntity::rank))
+        for (i in postEntities.indices) {
+            if (postEntities[i].rank != i) {
+                postsToUpdate.add(postEntities[i].copy(rank = i))
+            }
        }
-        updatePosts(posts)
+        updatePosts(postsToUpdate)
+        nextRank.set(transaction { getQueuePosition() }?.plus(1) ?: 0)
    }

    fun setDownloadingToStopped() {
-        transaction { postDownloadStateRepository.setDownloadingToStopped() }
+        transaction { postRepository.setDownloadingToStopped() }
    }

-    fun findAllPosts(): List<Post> {
-        return transaction { postDownloadStateRepository.findAll() }
+    fun findAllPosts(): List<PostEntity> {
+        return transaction { postRepository.findAll() }
    }

-    fun findPostById(id: Long): Optional<Post> {
-        return transaction { postDownloadStateRepository.findById(id) }
+    fun findPostById(id: Long): PostEntity {
+        return postEntityIdCache.get(id) ?: throw NoSuchElementException("Post with id = $id does not exist")
    }

-    fun findImagesByPostId(postId: Long): List<Image> {
+    fun findImagesByPostId(postId: Long): List<ImageEntity> {
        return transaction { imageRepository.findByPostId(postId) }
    }

-    fun findImageById(id: Long): Optional<Image> {
+    fun findImageById(id: Long): Optional<ImageEntity> {
        return transaction { imageRepository.findById(id) }
    }

-    fun findAllThreads(): List<Thread> {
+    fun findAllThreads(): List<ThreadEntity> {
        return transaction { threadRepository.findAll() }
    }

-    fun findThreadById(id: Long): Optional<Thread> {
+    fun findThreadById(id: Long): Optional<ThreadEntity> {
        return transaction {
            threadRepository.findById(id)
        }
    }

-    fun findByPostIdAndIsNotCompleted(postId: Long): List<Image> {
+    fun findByPostIdAndIsNotCompleted(postId: Long): List<ImageEntity> {
        return transaction { imageRepository.findByPostIdAndIsNotCompleted(postId) }
    }

@@ -271,49 +287,19 @@ class DataTransaction(
        return transaction { imageRepository.countError() }
    }

-    fun findPostByPostId(postId: Long): Optional<Post> {
-        return transaction { postDownloadStateRepository.findByPostId(postId) }
+    fun findPostByPostId(postId: Long): PostEntity {
+        return postPostIdCache.get(postId) ?: throw NoSuchElementException("Post with postId = $postId does not exist")
    }

-    fun findThreadByThreadId(threadId: Long): Optional<Thread> {
+    fun findThreadByThreadId(threadId: Long): Optional<ThreadEntity> {
        return transaction { threadRepository.findByThreadId(threadId) }
    }

-    fun saveLog(logEntry: LogEntry): LogEntry {
-        val pair = transaction {
-            val saved = logRepository.save(logEntry)
-            val deleted = logRepository.deleteOldest()
-            Pair(saved, deleted)
-        }
-        coroutineScope.launch {
-            eventBus.publishEvent(LogCreateEvent(pair.first))
-        }
-        coroutineScope.launch {
-            eventBus.publishEvent(LogDeleteEvent(pair.second))
-        }
-        return pair.first
-    }
-
-    fun updateLog(logEntry: LogEntry) {
-        transaction { logRepository.update(logEntry) }
-        coroutineScope.launch {
-            eventBus.publishEvent(LogUpdateEvent(logEntry))
-        }
-    }
-
-    fun deleteAllLogs() {
-        transaction { logRepository.deleteAll() }
-    }
-
-    fun findAllLogs(): List<LogEntry> {
-        return transaction { logRepository.findAll() }
-    }
-
    fun findAllNonCompletedPostIds(): List<Long> {
-        return transaction { postDownloadStateRepository.findAllNonCompletedPostIds() }
+        return transaction { postRepository.findAllNonCompletedPostIds() }
    }

-    fun findMetadataByPostId(postId: Long): Optional<Metadata> {
+    fun findMetadataByPostId(postId: Long): Optional<MetadataEntity> {
        return transaction { metadataRepository.findByPostId(postId) }
    }
 }
@@ -0,0 +1,441 @@
+package me.vripper.services
+
+import dev.failsafe.Failsafe
+import dev.failsafe.RetryPolicy
+import dev.failsafe.function.CheckedRunnable
+import kotlinx.coroutines.*
+import me.vripper.entities.ImageEntity
+import me.vripper.entities.PostEntity
+import me.vripper.entities.Status
+import me.vripper.event.ErrorCountEvent
+import me.vripper.event.EventBus
+import me.vripper.event.QueueStateEvent
+import me.vripper.event.StoppedEvent
+import me.vripper.exception.DownloadException
+import me.vripper.exception.HostException
+import me.vripper.host.DownloadedImage
+import me.vripper.host.Host
+import me.vripper.host.ImageMimeType
+import me.vripper.model.ErrorCount
+import me.vripper.model.QueueState
+import me.vripper.model.Settings
+import me.vripper.utilities.LoggerDelegate
+import me.vripper.utilities.PathUtils.getExtension
+import me.vripper.utilities.PathUtils.getFileNameWithoutExtension
+import me.vripper.utilities.PathUtils.sanitize
+import me.vripper.utilities.downloadRunner
+import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase
+import org.apache.hc.client5.http.cookie.BasicCookieStore
+import org.apache.hc.client5.http.protocol.HttpClientContext
+import org.jetbrains.exposed.sql.transactions.transaction
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import java.io.IOException
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.StandardCopyOption
+import java.util.*
+import java.util.concurrent.locks.ReentrantLock
+import kotlin.concurrent.withLock
+import kotlin.io.path.Path
+import kotlin.io.path.pathString
+
+internal class DownloadService(
+    private val settingsService: SettingsService,
+    private val dataTransaction: DataTransaction,
+    private val retryPolicyService: RetryPolicyService,
+    private val eventBus: EventBus
+) {
+    private val maxPoolSize: Int = 24
+    private val log by LoggerDelegate()
+    private val running: MutableMap<Byte, MutableList<ImageDownloadRunnable>> = mutableMapOf()
+    private val pending: MutableMap<Byte, MutableList<ImageDownloadRunnable>> = mutableMapOf()
+    private val lock = ReentrantLock()
+    private val condition = lock.newCondition()
+
+    internal class ImageDownloadContext(val imageEntity: ImageEntity, val settings: Settings) : KoinComponent {
+        private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
+        private val jobs = mutableListOf<Job>()
+        val httpContext: HttpClientContext =
+            HttpClientContext.create().apply { cookieStore = BasicCookieStore() }
+        val requests = mutableListOf<HttpUriRequestBase>()
+        val postId = imageEntity.postIdRef
+
+        fun cancelCoroutines() {
+            runBlocking {
+                coroutineScope.cancel()
+                jobs.forEach { job -> job.cancelAndJoin() }
+            }
+        }
+
+        fun launchCoroutine(block: suspend CoroutineScope.() -> Unit): Job {
+            return coroutineScope.launch(block = block).also { job -> jobs.add(job) }
+        }
+    }
+
+    internal class ImageDownloadRunnable(
+        val imageEntity: ImageEntity, val postRank: Int, private val settings: Settings
+    ) : KoinComponent, CheckedRunnable {
+        private val log by LoggerDelegate()
+        private val dataTransaction: DataTransaction by inject()
+        private val vgauthService: VGAuthService by inject()
+        private val hosts: List<Host> = getKoin().getAll()
+        var completed = false
+        var stopped = false
+
+        private lateinit var context: ImageDownloadContext
+
+        fun download() {
+            try {
+                imageEntity.status = Status.DOWNLOADING
+                imageEntity.downloaded = 0
+                dataTransaction.updateImage(imageEntity)
+                synchronized(imageEntity.postId.toString().intern()) {
+                    val post = dataTransaction.findPostById(context.postId)
+                    if (post.status != Status.DOWNLOADING) {
+                        post.status = Status.DOWNLOADING
+                        dataTransaction.updatePost(post)
+                        vgauthService.leaveThanks(post)
+                    }
+                }
+                log.debug("Getting image url and name from ${imageEntity.url} using ${imageEntity.host}")
+                val host = hosts.first { it.isSupported(imageEntity.url) }
+                val downloadedImage = host.downloadInternal(imageEntity.url, context)
+                log.debug("Resolved name for ${imageEntity.url}: ${downloadedImage.name}")
+                log.debug("Downloaded image {} to {}", imageEntity.url, downloadedImage.path)
+                synchronized(imageEntity.postId.toString().intern()) {
+                    val post = dataTransaction.findPostById(context.postId)
+                    val downloadDirectory = Path(post.downloadDirectory, post.folderName).pathString
+                    checkImageTypeAndRename(
+                        downloadDirectory, downloadedImage, imageEntity.index
+                    )
+                    if (imageEntity.downloaded == imageEntity.size && imageEntity.size > 0) {
+                        imageEntity.status = Status.FINISHED
+                        post.done += 1
+                        post.downloaded += imageEntity.size
+                        dataTransaction.updatePost(post)
+                    } else {
+                        imageEntity.status = Status.ERROR
+                    }
+                    dataTransaction.updateImage(imageEntity)
+                }
+            } catch (e: Exception) {
+                if (stopped) {
+                    return
+                }
+                imageEntity.status = Status.ERROR
+                dataTransaction.updateImage(imageEntity)
+                throw DownloadException(e)
+            }
+        }
+
+        @Throws(HostException::class)
+        private fun checkImageTypeAndRename(
+            downloadDirectory: String, downloadedImage: DownloadedImage, index: Int
+        ) {
+            val existingExtension = getExtension(downloadedImage.name).lowercase()
+            val fileNameWithoutExtension = getFileNameWithoutExtension(downloadedImage.name)
+            val extension = when (downloadedImage.type) {
+                ImageMimeType.IMAGE_BMP -> "BMP"
+                ImageMimeType.IMAGE_GIF -> "GIF"
+                ImageMimeType.IMAGE_JPEG -> "JPG"
+                ImageMimeType.IMAGE_PNG -> "PNG"
+                ImageMimeType.IMAGE_WEBP -> "WEBP"
+            }
+            val filename =
+                if (existingExtension.isBlank()) "${sanitize(downloadedImage.name)}.$extension" else "${
+                    sanitize(
+                        fileNameWithoutExtension
+                    )
+                }.$extension"
+            try {
+                val downloadDestinationFolder = Path.of(downloadDirectory)
+                Files.createDirectories(downloadDestinationFolder)
+                val finalFilename = "${
+                    if (settings.downloadSettings.forceOrder) String.format(
+                        "%03d_", index + 1
+                    ) else ""
+                }$filename"
+                imageEntity.filename = finalFilename
+                val imageDownloadPath = downloadDestinationFolder.resolve(finalFilename)
+                Files.copy(downloadedImage.path, imageDownloadPath, StandardCopyOption.REPLACE_EXISTING)
+            } catch (e: Exception) {
+                throw HostException("Failed to rename the image", e)
+            } finally {
+                try {
+                    Files.delete(downloadedImage.path)
+                } catch (_: IOException) {
+                }
+            }
+        }
+
+        override fun run() {
+            context = ImageDownloadContext(imageEntity, settings)
+            try {
+                if (stopped) {
+                    return
+                }
+                download()
+            } finally {
+                completed = true
+                context.cancelCoroutines()
+            }
+        }
+
+        fun stop() {
+            stopped = true
+            context.requests.forEach { it.abort() }
+            context.cancelCoroutines()
+            dataTransaction.updateImage(context.imageEntity)
+        }
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other == null || javaClass != other.javaClass) return false
+            val that = other as ImageDownloadRunnable
+            return imageEntity.id == that.imageEntity.id
+        }
+
+        override fun hashCode(): Int {
+            return Objects.hash(imageEntity.id)
+        }
+    }
+
+    fun init() {
+        Thread.ofVirtual().name("Download Loop").unstarted(Runnable {
+            val accepted: MutableList<ImageDownloadRunnable> = mutableListOf()
+            val candidates: MutableList<ImageDownloadRunnable> = mutableListOf()
+            while (!Thread.currentThread().isInterrupted) {
+                lock.withLock {
+                    candidates.addAll(getCandidates(candidateCount()))
+                    candidates.forEach {
+                        if (canRun(it.imageEntity.host)) {
+                            accepted.add(it)
+                            running[it.imageEntity.host]!!.add(it)
+                            log.debug("${it.imageEntity.url} accepted to run")
+                        }
+                    }
+                    accepted.forEach {
+                        pending[it.imageEntity.host]?.remove(it)
+                        scheduleForDownload(it)
+                    }
+                    accepted.clear()
+                    candidates.clear()
+                    try {
+                        condition.await()
+                    } catch (_: InterruptedException) {
+                        Thread.currentThread().interrupt()
+                    }
+                }
+            }
+        }).start()
+    }
+
+    fun stop(postIds: List<Long> = emptyList()) {
+        if (postIds.isNotEmpty()) {
+            stopInternal(postIds)
+            eventBus.publishEvent(StoppedEvent(postIds))
+        } else {
+            stopAll()
+            eventBus.publishEvent(StoppedEvent(listOf(-1)))
+        }
+    }
+
+    fun restartAll(postEntityIds: List<PostEntity> = emptyList()) {
+        if (postEntityIds.isNotEmpty()) {
+            restart(postEntityIds.associateWith { dataTransaction.findByPostIdAndIsNotCompleted(it.postId) })
+        } else {
+            restart(
+                dataTransaction.findAllPosts()
+                    .associateWith { dataTransaction.findByPostIdAndIsNotCompleted(it.postId) })
+        }
+    }
+
+    private fun restart(posts: Map<PostEntity, List<ImageEntity>>) {
+        lock.withLock {
+            val toProcess = mutableMapOf<PostEntity, List<ImageEntity>>()
+
+            for ((post, images) in posts) {
+                if (images.isEmpty()) {
+                    continue
+                }
+                if (isPending(post.postId)) {
+                    continue
+                }
+                toProcess[post] = images
+            }
+
+            toProcess.forEach { (post, images) ->
+                post.status = Status.PENDING
+                images.forEach { image ->
+                    with(image) {
+                        this.status = Status.PENDING
+                        this.downloaded = 0
+                    }
+                }
+            }
+
+            transaction {
+                dataTransaction.updatePosts(
+                    toProcess.keys.toList()
+                )
+                dataTransaction.updateImages(
+                    toProcess.values.flatten()
+                )
+            }
+
+
+            toProcess.entries.forEach { (post, images) ->
+                images.forEach { image ->
+                    log.debug("Enqueuing a job for ${image.url}")
+                    val imageDownloadRunnable = ImageDownloadRunnable(
+                        image, post.rank, settingsService.settings
+                    )
+                    pending.computeIfAbsent(
+                        image.host
+                    ) { mutableListOf() }
+                    pending[image.host]!!.add(imageDownloadRunnable)
+                }
+            }
+
+            condition.signal()
+        }
+    }
+
+    private fun isPending(postId: Long): Boolean {
+        return pending.values.flatten().any { it.imageEntity.postId == postId }
+    }
+
+    private fun isRunning(postId: Long): Boolean {
+        return running.values.flatten().any { it.imageEntity.postId == postId }
+    }
+
+    private fun stopAll() {
+        lock.withLock {
+            pending.values.clear()
+            running.values.flatten().forEach { obj: ImageDownloadRunnable -> obj.stop() }
+            while (running.values.flatten().count { !it.completed } > 0) {
+                Thread.sleep(100)
+            }
+            dataTransaction.findAllNonCompletedPostIds().forEach {
+                dataTransaction.stopImagesByPostIdAndIsNotCompleted(it)
+                dataTransaction.finishPost(it)
+            }
+        }
+    }
+
+    private fun stopInternal(postIds: List<Long>) {
+        lock.withLock {
+            for (postId in postIds) {
+                pending.values.forEach { pending ->
+                    pending.removeIf { it.imageEntity.postId == postId }
+                }
+                running.values.flatten()
+                    .filter { p: ImageDownloadRunnable -> p.imageEntity.postId == postId }
+                    .forEach { obj: ImageDownloadRunnable -> obj.stop() }
+                while (running.values.flatten()
+                        .count { !it.completed && it.imageEntity.postId == postId } > 0
+                ) {
+                    Thread.sleep(100)
+                }
+            }
+            postIds.forEach {
+                dataTransaction.stopImagesByPostIdAndIsNotCompleted(it)
+                dataTransaction.finishPost(it)
+            }
+        }
+    }
+
+    private fun canRun(host: Byte): Boolean {
+        val totalRunning = running.values.sumOf { it.size }
+        return (running[host]!!.size < settingsService.settings.connectionSettings.maxConcurrentPerHost && if (settingsService.settings.connectionSettings.maxGlobalConcurrent == 0) totalRunning < maxPoolSize else totalRunning < settingsService.settings.connectionSettings.maxGlobalConcurrent)
+    }
+
+    private fun candidateCount(): Map<Byte, Int> {
+        val map: MutableMap<Byte, Int> = mutableMapOf()
+        Host.Companion.getHosts().values.forEach { host: Byte ->
+            val imageDownloadRunnableList: List<ImageDownloadRunnable> = running.computeIfAbsent(
+                host
+            ) { mutableListOf() }
+            val count: Int =
+                settingsService.settings.connectionSettings.maxConcurrentPerHost - imageDownloadRunnableList.size
+            log.debug("Download slots for $host: $count")
+            map[host] = count
+        }
+        return map
+    }
+
+    private fun getCandidates(candidateCount: Map<Byte, Int>): List<ImageDownloadRunnable> {
+        val hostIntegerMap: MutableMap<Byte, Int> = candidateCount.toMutableMap()
+        val candidates: MutableList<ImageDownloadRunnable> = mutableListOf()
+        hosts@ for (host in pending.keys) {
+
+            val list: List<ImageDownloadRunnable> =
+                pending[host]!!.sortedWith(Comparator.comparingInt<ImageDownloadRunnable> { it.postRank }
+                    .thenComparingInt { it.imageEntity.index })
+
+            for (imageDownloadRunnable in list) {
+                val count = hostIntegerMap[host] ?: 0
+                if (count > 0) {
+                    candidates.add(imageDownloadRunnable)
+                    hostIntegerMap[host] = count - 1
+                } else {
+                    continue@hosts
+                }
+            }
+        }
+        return candidates
+    }
+
+    private fun scheduleForDownload(imageDownloadRunnable: ImageDownloadRunnable) {
+        log.debug("Scheduling a job for ${imageDownloadRunnable.imageEntity.url}")
+        eventBus.publishEvent(QueueStateEvent(QueueState(runningCount(), pendingCount())))
+        Failsafe.with<Any, RetryPolicy<Any>>(retryPolicyService.buildRetryPolicy("Failed to download ${imageDownloadRunnable.imageEntity.url}: "))
+            .with(downloadRunner)
+            .onFailure {
+                log.error(
+                    "Failed to download ${imageDownloadRunnable.imageEntity.url} after ${it.attemptCount} tries",
+                    it.exception
+                )
+                val image = imageDownloadRunnable.imageEntity
+                image.status = Status.ERROR
+                dataTransaction.updateImage(image)
+            }
+            .onComplete {
+                afterJobFinish(imageDownloadRunnable)
+                eventBus.publishEvent(
+                    QueueStateEvent(
+                        QueueState(
+                            runningCount(), pendingCount()
+                        )
+                    )
+                )
+                eventBus.publishEvent(ErrorCountEvent(ErrorCount(dataTransaction.countImagesInError())))
+                log.debug(
+                    "Finished downloading ${imageDownloadRunnable.imageEntity.url}"
+                )
+            }.runAsync(imageDownloadRunnable)
+    }
+
+    private fun afterJobFinish(imageDownloadRunnable: ImageDownloadRunnable) {
+        lock.withLock {
+            val image = imageDownloadRunnable.imageEntity
+            running[image.host]!!.remove(imageDownloadRunnable)
+            if (!isPending(image.postId) && !isRunning(
+                    image.postId
+                ) && !imageDownloadRunnable.stopped
+            ) {
+                dataTransaction.finishPost(image.postId, true)
+            }
+            condition.signal()
+        }
+    }
+
+    private fun pendingCount(): Int {
+        return pending.values.sumOf { it.size }
+    }
+
+    private fun runningCount(): Int {
+        return running.values.sumOf { it.size }
+    }
+}
@@ -8,7 +8,7 @@ import me.vripper.event.QueueStateEvent
 import me.vripper.model.DownloadSpeed
 import java.util.concurrent.atomic.AtomicLong

-class DownloadSpeedService(
+internal class DownloadSpeedService(
    private val eventBus: EventBus,
 ) {

@@ -23,7 +23,6 @@ class DownloadSpeedService(
    fun init() {
        coroutineScope.launch {
            eventBus.events.filterIsInstance(QueueStateEvent::class).collect {
-                coroutineContext.ensureActive()
                if (it.queueState.running + it.queueState.remaining > 0) {
                    if (job == null || job?.isActive == false) {
                        job = coroutineScope.launch {
@@ -31,7 +30,6 @@ class DownloadSpeedService(
                            while (isActive) {
                                delay(DOWNLOAD_POLL_RATE.toLong())
                                val newValue = bytesCount.getAndSet(0)
-
                                eventBus.publishEvent(DownloadSpeedEvent(DownloadSpeed(((newValue * 1000) / DOWNLOAD_POLL_RATE))))
                            }
                        }
@@ -4,72 +4,65 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.filterIsInstance
 import me.vripper.event.EventBus
 import me.vripper.event.SettingsUpdateEvent
+import me.vripper.utilities.ApplicationProperties
 import org.apache.hc.client5.http.config.ConnectionConfig
 import org.apache.hc.client5.http.config.RequestConfig
 import org.apache.hc.client5.http.cookie.StandardCookieSpec
 import org.apache.hc.client5.http.impl.DefaultRedirectStrategy
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient
 import org.apache.hc.client5.http.impl.classic.HttpClients
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager
+import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder
+import org.apache.hc.client5.http.io.HttpClientConnectionManager
 import org.apache.hc.core5.pool.PoolConcurrencyPolicy
 import org.apache.hc.core5.pool.PoolReusePolicy
-import org.apache.hc.core5.util.TimeValue
 import org.apache.hc.core5.util.Timeout

-class HTTPService(
-    private val eventBus: EventBus,
-    settingsService: SettingsService
+internal class HTTPService(
+    private val eventBus: EventBus
 ) {
-
-    companion object {
-        const val USER_AGENT =
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/118.0"
-    }
-
    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)

-    private lateinit var pcm: PoolingHttpClientConnectionManager
-    private lateinit var rc: RequestConfig
-    private lateinit var cc: ConnectionConfig
-    lateinit var client: CloseableHttpClient
-    private var connectionTimeout = settingsService.settings.connectionSettings.timeout
+    private var pcm: HttpClientConnectionManager = BasicHttpClientConnectionManager()
+    private var rc: RequestConfig = RequestConfig.DEFAULT
+    private var cc: ConnectionConfig = ConnectionConfig.DEFAULT
+    private var connectionTimeout = 30
+    private var connectionExpiryJob: Job? = null
+    var client: CloseableHttpClient = HttpClients.createDefault()

    fun init() {
-        buildRequestConfig()
-        buildConnectionConfig()
-        buildConnectionPool()
-        buildClientBuilder()
-        coroutineScope.launch {
-            pcm.closeIdle(TimeValue.ofSeconds(60))
-            delay(15000)
-        }
        coroutineScope.launch {
            eventBus
                .events
                .filterIsInstance(SettingsUpdateEvent::class)
                .collect {
-                    if (connectionTimeout != it.settings.connectionSettings.timeout) {
-                        connectionTimeout = it.settings.connectionSettings.timeout
-                        client.close()
-                        pcm.close()
-                        buildRequestConfig()
-                        buildConnectionConfig()
-                        buildConnectionPool()
-                        buildClientBuilder()
-                    }
+                    connectionTimeout = it.settings.connectionSettings.timeout
+                    client.close()
+                    pcm.close()
+                    buildRequestConfig()
+                    buildConnectionConfig()
+                    buildConnectionPool()
+                    buildClientBuilder()
                }
        }
    }

    private fun buildConnectionPool() {
+        connectionExpiryJob?.cancel()
        pcm = PoolingHttpClientConnectionManagerBuilder.create()
-            .setPoolConcurrencyPolicy(PoolConcurrencyPolicy.STRICT)
-            .setConnPoolPolicy(PoolReusePolicy.LIFO)
+            .setPoolConcurrencyPolicy(PoolConcurrencyPolicy.LAX)
+            .setConnPoolPolicy(PoolReusePolicy.FIFO)
            .setDefaultConnectionConfig(cc)
            .setMaxConnTotal(Int.MAX_VALUE)
            .setMaxConnPerRoute(Int.MAX_VALUE)
-            .build()
+            .build().also {
+                connectionExpiryJob = coroutineScope.launch {
+                    while (isActive) {
+                        it.closeExpired()
+                        delay(60_000)
+                    }
+                }
+            }
    }

    private fun buildRequestConfig() {
@@ -83,7 +76,6 @@ class HTTPService(
        cc = ConnectionConfig.custom()
            .setConnectTimeout(Timeout.ofSeconds(connectionTimeout.toLong()))
            .setSocketTimeout(Timeout.ofSeconds(connectionTimeout.toLong()))
-            .setTimeToLive(TimeValue.ofMinutes(10))
            .build()
    }

@@ -91,10 +83,9 @@ class HTTPService(
        client = HttpClients.custom()
            .setConnectionManager(pcm)
            .setRedirectStrategy(DefaultRedirectStrategy.INSTANCE)
-            .setUserAgent(USER_AGENT)
+            .setUserAgent(ApplicationProperties.USER_AGENT)
            .disableAutomaticRetries()
            .setDefaultRequestConfig(rc)
            .build()
-
    }
 }
@@ -0,0 +1,48 @@
+package me.vripper.services
+
+import kotlinx.coroutines.flow.Flow
+import me.vripper.model.*
+
+interface IAppEndpointService {
+    suspend fun scanLinks(postLinks: String)
+    suspend fun restartAll(posIds: List<Long> = listOf())
+    suspend fun remove(postIdList: List<Long>)
+    suspend fun stopAll(postIdList: List<Long> = emptyList())
+    suspend fun clearCompleted(): List<Long>
+    suspend fun findPost(postId: Long): Post
+    suspend fun findAllPosts(): List<Post>
+    suspend fun rename(postId: Long, newName: String)
+    fun onNewPosts(): Flow<Post>
+    fun onUpdatePosts(): Flow<Post>
+    fun onDeletePosts(): Flow<Long>
+    fun onUpdateMetadata(): Flow<Metadata>
+    suspend fun findImagesByPostId(postId: Long): List<Image>
+    fun onUpdateImagesByPostId(postId: Long): Flow<Image>
+    fun onUpdateImages(): Flow<Image>
+    fun onStopped(): Flow<Long>
+    fun onNewLog(): Flow<LogEntry>
+    fun onNewThread(): Flow<Thread>
+    fun onUpdateThread(): Flow<Thread>
+    fun onDeleteThread(): Flow<Long>
+    fun onClearThreads(): Flow<Unit>
+    suspend fun findAllThreads(): List<Thread>
+    suspend fun threadRemove(threadIdList: List<Long>)
+    suspend fun threadClear()
+    suspend fun grab(threadId: Long): List<PostSelection>
+    suspend fun download(posts: List<ThreadPostId>)
+    fun onDownloadSpeed(): Flow<DownloadSpeed>
+    fun onVGUserUpdate(): Flow<String>
+    fun onQueueStateUpdate(): Flow<QueueState>
+    fun onErrorCountUpdate(): Flow<ErrorCount>
+    fun onTasksRunning(): Flow<Boolean>
+    suspend fun getSettings(): Settings
+    suspend fun saveSettings(settings: Settings)
+    suspend fun getProxies(): List<String>
+    fun onUpdateSettings(): Flow<Settings>
+    suspend fun loggedInUser(): String
+    suspend fun getVersion(): String
+    suspend fun renameToFirst(postIds: List<Long>)
+    fun ready(): Boolean
+    suspend fun dbMigration(): String
+    suspend fun initLogger()
+}
@@ -0,0 +1,49 @@
+package me.vripper.services
+
+import kotlinx.coroutines.*
+import me.vripper.RingAppender
+import me.vripper.entities.LogEntryEntity
+import me.vripper.event.EventBus
+import me.vripper.event.LogCreateEvent
+import me.vripper.utilities.StackTraceElementUtils
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+
+class LogService(private val eventBus: EventBus) {
+    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
+    private val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS")
+    private var job: Job? = null
+
+    fun init() {
+        if (job != null) {
+            return
+        }
+        job = coroutineScope.launch {
+            while (isActive) {
+                while (!RingAppender.Static.events.isEmpty()) {
+                    RingAppender.Static.events.poll()?.also { loggingEvent ->
+                        eventBus.publishEvent(
+                            LogCreateEvent(
+                                LogEntryEntity(
+                                    loggingEvent.sequenceNumber,
+                                    loggingEvent.instant.atZone(ZoneId.systemDefault()).toLocalDateTime()
+                                        .format(dateTimeFormatter),
+                                    loggingEvent.threadName,
+                                    loggingEvent.loggerName,
+                                    loggingEvent.level.levelStr,
+                                    loggingEvent.formattedMessage,
+                                    loggingEvent.throwableProxy?.let { throwableProxy ->
+                                        StackTraceElementUtils.format(
+                                            throwableProxy
+                                        )
+                                    } ?: ""
+                                )
+                            )
+                        )
+                    }
+                }
+                delay(777)
+            }
+        }
+    }
+}
@@ -1,109 +1,29 @@
 package me.vripper.services

-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Semaphore
-import kotlinx.coroutines.sync.withPermit
-import me.vripper.entities.Metadata
-import me.vripper.exception.DownloadException
-import me.vripper.exception.VripperException
-import me.vripper.utilities.HtmlUtils
-import me.vripper.utilities.XpathUtils
-import org.apache.hc.client5.http.classic.methods.HttpGet
-import org.apache.hc.core5.net.URIBuilder
-import org.w3c.dom.Node
-import java.util.concurrent.atomic.AtomicBoolean
-import java.util.stream.Collectors
+import me.vripper.tasks.FetchMetadataTask
+import me.vripper.utilities.taskRunner

-
-class MetadataService(
-    private val httpService: HTTPService,
-    private val settingsService: SettingsService,
+internal class MetadataService(
    private val dataTransaction: DataTransaction,
-    private val vgAuthService: VGAuthService,
+    private val settingsService: SettingsService,
 ) {

-    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-    private val requestSemaphore = Semaphore(6)
-    private val dictionary: List<String> =
-        mutableListOf("download", "link", "rapidgator", "filefactory", "filefox")
-
    fun init() {
-        dataTransaction.findAllPosts()
-            .filter { dataTransaction.findMetadataByPostId(it.postId).isEmpty }.map { it.postId }
-            .forEach(::fetchMetadata)
+        if (!settingsService.settings.viperSettings.fetchMetadata) {
+            return
+        }
+        dataTransaction.findAllPosts().filter { dataTransaction.findMetadataByPostId(it.postId).isEmpty }
+            .map { it.postId }.forEach(::fetchMetadata)
    }

    fun fetchMetadata(postId: Long) {
-        coroutineScope.launch {
-            requestSemaphore.withPermit {
-                val httpGet =
-                    HttpGet(URIBuilder(settingsService.settings.viperSettings.host + "/threads/").also {
-                        it.setParameter(
-                            "p", postId.toString()
-                        )
-                    }.build())
-
-                val metadata = httpService.client.execute(httpGet, vgAuthService.context) {
-                    if (it.code / 100 != 2) {
-                        throw DownloadException("Unexpected response code '${it.code}' for $httpGet")
-                    }
-                    val document = HtmlUtils.clean(it.entity.content)
-                    val postNode: Node = XpathUtils.getAsNode(
-                        document,
-                        "//li[@id='post_$postId']/div[contains(@class, 'postdetails')]",
-
-                        ) ?: throw VripperException("Unable to find post #'$postId'")
-
-                    val postedBy: String = XpathUtils.getAsNode(
-                        postNode,
-                        "./div[contains(@class, 'userinfo')]//a[contains(@class, 'username')]//font"
-                    )?.textContent?.trim()
-                        ?: throw VripperException("Unable to find the poster for post #'$postId'")
-
-
-                    val node: Node = XpathUtils.getAsNode(
-                        document, java.lang.String.format("//div[@id='post_message_%s']", postId)
-                    ) ?: throw VripperException("Unable to locate post content")
-                    val titles = findTitleInContent(node)
-                    Metadata(postId, Metadata.Data(postedBy, titles))
-                }
-                dataTransaction.saveMetadata(metadata)
-            }
-        }
-    }
-
-    private fun findTitleInContent(node: Node): List<String> {
-        val altTitle: MutableList<String> = mutableListOf()
-        findTitle(node, altTitle, AtomicBoolean(true))
-        return altTitle.stream().distinct().collect(Collectors.toList())
-    }
-
-    private fun findTitle(node: Node, altTitle: MutableList<String>, keepGoing: AtomicBoolean) {
-        if (!keepGoing.get()) {
+        if (!settingsService.settings.viperSettings.fetchMetadata) {
            return
        }
-        if (node.nodeName == "a" || node.nodeName == "img") {
-            keepGoing.set(false)
-            return
-        }
-        if (node.nodeType == Node.ELEMENT_NODE) {
-            for (i in 0 until node.childNodes.length) {
-                val item = node.childNodes.item(i)
-                findTitle(item, altTitle, keepGoing)
-                if (!keepGoing.get()) {
-                    return
-                }
-            }
-        } else if (node.nodeType == Node.TEXT_NODE) {
-            val text = node.textContent.trim()
-            if (text.isNotBlank() && dictionary.stream().noneMatch { e ->
-                    text.lowercase().contains(e.lowercase())
-                }) {
-                altTitle.add(text)
-            }
-        }
+        taskRunner.submit(
+            FetchMetadataTask(
+                postId
+            )
+        )
    }
 }
@@ -1,5 +1,6 @@
 package me.vripper.services

+import dev.failsafe.RetryPolicy
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -7,14 +8,13 @@ import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.launch
 import me.vripper.event.EventBus
 import me.vripper.event.SettingsUpdateEvent
-import net.jodah.failsafe.RetryPolicy
-import net.jodah.failsafe.event.ExecutionAttemptedEvent
+import me.vripper.utilities.LoggerDelegate
 import java.time.temporal.ChronoUnit

-class RetryPolicyService(
+internal class RetryPolicyService(
    val eventBus: EventBus, settingsService: SettingsService
 ) {
-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()
    private var maxAttempts: Int = settingsService.settings.connectionSettings.maxAttempts
    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)

@@ -28,16 +28,10 @@ class RetryPolicyService(
        }
    }

-    fun <T> buildRetryPolicyForDownload(): RetryPolicy<T> {
-        return RetryPolicy<T>().withDelay(2, 5, ChronoUnit.SECONDS).withMaxAttempts(maxAttempts).onFailedAttempt {
-                log.warn("#${it.attemptCount} tries failed", it.lastFailure)
-            }
-    }
-
-    fun <T> buildGenericRetryPolicy(): RetryPolicy<T> {
-        return RetryPolicy<T>().withDelay(2, 5, ChronoUnit.SECONDS).withMaxAttempts(maxAttempts)
-            .onFailedAttempt { e: ExecutionAttemptedEvent<T> ->
-                log.warn("#${e.attemptCount} tries failed", e.lastFailure)
-            }
+    fun <T> buildRetryPolicy(message: String): RetryPolicy<T> {
+        return RetryPolicy.builder<T>().withDelay(2, 5, ChronoUnit.SECONDS).withMaxAttempts(maxAttempts)
+            .onFailedAttempt {
+                log.warn(message + "#${it.attemptCount} tries failed", it.lastException)
+            }.build()
    }
 }
@@ -1,9 +1,6 @@
 package me.vripper.services

-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.launch
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
@@ -12,38 +9,33 @@ import me.vripper.event.SettingsUpdateEvent
 import me.vripper.exception.ValidationException
 import me.vripper.model.Settings
 import me.vripper.utilities.ApplicationProperties.VRIPPER_DIR
-import org.apache.commons.codec.digest.DigestUtils
+import me.vripper.utilities.LoggerDelegate
+import me.vripper.utilities.md5Hex
 import java.io.FileWriter
 import java.nio.file.*
 import kotlin.io.path.readText

 class SettingsService(private val eventBus: EventBus) {

-    private val log by me.vripper.delegate.LoggerDelegate()
+    private val log by LoggerDelegate()
    private val configPath = VRIPPER_DIR.resolve("config.json")
    private val customProxiesPath = VRIPPER_DIR.resolve("proxies.json")
    private val proxies: MutableSet<String> = HashSet()
-    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)

    private val json = Json {
        encodeDefaults = true
        prettyPrint = true
+        ignoreUnknownKeys = true
    }
    var settings = Settings()

-    init {
-        init()
-    }
-
-    private fun init() {
+    fun init() {
        loadViperProxies()
        restore()
-        coroutineScope.launch {
-            eventBus.publishEvent(SettingsUpdateEvent(settings))
-        }
-
+        eventBus.publishEvent(SettingsUpdateEvent(settings))
    }

+    @OptIn(ExperimentalSerializationApi::class)
    private fun loadViperProxies() {
        try {
            SettingsService::class.java.getResourceAsStream("/proxies.json")?.use {
@@ -56,6 +48,7 @@ class SettingsService(private val eventBus: EventBus) {
                            customProxiesPath.readText()
                        )
                    } catch (e: Exception) {
+                        log.error("Failed to read custom proxies", e)
                        emptyList()
                    }
                } else {
@@ -89,7 +82,7 @@ class SettingsService(private val eventBus: EventBus) {
        check(settings)
        val viperSettings = if (settings.viperSettings.login) {
            if (this.settings.viperSettings.password != settings.viperSettings.password) {
-                settings.viperSettings.copy(password = DigestUtils.md5Hex(settings.viperSettings.password))
+                settings.viperSettings.copy(password = md5Hex(settings.viperSettings.password))
            } else {
                settings.viperSettings
            }
@@ -98,9 +91,7 @@ class SettingsService(private val eventBus: EventBus) {
        }
        this.settings = settings.copy(viperSettings = viperSettings)
        save()
-        coroutineScope.launch {
-            eventBus.publishEvent(SettingsUpdateEvent(this@SettingsService.settings))
-        }
+        eventBus.publishEvent(SettingsUpdateEvent(this@SettingsService.settings))
    }

    private fun restore() {
@@ -109,7 +100,7 @@ class SettingsService(private val eventBus: EventBus) {
                settings = json.decodeFromString(configPath.readText())
            }
        } catch (e: Exception) {
-            log.error("Failed restore user settings", e)
+            log.error("Failed to restore user settings", e)
            settings = Settings()
        }
        if (!proxies.contains(settings.viperSettings.host)) {
@@ -125,7 +116,7 @@ class SettingsService(private val eventBus: EventBus) {
        save()
    }

-    fun save() {
+    private fun save() {
        try {
            Files.writeString(
                configPath,
@@ -144,7 +135,7 @@ class SettingsService(private val eventBus: EventBus) {
    fun check(settings: Settings) {
        val path: Path = try {
            Paths.get(settings.downloadSettings.downloadPath)
-        } catch (e: InvalidPathException) {
+        } catch (_: InvalidPathException) {
            throw ValidationException(
                String.format(
                    "%s is invalid", settings.downloadSettings.downloadPath
@@ -195,5 +186,11 @@ class SettingsService(private val eventBus: EventBus) {
                "Invalid clipboard monitoring polling rate settings, values must be >= 500"
            )
        }
+
+        if (settings.viperSettings.requestLimit < 1 || settings.viperSettings.requestLimit > 5) {
+            throw ValidationException(
+                "Invalid request rate limit, values must be in [1,5]"
+            )
+        }
    }
 }
@@ -9,13 +9,12 @@ import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.launch
 import me.vripper.event.EventBus
 import me.vripper.event.SettingsUpdateEvent
-import me.vripper.model.ThreadItem
-import me.vripper.parser.ThreadLookupAPIParser
-import java.util.*
+import me.vripper.vgapi.ThreadItem
+import me.vripper.vgapi.ThreadLookupAPIParser
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.TimeUnit

-class ThreadCacheService(val eventBus: EventBus) {
+internal class ThreadCacheService(val eventBus: EventBus, val dataTransaction: DataTransaction) {

    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)

@@ -29,12 +28,18 @@ class ThreadCacheService(val eventBus: EventBus) {

    private val cache: LoadingCache<Long, ThreadItem> =
        Caffeine.newBuilder().expireAfterWrite(20, TimeUnit.MINUTES).build { threadId ->
-            ThreadLookupAPIParser(threadId).parse()
+            val threadItem = ThreadLookupAPIParser(threadId).parse()
+            dataTransaction.findThreadByThreadId(threadItem.threadId).ifPresent {
+                if (threadItem.postItemList.isNotEmpty()) {
+                    dataTransaction.update(it.copy(total = threadItem.postItemList.size))
+                }
+            }
+            threadItem
        }

    @Throws(ExecutionException::class)
    operator fun get(threadId: Long): ThreadItem {
-        return cache[threadId] ?: throw NoSuchElementException("$threadId does not exist")
+        return cache[threadId]
    }

    fun getIfPresent(threadId: Long): ThreadItem? {
@@ -5,68 +5,63 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.launch
-import me.vripper.entities.Post
+import me.vripper.entities.PostEntity
 import me.vripper.event.EventBus
 import me.vripper.event.SettingsUpdateEvent
 import me.vripper.event.VGUserLoginEvent
 import me.vripper.exception.VripperException
 import me.vripper.model.Settings
-import me.vripper.tasks.LeaveThanksRunnable
-import me.vripper.utilities.GLOBAL_EXECUTOR
+import me.vripper.tasks.LeaveThanksTask
+import me.vripper.utilities.LoggerDelegate
+import me.vripper.utilities.taskRunner
 import org.apache.hc.client5.http.classic.methods.HttpPost
 import org.apache.hc.client5.http.cookie.BasicCookieStore
 import org.apache.hc.client5.http.cookie.Cookie
 import org.apache.hc.client5.http.entity.UrlEncodedFormEntity
+import org.apache.hc.client5.http.impl.cookie.BasicClientCookie
 import org.apache.hc.client5.http.protocol.HttpClientContext
 import org.apache.hc.core5.http.io.entity.EntityUtils
 import org.apache.hc.core5.http.message.BasicNameValuePair
-import java.util.concurrent.CompletableFuture

-class VGAuthService(
+internal class VGAuthService(
    private val cm: HTTPService,
-    private val settingsService: SettingsService,
-    private val eventBus: EventBus
+    private val eventBus: EventBus,
 ) {
    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
-    private val log by me.vripper.delegate.LoggerDelegate()
-    val context: HttpClientContext = HttpClientContext.create()
+    private val log by LoggerDelegate()
+    private val vgCookies: MutableList<Cookie> = mutableListOf()
    var loggedUser = ""
-
    private var authenticated = false

    fun init() {
-        context.cookieStore = BasicCookieStore()
        coroutineScope.launch {
            eventBus.events.filterIsInstance(SettingsUpdateEvent::class).collect {
                authenticate(it.settings)
            }
        }
-        authenticate(settingsService.settings)
    }

    private fun authenticate(settings: Settings) {
-        authenticated = false
        if (!settings.viperSettings.login) {
            log.debug("Authentication option is disabled")
-            context.cookieStore.clear()
+            authenticated = false
            loggedUser = ""
-            coroutineScope.launch {
-                eventBus.publishEvent(VGUserLoginEvent(loggedUser))
+            synchronized(vgCookies) {
+                vgCookies.clear()
            }
-
+            eventBus.publishEvent(VGUserLoginEvent(loggedUser))
            return
        }
        val username = settings.viperSettings.username
        val password = settings.viperSettings.password
        if (username.isEmpty() || password.isEmpty()) {
            log.error("Cannot authenticate with ViperGirls credentials, username or password is empty")
-            context.cookieStore.clear()
+            authenticated = false
            loggedUser = ""
-
-            coroutineScope.launch {
-                eventBus.publishEvent(VGUserLoginEvent(loggedUser))
+            synchronized(vgCookies) {
+                vgCookies.clear()
            }
-
+            eventBus.publishEvent(VGUserLoginEvent(loggedUser))
            return
        }
        val postAuth = HttpPost(settings.viperSettings.host + "/login.php?do=login").also {
@@ -78,13 +73,13 @@ class VGAuthService(
                    BasicNameValuePair("vb_login_md5password", password)
                )
            )
-            it.addHeader("Referer", settings.viperSettings.host)
-            it.addHeader(
-                "Host", settings.viperSettings.host.replace("https://", "").replace("http://", "")
-            )
        }
-
+        log.info("Authenticating: ${postAuth.uri}")
        try {
+            val context = HttpClientContext.create().apply {
+                cookieStore =
+                    BasicCookieStore()
+            }
            cm.client.execute(postAuth, context) { response ->
                if (response.code / 100 != 2) {
                    throw VripperException("Unexpected response code returned ${response.code}")
@@ -92,39 +87,71 @@ class VGAuthService(
                val responseBody = EntityUtils.toString(response.entity)
                log.debug("Authentication with ViperGirls response body:{}", responseBody)
            }
-            if (context.cookieStore.cookies.stream().map { obj: Cookie -> obj.name }
-                    .noneMatch { e: String -> e == "vg_userid" }) {
+
+            val userIdCookie = context.cookieStore.cookies.find { it.name == "vg_userid" }
+            val passwordCookie = context.cookieStore.cookies.find { it.name == "vg_password" }
+
+            if (userIdCookie == null || passwordCookie == null) {
                log.error(
-                    "Failed to authenticate user with {}, missing vg_userid cookie",
+                    "Failed to authenticate user with {}, missing vg_userid/vg_password cookie",
                    settings.viperSettings.host
                )
+                eventBus.publishEvent(VGUserLoginEvent(loggedUser))
                return
            }
-        } catch (e: Exception) {
-            context.cookieStore.clear()
-            loggedUser = ""
-
-            coroutineScope.launch {
-                eventBus.publishEvent(VGUserLoginEvent(loggedUser))
+            synchronized(vgCookies) {
+                vgCookies.clear()
+                vgCookies.add(BasicClientCookie(userIdCookie.name, userIdCookie.value).apply {
+                    domain = userIdCookie.domain
+                })
+                vgCookies.add(BasicClientCookie(passwordCookie.name, passwordCookie.value).apply {
+                    domain = passwordCookie.domain
+                })
            }
-
+        } catch (e: Exception) {
            log.error(
                "Failed to authenticate user with " + settings.viperSettings.host, e
            )
+            authenticated = false
+            loggedUser = ""
+            eventBus.publishEvent(VGUserLoginEvent(loggedUser))
            return
        }
        authenticated = true
        loggedUser = username
-        log.info(String.format("Authenticated: %s", username))
-
-        coroutineScope.launch {
-            eventBus.publishEvent(VGUserLoginEvent(loggedUser))
-        }
+        eventBus.publishEvent(VGUserLoginEvent(loggedUser))
    }

-    fun leaveThanks(post: Post) {
-        CompletableFuture.runAsync(
-            LeaveThanksRunnable(post, authenticated, context), GLOBAL_EXECUTOR
+    fun leaveThanks(postEntity: PostEntity) {
+        val context = createVgContext()
+        taskRunner.submit(
+            LeaveThanksTask(postEntity, authenticated, context)
        )
    }
+
+    fun createVgContext(): HttpClientContext {
+        val context = HttpClientContext().apply { cookieStore = BasicCookieStore() }
+        synchronized(vgCookies) {
+            if (authenticated && vgCookies.isNotEmpty()) {
+                vgCookies.forEach { c -> context.cookieStore.addCookie(c) }
+            }
+        }
+        return context
+    }
+
+    fun createClickContext(): HttpClientContext {
+        val context = HttpClientContext().apply { cookieStore = BasicCookieStore() }
+        synchronized(vgCookies) {
+            if (authenticated && vgCookies.isNotEmpty()) {
+                vgCookies.forEach { c ->
+                    context.cookieStore.addCookie(
+                        BasicClientCookie(
+                            c.name,
+                            c.value
+                        ).apply { domain = "viper.click" })
+                }
+            }
+        }
+        return context
+    }
 }
@@ -1,11 +0,0 @@
-package me.vripper.tables
-
-import org.jetbrains.exposed.dao.id.LongIdTable
-import org.jetbrains.exposed.sql.javatime.datetime
-
-object LogTable : LongIdTable(name = "LOG", columnName = "ID") {
-    val type = varchar("TYPE", 8)
-    val status = varchar("STATUS", 10)
-    val time = datetime("TIME")
-    val message = varchar("MESSAGE", 500)
-}
@@ -1,57 +0,0 @@
-package me.vripper.tasks
-
-import me.vripper.download.DownloadService
-import me.vripper.model.PostItem
-import me.vripper.model.ThreadPostId
-import me.vripper.parser.PostLookupAPIParser
-import me.vripper.services.DataTransaction
-import me.vripper.services.MetadataService
-import me.vripper.services.SettingsService
-import me.vripper.services.ThreadCacheService
-import me.vripper.utilities.Tasks
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
-
-class AddPostRunnable(private val items: List<ThreadPostId>) : KoinComponent, Runnable {
-    private val log by me.vripper.delegate.LoggerDelegate()
-    private val dataTransaction: DataTransaction by inject()
-    private val settingsService: SettingsService by inject()
-    private val downloadService: DownloadService by inject()
-    private val threadCacheService: ThreadCacheService by inject()
-    private val metadataService: MetadataService by inject()
-
-    override fun run() {
-        try {
-            Tasks.increment()
-            val toProcess = mutableListOf<PostItem>()
-            for ((threadId, postId) in items) {
-                if (dataTransaction.exists(postId)) {
-                    log.warn(String.format("skipping %s, already loaded", postId))
-                    continue
-                }
-
-                val threadItem = threadCacheService.getIfPresent(threadId)
-                val postItem: PostItem =
-                    threadItem?.postItemList?.find { it.postId == postId } ?: PostLookupAPIParser(
-                        threadId,
-                        postId
-                    ).parse()
-                toProcess.add(postItem)
-            }
-
-            val posts = dataTransaction.newPosts(toProcess.toList())
-            posts.forEach {
-                metadataService.fetchMetadata(it.postId)
-            }
-            if (settingsService.settings.downloadSettings.autoStart) {
-                log.debug("Auto start downloads option is enabled")
-                downloadService.restartAll(posts)
-            }
-        } catch (e: Exception) {
-            val error = String.format("Error when adding galleries")
-            log.error(error, e)
-        } finally {
-            Tasks.decrement()
-        }
-    }
-}
@@ -0,0 +1,78 @@
+package me.vripper.tasks
+
+import me.vripper.model.ThreadPostId
+import me.vripper.services.*
+import me.vripper.utilities.LoggerDelegate
+import me.vripper.vgapi.PostItem
+import me.vripper.vgapi.PostLookupAPIParser
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+internal class AddPostTask(private val items: List<ThreadPostId>) : KoinComponent, Runnable {
+    private val log by LoggerDelegate()
+    private val dataTransaction: DataTransaction by inject()
+    private val settingsService: SettingsService by inject()
+    private val downloadService: DownloadService by inject()
+    private val threadCacheService: ThreadCacheService by inject()
+    private val metadataService: MetadataService by inject()
+
+    override fun run() {
+        try {
+            Tasks.increment()
+            val toProcess = mutableListOf<PostItem>()
+            for ((threadId, postId) in items) {
+                if (dataTransaction.exists(postId)) {
+                    continue
+                }
+
+                val link =
+                    "${settingsService.settings.viperSettings.host}/threads/$threadId?p=$postId&viewfull=1#post$postId"
+
+                val cachedThread = threadCacheService.getIfPresent(threadId)
+                val threadItem = cachedThread ?:
+                    PostLookupAPIParser(
+                        threadId, postId
+                    ).parse()
+
+
+                if (threadItem == null) {
+                    log.error("Failed to load $link")
+                    continue
+                } else {
+                    if (threadItem.error.isNotBlank()) {
+                        log.error("Error loading $link: ${threadItem.error}")
+                        continue
+                    } else if (threadItem.postItemList.isEmpty()) {
+                        log.error("Nothing found for $link")
+                        continue
+                    }
+                }
+
+                val postItem = threadItem.postItemList.firstOrNull { it.postId == postId }
+                if (postItem == null) {
+                    log.error("Unable to load $link")
+                    continue
+                }
+                toProcess.add(postItem)
+            }
+
+            val posts = try {
+                dataTransaction.newPosts(toProcess.toList())
+            } catch (e: Exception) {
+                e.printStackTrace()
+                emptyList()
+            }
+            posts.forEach {
+                metadataService.fetchMetadata(it.postId)
+            }
+            if (settingsService.settings.downloadSettings.autoStart) {
+                downloadService.restartAll(posts)
+            }
+        } catch (e: Exception) {
+            val error = String.format("Error when adding galleries")
+            log.error(error, e)
+        } finally {
+            Tasks.decrement()
+        }
+    }
+}
@@ -0,0 +1,110 @@
+package me.vripper.tasks
+
+import me.vripper.entities.MetadataEntity
+import me.vripper.exception.DownloadException
+import me.vripper.exception.VripperException
+import me.vripper.services.DataTransaction
+import me.vripper.services.HTTPService
+import me.vripper.services.SettingsService
+import me.vripper.services.VGAuthService
+import me.vripper.utilities.HtmlUtils
+import me.vripper.utilities.LoggerDelegate
+import me.vripper.utilities.RequestLimit
+import me.vripper.utilities.XpathUtils
+import org.apache.hc.client5.http.classic.methods.HttpGet
+import org.apache.hc.core5.http.io.entity.EntityUtils
+import org.apache.hc.core5.net.URIBuilder
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import org.w3c.dom.Node
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.stream.Collectors
+
+internal class FetchMetadataTask(
+    private val postId: Long,
+) : KoinComponent, Runnable {
+    private val dictionary: List<String> = mutableListOf("download", "link", "rapidgator", "filefactory", "filefox")
+    private val log by LoggerDelegate()
+    private val settingsService: SettingsService by inject()
+    private val vgAuthService: VGAuthService by inject()
+    private val httpService: HTTPService by inject()
+    private val dataTransaction: DataTransaction by inject()
+
+    override fun run() {
+        try {
+            if (!settingsService.settings.viperSettings.fetchMetadata) {
+                log.debug("Fetching metadata is disabled")
+                return
+            }
+            Tasks.increment()
+            val httpGet = HttpGet(URIBuilder(settingsService.settings.viperSettings.host + "/threads/").also {
+                it.setParameter(
+                    "p", postId.toString()
+                )
+            }.build())
+
+            RequestLimit.getPermit(1)
+            log.debug("Requesting {}", httpGet.uri)
+            val response = httpService.client.execute(httpGet, vgAuthService.createVgContext()) {
+                if (it.code / 100 != 2) {
+                    throw DownloadException("Unexpected response code '${it.code}' for $httpGet")
+                }
+                EntityUtils.toString(it.entity)
+            }
+
+            val document = HtmlUtils.clean(response)
+            val postNode: Node = XpathUtils.getAsNode(
+                document,
+                "//li[@id='post_$postId']/div[contains(@class, 'postdetails')]",
+
+                ) ?: throw VripperException("Unable to find post #'$postId'")
+
+            val postedBy: String = XpathUtils.getAsNode(
+                postNode, "./div[contains(@class, 'userinfo')]//a[contains(@class, 'username')]//font"
+            )?.textContent?.trim()
+                ?: throw VripperException("Unable to find the poster for post #'$postId'")
+
+
+            val node: Node = XpathUtils.getAsNode(
+                document, java.lang.String.format("//div[@id='post_message_%s']", postId)
+            ) ?: throw VripperException("Unable to locate post content")
+            val titles = findTitleInContent(node)
+            val metadataEntity = MetadataEntity(postId, MetadataEntity.Data(postedBy, titles))
+            dataTransaction.saveMetadata(metadataEntity)
+        } finally {
+            Tasks.decrement()
+        }
+    }
+
+    private fun findTitleInContent(node: Node): List<String> {
+        val altTitle: MutableList<String> = mutableListOf()
+        findTitle(node, altTitle, AtomicBoolean(true))
+        return altTitle.stream().distinct().collect(Collectors.toList())
+    }
+
+    private fun findTitle(node: Node, altTitle: MutableList<String>, keepGoing: AtomicBoolean) {
+        if (!keepGoing.get()) {
+            return
+        }
+        if (node.nodeName == "a" || node.nodeName == "img") {
+            keepGoing.set(false)
+            return
+        }
+        if (node.nodeType == Node.ELEMENT_NODE) {
+            for (i in 0 until node.childNodes.length) {
+                val item = node.childNodes.item(i)
+                findTitle(item, altTitle, keepGoing)
+                if (!keepGoing.get()) {
+                    return
+                }
+            }
+        } else if (node.nodeType == Node.TEXT_NODE) {
+            val text = node.textContent.trim()
+            if (text.isNotBlank() && dictionary.stream().noneMatch { e ->
+                    text.lowercase().contains(e.lowercase())
+                }) {
+                altTitle.add(text)
+            }
+        }
+    }
+}
@@ -1,71 +0,0 @@
-package me.vripper.tasks
-
-import me.vripper.entities.LogEntry
-import me.vripper.entities.LogEntry.Status.ERROR
-import me.vripper.entities.Post
-import me.vripper.services.DataTransaction
-import me.vripper.services.HTTPService
-import me.vripper.services.SettingsService
-import me.vripper.utilities.Tasks
-import me.vripper.utilities.formatToString
-import org.apache.hc.client5.http.classic.methods.HttpPost
-import org.apache.hc.client5.http.entity.UrlEncodedFormEntity
-import org.apache.hc.client5.http.protocol.HttpClientContext
-import org.apache.hc.core5.http.message.BasicNameValuePair
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
-
-class LeaveThanksRunnable(
-    private val post: Post,
-    private val authenticated: Boolean,
-    private val context: HttpClientContext
-) : KoinComponent, Runnable {
-    private val log by me.vripper.delegate.LoggerDelegate()
-    private val cm: HTTPService by inject()
-    private val settingsService: SettingsService by inject()
-    private val dataTransaction: DataTransaction by inject()
-
-    override fun run() {
-        try {
-            Tasks.increment()
-            if (!settingsService.settings.viperSettings.login || !authenticated) {
-                return
-            }
-            if (!settingsService.settings.viperSettings.thanks) {
-                return
-            }
-
-            val postThanks =
-                HttpPost("${settingsService.settings.viperSettings.host}/post_thanks.php").also {
-                    it.entity = UrlEncodedFormEntity(
-                        listOf(
-                            BasicNameValuePair("do", "post_thanks_add"),
-                            BasicNameValuePair("using_ajax", "1"),
-                            BasicNameValuePair("p", post.postId.toString()),
-                            BasicNameValuePair("securitytoken", post.token)
-                        )
-                    )
-                    it.addHeader("Referer", settingsService.settings.viperSettings.host)
-                    it.addHeader(
-                        "Host",
-                        settingsService.settings.viperSettings.host.replace("https://", "")
-                            .replace("http://", "")
-                    )
-                }
-            cm.client.execute(postThanks, context) { }
-        } catch (e: Exception) {
-            val error = "Failed to leave a thanks for $post"
-            log.error(error, e)
-            dataTransaction.saveLog(
-                LogEntry(
-                    type = LogEntry.Type.THANKS, status = ERROR, message = """
-                $error
-                ${e.formatToString()}
-                """.trimIndent()
-                )
-            )
-        } finally {
-            Tasks.decrement()
-        }
-    }
-}
@@ -0,0 +1,57 @@
+package me.vripper.tasks
+
+import me.vripper.entities.PostEntity
+import me.vripper.exception.VripperException
+import me.vripper.services.HTTPService
+import me.vripper.services.SettingsService
+import me.vripper.utilities.LoggerDelegate
+import me.vripper.utilities.RequestLimit
+import org.apache.hc.client5.http.classic.methods.HttpPost
+import org.apache.hc.client5.http.entity.UrlEncodedFormEntity
+import org.apache.hc.client5.http.protocol.HttpClientContext
+import org.apache.hc.core5.http.message.BasicNameValuePair
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+internal class LeaveThanksTask(
+    private val postEntity: PostEntity,
+    private val authenticated: Boolean,
+    private val context: HttpClientContext
+) : KoinComponent, Runnable {
+    private val log by LoggerDelegate()
+    private val cm: HTTPService by inject()
+    private val settingsService: SettingsService by inject()
+
+    override fun run() {
+        try {
+            Tasks.increment()
+            if (!settingsService.settings.viperSettings.login || !authenticated) {
+                return
+            }
+            if (!settingsService.settings.viperSettings.thanks) {
+                return
+            }
+            val postThanks = HttpPost("${settingsService.settings.viperSettings.host}/post_thanks.php").also {
+                it.entity = UrlEncodedFormEntity(
+                    listOf(
+                        BasicNameValuePair("do", "post_thanks_add"),
+                        BasicNameValuePair("using_ajax", "1"),
+                        BasicNameValuePair("p", postEntity.postId.toString()),
+                        BasicNameValuePair("securitytoken", postEntity.token)
+                    )
+                )
+            }
+            RequestLimit.getPermit(1)
+            log.debug("Requesting {}", postThanks.uri)
+            cm.client.execute(postThanks, context) { response ->
+                if (response.code / 100 != 2) {
+                    throw VripperException("Unexpected response code '${response.code}' for $postThanks")
+                }
+            }
+        } catch (e: Exception) {
+            log.error("Failed to leave a thanks for $postEntity", e)
+        } finally {
+            Tasks.decrement()
+        }
+    }
+}
@@ -0,0 +1,28 @@
+package me.vripper.tasks
+
+import me.vripper.event.EventBus
+import me.vripper.event.LoadingTasks
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+internal object Tasks : KoinComponent {
+
+    private val eventBus: EventBus by inject()
+    private var current = 0
+
+    @Synchronized
+    fun increment() {
+        if (current == 0) {
+            eventBus.publishEvent(LoadingTasks(true))
+        }
+        current += 1
+    }
+
+    @Synchronized
+    fun decrement() {
+        current -= 1
+        if (current == 0) {
+            eventBus.publishEvent(LoadingTasks(false))
+        }
+    }
+}
@@ -1,78 +0,0 @@
-package me.vripper.tasks
-
-import me.vripper.entities.LogEntry
-import me.vripper.entities.LogEntry.Status.ERROR
-import me.vripper.entities.Thread
-import me.vripper.model.Settings
-import me.vripper.model.ThreadItem
-import me.vripper.model.ThreadPostId
-import me.vripper.services.AppEndpointService
-import me.vripper.services.DataTransaction
-import me.vripper.services.SettingsService
-import me.vripper.services.ThreadCacheService
-import me.vripper.utilities.GLOBAL_EXECUTOR
-import me.vripper.utilities.Tasks
-import me.vripper.utilities.formatToString
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
-import java.util.concurrent.CompletableFuture
-
-class ThreadLookupRunnable(private val threadId: Long, private val settings: Settings) :
-    KoinComponent, Runnable {
-    private val log by me.vripper.delegate.LoggerDelegate()
-    private val dataTransaction by inject<DataTransaction>()
-    private val settingsService by inject<SettingsService>()
-    private val threadCacheService by inject<ThreadCacheService>()
-    private val appEndpointService by inject<AppEndpointService>()
-    private val link: String = "${settingsService.settings.viperSettings.host}/threads/$threadId"
-
-    override fun run() {
-        try {
-            Tasks.increment()
-            if (dataTransaction.findThreadByThreadId(threadId).isEmpty) {
-                val threadLookupResult = threadCacheService[threadId]
-                if (threadLookupResult.postItemList.isEmpty()) {
-                    val message = "Nothing found for $link"
-                    dataTransaction.saveLog(LogEntry(type = LogEntry.Type.THREAD, status = ERROR, message = message))
-                    return
-                }
-                dataTransaction.save(
-                    Thread(
-                        title = threadLookupResult.title,
-                        link = link,
-                        threadId = threadId,
-                        total = threadLookupResult.postItemList.size
-                    )
-                )
-                autostart(threadLookupResult)
-            } else {
-                log.info("Link $link is already loaded")
-            }
-        } catch (e: Exception) {
-            val error = "Error when processing $link"
-            log.error(error, e)
-            dataTransaction.saveLog(
-                LogEntry(
-                    type = LogEntry.Type.THREAD, status = ERROR, message = """
-                $error
-                ${e.formatToString()}
-                """.trimIndent()
-                )
-            )
-        } finally {
-            Tasks.decrement()
-        }
-    }
-
-    private fun autostart(lookupResult: ThreadItem) {
-        if (lookupResult.postItemList.size <= settings.downloadSettings.autoQueueThreshold) {
-            appEndpointService.threadRemove(listOf(lookupResult.threadId))
-            CompletableFuture.runAsync(
-                AddPostRunnable(
-                    lookupResult.postItemList.map { ThreadPostId(it.threadId, it.postId) }
-                ),
-                GLOBAL_EXECUTOR
-            )
-        }
-    }
-}
@@ -0,0 +1,60 @@
+package me.vripper.tasks
+
+import me.vripper.entities.ThreadEntity
+import me.vripper.model.Settings
+import me.vripper.model.ThreadPostId
+import me.vripper.services.DataTransaction
+import me.vripper.services.SettingsService
+import me.vripper.services.ThreadCacheService
+import me.vripper.utilities.LoggerDelegate
+import me.vripper.utilities.taskRunner
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+internal class ThreadLookupTask(private val threadId: Long, private val settings: Settings) : KoinComponent, Runnable {
+    private val log by LoggerDelegate()
+    private val dataTransaction by inject<DataTransaction>()
+    private val settingsService by inject<SettingsService>()
+    private val threadCacheService by inject<ThreadCacheService>()
+    private val link: String = "${settingsService.settings.viperSettings.host}/threads/$threadId"
+
+    override fun run() {
+        try {
+            Tasks.increment()
+            if (dataTransaction.findThreadByThreadId(threadId).isEmpty) {
+                val threadLookupResult = threadCacheService[threadId]
+                if (threadLookupResult.error.isNotBlank()) {
+                    log.error("Error loading $link: ${threadLookupResult.error}")
+                    return
+                }
+                if (threadLookupResult.postItemList.isEmpty()) {
+                    log.error("Nothing found for $link")
+                    return
+                }
+
+                if (threadLookupResult.postItemList.size <= settings.downloadSettings.autoQueueThreshold) {
+                    taskRunner.submit(
+                        AddPostTask(threadLookupResult.postItemList.map {
+                            ThreadPostId(
+                                it.threadId, it.postId
+                            )
+                        })
+                    )
+                } else {
+                        dataTransaction.save(
+                            ThreadEntity(
+                                title = threadLookupResult.title,
+                                link = link,
+                                threadId = threadId,
+                                total = threadLookupResult.postItemList.size
+                            )
+                        )
+                }
+            }
+        } catch (e: Exception) {
+            log.error("Error when processing $link", e)
+        } finally {
+            Tasks.decrement()
+        }
+    }
+}
@@ -1,4 +1,4 @@
-package me.vripper.listeners
+package me.vripper.utilities

 import me.vripper.utilities.ApplicationProperties.VRIPPER_DIR
 import java.io.RandomAccessFile
@@ -7,24 +7,25 @@ import kotlin.io.path.pathString
 import kotlin.system.exitProcess

 object AppLock {
-    fun exclusiveLock() {
+    fun exclusiveLock(): Boolean {
        val lock = VRIPPER_DIR.resolve("lock")
        try {
            val randomFile = RandomAccessFile(lock.pathString, "rw")
            val channel = randomFile.channel
            val fileLock = channel.tryLock()
            if (fileLock == null) {
-                System.err.println("Another instance is already running in ${lock.parent.pathString}")
-                exitProcess(-1)
+                return false
            } else {
                Runtime.getRuntime().addShutdownHook(Thread {
                    fileLock.release()
                    channel.close()
                    Files.deleteIfExists(lock)
                })
+                return true
            }
        } catch (e: Exception) {
-            println(e.toString())
+            e.printStackTrace()
+            exitProcess(-1)
        }
    }
 }
@@ -4,42 +4,54 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import me.vripper.exception.DownloadException
-import me.vripper.services.HTTPService
-import org.apache.hc.client5.http.classic.methods.HttpGet
-import org.apache.hc.core5.http.io.entity.EntityUtils
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
+import java.net.URI
+import java.net.http.HttpClient
+import java.net.http.HttpRequest
+import java.net.http.HttpResponse
 import java.nio.file.Files
 import java.nio.file.Path
 import kotlin.io.path.Path
+import kotlin.io.path.exists
 import kotlin.io.path.pathString
+import kotlin.io.path.readLines

-object ApplicationProperties : KoinComponent {
-    const val VERSION: String = "5.4.0"
+object ApplicationProperties {
+    val VERSION: String =
+        ApplicationProperties.javaClass.getResourceAsStream("/version")
+            ?.use { inputStream -> inputStream.reader().use { it.readText() } } ?: "undefined"
    private const val BASE_DIR_NAME: String = "vripper"
    private val portable = System.getProperty("vripper.portable", "true").toBoolean()
    private val BASE_DIR: String = getBaseDir()
-    private val httpService: HTTPService by inject()
    val VRIPPER_DIR: Path = Path(BASE_DIR, BASE_DIR_NAME)
    private val json = Json {
        ignoreUnknownKeys = true
    }
+    const val DEFAULT_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:136.0) Gecko/20100101 Firefox/136.0"
+    val USER_AGENT: String;
+
+    @Serializable
+    internal data class ReleaseResponse(@SerialName("tag_name") val tagName: String)

    init {
        Files.createDirectories(VRIPPER_DIR)
        System.setProperty("VRIPPER_DIR", VRIPPER_DIR.toRealPath().pathString)
+        val userAgentOverride = VRIPPER_DIR.resolve("user-agent")
+        USER_AGENT = if (userAgentOverride.exists()) {
+            userAgentOverride.readLines().firstOrNull() ?: DEFAULT_USER_AGENT
+        } else {
+            DEFAULT_USER_AGENT
+        }
    }

    fun latestVersion(): String {
-        @Serializable
-        data class ReleaseResponse(@SerialName("tag_name") val tagName: String)
-
-        val httpGet = HttpGet("https://api.github.com/repos/death-claw/vripper-project/releases/latest")
-        return httpService.client.execute(httpGet) {
-            if (it.code / 100 != 2) {
-                throw DownloadException("Unexpected response code '${it.code}' for $httpGet")
+        val request = HttpRequest.newBuilder()
+            .uri(URI.create("https://api.github.com/repos/dev-claw/vripper-project/releases/latest")).build()
+        return HttpClient.newHttpClient().use {
+            val response = it.send(request, HttpResponse.BodyHandlers.ofString())
+            if (response.statusCode() / 100 != 2) {
+                throw DownloadException("Unexpected response code '${response.statusCode()}' for $request")
            }
-            json.decodeFromString<ReleaseResponse>(EntityUtils.toString(it.entity)).tagName
+            json.decodeFromString<ReleaseResponse>(response.body()).tagName
        }
    }

@@ -0,0 +1,37 @@
+package me.vripper.utilities
+
+import liquibase.Contexts
+import liquibase.LabelExpression
+import liquibase.Liquibase
+import liquibase.database.DatabaseFactory
+import liquibase.database.jvm.JdbcConnection
+import liquibase.resource.ClassLoaderResourceAccessor
+import org.jetbrains.exposed.sql.Database
+import org.jetbrains.exposed.sql.transactions.TransactionManager
+import java.sql.Connection
+
+object DatabaseManager {
+    private var database: Database? = null
+
+    fun connect() {
+        database =
+            Database.connect("jdbc:sqlite:${ApplicationProperties.VRIPPER_DIR}/vripper.db")
+                .also { update(it.connector.invoke().connection as Connection) }
+    }
+
+    fun disconnect() {
+        database?.let { TransactionManager.closeAndUnregister(it) }
+    }
+
+    fun update(connection: Connection) {
+        connection.use { cn ->
+            val database: liquibase.database.Database = DatabaseFactory.getInstance()
+                .findCorrectDatabaseImplementation(JdbcConnection(cn))
+            Liquibase(
+                "db.changelog-master.xml", ClassLoaderResourceAccessor(), database
+            ).use { liquibase ->
+                liquibase.update(Contexts(), LabelExpression())
+            }
+        }
+    }
+}
@@ -1,29 +0,0 @@
-package me.vripper.utilities
-
-import liquibase.Contexts
-import liquibase.LabelExpression
-import liquibase.Liquibase
-import liquibase.database.Database
-import liquibase.database.DatabaseFactory
-import liquibase.database.jvm.JdbcConnection
-import liquibase.resource.ClassLoaderResourceAccessor
-import me.vripper.utilities.ApplicationProperties.VRIPPER_DIR
-import java.sql.DriverManager
-
-object DbUtils {
-
-    fun update() {
-        val connection =
-            DriverManager.getConnection("jdbc:h2:file:$VRIPPER_DIR/vripper;DB_CLOSE_DELAY=-1;")
-
-        connection.use { cn ->
-            val database: Database = DatabaseFactory.getInstance()
-                .findCorrectDatabaseImplementation(JdbcConnection(cn))
-            Liquibase(
-                "db.changelog-master.xml", ClassLoaderResourceAccessor(), database
-            ).use { liquibase ->
-                liquibase.update(Contexts(), LabelExpression())
-            }
-        }
-    }
-}
@@ -0,0 +1,7 @@
+package me.vripper.utilities
+
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+
+val taskRunner: ExecutorService = Executors.newFixedThreadPool(6)
+val downloadRunner: ExecutorService = Executors.newVirtualThreadPerTaskExecutor()
@@ -7,11 +7,12 @@ import org.htmlcleaner.HtmlCleaner
 import org.w3c.dom.Document
 import java.io.InputStream

-object HtmlUtils {
+internal object HtmlUtils {
+
    @Throws(HtmlProcessorException::class)
    fun clean(htmlContent: InputStream): Document {
        return try {
-            htmlContent.use {
+            htmlContent.use { stream ->
                val clean = HtmlCleaner().clean(htmlContent)
                DomSerializer(CleanerProperties()).createDOM(clean)
            }
@@ -19,4 +20,15 @@ object HtmlUtils {
            throw HtmlProcessorException(e)
        }
    }
+
+    @Throws(HtmlProcessorException::class)
+    fun clean(htmlContent: String): Document {
+        return try {
+            val clean = HtmlCleaner().clean(htmlContent)
+            DomSerializer(CleanerProperties()).createDOM(clean)
+
+        } catch (e: Exception) {
+            throw HtmlProcessorException(e)
+        }
+    }
 }
@@ -1,4 +1,4 @@
-package me.vripper.delegate
+package me.vripper.utilities

 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -0,0 +1,10 @@
+package me.vripper.utilities
+
+import java.security.MessageDigest
+import javax.xml.bind.DatatypeConverter
+
+fun md5Hex(data: String): String {
+    val md: MessageDigest = MessageDigest.getInstance("MD5")
+    md.update(data.toByteArray())
+    return DatatypeConverter.printHexBinary(md.digest()).lowercase()
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dev-claw	899e6d2893	version bump	2025-03-22 22:52:14 +01:00
dev-clawandGitHub	4c96e79802	fixes #225 (#226 )	2025-03-22 22:18:59 +01:00
dev-claw	4a001efa9f	version bump	2025-03-21 16:41:49 +01:00
dev-clawandGitHub	7035b1cce0	fixes #223 (#224 )	2025-03-21 16:40:38 +01:00
dev-clawandGitHub	b9862a5042	fixes #221 (#222 )	2025-03-11 16:08:48 +01:00
dev-claw	8bcdb80149	version bump	2025-03-11 16:05:08 +01:00
dev-clawandGitHub	e44220321e	fixes #219 (#220 )	2025-03-11 15:42:41 +01:00
dev-claw	f2c9806665	version bump	2025-03-04 18:03:18 +01:00
dev-clawandGitHub	fd586a522c	fixes #216 (#218 )	2025-03-04 18:00:16 +01:00
dev-clawandGitHub	6be744a7a7	Update release.yml	2025-03-02 14:11:22 +01:00
dev-clawandGitHub	6228551836	Update README.md	2024-12-29 12:48:07 +01:00
dev-claw	b872d5a1a5	update links	2024-12-27 19:27:28 +01:00
dev-claw	61ce16d219	version bump	2024-12-27 19:14:46 +01:00
dev-clawandGitHub	c74d711702	fixes #208 (#209 )	2024-12-27 19:12:07 +01:00
death-clawandGitHub	095e69d3c9	Update README.md	2024-12-27 11:45:42 +01:00
death-clawandGitHub	60bee4df2c	Update README.md	2024-12-27 11:39:59 +01:00
death-clawandGitHub	3d68691037	Update README.md	2024-12-26 22:46:03 +01:00
death-claw	4456d3d797	version bump	2024-12-25 16:24:46 +01:00
death-clawandGitHub	2bcdd81eeb	fixes #206 (#207 )	2024-12-25 16:23:13 +01:00
death-claw	9652c7725e	version bump	2024-12-21 17:59:27 +01:00
death-clawandGitHub	01ed204d12	Update README.md	2024-12-21 17:47:27 +01:00
death-clawandGitHub	b8639be241	fixes #204 (#205 )	2024-12-21 17:44:28 +01:00
death-clawandGitHub	b429c58eb5	version bump (#203 )	2024-12-14 18:01:02 +01:00
UncleRoger33andGitHub	91e74c38b8	Update README.md (#189 ) * Updated DL links to the latest version. * Added info for proxy domains giving 403 errors.	2024-04-22 11:01:47 +01:00
death-claw	d960b13a9f	version bump	2024-04-21 10:25:27 +01:00
death-clawandGitHub	b26f78a576	fixes #187 (#188 )	2024-04-21 10:24:55 +01:00
death-claw	733f5c926e	version bump	2024-04-20 22:34:47 +01:00
death-clawandGitHub	0012e3b8ca	fixes #185 (#186 )	2024-04-20 22:24:40 +01:00
death-claw	564033eb03	version bump	2024-04-19 21:38:26 +01:00
death-claw	776f996673	fixes #176 fixes #179 fixes #180 fixes #181 fixes #182	2024-04-19 21:38:06 +01:00
death-clawandGitHub	06942c70c8	Update README.md	2024-03-17 18:07:09 +01:00
death-clawandGitHub	0d95b97aee	Update README.md	2024-03-17 18:03:28 +01:00
death-clawandGitHub	e3598769cd	screenshot	2024-03-17 18:02:32 +01:00
death-claw	331749ca91	fixes #171	2024-03-17 15:47:13 +01:00
death-claw	e9b4ca24eb	fixes #171	2024-03-17 15:33:02 +01:00
death-claw	e5bbbd651f	version bump	2024-03-17 15:19:14 +01:00
death-claw	e7a2ed6e8b	fixes #171	2024-03-17 15:19:00 +01:00
death-claw	2923cc350c	fixes #171	2024-03-17 14:18:35 +01:00
death-clawandGitHub	53cdc8a4a1	fixes #171 (#174 ) fixes #173	2024-03-17 13:53:57 +01:00
UncleRoger33andGitHub	592a6d44c3	Update README.md (#170 ) - Updated direct download links for v5.4.0 in the downloads table. - Formatted "HOME_FOLDER" description for Windows. Previous one was a bit confusing for basic users.	2024-02-29 20:49:48 +01:00
death-clawandGitHub	dbf6e3436a	fixes #139 (#169 )	2024-02-28 15:42:57 +01:00