v5 wip

.github/workflows/package.yml

@@ -2,191 +2,54 @@ name: Package
 
 on:
   workflow_dispatch:
-    inputs:
-      release:
-        description: 'Release'
-        required: true
-        type: string
 
 jobs:
   build:
     strategy:
       matrix:
-        os: [ ubuntu-latest, windows-latest, macos-13, macos-latest ]
+        os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
-    permissions:
-      contents: write
-      packages: write
     steps:
-      - uses: actions/checkout@v3
+    - uses: actions/checkout@v3
 
-      - name: Set up jdk25
-        uses: actions/setup-java@v3
-        with:
-          java-version: '25'
-          distribution: 'zulu'
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        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 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-${{ inputs.release }}-jar-with-dependencies.jar vripper-gui/target/vripper-noarch-gui-${{ inputs.release }}.jar
+    - name: Build with Maven
+      run: mvn -B install --file pom.xml
 
-      - if: matrix.os == 'ubuntu-latest'
-        name: Release gui Jar
-        uses: softprops/action-gh-release@v1
-        with:
-          files: vripper-gui/target/vripper-noarch-gui-${{ inputs.release }}.jar
-      
-      # Start building WEB jar in ubuntu only
-      - if: matrix.os == 'ubuntu-latest'
-        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-${{ inputs.release }}.jar vripper-web/target/vripper-noarch-web-${{ inputs.release }}.jar
+    - name: Rename GUI artifact
+      run: mv vripper-gui/target/vripper-gui-*.jar vripper-gui/target/vripper-gui.jar
 
-      - if: matrix.os == 'ubuntu-latest'
-        name: Release web Jar
-        uses: softprops/action-gh-release@v1
-        with:
-          files: vripper-web/target/vripper-noarch-web-${{ inputs.release }}.jar
-        # End building WEB jar in ubuntu only
-        
-        # Start building docker image in ubuntu only
-      - if: matrix.os == 'ubuntu-latest'
-        name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Rename WEB artifact
+      run: mv vripper-web/target/vripper-web-*.jar vripper-web/target/vripper-web.jar
 
-      - if: matrix.os == 'ubuntu-latest'
-        name: Build Docker image
-        run: |
-          mkdir docker_build && cp Dockerfile docker_build/Dockerfile && cp vripper-web/target/vripper-noarch-web-${{ inputs.release }}.jar docker_build/vripper-web.jar
-          docker build -t ghcr.io/dev-claw/vripper-web docker_build
-          docker tag ghcr.io/dev-claw/vripper-web:latest ghcr.io/dev-claw/vripper-web:${{ inputs.release }}
-          docker push ghcr.io/dev-claw/vripper-web:latest
-          docker push ghcr.io/dev-claw/vripper-web:${{ inputs.release }}
-        
-        # End building docker image in ubuntu only
+    - if: matrix.os == 'ubuntu-latest'
+      name: Package Linux binaries
+      run: |
+        cd jpackage
+        cp ../vripper-gui/target/vripper-gui.jar jar/vripper-gui.jar
+        jpackage --type deb "@jpackage.cfg" "@jpackage-linux.cfg"
+        jpackage --type rpm "@jpackage.cfg" "@jpackage-linux.cfg"
+        ls -la dist
 
-      - name: Prepare Packaging
-        run: |
-          cp vripper-gui/target/vripper-noarch-gui-${{ inputs.release }}.jar jpackage/jar/vripper-gui.jar
+    - if: matrix.os == 'windows-latest'
+      name: Package Windows binaries
+      run: |
+        cd jpackage
+        cp ../vripper-gui/target/vripper-gui.jar jar/vripper-gui.jar
+        jpackage "@jpackage.cfg" "@jpackage-windows.cfg"
+        dir dist
 
-      - if: matrix.os == 'ubuntu-latest'
-        name: Package for Linux
-        run: |
-          cd jpackage
-          jpackage --app-version ${{ inputs.release }} "@jpackage.cfg" "@jpackage-app-image.cfg" --icon resources/VRipper.png
-          jpackage --app-version ${{ inputs.release }} "@jpackage.cfg" "@jpackage-linux.cfg" --resource-dir resources --type deb
-          jpackage --app-version ${{ inputs.release }} "@jpackage.cfg" "@jpackage-linux.cfg" --resource-dir resources --type rpm
-          mv dist/vripper-${{ inputs.release }}-1.x86_64.rpm dist/vripper-linux-${{ inputs.release }}.x86_64.rpm
-          mv dist/vripper_${{ inputs.release }}-1_amd64.deb dist/vripper-linux-${{ inputs.release }}_amd64.deb
-
-      - if: matrix.os == 'windows-latest'
-        name: Package for Windows
-        run: |
-          cd jpackage
-          jpackage --app-version ${{ inputs.release }} "@jpackage.cfg" "@jpackage-app-image.cfg" --icon resources/VRipper.ico
-          jpackage --app-version ${{ inputs.release }} "@jpackage.cfg" "@jpackage-windows.cfg" --resource-dir resources --type msi
-          jpackage --app-version ${{ inputs.release }} "@jpackage.cfg" "@jpackage-windows.cfg" --resource-dir resources --type exe
-          cd dist
-          ren VRipper-${{ inputs.release }}.msi vripper-windows-installer-${{ inputs.release }}.msi
-          ren VRipper-${{ inputs.release }}.exe vripper-windows-installer-${{ inputs.release }}.exe
-
-      - if: matrix.os == 'macos-latest'
-        name: Package for macOS(arm64)
-        run: |
-          cd jpackage
-          jpackage --app-version ${{ inputs.release }} "@jpackage.cfg" "@jpackage-app-image.cfg" --icon resources/VRipper.icns
-          jpackage --app-version ${{ inputs.release }} "@jpackage.cfg" "@jpackage-macos.cfg" --resource-dir resources --type pkg
-          jpackage --app-version ${{ inputs.release }} "@jpackage.cfg" "@jpackage-macos.cfg" --resource-dir resources --type dmg
-          mv dist/VRipper-${{ inputs.release }}.pkg dist/vripper-macos-${{ inputs.release }}.arm64.pkg
-          mv dist/VRipper-${{ inputs.release }}.dmg dist/vripper-macos-${{ inputs.release }}.arm64.dmg
-
-      - if: matrix.os == 'macos-13'
-        name: Package for macOS(x86_64)
-        run: |
-          cd jpackage
-          jpackage --app-version ${{ inputs.release }} "@jpackage.cfg" "@jpackage-app-image.cfg" --icon resources/VRipper.icns
-          jpackage --app-version ${{ inputs.release }} "@jpackage.cfg" "@jpackage-macos.cfg" --resource-dir resources --type pkg
-          jpackage --app-version ${{ inputs.release }} "@jpackage.cfg" "@jpackage-macos.cfg" --resource-dir resources --type dmg
-          mv dist/VRipper-${{ inputs.release }}.pkg dist/vripper-macos-${{ inputs.release }}.x86_64.pkg
-          mv dist/VRipper-${{ inputs.release }}.dmg dist/vripper-macos-${{ inputs.release }}.x86_64.dmg
-
-      - if: matrix.os == 'ubuntu-latest'
-        name: Zip Ubuntu portable
-        uses: thedoctor0/zip-release@0.7.1
-        with:
-          type: 'zip'
-          directory: 'jpackage/dist'
-          path: 'VRipper'
-          filename: 'vripper-linux-portable-${{ inputs.release }}.zip'
-
-      - if: matrix.os == 'windows-latest'
-        name: Zip Windows portable
-        uses: thedoctor0/zip-release@0.7.1
-        with:
-          type: 'zip'
-          directory: 'jpackage/dist'
-          path: 'VRipper'
-          filename: 'vripper-windows-portable-${{ inputs.release }}.zip'
-
-      - if: matrix.os == 'macos-latest'
-        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-${{ inputs.release }}.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-${{ inputs.release }}.x86_64.zip'
-
-      - if: matrix.os == 'ubuntu-latest'
-        name: Release packages for Linux
-        uses: softprops/action-gh-release@v1
-        with:
-          files: |
-            jpackage/dist/vripper-linux-${{ inputs.release }}.x86_64.rpm
-            jpackage/dist/vripper-linux-${{ inputs.release }}_amd64.deb
-            jpackage/dist/vripper-linux-portable-${{ inputs.release }}.zip
-
-      - if: matrix.os == 'windows-latest'
-        name: Release packages for Windows
-        uses: softprops/action-gh-release@v1
-        with:
-          files: |
-            jpackage/dist/vripper-windows-installer-${{ inputs.release }}.msi
-            jpackage/dist/vripper-windows-installer-${{ inputs.release }}.exe
-            jpackage/dist/vripper-windows-portable-${{ inputs.release }}.zip
-
-      - if: matrix.os == 'macos-latest'
-        name: Release packages for macOS(arm64)
-        uses: softprops/action-gh-release@v1
-        with:
-          files: |
-            jpackage/dist/vripper-macos-${{ inputs.release }}.arm64.pkg
-            jpackage/dist/vripper-macos-${{ inputs.release }}.arm64.dmg
-            jpackage/dist/vripper-macos-portable-${{ inputs.release }}.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-${{ inputs.release }}.x86_64.pkg
-            jpackage/dist/vripper-macos-${{ inputs.release }}.x86_64.dmg
-            jpackage/dist/vripper-macos-portable-${{ inputs.release }}.x86_64.zip
+    - if: matrix.os == 'macos-latest'
+      name: Package macOS binaries
+      run: |
+        cd jpackage
+        cp ../vripper-gui/target/vripper-gui.jar jar/vripper-gui.jar
+        jpackage "@jpackage.cfg" "@jpackage-macos.cfg"
+        ls -la dist

.github/workflows/release.yml

@@ -8,116 +8,89 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ ubuntu-latest, windows-latest, macos-13, macos-latest ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
-    permissions:
-      contents: write
-      packages: write
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up jdk25
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '25'
-        distribution: 'zulu'
-        cache: maven
+        java-version: '17'
+        distribution: 'temurin'
+        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 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
+    - 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 vripper-gui/target/vripper-noarch-gui-${{ github.event.release.tag_name }}.jar
 
     - if: matrix.os == 'ubuntu-latest'
-      name: Release gui Jar
+      name: Upload 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: Release web Jar
+      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: Upload WEB Jar
       uses: softprops/action-gh-release@v1
       with:
         files: vripper-web/target/vripper-noarch-web-${{ github.event.release.tag_name }}.jar
     # End building WEB jar in ubuntu only
 
-      # Start building docker image in ubuntu only
-    - if: matrix.os == 'ubuntu-latest'
-      name: Log in to GitHub Container Registry
-      uses: docker/login-action@v3
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - if: matrix.os == 'ubuntu-latest'
-      name: Build Docker image
-      run: |
-        mkdir docker_build && cp Dockerfile docker_build/Dockerfile && cp vripper-web/target/vripper-noarch-web-${{ github.event.release.tag_name }}.jar docker_build/vripper-web.jar
-        docker build -t ghcr.io/dev-claw/vripper-web docker_build
-        docker tag ghcr.io/dev-claw/vripper-web:latest ghcr.io/dev-claw/vripper-web:${{ github.event.release.tag_name }}
-        docker push ghcr.io/dev-claw/vripper-web:latest
-        docker push ghcr.io/dev-claw/vripper-web:${{ github.event.release.tag_name }}
-
-      # End building docker image in ubuntu only
-
     - name: Prepare Packaging
       run: |
         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 for Linux
+      name: Package Linux
       run: |
         cd jpackage
-        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-app-image.cfg" --icon resources/VRipper.png
-        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-linux.cfg" --resource-dir resources --type deb
-        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-linux.cfg" --resource-dir resources --type rpm
+        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-app-image.cfg" --icon icon.png
+        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-linux.cfg" --type deb
+        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-linux.cfg" --type rpm
         mv dist/vripper-${{ github.event.release.tag_name }}-1.x86_64.rpm dist/vripper-linux-${{ github.event.release.tag_name }}.x86_64.rpm
         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 for Windows
+      name: Package Windows
       run: |
         cd jpackage
-        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-app-image.cfg" --icon resources/VRipper.ico
-        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-windows.cfg" --resource-dir resources --type msi
-        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-windows.cfg" --resource-dir resources --type exe
+        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-app-image.cfg" --icon icon.ico
+        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-windows.cfg" --type msi
+        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-windows.cfg" --type exe
         cd dist
         ren VRipper-${{ github.event.release.tag_name }}.msi vripper-windows-installer-${{ github.event.release.tag_name }}.msi
         ren VRipper-${{ github.event.release.tag_name }}.exe vripper-windows-installer-${{ github.event.release.tag_name }}.exe
 
     - if: matrix.os == 'macos-latest'
-      name: Package for macOS(arm64)
+      name: Package macOS
       run: |
         cd jpackage
-        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-app-image.cfg" --icon resources/VRipper.icns
-        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-macos.cfg" --resource-dir resources --type pkg
-        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-macos.cfg" --resource-dir resources --type 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 resources/VRipper.icns
-        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-macos.cfg" --resource-dir resources --type pkg
-        jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-macos.cfg" --resource-dir resources --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
+        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
 
     - if: matrix.os == 'ubuntu-latest'
-      name: Zip Ubuntu portable
+      name: Zip portable
       uses: thedoctor0/zip-release@0.7.1
       with:
         type: 'zip'
@@ -126,7 +99,7 @@ jobs:
         filename: 'vripper-linux-portable-${{ github.event.release.tag_name }}.zip'
 
     - if: matrix.os == 'windows-latest'
-      name: Zip Windows portable
+      name: Zip portable
       uses: thedoctor0/zip-release@0.7.1
       with:
         type: 'zip'
@@ -135,25 +108,16 @@ jobs:
         filename: 'vripper-windows-portable-${{ github.event.release.tag_name }}.zip'
 
     - if: matrix.os == 'macos-latest'
-      name: Zip macOS(arm64) portable
+      name: Zip 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 }}.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'
+        filename: 'vripper-macos-portable-${{ github.event.release.tag_name }}.zip'
 
     - if: matrix.os == 'ubuntu-latest'
-      name: Release packages for Linux
+      name: Upload DEB and RPM package for Linux
       uses: softprops/action-gh-release@v1
       with:
         files: |
@@ -162,7 +126,7 @@ jobs:
           jpackage/dist/vripper-linux-portable-${{ github.event.release.tag_name }}.zip
 
     - if: matrix.os == 'windows-latest'
-      name: Release packages for Windows
+      name: Upload packages for Windows
       uses: softprops/action-gh-release@v1
       with:
         files: |
@@ -171,19 +135,10 @@ jobs:
           jpackage/dist/vripper-windows-portable-${{ github.event.release.tag_name }}.zip
 
     - if: matrix.os == 'macos-latest'
-      name: Release packages for macOS(arm64)
+      name: Upload package for macOS
       uses: softprops/action-gh-release@v1
       with:
         files: |
-          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
+          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

.gitignore

@@ -4,5 +4,4 @@
 /**/*/build-dir
 /**/*/java-runtime
 .idea
-.vripper
-.flattened-pom.xml
+.vripper

Dockerfile

@@ -1,4 +0,0 @@
-FROM azul/zulu-openjdk:25-latest
-WORKDIR /opt/vripper-web
-ENTRYPOINT ["java", "-jar", "vripper-web.jar"]
-ADD vripper-web.jar /opt/vripper-web/vripper-web.jar

LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,172 +1,19 @@
 # VRipper!
 
-This is my spin for a cross-platform gallery ripper for [vipergirls.to](https://vipergirls.to)
-
-![GitHub Image](/image.png)
-
-## 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
-
-## Supported Image Hosts
-
-The following hosts are supported:
-
-* acidimg.cc
-* imagetwist.com
-* imagezilla.com
-* imgspice.com
-* imagebam.com
-* imgbox.com
-* imx.to
-* pimpandhost.com
-* pixhost.to
-* pixxxels.cc
-* turboimagehost.com
-* postimg.cc
-* imagevenue.com
-* pixroute.to
-* vipr.im
-
-## 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 (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/dev-claw/vripper-project/releases/download/6.5.8/vripper-windows-installer-6.5.8.exe) <br /> [Installer (MSI)](https://github.com/dev-claw/vripper-project/releases/download/6.5.8/vripper-windows-installer-6.5.8.msi) <br /> [Portable (ZIP)](https://github.com/dev-claw/vripper-project/releases/download/6.5.8/vripper-windows-portable-6.5.8.zip) | [Installer (DMG)](https://github.com/dev-claw/vripper-project/releases/download/6.5.8/vripper-macos-6.5.8.x86_64.dmg) <br /> [Installer (PKG)](https://github.com/dev-claw/vripper-project/releases/download/6.5.8/vripper-macos-6.5.8.x86_64.pkg) <br /> [Portable (ZIP)](https://github.com/dev-claw/vripper-project/releases/download/6.5.8/vripper-macos-portable-6.5.8.x86_64.zip) | [Installer (DMG)](https://github.com/dev-claw/vripper-project/releases/download/6.5.8/vripper-macos-6.5.8.arm64.dmg) <br /> [Installer (PKG)](https://github.com/dev-claw/vripper-project/releases/download/6.5.8/vripper-macos-6.5.8.arm64.pkg) <br /> [Portable (ZIP)](https://github.com/dev-claw/vripper-project/releases/download/6.5.8/vripper-macos-portable-6.5.8.arm64.zip)  | [Linux (amd64) (DEB)](https://github.com/dev-claw/vripper-project/releases/download/6.5.8/vripper-linux-6.5.3_amd64.deb) <br /> [Linux (x86_64) (RPM)](https://github.com/dev-claw/vripper-project/releases/download/6.5.8/vripper-linux-6.5.8.x86_64.rpm) <br /> [Portable (ZIP)](https://github.com/dev-claw/vripper-project/releases/download/6.5.8/vripper-linux-portable-6.5.8.zip) | [Java GUI (noarch)](https://github.com/dev-claw/vripper-project/releases/download/6.5.8/vripper-noarch-gui-6.5.8.jar) <br /> [Java Web (noarch)](https://github.com/dev-claw/vripper-project/releases/download/6.5.8/vripper-noarch-web-6.5.8.jar)
-
-Source code and previous versions are available on
-the [Releases page](https://github.com/dev-claw/vripper-project/releases).
-
-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`
-
-## Docker Support
-
-The project is supplied as a container image and can be run locally or in production using Docker. By default:
-
-- **gRPC server/client** uses port **30000**
-- **Web UI** runs on port **8080**
-
-### Run with `docker run`
-
-```bash
-docker run -d \
-  -p 30000:30000 \
-  -p 8080:8080 \
-  -e GRPC_ENABLED=true \
-  -e GRPC_PASSPHRASE=my-secure-secret \
-  ghcr.io/dev-claw/vripper-web:latest
-```
-
-### Run with Docker Compose
-
-```yaml
-services:
-  app:
-    image: ghcr.io/dev-claw/vripper-web:latest
-    environment:
-      - GRPC_ENABLED=true
-      - GRPC_PASSPHRASE=super-secret-passphrase
-    ports:
-      - "30000:30000"
-      - "8080:8080"
-```
-
-> **Tip:** For production, prefer storing the passphrase as a secret (see `Security Notes` below) rather than writing it
-> directly in the Compose file.
-
-### Environment Variables
-
-The container supports these environment variables for enabling and securing the gRPC server.
-
-### `GRPC_ENABLED`
-
-- **Type:** String (interpreted as Boolean)
-- **Accepted values:** `true` (case-insensitive) to enable; any other value or unset → disabled
-- **Default:** `false` (gRPC disabled)
-- **Behavior:**
-    - When `GRPC_ENABLED=true`, the application will attempt to start the gRPC server (default port: `30000`).
-    - When absent or set to anything other than `true`, the gRPC server will not be started.
-- **Example (shell):**
-
-```bash
-export GRPC_ENABLED=true
-```
-
-- **Example (Docker Compose):**
-
-```yaml
-environment:
-  - GRPC_ENABLED=true
-```
-
-- **Notes / Best practices:**
-    - Treat the value as a simple on/off toggle. To avoid ambiguity, set explicitly to `true` or `false`.
-    - If you enable gRPC, make sure any required authentication (see `GRPC_PASSPHRASE`) is also configured.
-
-### `GRPC_PASSPHRASE`
-
-- **Type:** String
-- **Default:** *no default* (empty / unset)
-- **Required if:** `GRPC_ENABLED=true`
-- **Purpose:** Shared secret used to authenticate gRPC clients. The application should validate that the passphrase is
-  present when gRPC is enabled and use it to verify client connections.
-- **Example (shell):**
-
-```bash
-export GRPC_PASSPHRASE="my-very-strong-passphrase"
-```
-
-## Default Ports
-
-- **gRPC server/client:** `30000`
-- **Web UI:** `8080`
-
-You can map these ports when running the container. The application supports overriding these defaults with environment
-variables (`GRPC_PORT`, `SERVER_PORT`), configure them as needed.
-
-## 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.
-
-## Instructions to run from Jar file
-You need Java 21+, you can download from https://adoptium.net/
-
-Download the latest jar file from the Release page, open a command prompt and run the jar file using the following command
-
-For the GUI app
-
-    javaw -jar vripper-gui.jar
-
-For the WEB app
-
-    java -jar vripper-web.jar
-
-Application data (application logs, settings and persisted data) is stored in the location where you launched the jar for both GUI and WEB
+This is my spin for a cross-platform gallery ripper for [vipergirls.to](https://vipergirls.to).
 
 ## How to build
 
-You need JDK 21 and a recent version of maven 3.8.x+
+You need JDK 17 and a recent version of maven 3.6.1+
 
-To build, run the following command:
+To build run the following:
 
     mvn clean install
 
 Build artifact is located under
 
-    vripper-project\vripper-gui\target\vripper-gui-{{version}}-jar-with-dependencies.jar
+    vripper-project\vripper-gui\target\vripper-gui-{{version}}.jar
 
 Copy the artifact into any other folder and run:
 
-    java -jar vripper-gui-{{version}}-jar-with-dependencies.jar
+    java -jar vripper-gui-{{version}}.jar

jpackage/jpackage-app-image.cfg

@@ -1,2 +1,2 @@
 --type app-image
---java-options "-Dvripper.portable=true"
+--java-options "-Dbase.dir=${user.dir}"

jpackage/jpackage-linux.cfg

@@ -1,4 +1,5 @@
---java-options "-Dvripper.portable=false"
+--icon icon.png
+--java-options "-Dbase.dir=${user.home}/.config"
 --linux-package-name vripper
 --linux-app-release 1
 --linux-menu-group Utility

jpackage/jpackage-macos.cfg

@@ -1,3 +1,4 @@
---java-options "-Dvripper.portable=false"
+--icon icon.icns
+--java-options "-Dbase.dir=${user.home}/.config"
 --mac-package-identifier me.mnlr.vripper.vripper-gui
 --mac-package-name VRipper

jpackage/jpackage-windows.cfg

@@ -1,7 +1,8 @@
---java-options "-Dvripper.portable=false"
+--icon icon.ico
+--java-options "-Dbase.dir=${user.home}"
 --win-dir-chooser
 --win-menu
 --win-per-user-install
 --win-shortcut
 --win-shortcut-prompt
---win-update-url https://github.com/dev-claw/vripper-project/releases
+--win-update-url https://github.com/death-claw/vripper-project/releases

jpackage/jpackage.cfg

@@ -1,8 +1,8 @@
 --input jar
 --main-jar vripper-gui.jar
---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"
+--add-modules java.base,java.desktop,java.sql,jdk.unsupported,jdk.crypto.ec,java.security.jgss
+--jlink-options "--strip-native-commands --strip-debug --no-man-pages --no-header-files --compress=2"
 --name VRipper
 --description "Image ripper tool for vipergirls"
 --dest dist
---vendor "dev-claw"
+--vendor "death-claw"

jpackage/resources/VRipper.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=VRipper
-Comment=Image ripper tool for vipergirls
-Exec=/opt/vripper/bin/VRipper
-Icon=/opt/vripper/lib/VRipper.png
-Terminal=false
-Type=Application
-Categories=Utility
-MimeType=
-StartupWMClass=me.vripper.gui.VripperGuiApplication

pom.xml

@@ -1,227 +1,143 @@
 <?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>25</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.6.1</revision>
-        <app-version>6.6.1-alpha</app-version>
-        <kotlin.version>2.2.20</kotlin.version>
-        <slf4j.version>2.0.16</slf4j.version>
-        <logback.version>1.5.12</logback.version>
-        <kotlinx-coroutines.version>1.10.2</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.9.0</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>
+  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.mnlr</groupId>
+  <artifactId>vripper-project</artifactId>
+  <modules>
+    <module>vripper-core</module>
+<!--    <module>vripper-web-ui</module>-->
+<!--    <module>vripper-web</module>-->
+    <module>vripper-gui</module>
+  </modules>
+  <packaging>pom</packaging>
+  <version>4.4.0</version>
+  <properties>
+    <java.version>17</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.target>17</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <artifactId>logback-classic</artifactId>
+        <groupId>ch.qos.logback</groupId>
+        <version>1.4.11</version>
+      </dependency>
+      <dependency>
+        <artifactId>kotlin-stdlib</artifactId>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <version>1.9.10</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jetbrains.kotlinx</groupId>
+        <artifactId>kotlinx-coroutines-core-jvm</artifactId>
+        <version>1.7.3</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jetbrains.exposed</groupId>
+        <artifactId>exposed-jdbc</artifactId>
+        <version>0.41.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jetbrains.exposed</groupId>
+        <artifactId>exposed-java-time</artifactId>
+        <version>0.41.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.yaml</groupId>
+        <artifactId>snakeyaml</artifactId>
+        <version>2.0</version>
+      </dependency>
+      <dependency>
+        <groupId>io.projectreactor</groupId>
+        <artifactId>reactor-core</artifactId>
+        <version>3.5.10</version>
+      </dependency>
+      <dependency>
+        <groupId>io.insert-koin</groupId>
+        <artifactId>koin-core-jvm</artifactId>
+        <version>3.4.2</version>
+      </dependency>
+      <dependency>
+        <artifactId>jackson-module-kotlin</artifactId>
+        <groupId>com.fasterxml.jackson.module</groupId>
+        <version>2.15.2</version>
+      </dependency>
+      <dependency>
+        <artifactId>h2</artifactId>
+        <groupId>com.h2database</groupId>
+        <version>2.2.224</version>
+      </dependency>
+      <dependency>
+        <artifactId>httpclient</artifactId>
+        <groupId>org.apache.httpcomponents</groupId>
+        <version>4.5.14</version>
+      </dependency>
+      <dependency>
+        <artifactId>htmlcleaner</artifactId>
+        <groupId>net.sourceforge.htmlcleaner</groupId>
+        <version>2.26</version>
+      </dependency>
+      <dependency>
+        <artifactId>failsafe</artifactId>
+        <groupId>net.jodah</groupId>
+        <version>2.4.4</version>
+      </dependency>
+      <dependency>
+        <artifactId>caffeine</artifactId>
+        <groupId>com.github.ben-manes.caffeine</groupId>
+        <version>3.1.8</version>
+      </dependency>
+      <dependency>
+        <artifactId>jackson-databind</artifactId>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <version>2.15.2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.dataformat</groupId>
+        <artifactId>jackson-dataformat-yaml</artifactId>
+        <version>2.15.2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.datatype</groupId>
+        <artifactId>jackson-datatype-jsr310</artifactId>
+        <version>2.15.2</version>
+      </dependency>
+      <dependency>
+        <groupId>net.java.dev.jna</groupId>
+        <artifactId>jna-platform</artifactId>
+        <version>5.13.0</version>
+      </dependency>
+      <dependency>
+        <artifactId>kotlin-reflect</artifactId>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <version>1.9.10</version>
+      </dependency>
+      <dependency>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <groupId>org.slf4j</groupId>
+        <version>1.7.32</version>
+      </dependency>
+      <dependency>
+        <artifactId>httpclient5</artifactId>
+        <groupId>org.apache.httpcomponents.client5</groupId>
+        <version>5.2.1</version>
+      </dependency>
+      <dependency>
+        <artifactId>commons-codec</artifactId>
+        <groupId>commons-codec</groupId>
+        <version>1.16.0</version>
+      </dependency>
+      <dependency>
+        <artifactId>liquibase-core</artifactId>
+        <groupId>org.liquibase</groupId>
+        <version>4.24.0</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 </project>

vripper-core/pom.xml

@@ -1,233 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  xmlns="http://maven.apache.org/POM/4.0.0"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>me.mnlr</groupId>
+    <artifactId>vripper-project</artifactId>
+    <version>4.4.0</version>
+  </parent>
+  <groupId>me.mnlr.vripper</groupId>
+  <artifactId>vripper-core</artifactId>
+  <name>vripper-core</name>
+  <description>vripper-core</description>
 
-    <parent>
-        <groupId>me.vripper</groupId>
-        <artifactId>vripper-project</artifactId>
-        <version>${revision}</version>
-    </parent>
+  <dependencies>
+    <dependency>
+      <artifactId>logback-classic</artifactId>
+      <groupId>ch.qos.logback</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>kotlin-stdlib</artifactId>
+      <groupId>org.jetbrains.kotlin</groupId>
+    </dependency>
+    <dependency>
+      <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>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.exposed</groupId>
+      <artifactId>exposed-java-time</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.insert-koin</groupId>
+      <artifactId>koin-core-jvm</artifactId>
+    </dependency>
+    <dependency>
+      <artifactId>jackson-module-kotlin</artifactId>
+      <groupId>com.fasterxml.jackson.module</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>h2</artifactId>
+      <groupId>com.h2database</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>httpclient5</artifactId>
+      <groupId>org.apache.httpcomponents.client5</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <groupId>org.slf4j</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>htmlcleaner</artifactId>
+      <groupId>net.sourceforge.htmlcleaner</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>failsafe</artifactId>
+      <groupId>net.jodah</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>caffeine</artifactId>
+      <groupId>com.github.ben-manes.caffeine</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>jackson-databind</artifactId>
+      <groupId>com.fasterxml.jackson.core</groupId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-yaml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+    </dependency>
+    <dependency>
+      <artifactId>commons-codec</artifactId>
+      <groupId>commons-codec</groupId>
+    </dependency>
+    <dependency>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna-platform</artifactId>
+    </dependency>
+    <dependency>
+      <artifactId>liquibase-core</artifactId>
+      <groupId>org.liquibase</groupId>
+    </dependency>
+  </dependencies>
 
-    <artifactId>vripper-core</artifactId>
-    <name>vripper-core</name>
-    <description>vripper-core</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <artifactId>logback-classic</artifactId>
-            <groupId>ch.qos.logback</groupId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-        </dependency>
-        <dependency>
-            <artifactId>kotlin-stdlib</artifactId>
-            <groupId>org.jetbrains.kotlin</groupId>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-coroutines-core-jvm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.exposed</groupId>
-            <artifactId>exposed-jdbc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.exposed</groupId>
-            <artifactId>exposed-java-time</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.insert-koin</groupId>
-            <artifactId>koin-core-jvm</artifactId>
-        </dependency>
-        <dependency>
-            <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>
-        </dependency>
-        <dependency>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <groupId>org.slf4j</groupId>
-        </dependency>
-        <dependency>
-            <artifactId>htmlcleaner</artifactId>
-            <groupId>net.sourceforge.htmlcleaner</groupId>
-        </dependency>
-        <dependency>
-            <artifactId>failsafe</artifactId>
-            <groupId>dev.failsafe</groupId>
-        </dependency>
-        <dependency>
-            <artifactId>caffeine</artifactId>
-            <groupId>com.github.ben-manes.caffeine</groupId>
-        </dependency>
-        <dependency>
-            <groupId>net.java.dev.jna</groupId>
-            <artifactId>jna-platform</artifactId>
-        </dependency>
-        <dependency>
-            <artifactId>liquibase-core</artifactId>
-            <groupId>org.liquibase</groupId>
-        </dependency>
-        <dependency>
-            <artifactId>liquibase-slf4j</artifactId>
-            <groupId>com.mattbertolini</groupId>
-            <scope>runtime</scope>
-        </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>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <version>${kotlin.version}</version>
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <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>
-                <version>3.3.0</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Build-Time>${maven.build.timestamp}</Build-Time>
-                            <Built-By>${user.name}</Built-By>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
+    <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <sourceDirs>
+                <source>src/main/kotlin</source>
+                <source>target/generated-sources/annotations</source>
+              </sourceDirs>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

vripper-core/src/main/kotlin/me/mnlr/vripper/AppEndpointService.kt

@@ -0,0 +1,139 @@
+package me.mnlr.vripper
+
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.DownloadService
+import me.mnlr.vripper.download.PostDownloadRunnable
+import me.mnlr.vripper.exception.PostParseException
+import me.mnlr.vripper.model.PostItem
+import me.mnlr.vripper.repositories.LogEventRepository
+import me.mnlr.vripper.services.*
+import me.mnlr.vripper.tasks.ThreadLookupRunnable
+import java.util.*
+import java.util.concurrent.CompletableFuture
+import java.util.regex.Pattern
+
+class AppEndpointService(
+    private val downloadService: DownloadService,
+    private val dataTransaction: DataTransaction,
+    private val threadCacheService: ThreadCacheService,
+    private val eventRepository: LogEventRepository,
+    private val settingsService: SettingsService
+) {
+    private val log by LoggerDelegate()
+
+    @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
+            }
+            var threadId: String
+            var postId: String?
+            val m = Pattern.compile(
+                Pattern.quote(settingsService.settings.viperSettings.host) + "/threads/(\\d+)((.*p=)(\\d+))?"
+            ).matcher(link)
+            if (m.find()) {
+                threadId = m.group(1)
+                postId = m.group(4)
+                if (postId == null) {
+                    CompletableFuture.runAsync(ThreadLookupRunnable(
+                        threadId, settingsService.settings
+                    ))
+                } else {
+                    CompletableFuture.runAsync(PostDownloadRunnable(
+                        threadId, postId
+                    ))
+                }
+            } else {
+                log.error("Cannot retrieve thread id from URL $link")
+                continue
+            }
+        }
+    }
+
+    @Synchronized
+    fun restartAll(posIds: List<String> = listOf()) {
+        downloadService.restartAll(posIds)
+    }
+
+    @Synchronized
+    fun download(posts: List<Pair<String, String>>) {
+        posts.forEach {
+            CompletableFuture.runAsync(PostDownloadRunnable(
+                it.first, it.second
+            ))
+        }
+    }
+
+    @Synchronized
+    fun stopAll(postIdList: List<String>?) {
+        downloadService.stopAll(postIdList)
+    }
+
+    @Synchronized
+    fun remove(postIdList: List<String>) {
+        downloadService.stopAll(postIdList)
+        dataTransaction.removeAll(postIdList)
+    }
+
+    @Synchronized
+    fun clearCompleted(): List<String> {
+        return dataTransaction.clearCompleted()
+    }
+
+    @Synchronized
+    @Throws(PostParseException::class)
+    fun grab(threadId: String): 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
+                )
+            )
+        }
+    }
+
+    @Synchronized
+    fun threadRemove(threadIdList: List<String>) {
+        threadIdList.forEach {
+            dataTransaction.removeThread(it)
+        }
+    }
+
+    @Synchronized
+    fun threadClear() {
+        dataTransaction.clearQueueLinks()
+    }
+
+    fun logClear() {
+        eventRepository.deleteAll()
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/ApplicationProperties.kt

@@ -0,0 +1,13 @@
+package me.mnlr.vripper
+
+import java.nio.file.Files
+import java.nio.file.Path
+
+object ApplicationProperties {
+    const val BASE_DIR_NAME: String = "vripper"
+    val baseDir: String = System.getProperty("base.dir", System.getProperty("user.dir"))
+
+    init {
+        Files.createDirectories(Path.of(baseDir, BASE_DIR_NAME))
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/Module.kt

@@ -0,0 +1,106 @@
+package me.mnlr.vripper
+
+import me.mnlr.vripper.download.DownloadService
+import me.mnlr.vripper.event.EventBus
+import me.mnlr.vripper.host.*
+import me.mnlr.vripper.repositories.*
+import me.mnlr.vripper.repositories.impl.*
+import me.mnlr.vripper.services.*
+import org.koin.dsl.bind
+import org.koin.dsl.module
+
+val coreModule = module {
+    single<EventBus> {
+        EventBus
+    }
+    single<SettingsService> {
+        SettingsService(get())
+    }
+    single<ImageRepository> {
+        ImageRepositoryImpl()
+    }
+    single<PostDownloadStateRepository> {
+        PostDownloadStateRepositoryImpl()
+    }
+    single<MetadataRepository> {
+        MetadataRepositoryImpl()
+    }
+    single<ThreadRepository> {
+        ThreadRepositoryImpl()
+    }
+    single<LogEventRepository> {
+        LogEventRepositoryImpl()
+    }
+    single<DataTransaction> {
+        DataTransaction(get(), get(), get(), get(), get(), get())
+    }
+    single<RetryPolicyService> {
+        RetryPolicyService(get(), get())
+    }
+    single<HTTPService> {
+        HTTPService(get(), get())
+    }
+    single<VGAuthService> {
+        VGAuthService(get(), get(), get())
+    }
+    single<ThreadCacheService> {
+        ThreadCacheService(get())
+    }
+    single<DownloadService> {
+        DownloadService(get(), get(), get(), get(), get())
+    }
+    single<DownloadSpeedService> {
+        DownloadSpeedService(get())
+    }
+    single<AppEndpointService> {
+        AppEndpointService(get(), get(), get(), get(), get())
+    }
+    single {
+        AcidimgHost(get(), get(), get())
+    } bind Host::class
+    single {
+        DPicMeHost(get(), get(), get())
+    } bind Host::class
+    single {
+        ImageBamHost(get(), get(), get())
+    } bind Host::class
+    single {
+        ImageTwistHost(get(), get(), get())
+    } bind Host::class
+    single {
+        ImageVenueHost(get(), get(), get())
+    } bind Host::class
+    single {
+        ImageZillaHost(get(), get(), get())
+    } bind Host::class
+    single {
+        ImgboxHost(get(), get(), get())
+    } bind Host::class
+    single {
+        ImgSpiceHost(get(), get(), get())
+    } bind Host::class
+    single {
+        ImxHost(get(), get(), get())
+    } bind Host::class
+    single {
+        PimpandhostHost(get(), get(), get())
+    } bind Host::class
+    single {
+        PixhostHost(get(), get(), get())
+    } bind Host::class
+    single {
+        PixRouteHost(get(), get(), get())
+    } bind Host::class
+    single {
+        PixxxelsHost(get(), get(), get())
+    } bind Host::class
+    single {
+        PostImgHost(get(), get(), get())
+    } bind Host::class
+    single {
+        TurboImageHost(get(), get(), get())
+    } bind Host::class
+    single {
+        ViprImHost(get(), get(), get())
+    } bind Host::class
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/Utils.kt

@@ -1,4 +1,4 @@
-package me.vripper.utilities
+package me.mnlr.vripper
 
 import java.io.PrintWriter
 import java.io.StringWriter
@@ -16,20 +16,29 @@ fun Throwable.formatToString(): String {
 }
 
 fun Long.formatSI(): String {
-    if (this < 0) {
-        return "? Bytes"
-    }
     return humanReadableByteCount(this, false)
 }
 
 private fun humanReadableByteCount(bytes: Long, si: Boolean): String {
     val unit = if (si) 1000 else 1024
-    if (bytes < unit) return "$bytes Bytes"
+    if (bytes < unit) return "$bytes B"
     val exp = (Math.log(bytes.toDouble()) / Math.log(unit.toDouble())).toInt()
     val pre = (if (si) "kMGTPE" else "KMGTPE")[exp - 1].toString() + if (si) "" else "i"
     return String.format("%.1f %sB", bytes / Math.pow(unit.toDouble(), exp.toDouble()), pre)
 }
 
+
+fun getExtension(fileName: String): String {
+    return if (fileName.contains(".")) fileName.substring(fileName.lastIndexOf(".") + 1) else ""
+}
+
+fun getFileNameWithoutExtension(fileName: String): String {
+    return if (fileName.contains(".")) fileName.substring(
+        0,
+        fileName.lastIndexOf(".")
+    ) else fileName
+}
+
 fun String.hash256(): String {
     val bytes = this.toByteArray()
     val md = MessageDigest.getInstance("SHA-256")

vripper-core/src/main/kotlin/me/mnlr/vripper/delegate/LoggerDelegate.kt

@@ -1,4 +1,4 @@
-package me.vripper.utilities
+package me.mnlr.vripper.delegate
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

vripper-core/src/main/kotlin/me/mnlr/vripper/download/DownloadService.kt

@@ -0,0 +1,273 @@
+package me.mnlr.vripper.download
+
+import kotlinx.coroutines.*
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.entities.Image
+import me.mnlr.vripper.entities.LogEvent
+import me.mnlr.vripper.entities.Post
+import me.mnlr.vripper.entities.domain.Status
+import me.mnlr.vripper.event.ErrorCountEvent
+import me.mnlr.vripper.event.EventBus
+import me.mnlr.vripper.event.QueueStateEvent
+import me.mnlr.vripper.formatToString
+import me.mnlr.vripper.host.Host
+import me.mnlr.vripper.model.ErrorCount
+import me.mnlr.vripper.model.QueueState
+import me.mnlr.vripper.repositories.LogEventRepository
+import me.mnlr.vripper.services.DataTransaction
+import me.mnlr.vripper.services.RetryPolicyService
+import me.mnlr.vripper.services.SettingsService
+import net.jodah.failsafe.Failsafe
+import net.jodah.failsafe.RetryPolicy
+import java.util.concurrent.locks.ReentrantLock
+import java.util.stream.Collectors
+import kotlin.concurrent.withLock
+
+class DownloadService(
+    private val settingsService: SettingsService,
+    private val dataTransaction: DataTransaction,
+    private val retryPolicyService: RetryPolicyService,
+    private val eventRepository: LogEventRepository,
+    private val eventBus: EventBus
+) {
+    private val maxPoolSize: Int = 12
+    private val log by LoggerDelegate()
+
+    // Class fields
+    private val running: MutableMap<String, MutableList<ImageDownloadRunnable>> = mutableMapOf()
+    private val pending: MutableMap<String, MutableList<ImageDownloadRunnable>> = mutableMapOf()
+    private val lock = ReentrantLock()
+    private val condition = lock.newCondition()
+    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+    fun init() {
+        coroutineScope.launch(Dispatchers.Default) {
+            val accepted: MutableList<ImageDownloadRunnable> = mutableListOf()
+            val candidates: MutableList<ImageDownloadRunnable> = mutableListOf()
+            while (isActive) {
+                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()
+                    }
+                }
+            }
+        }
+    }
+
+    fun destroy() {
+        stop(dataTransaction.findAllPosts().map { it.postId })
+    }
+
+    fun stopAll(postIds: List<String>?) {
+        if (postIds != null) {
+            stop(postIds)
+        } else {
+            stop(dataTransaction.findAllPosts().map(Post::postId))
+        }
+    }
+
+    fun restartAll(postIds: List<String> = listOf()) {
+        if (postIds.isNotEmpty()) {
+            restart(postIds)
+        } else {
+            restart(dataTransaction.findAllPosts().map(Post::postId))
+        }
+    }
+
+    private fun restart(postIds: List<String>) {
+        lock.withLock {
+            val data: MutableMap<Post, Collection<Image>> = mutableMapOf()
+            for (postId in postIds) {
+                if (isPending(postId)) {
+                    log.warn("Cannot restart, jobs are currently running for post id $postIds")
+                    continue
+                }
+                val images: List<Image> =
+                    dataTransaction.findByPostIdAndIsNotCompleted(postId)
+                if (images.isEmpty()) {
+                    continue
+                }
+                val post: Post =
+                    dataTransaction.findPostsByPostId(postId).orElseThrow()
+                log.debug("Restarting {} jobs for post id {}", images.size, postIds)
+                post.status = Status.PENDING
+                dataTransaction.update(post)
+                data[post] = images
+            }
+
+            for ((_, images) in data) {
+                for (image in images) {
+                    log.debug("Enqueuing a job for ${image.url}")
+                    with(image) {
+                        this.status = Status.PENDING
+                        this.current = 0
+                    }
+                    dataTransaction.update(image)
+                    val imageDownloadRunnable = ImageDownloadRunnable(
+                        image.id, settingsService.settings
+                    )
+                    pending.computeIfAbsent(
+                        image.host
+                    ) { mutableListOf() }
+                    pending[image.host]!!.add(imageDownloadRunnable)
+                }
+            }
+            condition.signal()
+        }
+    }
+
+    private fun isPending(postId: String): Boolean {
+        lock.withLock {
+            return pending.values.flatten().any { it.context.image.postId == postId }
+        }
+    }
+
+    private fun isRunning(postId: String): Boolean {
+        lock.withLock {
+            return running.values.flatten().any { it.context.image.postId == postId }
+        }
+    }
+
+    private fun stop(postIds: List<String>) {
+        lock.withLock {
+            for (postId in postIds) {
+                val post: Post =
+                    dataTransaction.findPostsByPostId(postId).orElseThrow()
+                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() }
+                dataTransaction.stopImagesByPostIdAndIsNotCompleted(postId)
+                dataTransaction.finishPost(post)
+            }
+        }
+    }
+
+    private fun canRun(host: String): Boolean {
+        val totalRunning = running.values.sumOf { it.size }
+        return (running[host]!!.size < settingsService.settings.connectionSettings.maxThreads && if (settingsService.settings.connectionSettings.maxTotalThreads == 0) totalRunning < maxPoolSize else totalRunning < settingsService.settings.connectionSettings.maxTotalThreads)
+    }
+
+    private fun candidateCount(): Map<String, Int> {
+        val map: MutableMap<String, Int> = mutableMapOf()
+        Host.getHosts().forEach { host: String ->
+            val imageDownloadRunnableList: List<ImageDownloadRunnable> = running.computeIfAbsent(
+                host
+            ) { mutableListOf() }
+            val count: Int =
+                settingsService.settings.connectionSettings.maxThreads - imageDownloadRunnableList.size
+            log.debug("Download slots for $host: $count")
+            map[host] = count
+        }
+        return map
+    }
+
+    private fun getCandidates(candidateCount: Map<String, Int>): List<ImageDownloadRunnable> {
+        val hostIntegerMap: MutableMap<String, 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.context.post.rank }
+                    .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
+                }
+            }
+        }
+        if (log.isDebugEnabled) {
+            val collect: Map<String, List<ImageDownloadRunnable>> =
+                candidates.stream().collect(Collectors.groupingBy { it.context.image.host })
+            collect.forEach {
+                log.debug(
+                    "Candidate download for ${it.key} ${it.value.size}/${candidateCount[it.key]}"
+                )
+            }
+        }
+        return candidates.sortedWith(Comparator.comparing { v: ImageDownloadRunnable -> v.context.post.rank })
+    }
+
+    private fun scheduleForDownload(imageDownloadRunnable: ImageDownloadRunnable) {
+        log.debug("Scheduling a job for ${imageDownloadRunnable.context.image.url}")
+                eventBus.publishEvent(QueueStateEvent(QueueState(runningCount(), pendingCount())))
+                Failsafe.with<Any, RetryPolicy<Any>>(retryPolicyService.buildRetryPolicyForDownload())
+                    .onFailure {
+                        try {
+                            eventRepository.save(
+                                LogEvent(
+                                    type = LogEvent.Type.DOWNLOAD,
+                                    status = LogEvent.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.update(image)
+                            eventBus.publishEvent(ErrorCountEvent(ErrorCount(dataTransaction.countImagesInError())))
+                    }.onComplete {
+                        afterJobFinish(imageDownloadRunnable)
+                            eventBus.publishEvent(
+                                QueueStateEvent(
+                                    QueueState(
+                                        runningCount(),
+                                        pendingCount()
+                                    )
+                                )
+                            )
+                        log.debug(
+                            "Finished downloading ${imageDownloadRunnable.context.image.url}"
+                        )
+                    }.runAsync(imageDownloadRunnable::run)
+    }
+
+    private fun afterJobFinish(imageDownloadRunnable: ImageDownloadRunnable) {
+        lock.withLock {
+            val image = imageDownloadRunnable.context.image
+            running[image.host]!!.remove(imageDownloadRunnable)
+            if (!isPending(image.postId) && !isRunning(
+                    image.postId
+                )
+            ) {
+                dataTransaction.finishPost(imageDownloadRunnable.context.post)
+            }
+            condition.signal()
+        }
+    }
+
+    private fun pendingCount(): Int {
+        return pending.values.sumOf { it.size }
+    }
+
+    private fun runningCount(): Int {
+        return running.values.sumOf { it.size }
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/download/ImageDownloadContext.kt

@@ -0,0 +1,22 @@
+package me.mnlr.vripper.download
+
+import me.mnlr.vripper.entities.Image
+import me.mnlr.vripper.entities.Post
+import me.mnlr.vripper.model.Settings
+import me.mnlr.vripper.services.DataTransaction
+import org.apache.hc.client5.http.protocol.HttpClientContext
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+class ImageDownloadContext(val imageId: Long, val settings: Settings) : KoinComponent {
+
+    private val dataTransaction: DataTransaction by inject()
+
+    val httpContext: HttpClientContext = HttpClientContext.create()
+    val postId = image.postIdRef
+    var stopped = false
+    val image: Image
+        get() = dataTransaction.findImageById(imageId).orElseThrow()
+    val post: Post
+        get() = dataTransaction.findPostById(postId).orElseThrow()
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/download/ImageDownloadRunnable.kt

@@ -0,0 +1,188 @@
+package me.mnlr.vripper.download
+
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.entities.Image
+import me.mnlr.vripper.entities.Post
+import me.mnlr.vripper.entities.domain.Status
+import me.mnlr.vripper.exception.DownloadException
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.getExtension
+import me.mnlr.vripper.host.DownloadedImage
+import me.mnlr.vripper.host.Host
+import me.mnlr.vripper.host.ImageMimeType
+import me.mnlr.vripper.model.Settings
+import me.mnlr.vripper.services.*
+import net.jodah.failsafe.function.CheckedRunnable
+import org.apache.hc.client5.http.cookie.BasicCookieStore
+import org.apache.hc.client5.http.protocol.HttpClientContext
+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.pathString
+
+class ImageDownloadRunnable(
+    private val imageInternalId: Long, private val settings: Settings
+) : KoinComponent, CheckedRunnable {
+    private val log by LoggerDelegate()
+
+    private val dataTransaction: DataTransaction by inject()
+    private val hosts: List<Host> = getKoin().getAll()
+
+    val context: ImageDownloadContext = ImageDownloadContext(imageInternalId, settings)
+    private val image: Image
+        get() = context.image
+
+    private val post: Post
+        get() = context.post
+    private var stopped: Boolean
+        get() = context.stopped
+        set(value) {
+            context.stopped = value
+        }
+    private val httpContext: HttpClientContext
+        get() = context.httpContext
+
+    init {
+        httpContext.cookieStore = BasicCookieStore()
+        httpContext.setAttribute(
+            HTTPService.ContextAttributes.CONTEXT_ATTRIBUTES, HTTPService.ContextAttributes()
+        )
+    }
+
+    @Throws(DownloadException::class)
+    fun download() {
+        try {
+            val image = image
+            with(image) {
+                this.status = Status.DOWNLOADING
+                this.current = 0
+            }
+            dataTransaction.update(image)
+            synchronized(post.id.toString().intern()) {
+                val post = context.post
+                if (post.status != Status.DOWNLOADING) {
+                    post.status = Status.DOWNLOADING
+                    dataTransaction.update(post)
+                }
+            }
+
+            if (stopped) {
+                return
+            }
+
+
+            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 ${image.url} to ${downloadedImage.path}"
+            )
+            val sanitizedFileName = PathUtils.sanitize(downloadedImage.name)
+            log.debug(
+                "Sanitizing image name from ${downloadedImage.name} to $sanitizedFileName"
+            )
+            checkImageTypeAndRename(
+                context.post, downloadedImage, image.index
+            )
+        } catch (e: Exception) {
+            if (stopped) {
+                return
+            }
+            throw DownloadException(e)
+        } finally {
+            synchronized(post.id.toString().intern()) {
+                val image = image
+                if (image.current == image.total && image.total > 0) {
+                    image.status = Status.FINISHED
+                    val post = context.post
+                    post.done += 1
+                    dataTransaction.update(post)
+                } else if (stopped) {
+                    image.status = Status.STOPPED
+                } else {
+                    image.status = Status.ERROR
+                }
+                dataTransaction.update(image)
+            }
+        }
+    }
+
+    @Throws(HostException::class)
+    private fun checkImageTypeAndRename(
+        post: Post, downloadedImage: DownloadedImage, index: Int
+    ) {
+        val existingExtension = getExtension(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()) "${downloadedImage.name}.$extension" else downloadedImage.name
+        try {
+            val downloadDestinationFolder = Path.of(post.downloadDirectory)
+            synchronized(downloadDestinationFolder.pathString.intern()) {
+                Files.createDirectories(downloadDestinationFolder)
+            }
+            val image = downloadDestinationFolder.resolve(
+                "${
+                    if (settings.downloadSettings.forceOrder) String.format(
+                        "%03d_", index + 1
+                    ) else ""
+                }$filename"
+            )
+            Files.copy(downloadedImage.path, image, 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 imageInternalId == that.imageInternalId
+    }
+
+    override fun hashCode(): Int {
+        return Objects.hash(imageInternalId)
+    }
+
+    fun stop() {
+        stopped = true
+        val contextAttributes = httpContext.getAttribute(
+            HTTPService.ContextAttributes.CONTEXT_ATTRIBUTES,
+            HTTPService.ContextAttributes::class.java
+        )
+        if (contextAttributes != null) {
+            synchronized(contextAttributes.requests) {
+                for (request in contextAttributes.requests) {
+                    request.abort()
+                }
+            }
+        }
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/download/PostDownloadRunnable.kt

@@ -0,0 +1,158 @@
+package me.mnlr.vripper.download
+
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.entities.LogEvent
+import me.mnlr.vripper.entities.LogEvent.Status.*
+import me.mnlr.vripper.exception.DownloadException
+import me.mnlr.vripper.exception.PostParseException
+import me.mnlr.vripper.formatToString
+import me.mnlr.vripper.model.PostItem
+import me.mnlr.vripper.parser.ThreadLookupAPIResponseHandler
+import me.mnlr.vripper.repositories.LogEventRepository
+import me.mnlr.vripper.services.*
+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.client5.http.impl.classic.CloseableHttpResponse
+import org.apache.hc.client5.http.protocol.HttpClientContext
+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 java.net.URISyntaxException
+import java.util.*
+import javax.xml.parsers.SAXParserFactory
+
+class PostDownloadRunnable(private val threadId: String, private val postId: String) : KoinComponent, Runnable {
+    private val log by LoggerDelegate()
+    private val dataTransaction: DataTransaction by inject()
+    private val settingsService: SettingsService by inject()
+    private val vgAuthService: VGAuthService by inject()
+    private val eventRepository: LogEventRepository by inject()
+    private val cm: HTTPService by inject()
+    private val retryPolicyService: RetryPolicyService by inject()
+    private val downloadService: DownloadService by inject()
+    private val link: String =
+        "${settingsService.settings.viperSettings.host}/threads/$threadId?p=$postId"
+    private val logEvent: LogEvent
+
+    init {
+        logEvent = eventRepository.save(
+            LogEvent(
+                type = LogEvent.Type.POST,
+                status = PENDING,
+                message = "Processing $link"
+            )
+        )
+    }
+
+    override fun run() {
+        try {
+            eventRepository.update(logEvent.copy(status = PROCESSING))
+            if (dataTransaction.exists(postId)) {
+                log.warn(String.format("skipping %s, already loaded", postId))
+                eventRepository.update(
+                    logEvent.copy(
+                        status = ERROR,
+                        message = String.format("Gallery %s is already loaded", link)
+                    )
+                )
+                return
+            }
+            val postItem: PostItem = try {
+                parse()
+            } catch (e: PostParseException) {
+                val error = String.format("parsing failed for gallery %s", link)
+                log.error(error, e)
+                eventRepository.update(
+                    logEvent.copy(
+                        status = ERROR, message = """
+                    $error
+                    ${e.formatToString()}
+                    """.trimIndent()
+                    )
+                )
+                return
+            }
+            if (postItem.imageItemList.isEmpty()) {
+                val error = String.format("Gallery %s contains no images to download", link)
+                log.error(error)
+                eventRepository.update(logEvent.copy(status = ERROR, message = error))
+                return
+            }
+            val post = dataTransaction.newPost(postItem)
+            vgAuthService.leaveThanks(post)
+//            metadataService.startFetchingMetadata(post)
+            if (settingsService.settings.downloadSettings.autoStart) {
+                log.debug("Auto start downloads option is enabled")
+                downloadService.restartAll(listOf(postItem.postId))
+                log.debug(String.format("Done enqueuing jobs for %s", postItem.url))
+            }
+
+            eventRepository.update(
+                logEvent.copy(
+                    status = DONE,
+                    message = String.format(
+                        "Gallery %s is successfully added to download queue",
+                        link
+                    )
+                )
+            )
+        } catch (e: Exception) {
+            val error = String.format("Error when adding gallery %s", link)
+            log.error(error, e)
+            eventRepository.update(
+                logEvent.copy(
+                    status = ERROR, message = """
+                $error
+                ${e.formatToString()}
+                """.trimIndent()
+                )
+            )
+        }
+    }
+
+    @Throws(PostParseException::class)
+    fun parse(): PostItem {
+        log.debug("Parsing post $postId")
+        val httpGet: HttpGet = try {
+            val uriBuilder = URIBuilder("${settingsService.settings.viperSettings.host}/vr.php")
+            uriBuilder.setParameter("p", postId)
+            cm.buildHttpGet(uriBuilder.build(), HttpClientContext.create())
+        } catch (e: URISyntaxException) {
+            throw PostParseException(e)
+        }
+        val threadLookupAPIResponseHandler = ThreadLookupAPIResponseHandler()
+        log.debug("Requesting $httpGet")
+        return try {
+            Failsafe.with(retryPolicyService.buildGenericRetryPolicy<Any>()).onFailure {
+                log.error(
+                    "parsing failed for thread $threadId, post $postId", it.failure
+                )
+            }.get(CheckedSupplier {
+                val connection: HttpClient = cm.clientBuilder.build()
+                (connection.execute(
+                    httpGet, vgAuthService.context
+                ) as CloseableHttpResponse).use { response ->
+                    try {
+                        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()
+                    } finally {
+                        EntityUtils.consumeQuietly(response.entity)
+                    }
+                }
+            })
+        } catch (e: Exception) {
+            throw PostParseException(e)
+        }
+    }
+
+    companion object {
+        private val factory = SAXParserFactory.newInstance()
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/entities/Image.kt

@@ -0,0 +1,31 @@
+package me.mnlr.vripper.entities
+
+import me.mnlr.vripper.entities.domain.Status
+
+data class Image(
+    var id: Long = -1,
+    val postId: String,
+    val url: String,
+    val thumbUrl: String,
+    val host: String,
+    val index: Int,
+    val postIdRef: Long,
+    var total: Long = -1,
+    var current: Long = 0,
+    var status: Status = Status.STOPPED,
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as Image
+
+        if (url != other.url) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return url.hashCode()
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/entities/LogEvent.kt

@@ -0,0 +1,23 @@
+package me.mnlr.vripper.entities
+
+import com.fasterxml.jackson.annotation.JsonFormat
+import java.time.LocalDateTime
+
+data class LogEvent(
+    val id: Long? = null,
+    val type: Type,
+    val status: Status,
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") 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")
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/entities/Metadata.kt

@@ -0,0 +1,19 @@
+package me.mnlr.vripper.entities
+
+class Metadata {
+    var postIdRef: Long? = null
+    var postId: String? = null
+    var postedBy: String? = null
+    var resolvedNames = emptyList<String>()
+
+    companion object {
+        fun from(metadata: Metadata): Metadata {
+            val copy = Metadata()
+            copy.postIdRef = metadata.postIdRef
+            copy.postId = metadata.postId
+            copy.postedBy = metadata.postedBy
+            copy.resolvedNames = metadata.resolvedNames
+            return copy
+        }
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/entities/Post.kt

@@ -0,0 +1,38 @@
+package me.mnlr.vripper.entities
+
+import com.fasterxml.jackson.annotation.JsonFormat
+import me.mnlr.vripper.entities.domain.Status
+import java.time.LocalDateTime
+
+data class Post(
+    var id: Long = -1,
+    val postTitle: String,
+    val threadTitle: String,
+    val forum: String,
+    val url: String,
+    val token: String,
+    val postId: String,
+    val threadId: String,
+    val total: Int,
+    val hosts: Set<String>,
+    val downloadDirectory: String,
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") val addedOn: LocalDateTime = LocalDateTime.now(),
+    var status: Status = Status.STOPPED,
+    var done: Int = 0,
+    var rank: Int = Int.MAX_VALUE
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as Post
+
+        if (postId != other.postId) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return postId.hashCode()
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/entities/Thread.kt

@@ -0,0 +1,22 @@
+package me.mnlr.vripper.entities
+
+data class Thread(
+    val id: Long? = null,
+    val title: String,
+    val link: String,
+    val threadId: String,
+    var total: Int = 0,
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as Thread
+
+        return threadId == other.threadId
+    }
+
+    override fun hashCode(): Int {
+        return threadId.hashCode()
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/entities/domain/Status.kt

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

vripper-core/src/main/kotlin/me/mnlr/vripper/event/Event.kt

@@ -0,0 +1,23 @@
+package me.mnlr.vripper.event
+
+import me.mnlr.vripper.entities.Image
+import me.mnlr.vripper.entities.Post
+import me.mnlr.vripper.entities.Thread
+import me.mnlr.vripper.model.DownloadSpeed
+import me.mnlr.vripper.model.ErrorCount
+import me.mnlr.vripper.model.QueueState
+import me.mnlr.vripper.model.Settings
+
+data class PostCreateEvent(val post: Post)
+data class PostUpdateEvent(val post: Post)
+data class PostDeleteEvent(val postId: String)
+data class ImageCreateEvent(val image: Image)
+data class ImageUpdateEvent(val image: Image)
+data class ThreadCreateEvent(val thread: Thread)
+data class ThreadDeleteEvent(val threadId: String)
+class ThreadClearEvent
+data class VGUserLoginEvent(val username: String)
+data class DownloadSpeedEvent(val downloadSpeed: DownloadSpeed)
+data class QueueStateEvent(val queueState: QueueState)
+data class ErrorCountEvent(val errorCount: ErrorCount)
+data class SettingsUpdateEvent(val settings: Settings)

vripper-core/src/main/kotlin/me/mnlr/vripper/event/EventBus.kt

@@ -0,0 +1,29 @@
+package me.mnlr.vripper.event
+
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.filterIsInstance
+import kotlin.coroutines.coroutineContext
+
+object EventBus {
+
+    private val _events = MutableSharedFlow<Any>(
+        onBufferOverflow = BufferOverflow.DROP_OLDEST,
+        extraBufferCapacity = 100_000
+    )
+    val events = _events.asSharedFlow()
+    fun publishEvent(event: Any) {
+        _events.tryEmit(event)
+    }
+
+    suspend inline fun <reified T> subscribe(crossinline onEvent: (T) -> Unit) {
+        events.filterIsInstance<T>()
+            .collectLatest { event ->
+                coroutineContext.ensureActive()
+                onEvent(event)
+            }
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/exception/DownloadException.kt

@@ -1,4 +1,4 @@
-package me.vripper.exception
+package me.mnlr.vripper.exception
 
 class DownloadException : Exception {
     constructor(message: String?) : super(message)

vripper-core/src/main/kotlin/me/mnlr/vripper/exception/HostException.kt

@@ -1,4 +1,4 @@
-package me.vripper.exception
+package me.mnlr.vripper.exception
 
 class HostException : Exception {
     constructor(e: Throwable?) : super(e)

vripper-core/src/main/kotlin/me/mnlr/vripper/exception/HtmlProcessorException.kt

@@ -1,3 +1,3 @@
-package me.vripper.exception
+package me.mnlr.vripper.exception
 
 class HtmlProcessorException(e: Throwable?) : Exception(e)

vripper-core/src/main/kotlin/me/mnlr/vripper/exception/PostParseException.kt

@@ -1,4 +1,4 @@
-package me.vripper.exception
+package me.mnlr.vripper.exception
 
 class PostParseException : Exception {
     constructor(message: String?) : super(message)

vripper-core/src/main/kotlin/me/mnlr/vripper/exception/QueueException.kt

@@ -1,4 +1,4 @@
-package me.vripper.exception
+package me.mnlr.vripper.exception
 
 class QueueException : Exception {
     constructor(message: String?) : super(message)

vripper-core/src/main/kotlin/me/mnlr/vripper/exception/RenameException.kt

@@ -1,3 +1,3 @@
-package me.vripper.exception
+package me.mnlr.vripper.exception
 
 class RenameException(message: String?, e: Exception?) : Exception(message, e)

vripper-core/src/main/kotlin/me/mnlr/vripper/exception/ValidationException.kt

@@ -1,3 +1,3 @@
-package me.vripper.exception
+package me.mnlr.vripper.exception
 
 class ValidationException(message: String) : Exception(message)

vripper-core/src/main/kotlin/me/mnlr/vripper/exception/VripperException.kt

@@ -1,4 +1,4 @@
-package me.vripper.exception
+package me.mnlr.vripper.exception
 
 class VripperException : Exception {
     constructor(message: String?) : super(message)

vripper-core/src/main/kotlin/me/mnlr/vripper/exception/XpathException.kt

@@ -1,3 +1,3 @@
-package me.vripper.exception
+package me.mnlr.vripper.exception
 
 class XpathException(e: Throwable?) : Exception(e)

vripper-core/src/main/kotlin/me/mnlr/vripper/host/AcidimgHost.kt

@@ -0,0 +1,90 @@
+package me.mnlr.vripper.host
+
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.exception.XpathException
+import me.mnlr.vripper.services.*
+import org.apache.hc.client5.http.classic.HttpClient
+import org.apache.hc.client5.http.entity.UrlEncodedFormEntity
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse
+import org.apache.hc.core5.http.NameValuePair
+import org.apache.hc.core5.http.io.entity.EntityUtils
+import org.apache.hc.core5.http.message.BasicNameValuePair
+import org.w3c.dom.Document
+import org.w3c.dom.Node
+
+class AcidimgHost(
+    private val httpService: HTTPService,
+    dataTransaction: DataTransaction,
+    downloadSpeedService: DownloadSpeedService,
+) : Host("acidimg.cc", httpService, dataTransaction, downloadSpeedService) {
+    private val log by LoggerDelegate()
+
+    @Throws(HostException::class)
+    override fun resolve(
+        url: String, document: Document, context: ImageDownloadContext
+    ): Pair<String, String> {
+        try {
+            log.debug(
+                String.format(
+                    "Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url
+                )
+            )
+            XpathService.getAsNode(document, CONTINUE_BUTTON_XPATH)
+        } catch (e: XpathException) {
+            throw HostException(e)
+        }
+        log.debug(String.format("Click button found for %s", url))
+        val client: HttpClient = httpService.clientBuilder.build()
+        val httpPost = httpService.buildHttpPost(url, context.httpContext)
+        httpPost.addHeader("Referer", url)
+        val params: MutableList<NameValuePair> = ArrayList()
+        params.add(BasicNameValuePair("imgContinue", "Continue to your image"))
+        try {
+            httpPost.entity = UrlEncodedFormEntity(params)
+        } catch (e: Exception) {
+            throw HostException(e)
+        }
+        log.debug(String.format("Requesting %s", httpPost))
+        val doc = try {
+            (client.execute(
+                httpPost, context.httpContext
+            ) as CloseableHttpResponse).use { response ->
+                log.debug(String.format("Cleaning response for %s", httpPost))
+                try {
+                    HtmlProcessorService.clean(response.entity.content)
+                } finally {
+                    EntityUtils.consumeQuietly(response.entity)
+                }
+            }
+        } catch (e: Exception) {
+            throw HostException(e)
+        }
+        val imgNode: Node = try {
+            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
+            XpathService.getAsNode(doc, IMG_XPATH)
+        } catch (e: XpathException) {
+            throw HostException(e)
+        } ?: throw HostException(
+            String.format(
+                "Xpath '%s' cannot be found in '%s'", IMG_XPATH, url
+            )
+        )
+        return try {
+            log.debug(String.format("Resolving name and image url for %s", url))
+            val imgTitle = imgNode.attributes.getNamedItem("alt").textContent.trim()
+            val imgUrl = imgNode.attributes.getNamedItem("src").textContent.trim()
+            Pair(
+                imgTitle.ifEmpty { getDefaultImageName(imgUrl) }, imgUrl
+            )
+        } catch (e: Exception) {
+            throw HostException("Unexpected error occurred", e)
+        }
+    }
+
+    companion object {
+        private const val CONTINUE_BUTTON_XPATH = "//input[@id='continuebutton']"
+        private const val IMG_XPATH = "//img[@class='centred']"
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/host/DPicMeHost.kt

@@ -1,35 +1,41 @@
-package me.vripper.host
+package me.mnlr.vripper.host
 
-import me.vripper.exception.HostException
-import me.vripper.exception.XpathException
-import me.vripper.services.download.ImageDownloadRunnable
-import me.vripper.utilities.LoggerDelegate
-import me.vripper.utilities.XpathUtils
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.exception.XpathException
+import me.mnlr.vripper.services.*
+import org.w3c.dom.Document
 import org.w3c.dom.Node
 import java.util.*
 
-internal class DPicMeHost : Host("dpic.me", 1) {
+class DPicMeHost(
+    httpService: HTTPService,
+    dataTransaction: DataTransaction,
+    downloadSpeedService: DownloadSpeedService,
+) : Host("dpic.me", httpService, dataTransaction, downloadSpeedService) {
     private val log by LoggerDelegate()
 
     @Throws(HostException::class)
     override fun resolve(
-        context: ImageDownloadRunnable.Context
+        url: String,
+        document: Document,
+        context: ImageDownloadContext
     ): Pair<String, String> {
-        val document = fetchDocument(context.imageEntity.url, context)
         val imgNode: Node = try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, context.imageEntity.url))
-            XpathUtils.getAsNode(document, IMG_XPATH)
+            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
+            XpathService.getAsNode(document, IMG_XPATH)
         } catch (e: XpathException) {
             throw HostException(e)
         } ?: throw HostException(
             String.format(
                 "Xpath '%s' cannot be found in '%s'",
                 IMG_XPATH,
-                context.imageEntity.url
+                url
             )
         )
         return try {
-            log.debug(String.format("Resolving name and image url for %s", context.imageEntity.url))
+            log.debug(String.format("Resolving name and image url for %s", url))
             val imgTitle =
                 Optional.ofNullable(imgNode.attributes.getNamedItem("alt"))
                     .map { e: Node -> e.textContent.trim() }

vripper-core/src/main/kotlin/me/mnlr/vripper/host/Host.kt

@@ -0,0 +1,239 @@
+package me.mnlr.vripper.host
+
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.DownloadException
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.getFileNameWithoutExtension
+import me.mnlr.vripper.services.*
+import org.apache.hc.client5.http.classic.HttpClient
+import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse
+import org.apache.hc.client5.http.protocol.HttpClientContext
+import org.apache.hc.core5.http.Header
+import org.apache.hc.core5.http.io.entity.EntityUtils
+import org.w3c.dom.Document
+import java.nio.file.Files
+import java.nio.file.Path
+
+abstract class Host(
+    val hostId: String,
+    private val httpService: HTTPService,
+    private val dataTransaction: DataTransaction,
+    private val downloadSpeedService: DownloadSpeedService
+) {
+    private val log by LoggerDelegate()
+
+    companion object {
+        private const val READ_BUFFER_SIZE = 8192
+        private val hosts: MutableList<String> = mutableListOf()
+
+        fun getHosts(): List<String> {
+            return hosts.toList()
+        }
+    }
+
+    init {
+        hosts.add(hostId)
+    }
+
+    @Throws(HostException::class)
+    abstract fun resolve(
+        url: String,
+        document: Document,
+        context: ImageDownloadContext
+    ): Pair<String, String>
+
+    @Throws(HostException::class)
+    fun downloadInternal(url: String, context: ImageDownloadContext): DownloadedImage {
+        val headers = head(url, context.httpContext)
+        // is the body of type image ?
+        val imageMimeType = getImageMimeType(headers)
+
+        val downloadedImage = if (imageMimeType != null) {
+            // a direct link, awesome
+            val downloadedImage = fetch(url, context) {
+                handleImageDownload(it, context)
+            }
+            DownloadedImage(getDefaultImageName(url), downloadedImage.first, downloadedImage.second)
+        } else {
+            // linked image ?
+            val value = headers.find { it.name.contains("content-type", true) }?.value
+            if (value != null) {
+                if (value.contains("text/html")) {
+                    val document = fetch(url, context) {
+                        HtmlProcessorService.clean(it.entity.content)
+                    }
+                    if (log.isDebugEnabled) {
+                        log.debug("Cleaning $url response", url)
+                    }
+                    val resolvedImage = resolve(url, document, context)
+                    val downloadImage: Pair<Path, ImageMimeType> =
+                        fetch(resolvedImage.second, context) {
+                            handleImageDownload(it, context)
+                        }
+                    DownloadedImage(resolvedImage.first, downloadImage.first, downloadImage.second)
+                } else {
+                    throw HostException("Unable to download $url, can't process content type $value")
+                }
+            } else {
+                throw HostException("Unexpected server response for $url, response have no content type")
+            }
+        }
+        return downloadedImage
+    }
+
+    private fun handleImageDownload(
+        response: CloseableHttpResponse,
+        context: ImageDownloadContext
+    ): Pair<Path, ImageMimeType> {
+        val mimeType = getImageMimeType(response.headers)
+            ?: throw HostException("Unsupported image type ${response.getFirstHeader("content-type")}")
+
+        val tempImage = Files.createTempFile(Path.of(context.settings.downloadSettings.tempPath), "vripper_", ".tmp")
+        return response.entity.content.use { inputStream ->
+            try {
+                Files.newOutputStream(tempImage).use { fos ->
+                    val image = context.image
+                    image.total = response.entity.contentLength
+                    dataTransaction.update(image)
+                    log.debug(
+                        "Length is ${image.total}"
+                    )
+                    log.debug(
+                        "Starting data transfer"
+                    )
+                    val buffer = ByteArray(READ_BUFFER_SIZE)
+                    var read: Int
+                    while (inputStream.read(buffer, 0, READ_BUFFER_SIZE)
+                            .also { read = it } != -1 && !context.stopped
+                    ) {
+                        fos.write(buffer, 0, read)
+                        with(image) {
+                            current += read
+                        }
+                        downloadSpeedService.reportDownloadedBytes(read.toLong())
+                        dataTransaction.update(image)
+                    }
+                    Pair(tempImage, mimeType)
+                }
+            } finally {
+                EntityUtils.consumeQuietly(response.entity)
+            }
+        }
+    }
+
+    fun isSupported(url: String): Boolean {
+        return url.contains(hostId)
+    }
+
+    @Throws(HostException::class)
+    fun head(url: String, context: HttpClientContext): Array<Header> {
+        val client: CloseableHttpAsyncClient = httpService.clientBuilder.build()
+        val httpGet = httpService.buildHttpHead(url, context)
+        log.debug(String.format("Requesting %s", url))
+        return try {
+            (client.execute(
+                httpGet,
+                context
+            ) as CloseableHttpResponse).use { response ->
+                try {
+                    if (response.code / 100 != 2) {
+                        throw HostException(
+                            String.format(
+                                "Unexpected response code: %d", response.code
+                            )
+                        )
+                    }
+                    response.headers
+                } finally {
+                    EntityUtils.consumeQuietly(response.entity)
+                }
+            }
+        } catch (e: Exception) {
+            throw HostException(e)
+        }
+    }
+
+    @Throws(HostException::class)
+    fun <T> fetch(
+        url: String,
+        context: ImageDownloadContext,
+        transformer: (CloseableHttpResponse) -> T
+    ): T {
+        val client: HttpClient = httpService.clientBuilder.build()
+        val httpGet = httpService.buildHttpGet(url, context.httpContext)
+        httpGet.addHeader("Referer", context.image.url)
+        log.debug(String.format("Requesting %s", url))
+        return try {
+            (client.execute(
+                httpGet,
+                context.httpContext
+            ) as CloseableHttpResponse).use { response ->
+                if (response.code / 100 != 2) {
+                    EntityUtils.consumeQuietly(response.entity)
+                    throw DownloadException(
+                        "Server returned code ${response.code}"
+                    )
+                }
+                try {
+                    transformer(response)
+                } finally {
+                    EntityUtils.consumeQuietly(response.entity)
+                }
+            }
+        } catch (e: Exception) {
+            throw HostException(e)
+        }
+    }
+
+    private fun getImageMimeType(headers: Array<Header>): ImageMimeType? {
+
+        // first check if content type header exists
+        val value = headers.find { it.name.contains("content-type", true) }?.value
+
+        // header found, check the type
+        return if (value != null) {
+            ImageMimeType.values().find {
+                value.contains(it.strValue, true)
+            }
+        } else {
+            null
+        }
+    }
+
+    fun getDefaultImageName(imgUrl: String): String {
+        val imageTitle = imgUrl.substring(imgUrl.lastIndexOf('/') + 1)
+        log.debug(String.format("Extracting name from url %s: %s", imgUrl, imageTitle))
+        return getFileNameWithoutExtension(imageTitle)
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as Host
+
+        if (hostId != other.hostId) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return hostId.hashCode()
+    }
+
+    override fun toString(): String {
+        return hostId
+    }
+}
+
+data class DownloadedImage(val name: String, val path: Path, val type: ImageMimeType)
+
+enum class ImageMimeType(val strValue: String) {
+    IMAGE_BMP("image/bmp"),
+    IMAGE_GIF("image/gif"),
+    IMAGE_JPEG("image/jpeg"),
+    IMAGE_PNG("image/png"),
+    IMAGE_WEBP("image/webp"),
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/host/ImageBamHost.kt

@@ -1,29 +1,34 @@
-package me.vripper.host
+package me.mnlr.vripper.host
 
-import me.vripper.exception.HostException
-import me.vripper.exception.XpathException
-import me.vripper.services.download.ImageDownloadRunnable
-import me.vripper.utilities.HtmlUtils
-import me.vripper.utilities.LoggerDelegate
-import me.vripper.utilities.XpathUtils
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.exception.XpathException
+import me.mnlr.vripper.services.*
 import org.apache.hc.client5.http.impl.cookie.BasicClientCookie
+import org.w3c.dom.Document
 import org.w3c.dom.Node
 import java.sql.Date
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.util.*
 
-internal class ImageBamHost : Host("imagebam.com", 2) {
+class ImageBamHost(
+    httpService: HTTPService,
+    dataTransaction: DataTransaction,
+    downloadSpeedService: DownloadSpeedService,
+) : Host("imagebam.com", httpService, dataTransaction, downloadSpeedService) {
     private val log by LoggerDelegate()
 
     @Throws(HostException::class)
     override fun resolve(
-        context: ImageDownloadRunnable.Context
+        url: String,
+        document: Document,
+        context: ImageDownloadContext
     ): Pair<String, String> {
-        val document = fetchDocument(context.imageEntity.url, context)
         val doc = try {
-            log.debug(String.format("Looking for xpath expression %s in %s", CONTINUE_XPATH, context.imageEntity.url))
-            if (XpathUtils.getAsNode(document, CONTINUE_XPATH) != null) {
+            log.debug(String.format("Looking for xpath expression %s in %s", CONTINUE_XPATH, url))
+            if (XpathService.getAsNode(document, CONTINUE_XPATH) != null) {
                 val clientCookie = BasicClientCookie("nsfw_inter", "1")
                 clientCookie.domain = "www.imagebam.com"
                 clientCookie.path = "/"
@@ -32,8 +37,8 @@ internal class ImageBamHost : Host("imagebam.com", 2) {
                         LocalDateTime.now().plusDays(3).atZone(ZoneId.systemDefault()).toInstant()
                     )
                 context.httpContext.cookieStore.addCookie(clientCookie)
-                fetch(context.imageEntity.url, context.imageEntity.url, context) {
-                    HtmlUtils.clean(it.entity.content)
+                fetch(url, context) {
+                    HtmlProcessorService.clean(it.entity.content)
                 }
             } else {
                 document
@@ -42,19 +47,19 @@ internal class ImageBamHost : Host("imagebam.com", 2) {
             throw HostException(e)
         }
         val imgNode: Node = try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, context.imageEntity.url))
-            XpathUtils.getAsNode(doc, IMG_XPATH)
+            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
+            XpathService.getAsNode(doc, IMG_XPATH)
         } catch (e: XpathException) {
             throw HostException(e)
         } ?: throw HostException(
             String.format(
                 "Xpath '%s' cannot be found in '%s'",
                 IMG_XPATH,
-                context.imageEntity.url
+                url
             )
         )
         return try {
-            log.debug(String.format("Resolving name and image url for %s", context.imageEntity.url))
+            log.debug(String.format("Resolving name and image url for %s", url))
             val imgTitle = Optional.ofNullable(imgNode.attributes.getNamedItem("alt"))
                 .map { e: Node -> e.textContent.trim { it <= ' ' } }
                 .orElse("")

vripper-core/src/main/kotlin/me/mnlr/vripper/host/ImageTwistHost.kt

@@ -1,35 +1,41 @@
-package me.vripper.host
+package me.mnlr.vripper.host
 
-import me.vripper.exception.HostException
-import me.vripper.exception.XpathException
-import me.vripper.services.download.ImageDownloadRunnable
-import me.vripper.utilities.LoggerDelegate
-import me.vripper.utilities.XpathUtils
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.exception.XpathException
+import me.mnlr.vripper.services.*
+import org.w3c.dom.Document
 import org.w3c.dom.Node
 import java.util.*
 
-internal class ImageTwistHost : Host("imagetwist.com", 3) {
+class ImageTwistHost(
+    httpService: HTTPService,
+    dataTransaction: DataTransaction,
+    downloadSpeedService: DownloadSpeedService,
+) : Host("imagetwist.com", httpService, dataTransaction, downloadSpeedService) {
     private val log by LoggerDelegate()
 
     @Throws(HostException::class)
     override fun resolve(
-        context: ImageDownloadRunnable.Context
+        url: String,
+        document: Document,
+        context: ImageDownloadContext
     ): Pair<String, String> {
-        val document = fetchDocument(context.imageEntity.url, context)
         val imgNode: Node = try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, context.imageEntity.url))
-            XpathUtils.getAsNode(document, IMG_XPATH)
+            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
+            XpathService.getAsNode(document, IMG_XPATH)
         } catch (e: XpathException) {
             throw HostException(e)
         } ?: throw HostException(
             String.format(
                 "Xpath '%s' cannot be found in '%s'",
                 IMG_XPATH,
-                context.imageEntity.url
+                url
             )
         )
         return try {
-            log.debug(String.format("Resolving name and image url for %s", context.imageEntity.url))
+            log.debug(String.format("Resolving name and image url for %s", url))
             val imgTitle =
                 Optional.ofNullable(imgNode.attributes.getNamedItem("alt"))
                     .map { obj: Node -> obj.textContent }

vripper-core/src/main/kotlin/me/mnlr/vripper/host/ImageVenueHost.kt

@@ -1,33 +1,38 @@
-package me.vripper.host
+package me.mnlr.vripper.host
 
-import me.vripper.exception.HostException
-import me.vripper.exception.XpathException
-import me.vripper.services.download.ImageDownloadRunnable
-import me.vripper.utilities.HtmlUtils
-import me.vripper.utilities.LoggerDelegate
-import me.vripper.utilities.XpathUtils
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.exception.XpathException
+import me.mnlr.vripper.services.*
+import org.w3c.dom.Document
 import org.w3c.dom.Node
 
-internal class ImageVenueHost : Host("imagevenue.com", 4) {
+class ImageVenueHost(
+    httpService: HTTPService,
+    dataTransaction: DataTransaction,
+    downloadSpeedService: DownloadSpeedService,
+) : Host("imagevenue.com", httpService, dataTransaction, downloadSpeedService) {
     private val log by LoggerDelegate()
 
     @Throws(HostException::class)
     override fun resolve(
-        context: ImageDownloadRunnable.Context
+        url: String,
+        document: Document,
+        context: ImageDownloadContext
     ): Pair<String, String> {
         val doc = try {
-            val document = fetchDocument(context.imageEntity.url, context)
             log.debug(
                 String.format(
                     "Looking for xpath expression %s in %s",
                     CONTINUE_BUTTON_XPATH,
-                    context.imageEntity.url
+                    url
                 )
             )
-            if (XpathUtils.getAsNode(document, CONTINUE_BUTTON_XPATH) != null) {
+            if (XpathService.getAsNode(document, CONTINUE_BUTTON_XPATH) != null) {
                 // Button detected. No need to actually click it, just make the call again.
-                fetch(context.imageEntity.url, context.imageEntity.url, context) {
-                    HtmlUtils.clean(it.entity.content)
+                fetch(url, context) {
+                    HtmlProcessorService.clean(it.entity.content)
                 }
             } else {
                 document
@@ -36,19 +41,19 @@ internal class ImageVenueHost : Host("imagevenue.com", 4) {
             throw HostException(e)
         }
         val imgNode: Node = try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, context.imageEntity.url))
-            XpathUtils.getAsNode(doc, IMG_XPATH)
+            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
+            XpathService.getAsNode(doc, IMG_XPATH)
         } catch (e: XpathException) {
             throw HostException(e)
         } ?: throw HostException(
             String.format(
                 "Xpath '%s' cannot be found in '%s'",
                 IMG_XPATH,
-                context.imageEntity.url
+                url
             )
         )
         return try {
-            log.debug(String.format("Resolving name and image url for %s", context.imageEntity.url))
+            log.debug(String.format("Resolving name and image url for %s", url))
             val imgTitle = imgNode.attributes.getNamedItem("alt").textContent.trim { it <= ' ' }
             val imgUrl = imgNode.attributes.getNamedItem("src").textContent.trim { it <= ' ' }
             Pair(
@@ -62,6 +67,6 @@ internal class ImageVenueHost : Host("imagevenue.com", 4) {
 
     companion object {
         private const val CONTINUE_BUTTON_XPATH = "//a[@title='Continue to ImageVenue']"
-        private const val IMG_XPATH = "//a[@data-toggle='full']/img[@id='main-image']"
+        private const val IMG_XPATH = "//a[@data-toggle='full']/img"
     }
 }

vripper-core/src/main/kotlin/me/mnlr/vripper/host/ImageZillaHost.kt

@@ -0,0 +1,51 @@
+package me.mnlr.vripper.host
+
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.exception.XpathException
+import me.mnlr.vripper.services.*
+import org.w3c.dom.Document
+
+class ImageZillaHost(
+    httpService: HTTPService,
+    dataTransaction: DataTransaction,
+    downloadSpeedService: DownloadSpeedService,
+) : Host("imagezilla.net", httpService, dataTransaction, downloadSpeedService) {
+    private val log by LoggerDelegate()
+
+    @Throws(HostException::class)
+    override fun resolve(
+        url: String,
+        document: Document,
+        context: ImageDownloadContext
+    ): Pair<String, String> {
+        val titleNode = try {
+            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
+            XpathService.getAsNode(document, IMG_XPATH)
+        } catch (e: XpathException) {
+            throw HostException(e)
+        } ?: throw HostException(
+            String.format(
+                "Xpath '%s' cannot be found in '%s'",
+                IMG_XPATH,
+                url
+            )
+        )
+        log.debug(String.format("Resolving name for %s", url))
+        var title = titleNode.attributes.getNamedItem("title").textContent.trim()
+        titleNode.textContent.trim()
+        if (title.isEmpty()) {
+            title = getDefaultImageName(url)
+        }
+        return try {
+            Pair(title, url.replace("show", "images"))
+        } catch (e: Exception) {
+            throw HostException("Unexpected error occurred", e)
+        }
+    }
+
+    companion object {
+        private const val IMG_XPATH = "//img[@id='photo']"
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/host/ImgSpiceHost.kt

@@ -1,34 +1,40 @@
-package me.vripper.host
+package me.mnlr.vripper.host
 
-import me.vripper.exception.HostException
-import me.vripper.exception.XpathException
-import me.vripper.services.download.ImageDownloadRunnable
-import me.vripper.utilities.LoggerDelegate
-import me.vripper.utilities.XpathUtils
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.exception.XpathException
+import me.mnlr.vripper.services.*
+import org.w3c.dom.Document
 import org.w3c.dom.Node
 
-internal class ImgSpiceHost : Host("imgspice.com", 7) {
+class ImgSpiceHost(
+    httpService: HTTPService,
+    dataTransaction: DataTransaction,
+    downloadSpeedService: DownloadSpeedService,
+) : Host("imgspice.com", httpService, dataTransaction, downloadSpeedService) {
     private val log by LoggerDelegate()
 
     @Throws(HostException::class)
     override fun resolve(
-        context: ImageDownloadRunnable.Context
+        url: String,
+        document: Document,
+        context: ImageDownloadContext
     ): Pair<String, String> {
-        val document = fetchDocument(context.imageEntity.url, context)
         val imgNode: Node = try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, context.imageEntity.url))
-            XpathUtils.getAsNode(document, IMG_XPATH)
+            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
+            XpathService.getAsNode(document, IMG_XPATH)
         } catch (e: XpathException) {
             throw HostException(e)
         } ?: throw HostException(
             String.format(
                 "Xpath '%s' cannot be found in '%s'",
                 IMG_XPATH,
-                context.imageEntity.url
+                url
             )
         )
         return try {
-            log.debug(String.format("Resolving name and image url for %s", context.imageEntity.url))
+            log.debug(String.format("Resolving name and image url for %s", url))
             val imgTitle = imgNode.attributes.getNamedItem("alt").textContent.trim { it <= ' ' }
             val imgUrl = imgNode.attributes.getNamedItem("src").textContent.trim { it <= ' ' }
             Pair(

vripper-core/src/main/kotlin/me/mnlr/vripper/host/ImgboxHost.kt

@@ -1,34 +1,40 @@
-package me.vripper.host
+package me.mnlr.vripper.host
 
-import me.vripper.exception.HostException
-import me.vripper.exception.XpathException
-import me.vripper.services.download.ImageDownloadRunnable
-import me.vripper.utilities.LoggerDelegate
-import me.vripper.utilities.XpathUtils
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.exception.XpathException
+import me.mnlr.vripper.services.*
+import org.w3c.dom.Document
 import org.w3c.dom.Node
 
-internal class ImgboxHost : Host("imgbox.com", 6) {
+class ImgboxHost(
+    httpService: HTTPService,
+    dataTransaction: DataTransaction,
+    downloadSpeedService: DownloadSpeedService,
+) : Host("imgbox.com", httpService, dataTransaction, downloadSpeedService) {
     private val log by LoggerDelegate()
 
     @Throws(HostException::class)
     override fun resolve(
-        context: ImageDownloadRunnable.Context
+        url: String,
+        document: Document,
+        context: ImageDownloadContext
     ): Pair<String, String> {
-        val document = fetchDocument(context.imageEntity.url, context)
         val imgNode: Node = try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, context.imageEntity.url))
-            XpathUtils.getAsNode(document, IMG_XPATH)
+            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
+            XpathService.getAsNode(document, IMG_XPATH)
         } catch (e: XpathException) {
             throw HostException(e)
         } ?: throw HostException(
             String.format(
                 "Xpath '%s' cannot be found in '%s'",
                 IMG_XPATH,
-                context.imageEntity.url
+                url
             )
         )
         return try {
-            log.debug(String.format("Resolving name and image url for %s", context.imageEntity.url))
+            log.debug(String.format("Resolving name and image url for %s", url))
             val imgTitle = imgNode.attributes.getNamedItem("title").textContent.trim { it <= ' ' }
             val imgUrl = imgNode.attributes.getNamedItem("src").textContent.trim { it <= ' ' }
             Pair(imgTitle, imgUrl)

vripper-core/src/main/kotlin/me/mnlr/vripper/host/ImxHost.kt

@@ -0,0 +1,100 @@
+package me.mnlr.vripper.host
+
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.exception.HtmlProcessorException
+import me.mnlr.vripper.exception.XpathException
+import me.mnlr.vripper.services.*
+import org.apache.hc.client5.http.classic.HttpClient
+import org.apache.hc.client5.http.classic.methods.HttpPost
+import org.apache.hc.client5.http.entity.UrlEncodedFormEntity
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse
+import org.apache.hc.core5.http.NameValuePair
+import org.apache.hc.core5.http.io.entity.EntityUtils
+import org.apache.hc.core5.http.message.BasicNameValuePair
+import org.w3c.dom.Document
+import org.w3c.dom.Node
+import java.io.IOException
+
+class ImxHost(
+    private val httpService: HTTPService,
+    dataTransaction: DataTransaction,
+    downloadSpeedService: DownloadSpeedService,
+) : Host("imx.to", httpService, dataTransaction, downloadSpeedService) {
+    private val log by LoggerDelegate()
+
+    @Throws(HostException::class)
+    override fun resolve(
+        url: String,
+        document: Document,
+        context: ImageDownloadContext
+    ): Pair<String, String> {
+        val httpsUrl = url.replace("http:", "https:")
+        var value: String? = null
+        try {
+            log.debug("Looking for xpath expression $CONTINUE_BUTTON_XPATH in $httpsUrl")
+            val contDiv = XpathService.getAsNode(document, CONTINUE_BUTTON_XPATH)
+                ?: throw HostException("$CONTINUE_BUTTON_XPATH cannot be found")
+            val node = contDiv.attributes.getNamedItem("value")
+            if (node != null) {
+                value = node.textContent
+            }
+        } catch (e: XpathException) {
+            throw HostException(e)
+        }
+        if (value == null) {
+            throw HostException("Failed to obtain value attribute from continue input")
+        }
+        log.debug("Click button found for $httpsUrl")
+        val client: HttpClient = httpService.clientBuilder.build()
+        val httpPost: HttpPost = httpService.buildHttpPost(httpsUrl, context.httpContext)
+        val params: MutableList<NameValuePair> = ArrayList()
+        params.add(BasicNameValuePair("imgContinue", value))
+        try {
+            httpPost.entity = UrlEncodedFormEntity(params)
+        } catch (e: Exception) {
+            throw HostException(e)
+        }
+        log.debug("Requesting $httpPost")
+        val doc = try {
+            (client.execute(
+                httpPost, context.httpContext
+            ) as CloseableHttpResponse).use { response ->
+                log.debug("Cleaning response for $httpPost")
+                try {
+                    HtmlProcessorService.clean(response.entity.content)
+                } finally {
+                    EntityUtils.consumeQuietly(response.entity)
+                }
+            }
+        } catch (e: IOException) {
+            throw HostException(e)
+        } catch (e: HtmlProcessorException) {
+            throw HostException(e)
+        }
+        val imgNode: Node = try {
+            log.debug("Looking for xpath expression $IMG_XPATH in $httpsUrl")
+            XpathService.getAsNode(doc, IMG_XPATH)
+        } catch (e: XpathException) {
+            throw HostException(e)
+        } ?: throw HostException(
+            "Xpath $IMG_XPATH cannot be found in $httpsUrl"
+        )
+        return try {
+            log.debug("Resolving name and image url for $httpsUrl")
+            val imgTitle = imgNode.attributes.getNamedItem("alt").textContent.trim { it <= ' ' }
+            val imgUrl = imgNode.attributes.getNamedItem("src").textContent.trim { it <= ' ' }
+            Pair(
+                imgTitle.ifEmpty { getDefaultImageName(imgUrl) }, imgUrl
+            )
+        } catch (e: Exception) {
+            throw HostException("Unexpected error occurred", e)
+        }
+    }
+
+    companion object {
+        private const val CONTINUE_BUTTON_XPATH = "//*[@name='imgContinue']"
+        private const val IMG_XPATH = "//img[@class='centred']"
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/host/PimpandhostHost.kt

@@ -1,44 +1,47 @@
-package me.vripper.host
+package me.mnlr.vripper.host
 
-import me.vripper.exception.HostException
-import me.vripper.exception.XpathException
-import me.vripper.services.download.ImageDownloadRunnable
-import me.vripper.utilities.HtmlUtils
-import me.vripper.utilities.LoggerDelegate
-import me.vripper.utilities.XpathUtils
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.exception.XpathException
+import me.mnlr.vripper.services.*
+import org.w3c.dom.Document
 import org.w3c.dom.Node
 import java.net.URI
 import java.net.URISyntaxException
 
-internal class PimpandhostHost : Host("pimpandhost.com", 9) {
+class PimpandhostHost(
+    httpService: HTTPService,
+    dataTransaction: DataTransaction,
+    downloadSpeedService: DownloadSpeedService,
+) : Host("pimpandhost.com", httpService, dataTransaction, downloadSpeedService) {
     private val log by LoggerDelegate()
 
     @Throws(HostException::class)
     override fun resolve(
-        context: ImageDownloadRunnable.Context
+        url: String,
+        document: Document,
+        context: ImageDownloadContext
     ): Pair<String, String> {
         val newUrl: String
         try {
-            newUrl = appendUri(
-                context.imageEntity.url.replace("http://", "https://").replace("-medium(\\.html)?".toRegex(), ""),
-                "size=original"
-            )
+            newUrl = appendUri(url.replace("http://", "https://").replace("-medium(\\.html)?".toRegex(), ""), "size=original")
         } catch (e: Exception) {
             throw HostException(e)
         }
-        val doc = fetch(newUrl, context.imageEntity.url, context) {
-            HtmlUtils.clean(it.entity.content)
+        val doc = fetch(newUrl, context) {
+            HtmlProcessorService.clean(it.entity.content)
         }
         val imgNode: Node = try {
             log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, newUrl))
-            XpathUtils.getAsNode(doc, IMG_XPATH)
+            XpathService.getAsNode(doc, IMG_XPATH)
         } catch (e: XpathException) {
             throw HostException(e)
         } ?: throw HostException(
             String.format(
                 "Xpath '%s' cannot be found in '%s'",
                 IMG_XPATH,
-                context.imageEntity.url
+                url
             )
         )
         return try {

vripper-core/src/main/kotlin/me/mnlr/vripper/host/PixRouteHost.kt

@@ -1,34 +1,40 @@
-package me.vripper.host
+package me.mnlr.vripper.host
 
-import me.vripper.exception.HostException
-import me.vripper.exception.XpathException
-import me.vripper.services.download.ImageDownloadRunnable
-import me.vripper.utilities.LoggerDelegate
-import me.vripper.utilities.XpathUtils
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.exception.XpathException
+import me.mnlr.vripper.services.*
+import org.w3c.dom.Document
 import org.w3c.dom.Node
 
-internal class PixRouteHost : Host("pixroute.com", 11) {
+class PixRouteHost(
+    httpService: HTTPService,
+    dataTransaction: DataTransaction,
+    downloadSpeedService: DownloadSpeedService,
+) : Host("pixroute.com", httpService, dataTransaction, downloadSpeedService) {
     private val log by LoggerDelegate()
 
     @Throws(HostException::class)
     override fun resolve(
-        context: ImageDownloadRunnable.Context
+        url: String,
+        document: Document,
+        context: ImageDownloadContext
     ): Pair<String, String> {
-        val document = fetchDocument(context.imageEntity.url, context)
         val imgNode: Node = try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, context.imageEntity.url))
-            XpathUtils.getAsNode(document, IMG_XPATH)
+            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
+            XpathService.getAsNode(document, IMG_XPATH)
         } catch (e: XpathException) {
             throw HostException(e)
         } ?: throw HostException(
             String.format(
                 "Xpath '%s' cannot be found in '%s'",
                 IMG_XPATH,
-                context.imageEntity.url
+                url
             )
         )
         return try {
-            log.debug(String.format("Resolving name and image url for %s", context.imageEntity.url))
+            log.debug(String.format("Resolving name and image url for %s", url))
             Pair(imgNode.attributes.getNamedItem("alt").textContent.trim { it <= ' ' },
                 imgNode.attributes.getNamedItem("src").textContent.trim { it <= ' ' })
         } catch (e: Exception) {

vripper-core/src/main/kotlin/me/mnlr/vripper/host/PixhostHost.kt

@@ -1,34 +1,40 @@
-package me.vripper.host
+package me.mnlr.vripper.host
 
-import me.vripper.exception.HostException
-import me.vripper.exception.XpathException
-import me.vripper.services.download.ImageDownloadRunnable
-import me.vripper.utilities.LoggerDelegate
-import me.vripper.utilities.XpathUtils
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.exception.XpathException
+import me.mnlr.vripper.services.*
+import org.w3c.dom.Document
 import org.w3c.dom.Node
 
-internal class PixhostHost : Host("pixhost.to", 10) {
+class PixhostHost(
+    httpService: HTTPService,
+    dataTransaction: DataTransaction,
+    downloadSpeedService: DownloadSpeedService,
+) : Host("pixhost.to", httpService, dataTransaction, downloadSpeedService) {
     private val log by LoggerDelegate()
 
     @Throws(HostException::class)
     override fun resolve(
-        context: ImageDownloadRunnable.Context
+        url: String,
+        document: Document,
+        context: ImageDownloadContext
     ): Pair<String, String> {
-        val document = fetchDocument(context.imageEntity.url, context)
         val imgNode: Node = try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, context.imageEntity.url))
-            XpathUtils.getAsNode(document, IMG_XPATH)
+            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
+            XpathService.getAsNode(document, IMG_XPATH)
         } catch (e: XpathException) {
             throw HostException(e)
         } ?: throw HostException(
             String.format(
                 "Xpath '%s' cannot be found in '%s'",
                 IMG_XPATH,
-                context.imageEntity.url
+                url
             )
         )
         return try {
-            log.debug(String.format("Resolving name and image url for %s", context.imageEntity.url))
+            log.debug(String.format("Resolving name and image url for %s", url))
             val imgTitle = imgNode.attributes.getNamedItem("alt").textContent.trim { it <= ' ' }
             val imgUrl = imgNode.attributes.getNamedItem("src").textContent.trim { it <= ' ' }
             Pair(imgTitle.substring(imgTitle.indexOf('_') + 1), imgUrl)

vripper-core/src/main/kotlin/me/mnlr/vripper/host/PixxxelsHost.kt

@@ -1,45 +1,51 @@
-package me.vripper.host
+package me.mnlr.vripper.host
 
-import me.vripper.exception.HostException
-import me.vripper.exception.XpathException
-import me.vripper.services.download.ImageDownloadRunnable
-import me.vripper.utilities.LoggerDelegate
-import me.vripper.utilities.XpathUtils
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.exception.XpathException
+import me.mnlr.vripper.services.*
+import org.w3c.dom.Document
 
-internal class PixxxelsHost : Host("pixxxels.cc", 12) {
+class PixxxelsHost(
+    httpService: HTTPService,
+    dataTransaction: DataTransaction,
+    downloadSpeedService: DownloadSpeedService,
+) : Host("pixxxels.cc", httpService, dataTransaction, downloadSpeedService) {
     private val log by LoggerDelegate()
 
     @Throws(HostException::class)
     override fun resolve(
-        context: ImageDownloadRunnable.Context
+        url: String,
+        document: Document,
+        context: ImageDownloadContext
     ): Pair<String, String> {
-        val document = fetchDocument(context.imageEntity.url, context)
         val imgNode = try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, context.imageEntity.url))
-            XpathUtils.getAsNode(document, IMG_XPATH)
+            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
+            XpathService.getAsNode(document, IMG_XPATH)
         } catch (e: XpathException) {
             throw HostException(e)
         } ?: throw HostException(
             String.format(
                 "Xpath '%s' cannot be found in '%s'",
                 IMG_XPATH,
-                context.imageEntity.url
+                url
             )
         )
         val titleNode = try {
-            log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, context.imageEntity.url))
-            XpathUtils.getAsNode(document, TITLE_XPATH)
+            log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url))
+            XpathService.getAsNode(document, TITLE_XPATH)
         } catch (e: XpathException) {
             throw HostException(e)
         } ?: throw HostException(
             String.format(
                 "Xpath '%s' cannot be found in '%s'",
                 TITLE_XPATH,
-                context.imageEntity.url
+                url
             )
         )
         return try {
-            log.debug(String.format("Resolving name and image url for %s", context.imageEntity.url))
+            log.debug(String.format("Resolving name and image url for %s", url))
             val imgTitle = titleNode.textContent.trim { it <= ' ' }
             val imgUrl = imgNode.attributes.getNamedItem("href").textContent.trim { it <= ' ' }
             Pair(

vripper-core/src/main/kotlin/me/mnlr/vripper/host/PostImgHost.kt

@@ -1,50 +1,56 @@
-package me.vripper.host
+package me.mnlr.vripper.host
 
-import me.vripper.exception.HostException
-import me.vripper.exception.XpathException
-import me.vripper.services.download.ImageDownloadRunnable
-import me.vripper.utilities.LoggerDelegate
-import me.vripper.utilities.XpathUtils
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.exception.XpathException
+import me.mnlr.vripper.services.*
+import org.w3c.dom.Document
 import org.w3c.dom.Node
 import java.util.*
 
-internal class PostImgHost : Host("postimg.cc", 13) {
+class PostImgHost(
+    httpService: HTTPService,
+    dataTransaction: DataTransaction,
+    downloadSpeedService: DownloadSpeedService,
+) : Host("postimg.cc", httpService, dataTransaction, downloadSpeedService) {
     private val log by LoggerDelegate()
 
     @Throws(HostException::class)
     override fun resolve(
-        context: ImageDownloadRunnable.Context
+        url: String,
+        document: Document,
+        context: ImageDownloadContext
     ): Pair<String, String> {
-        val document = fetchDocument(context.imageEntity.url, context)
         val titleNode = try {
-            log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, context.imageEntity.url))
-            XpathUtils.getAsNode(document, TITLE_XPATH)
+            log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url))
+            XpathService.getAsNode(document, TITLE_XPATH)
         } catch (e: XpathException) {
             throw HostException(e)
         } ?: throw HostException(
             String.format(
                 "Xpath '%s' cannot be found in '%s'",
                 TITLE_XPATH,
-                context.imageEntity.url
+                url
             )
         )
         val urlNode = try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, context.imageEntity.url))
-            XpathUtils.getAsNode(document, IMG_XPATH)
+            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
+            XpathService.getAsNode(document, IMG_XPATH)
         } catch (e: XpathException) {
             throw HostException(e)
         } ?: throw HostException(
             String.format(
                 "Xpath '%s' cannot be found in '%s'",
                 IMG_XPATH,
-                context.imageEntity.url
+                url
             )
         )
         return try {
-            log.debug(String.format("Resolving name and image url for %s", context.imageEntity.url))
+            log.debug(String.format("Resolving name and image url for %s", url))
             val imgTitle = Optional.ofNullable(titleNode)
                 .map { node: Node -> node.textContent.trim { it <= ' ' } }
-                .orElseGet { getDefaultImageName(context.imageEntity.url) }
+                .orElseGet { getDefaultImageName(url) }
             Pair(imgTitle, urlNode.attributes.getNamedItem("href").textContent.trim { it <= ' ' })
         } catch (e: Exception) {
             throw HostException("Unexpected error occurred", e)

vripper-core/src/main/kotlin/me/mnlr/vripper/host/TurboImageHost.kt

@@ -1,38 +1,44 @@
-package me.vripper.host
+package me.mnlr.vripper.host
 
-import me.vripper.exception.HostException
-import me.vripper.exception.XpathException
-import me.vripper.services.download.ImageDownloadRunnable
-import me.vripper.utilities.LoggerDelegate
-import me.vripper.utilities.XpathUtils
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.exception.XpathException
+import me.mnlr.vripper.services.*
+import org.w3c.dom.Document
 import org.w3c.dom.Node
 
-internal class TurboImageHost : Host("turboimagehost.com", 14) {
+class TurboImageHost(
+    httpService: HTTPService,
+    dataTransaction: DataTransaction,
+    downloadSpeedService: DownloadSpeedService,
+) : Host("turboimagehost.com", httpService, dataTransaction, downloadSpeedService) {
     private val log by LoggerDelegate()
 
     @Throws(HostException::class)
     override fun resolve(
-        context: ImageDownloadRunnable.Context
+        url: String,
+        document: Document,
+        context: ImageDownloadContext
     ): Pair<String, String> {
-        val document = fetchDocument(context.imageEntity.url, context)
         var title: String?
         title = try {
-            log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, context.imageEntity.url))
-            val titleNode: Node? = XpathUtils.getAsNode(document, TITLE_XPATH)
-            log.debug(String.format("Resolving name for %s", context.imageEntity.url))
+            log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url))
+            val titleNode: Node? = XpathService.getAsNode(document, TITLE_XPATH)
+            log.debug(String.format("Resolving name for %s", url))
             titleNode?.textContent?.trim { it <= ' ' }
         } catch (e: XpathException) {
             throw HostException(e)
         }
         if (title.isNullOrEmpty()) {
-            title = getDefaultImageName(context.imageEntity.url)
+            title = getDefaultImageName(url)
         }
-        val urlNode: Node = XpathUtils.getAsNode(document, IMG_XPATH)
+        val urlNode: Node = XpathService.getAsNode(document, IMG_XPATH)
             ?: throw HostException(
                 String.format(
                     "Xpath '%s' cannot be found in '%s'",
                     IMG_XPATH,
-                    context.imageEntity.url
+                    url
                 )
             )
         return Pair(title, urlNode.attributes.getNamedItem("src").textContent.trim { it <= ' ' })

vripper-core/src/main/kotlin/me/mnlr/vripper/host/ViprImHost.kt

@@ -1,35 +1,41 @@
-package me.vripper.host
+package me.mnlr.vripper.host
 
-import me.vripper.exception.HostException
-import me.vripper.exception.XpathException
-import me.vripper.services.download.ImageDownloadRunnable
-import me.vripper.utilities.LoggerDelegate
-import me.vripper.utilities.XpathUtils
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.ImageDownloadContext
+import me.mnlr.vripper.exception.HostException
+import me.mnlr.vripper.exception.XpathException
+import me.mnlr.vripper.services.*
+import org.w3c.dom.Document
 import org.w3c.dom.Node
 import java.util.*
 
-internal class ViprImHost : Host("vipr.im", 15) {
+class ViprImHost(
+    httpService: HTTPService,
+    dataTransaction: DataTransaction,
+    downloadSpeedService: DownloadSpeedService,
+) : Host("vipr.im", httpService, dataTransaction, downloadSpeedService) {
     private val log by LoggerDelegate()
 
     @Throws(HostException::class)
     override fun resolve(
-        context: ImageDownloadRunnable.Context
+        url: String,
+        document: Document,
+        context: ImageDownloadContext
     ): Pair<String, String> {
-        val document = fetchDocument(context.imageEntity.url, context)
         val imgNode: Node = try {
-            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, context.imageEntity.url))
-            XpathUtils.getAsNode(document, IMG_XPATH)
+            log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
+            XpathService.getAsNode(document, IMG_XPATH)
         } catch (e: XpathException) {
             throw HostException(e)
         } ?: throw HostException(
             String.format(
                 "Xpath '%s' cannot be found in '%s'",
                 IMG_XPATH,
-                context.imageEntity.url
+                url
             )
         )
         return try {
-            log.debug(String.format("Resolving name and image url for %s", context.imageEntity.url))
+            log.debug(String.format("Resolving name and image url for %s", url))
             val imgTitle =
                 Optional.ofNullable(imgNode.attributes.getNamedItem("alt"))
                     .map { obj: Node -> obj.textContent }

vripper-core/src/main/kotlin/me/mnlr/vripper/listeners/AppLock.kt

@@ -1,31 +1,32 @@
-package me.vripper.utilities
+package me.mnlr.vripper.listeners
 
-import me.vripper.utilities.ApplicationProperties.VRIPPER_DIR
+import me.mnlr.vripper.ApplicationProperties.BASE_DIR_NAME
+import me.mnlr.vripper.ApplicationProperties.baseDir
 import java.io.RandomAccessFile
 import java.nio.file.Files
+import kotlin.io.path.Path
 import kotlin.io.path.pathString
 import kotlin.system.exitProcess
 
 object AppLock {
-    fun exclusiveLock(): Boolean {
-        val lock = VRIPPER_DIR.resolve("lock")
+    fun exclusiveLock() {
+        val lock = Path(baseDir).resolve(BASE_DIR_NAME).resolve("lock")
         try {
             val randomFile = RandomAccessFile(lock.pathString, "rw")
             val channel = randomFile.channel
             val fileLock = channel.tryLock()
             if (fileLock == null) {
-                return false
+                System.err.println("Another instance is already running in ${lock.parent.pathString}")
+                exitProcess(-1)
             } else {
                 Runtime.getRuntime().addShutdownHook(Thread {
                     fileLock.release()
                     channel.close()
                     Files.deleteIfExists(lock)
                 })
-                return true
             }
         } catch (e: Exception) {
-            e.printStackTrace()
-            exitProcess(-1)
+            println(e.toString())
         }
     }
 }

vripper-core/src/main/kotlin/me/mnlr/vripper/listeners/OnStartupListener.kt

@@ -0,0 +1,25 @@
+package me.mnlr.vripper.listeners
+
+import me.mnlr.vripper.download.DownloadService
+import me.mnlr.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 vgAuthService: VGAuthService by inject()
+    private val downloadSpeedService: DownloadSpeedService by inject()
+
+    open fun run() {
+        dataTransaction.setDownloadingToStopped()
+        dataTransaction.sortPostsByRank()
+        httpService.init()
+        retryPolicyService.init()
+        vgAuthService.init()
+        downloadService.init()
+        downloadSpeedService.init()
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/model/DownloadSpeed.kt

@@ -0,0 +1,3 @@
+package me.mnlr.vripper.model
+
+data class DownloadSpeed(val speed: String)

vripper-core/src/main/kotlin/me/mnlr/vripper/model/ErrorCount.kt

@@ -0,0 +1,3 @@
+package me.mnlr.vripper.model
+
+data class ErrorCount(val count: Int)

vripper-core/src/main/kotlin/me/mnlr/vripper/model/ImageItem.kt

@@ -0,0 +1,5 @@
+package me.mnlr.vripper.model
+
+import me.mnlr.vripper.host.Host
+
+data class ImageItem(val mainLink: String, val thumbLink: String, val host: Host)

vripper-core/src/main/kotlin/me/mnlr/vripper/model/LoggedUser.kt

@@ -1,3 +1,3 @@
-package me.vripper.model
+package me.mnlr.vripper.model
 
 data class LoggedUser(val user: String)

vripper-core/src/main/kotlin/me/mnlr/vripper/model/PostItem.kt

@@ -1,9 +1,9 @@
-package me.vripper.vgapi
+package me.mnlr.vripper.model
 
-internal data class PostItem(
-    val threadId: Long,
+data class PostItem(
+    val threadId: String,
     val threadTitle: String,
-    val postId: Long,
+    val postId: String,
     val number: Int,
     val title: String,
     val imageCount: Int,

vripper-core/src/main/kotlin/me/mnlr/vripper/model/QueueState.kt

@@ -0,0 +1,6 @@
+package me.mnlr.vripper.model
+
+data class QueueState(
+    val running: Int,
+    val remaining: Int
+)

vripper-core/src/main/kotlin/me/mnlr/vripper/model/Settings.kt

@@ -0,0 +1,38 @@
+package me.mnlr.vripper.model
+
+data class Settings(
+    var maxEventLog: Int = 1_000,
+    var connectionSettings: ConnectionSettings = ConnectionSettings(),
+    var downloadSettings: DownloadSettings = DownloadSettings(),
+    var viperSettings: ViperSettings = ViperSettings(),
+    var clipboardSettings: ClipboardSettings = ClipboardSettings()
+)
+
+data class ViperSettings(
+    var login: Boolean = false,
+    var username: String = "",
+    var password: String = "",
+    var thanks: Boolean = false,
+    var host: String = "https://vipergirls.to",
+)
+
+data class DownloadSettings(
+    var downloadPath: String = System.getProperty("user.home"),
+    var tempPath: String = System.getProperty("java.io.tmpdir"),
+    var autoStart: Boolean = true,
+    var autoQueueThreshold: Int = 1,
+    var forceOrder: Boolean = false,
+    var forumSubfolder: Boolean = false,
+    var threadSubLocation: Boolean = false,
+    var clearCompleted: Boolean = false,
+    var appendPostId: Boolean = false
+)
+
+data class ConnectionSettings(
+    var maxThreads: Int = 2,
+    var maxTotalThreads: Int = 0,
+    var timeout: Long = 30,
+    var maxAttempts: Int = 3,
+)
+
+data class ClipboardSettings(var enable: Boolean = false, var pollingRate: Int = 500)

vripper-core/src/main/kotlin/me/mnlr/vripper/model/ThreadItem.kt

@@ -0,0 +1,9 @@
+package me.mnlr.vripper.model
+
+data class ThreadItem(
+    val threadId: String,
+    val title: String,
+    val securityToken: String,
+    val forum: String,
+    val postItemList: List<PostItem>
+)

vripper-core/src/main/kotlin/me/mnlr/vripper/parser/ThreadLookupAPIParser.kt

@@ -0,0 +1,78 @@
+package me.mnlr.vripper.parser
+
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.exception.DownloadException
+import me.mnlr.vripper.exception.PostParseException
+import me.mnlr.vripper.model.ThreadItem
+import me.mnlr.vripper.services.HTTPService
+import me.mnlr.vripper.services.RetryPolicyService
+import me.mnlr.vripper.services.SettingsService
+import me.mnlr.vripper.services.VGAuthService
+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.client5.http.impl.classic.CloseableHttpResponse
+import org.apache.hc.client5.http.protocol.HttpClientContext
+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 java.io.BufferedInputStream
+import java.net.URISyntaxException
+import java.util.*
+import javax.xml.parsers.SAXParserFactory
+
+class ThreadLookupAPIParser(private val threadId: String) : KoinComponent {
+    private val log by 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()
+
+    @Throws(PostParseException::class)
+    fun parse(): ThreadItem {
+        log.debug("Parsing thread $threadId")
+        val httpGet: HttpGet = try {
+            val uriBuilder = URIBuilder(settingsService.settings.viperSettings.host + "/vr.php")
+            uriBuilder.setParameter("t", threadId)
+            cm.buildHttpGet(uriBuilder.build(), HttpClientContext.create())
+        } catch (e: URISyntaxException) {
+            throw PostParseException(e)
+        }
+        val threadLookupAPIResponseHandler = ThreadLookupAPIResponseHandler()
+        log.debug("Requesting $httpGet")
+        return try {
+            Failsafe.with(retryPolicyService.buildGenericRetryPolicy<Any>()).onFailure {
+                log.error(
+                    "parsing failed for thread $threadId",
+                    it.failure
+                )
+            }.get(CheckedSupplier {
+                val connection: HttpClient = cm.clientBuilder.build()
+                (connection.execute(
+                    httpGet, vgAuthService.context
+                ) as CloseableHttpResponse).use { response ->
+                    try {
+                        if (response.code / 100 != 2) {
+                            throw DownloadException("Unexpected response code '${response.code}' for $httpGet")
+                        }
+                        factory.newSAXParser().parse(
+                            BufferedInputStream(response.entity.content),
+                            threadLookupAPIResponseHandler
+                        )
+                        threadLookupAPIResponseHandler.result
+                    } finally {
+                        EntityUtils.consumeQuietly(response.entity)
+                    }
+                }
+            })
+        } catch (e: Exception) {
+            throw PostParseException(e)
+        }
+    }
+
+    companion object {
+        private val factory = SAXParserFactory.newInstance()
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/parser/ThreadLookupAPIResponseHandler.kt

@@ -1,13 +1,18 @@
-package me.vripper.vgapi
+package me.mnlr.vripper.parser
 
-import me.vripper.host.Host
-import me.vripper.services.SettingsService
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.host.Host
+import me.mnlr.vripper.model.ImageItem
+import me.mnlr.vripper.model.PostItem
+import me.mnlr.vripper.model.ThreadItem
+import me.mnlr.vripper.services.SettingsService
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import org.xml.sax.Attributes
 import org.xml.sax.helpers.DefaultHandler
 
-internal class ThreadLookupAPIResponseHandler : KoinComponent, DefaultHandler() {
+class ThreadLookupAPIResponseHandler : KoinComponent, DefaultHandler() {
+    private val log by LoggerDelegate()
     private val supportedHosts: List<Host> = getKoin().getAll()
     private val settingsService: SettingsService by inject()
     private var error: String = ""
@@ -15,14 +20,14 @@ internal class ThreadLookupAPIResponseHandler : KoinComponent, DefaultHandler()
     private val postItemList: MutableList<PostItem> = mutableListOf()
     private val imageItemList: MutableList<ImageItem> = mutableListOf()
     private lateinit var threadItem: ThreadItem
-    private var threadId: Long = -1
-    private var threadTitle: String = ""
-    private var forum: String = ""
-    private var securityToken: String = ""
-    private var postId: Long = -1
-    private var postTitle: String = ""
-
+    private lateinit var threadId: String
+    private lateinit var threadTitle: String
+    private lateinit var forum: String
+    private lateinit var securityToken: String
+    private lateinit var postId: String
+    private lateinit var postTitle: String
     private var postCounter: Int = 0
+
     val result: ThreadItem
         get() = threadItem
 
@@ -33,14 +38,14 @@ internal class ThreadLookupAPIResponseHandler : KoinComponent, DefaultHandler()
         when (qName.lowercase()) {
             "error" -> error = attributes.getValue("details")
             "thread" -> {
-                threadId = attributes.getValue("id")?.trim()?.toLong() ?: -1
+                threadId = attributes.getValue("id")?.trim() ?: ""
                 threadTitle = attributes.getValue("title")?.trim() ?: ""
             }
 
             "forum" -> forum = attributes.getValue("title")?.trim() ?: ""
             "user" -> securityToken = attributes.getValue("hash")?.trim() ?: ""
             "post" -> {
-                postId = attributes.getValue("id")?.trim()?.toLong() ?: -1
+                postId = attributes.getValue("id")?.trim() ?: ""
                 postCounter = attributes.getValue("number")?.trim()?.toInt() ?: 0
                 val title = attributes.getValue("title")?.trim() ?: ""
                 postTitle = title.ifBlank { threadTitle }
@@ -51,12 +56,17 @@ internal class ThreadLookupAPIResponseHandler : KoinComponent, DefaultHandler()
                 val thumbLink = attributes.getValue("thumb_url")?.trim() ?: ""
                 val type = attributes.getValue("type")?.trim() ?: ""
                 if (type == "linked") {
-                    supportedHosts.firstOrNull {
-                        it.isSupported(mainLink)
-                    }?.also { host ->
-                        hostMap.computeIfAbsent(host) { 0 }
-                        hostMap[host] = hostMap[host]!! + 1
+                    try {
+                        val host = supportedHosts.first {
+                            it.isSupported(mainLink)
+                        }.let { host ->
+                            hostMap.computeIfAbsent(host) { 0 }
+                            hostMap[host] = hostMap[host]!! + 1
+                            host
+                        }
                         imageItemList.add(ImageItem(mainLink, thumbLink, host))
+                    } catch (e: Exception) {
+                        log.warn("Unsupported link: $mainLink", e)
                     }
                 }
             }
@@ -74,8 +84,8 @@ internal class ThreadLookupAPIResponseHandler : KoinComponent, DefaultHandler()
                         postCounter,
                         postTitle,
                         imageItemList.size,
-                        "${settingsService.settings.viperSettings.host}/threads/$threadId?p=$postId&viewfull=1#post$postId",
-                        hostMap.toMap().map { Pair(it.key.hostName, it.value) },
+                        "${settingsService.settings.viperSettings.host}/threads/?p=$postId&viewfull=1#post$postId",
+                        hostMap.toMap().map { Pair(it.key.hostId, it.value) },
                         securityToken,
                         forum,
                         imageItemList.toList()
@@ -88,6 +98,6 @@ internal class ThreadLookupAPIResponseHandler : KoinComponent, DefaultHandler()
     }
 
     override fun endDocument() {
-        threadItem = ThreadItem(threadId, threadTitle, securityToken, forum, postItemList.toList(), error)
+        threadItem = ThreadItem(threadId, threadTitle, securityToken, forum, postItemList.toList())
     }
 }

vripper-core/src/main/kotlin/me/mnlr/vripper/repositories/ImageRepository.kt

@@ -0,0 +1,17 @@
+package me.mnlr.vripper.repositories
+
+import me.mnlr.vripper.entities.Image
+import java.util.*
+
+interface ImageRepository {
+    fun save(image: Image): Image
+    fun save(imageList: List<Image>)
+    fun deleteAllByPostId(postId: String)
+    fun findByPostId(postId: String): List<Image>
+    fun countError(): Int
+    fun findByPostIdAndIsNotCompleted(postId: String): List<Image>
+    fun stopByPostIdAndIsNotCompleted(postId: String): Int
+    fun findByPostIdAndIsError(postId: String): List<Image>
+    fun findById(id: Long): Optional<Image>
+    fun update(image: Image)
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/repositories/LogEventRepository.kt

@@ -0,0 +1,13 @@
+package me.mnlr.vripper.repositories
+
+import me.mnlr.vripper.entities.LogEvent
+import java.util.*
+
+interface LogEventRepository {
+    fun save(logEvent: LogEvent): LogEvent
+    fun update(logEvent: LogEvent): LogEvent
+    fun findAll(): List<LogEvent>
+    fun findById(id: Long): Optional<LogEvent>
+    fun delete(id: Long)
+    fun deleteAll()
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/repositories/MetadataRepository.kt

@@ -0,0 +1,10 @@
+package me.mnlr.vripper.repositories
+
+import me.mnlr.vripper.entities.Metadata
+import java.util.*
+
+interface MetadataRepository {
+    fun save(metadata: Metadata): Metadata
+    fun findByPostId(postId: String): Optional<Metadata>
+    fun deleteByPostId(postId: String): Int
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/repositories/PostDownloadStateRepository.kt

@@ -0,0 +1,17 @@
+package me.mnlr.vripper.repositories
+
+import me.mnlr.vripper.entities.Post
+import java.util.*
+
+interface PostDownloadStateRepository {
+    fun save(post: Post): Post
+    fun findByPostId(postId: String): Optional<Post>
+    fun findById(id: Long): Optional<Post>
+    fun findCompleted(): List<String>
+    fun findAll(): List<Post>
+    fun existByPostId(postId: String): Boolean
+    fun setDownloadingToStopped(): Int
+    fun deleteByPostId(postId: String): Int
+    fun update(post: Post)
+    fun update(post: List<Post>)
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/repositories/ThreadRepository.kt

@@ -0,0 +1,13 @@
+package me.mnlr.vripper.repositories
+
+import me.mnlr.vripper.entities.Thread
+import java.util.*
+
+interface ThreadRepository {
+    fun save(thread: Thread): Thread
+    fun findByThreadId(threadId: String): Optional<Thread>
+    fun findAll(): List<Thread>
+    fun findById(id: Long): Optional<Thread>
+    fun deleteByThreadId(threadId: String): Int
+    fun deleteAll()
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/repositories/impl/ImageRepositoryImpl.kt

@@ -0,0 +1,120 @@
+package me.mnlr.vripper.repositories.impl
+
+import me.mnlr.vripper.entities.Image
+import me.mnlr.vripper.entities.domain.Status
+import me.mnlr.vripper.repositories.ImageRepository
+import me.mnlr.vripper.tables.ImageTable
+import org.jetbrains.exposed.sql.*
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
+import java.util.*
+
+class ImageRepositoryImpl : ImageRepository {
+    override fun save(image: Image): Image {
+        val id = ImageTable.insertAndGetId {
+            it[current] = image.current
+            it[host] = image.host
+            it[index] = image.index
+            it[postId] = image.postId
+            it[status] = image.status.name
+            it[total] = image.total
+            it[url] = image.url
+            it[thumbUrl] = image.thumbUrl
+            it[postIdRef] = image.postIdRef
+        }.value
+        return image.copy(id = id)
+    }
+
+    override fun save(imageList: List<Image>) {
+        ImageTable.batchInsert(imageList, shouldReturnGeneratedValues = false) {
+            this[ImageTable.current] = it.current
+            this[ImageTable.host] = it.host
+            this[ImageTable.index] = it.index
+            this[ImageTable.postId] = it.postId
+            this[ImageTable.status] = it.status.name
+            this[ImageTable.total] = it.total
+            this[ImageTable.url] = it.url
+            this[ImageTable.thumbUrl] = it.thumbUrl
+            this[ImageTable.postIdRef] = it.postIdRef
+        }
+    }
+
+    override fun deleteAllByPostId(postId: String) {
+        ImageTable.deleteWhere { ImageTable.postId eq postId }
+    }
+
+    override fun findByPostId(postId: String): List<Image> {
+        return ImageTable.select {
+            ImageTable.postId eq postId
+        }.map(this::transform)
+    }
+
+    override fun countError(): Int {
+        return ImageTable
+            .slice(ImageTable.id)
+            .select { ImageTable.status eq Status.ERROR.name }
+            .count().toInt()
+    }
+
+    override fun findByPostIdAndIsNotCompleted(postId: String): List<Image> {
+        return ImageTable
+            .select {
+                (ImageTable.postId eq postId) and (ImageTable.status neq Status.FINISHED.name)
+            }.map(this::transform)
+    }
+
+    override fun stopByPostIdAndIsNotCompleted(postId: String): Int {
+        return ImageTable.update({ (ImageTable.postId eq postId) and (ImageTable.status neq Status.FINISHED.name) }) {
+            it[status] = Status.STOPPED.name
+        }
+    }
+
+    override fun findByPostIdAndIsError(postId: String): List<Image> {
+        return ImageTable.select {
+            (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 {
+            ImageTable.id eq id
+        }.map(this::transform)
+        return if (result.isEmpty()) {
+            Optional.empty()
+        } else {
+            Optional.of(result.first())
+        }
+    }
+
+    override fun update(image: Image) {
+        ImageTable.update({ ImageTable.id eq image.id }) {
+            it[status] = image.status.name
+            it[current] = image.current
+            it[total] = image.total
+        }
+    }
+
+    private fun transform(resultRow: ResultRow): Image {
+        val id = resultRow[ImageTable.id].value
+        val postId = resultRow[ImageTable.postId]
+        val url = resultRow[ImageTable.url]
+        val thumbUrl = resultRow[ImageTable.thumbUrl]
+        val host = resultRow[ImageTable.host]
+        val index = resultRow[ImageTable.index]
+        val current = resultRow[ImageTable.current]
+        val total = resultRow[ImageTable.total]
+        val status = Status.valueOf(resultRow[ImageTable.status])
+        val postIdRef = resultRow[ImageTable.postIdRef]
+        return Image(
+            id,
+            postId,
+            url,
+            thumbUrl,
+            host,
+            index,
+            postIdRef,
+            total,
+            current,
+            status
+        )
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/repositories/impl/LogEventRepositoryImpl.kt

@@ -0,0 +1,33 @@
+package me.mnlr.vripper.repositories.impl
+
+import me.mnlr.vripper.entities.LogEvent
+import me.mnlr.vripper.repositories.LogEventRepository
+import java.util.*
+
+class LogEventRepositoryImpl : LogEventRepository {
+
+    @Synchronized
+    override fun save(logEvent: LogEvent): LogEvent {
+        return  logEvent
+    }
+
+    override fun update(logEvent: LogEvent): LogEvent {
+        return logEvent
+    }
+
+    override fun findById(id: Long): Optional<LogEvent> {
+        return Optional.empty()
+    }
+
+    override fun findAll(): List<LogEvent> {
+        return emptyList()
+    }
+
+    override fun delete(id: Long) {
+
+    }
+
+    override fun deleteAll() {
+
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/repositories/impl/MetadataRepositoryImpl.kt

@@ -0,0 +1,20 @@
+package me.mnlr.vripper.repositories.impl
+
+import me.mnlr.vripper.entities.Metadata
+import me.mnlr.vripper.repositories.MetadataRepository
+import java.util.*
+
+class MetadataRepositoryImpl: MetadataRepository {
+
+    override fun save(metadata: Metadata): Metadata {
+        return metadata
+    }
+
+    override fun findByPostId(postId: String): Optional<Metadata> {
+        return Optional.empty()
+    }
+
+    override fun deleteByPostId(postId: String): Int {
+        return 0
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/repositories/impl/PostDownloadStateRepositoryImpl.kt

@@ -0,0 +1,145 @@
+package me.mnlr.vripper.repositories.impl
+
+import me.mnlr.vripper.entities.Post
+import me.mnlr.vripper.entities.domain.Status
+import me.mnlr.vripper.repositories.PostDownloadStateRepository
+import me.mnlr.vripper.tables.PostTable
+import org.jetbrains.exposed.sql.*
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
+import java.util.*
+
+class PostDownloadStateRepositoryImpl :
+    PostDownloadStateRepository {
+
+    private val delimiter = ";"
+
+    override fun save(post: Post): Post {
+        val id = PostTable.insertAndGetId {
+            it[done] = post.done
+            it[hosts] = java.lang.String.join(delimiter, post.hosts)
+            it[outputPath] = post.downloadDirectory
+            it[postId] = post.postId
+            it[status] = post.status.name
+            it[threadId] = post.threadId
+            it[postTitle] = post.postTitle
+            it[threadTitle] = post.threadTitle
+            it[forum] = post.forum
+            it[total] = post.total
+            it[url] = post.url
+            it[token] = post.token
+            it[addedAt] = post.addedOn
+            it[rank] = post.rank
+        }.value
+        return post.copy(id = id)
+    }
+
+    override fun findByPostId(postId: String): Optional<Post> {
+        val result = PostTable.select {
+            PostTable.postId eq postId
+        }.map { transform(it) }
+        return if (result.isEmpty()) {
+            Optional.empty()
+        } else {
+            Optional.of(result.first())
+        }
+    }
+
+    override fun findCompleted(): List<String> {
+        return PostTable.slice(PostTable.postId).select {
+            (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 {
+            PostTable.id eq id
+        }.map { transform(it) }
+
+        return if (result.isEmpty()) {
+            Optional.empty()
+        } else {
+            Optional.of(result.first())
+        }
+    }
+
+    override fun findAll(): List<Post> {
+        return PostTable.selectAll().map { transform(it) }
+    }
+
+    override fun existByPostId(postId: String): Boolean {
+        return PostTable.slice(PostTable.id).select { PostTable.postId eq postId }.count() > 0
+    }
+
+    override fun setDownloadingToStopped(): Int {
+        return PostTable.update({ (PostTable.status eq Status.DOWNLOADING.name) or (PostTable.status eq Status.PENDING.name) }) {
+            it[status] = Status.STOPPED.name
+        }
+    }
+
+    override fun deleteByPostId(postId: String): Int {
+        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
+        }
+    }
+
+    override fun update(post: List<Post>) {
+        PostTable.batchReplace(post, shouldReturnGeneratedValues = false) {
+            this[PostTable.id] = it.id
+            this[PostTable.status] = it.status.name
+            this[PostTable.done] = it.done
+            this[PostTable.total] = it.total
+            this[PostTable.rank] = it.rank
+            this[PostTable.hosts] = java.lang.String.join(delimiter, it.hosts)
+            this[PostTable.outputPath] = it.downloadDirectory
+            this[PostTable.postId] = it.postId
+            this[PostTable.threadId] = it.threadId
+            this[PostTable.postTitle] = it.postTitle
+            this[PostTable.threadTitle] = it.threadTitle
+            this[PostTable.forum] = it.forum
+            this[PostTable.url] = it.url
+            this[PostTable.token] = it.token
+        }
+    }
+
+    private fun transform(resultRow: ResultRow): Post {
+        val id = resultRow[PostTable.id].value
+        val status = Status.valueOf(resultRow[PostTable.status])
+        val postId = resultRow[PostTable.postId]
+        val threadId = resultRow[PostTable.threadId]
+        val postTitle = resultRow[PostTable.postTitle]
+        val threadTitle = resultRow[PostTable.threadTitle]
+        val forum = resultRow[PostTable.forum]
+        val url = resultRow[PostTable.url]
+        val token = resultRow[PostTable.token]
+        val done = resultRow[PostTable.done]
+        val total = resultRow[PostTable.total]
+        val hosts =
+            resultRow[PostTable.hosts].split(delimiter).dropLastWhile { it.isEmpty() }.toSet()
+        val downloadDirectory = resultRow[PostTable.outputPath]
+        val addedOn = resultRow[PostTable.addedAt]
+        val rank = resultRow[PostTable.rank]
+        return Post(
+            id,
+            postTitle,
+            threadTitle,
+            forum,
+            url,
+            token,
+            postId,
+            threadId,
+            total,
+            hosts,
+            downloadDirectory,
+            addedOn,
+            status,
+            done,
+            rank
+        )
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/repositories/impl/ThreadRepositoryImpl.kt

@@ -0,0 +1,64 @@
+package me.mnlr.vripper.repositories.impl
+
+import me.mnlr.vripper.entities.Thread
+import me.mnlr.vripper.repositories.ThreadRepository
+import me.mnlr.vripper.tables.ThreadTable
+import org.jetbrains.exposed.sql.*
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
+import java.util.*
+
+class ThreadRepositoryImpl : ThreadRepository {
+
+    override fun save(thread: Thread): Thread {
+        val id = ThreadTable.insertAndGetId {
+            it[title] = thread.title
+            it[total] = thread.total
+            it[url] = thread.link
+            it[threadId] = thread.threadId
+        }.value
+        return thread.copy(id = id)
+    }
+
+    override fun findByThreadId(threadId: String): Optional<Thread> {
+        val result = ThreadTable.select {
+            ThreadTable.threadId eq threadId
+        }.map(this::transform)
+        return if (result.isEmpty()) {
+            Optional.empty()
+        } else {
+            Optional.of(result.first())
+        }
+    }
+
+    override fun findAll(): List<Thread> {
+        return ThreadTable.selectAll().map(this::transform)
+    }
+
+    override fun findById(id: Long): Optional<Thread> {
+        val result = ThreadTable.select {
+            ThreadTable.id eq id
+        }.map(this::transform)
+        return if (result.isEmpty()) {
+            Optional.empty()
+        } else {
+            Optional.of(result.first())
+        }
+    }
+
+    override fun deleteByThreadId(threadId: String): Int {
+        return ThreadTable.deleteWhere { ThreadTable.threadId eq threadId }
+    }
+
+    override fun deleteAll() {
+        ThreadTable.deleteAll()
+    }
+
+    private fun transform(resultRow: ResultRow): Thread {
+        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)
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/services/AppVersion.kt

@@ -0,0 +1,5 @@
+package me.mnlr.vripper.services
+
+object AppVersion {
+    const val VERSION: String = "4.4.0"
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/services/DataTransaction.kt

@@ -0,0 +1,272 @@
+package me.mnlr.vripper.services
+
+import com.github.benmanes.caffeine.cache.Caffeine
+import com.github.benmanes.caffeine.cache.LoadingCache
+import me.mnlr.vripper.entities.Image
+import me.mnlr.vripper.entities.Metadata
+import me.mnlr.vripper.entities.Post
+import me.mnlr.vripper.entities.Thread
+import me.mnlr.vripper.entities.domain.Status
+import me.mnlr.vripper.event.*
+import me.mnlr.vripper.model.PostItem
+import me.mnlr.vripper.repositories.ImageRepository
+import me.mnlr.vripper.repositories.MetadataRepository
+import me.mnlr.vripper.repositories.PostDownloadStateRepository
+import me.mnlr.vripper.repositories.ThreadRepository
+import org.jetbrains.exposed.sql.transactions.transaction
+import java.util.*
+import kotlin.io.path.pathString
+
+class DataTransaction(
+    private val settingsService: SettingsService,
+    private val postDownloadStateRepository: PostDownloadStateRepository,
+    private val imageRepository: ImageRepository,
+    private val threadRepository: ThreadRepository,
+    private val metadataRepository: MetadataRepository,
+    private val eventBus: EventBus,
+) {
+
+    private val imageIdCache: LoadingCache<Long, Optional<Image>> = Caffeine.newBuilder().build {
+        _findImageById(it)
+    }
+    private val postIdCache: LoadingCache<Long, Optional<Post>> = Caffeine.newBuilder().build {
+        _findPostById(it)
+    }
+
+    private fun save(post: Post): Post {
+        return transaction { postDownloadStateRepository.save(post) }
+    }
+
+    fun update(post: Post) {
+        transaction { postDownloadStateRepository.update(post) }
+        postIdCache.invalidate(post.id)
+
+            eventBus.publishEvent(PostUpdateEvent(post))
+
+    }
+
+    fun save(thread: Thread) {
+        val savedThread = transaction { threadRepository.save(thread) }
+            eventBus.publishEvent(
+                ThreadCreateEvent(
+                    savedThread
+                )
+            )
+
+    }
+
+    fun update(image: Image) {
+        transaction { imageRepository.update(image) }
+        imageIdCache.invalidate(image.id)
+
+        eventBus.publishEvent(ImageUpdateEvent(image))
+
+    }
+
+    fun exists(postId: String): Boolean {
+        return transaction { postDownloadStateRepository.existByPostId(postId) }
+    }
+
+    fun newPost(postItem: PostItem): Post {
+        val (post, images) = transaction {
+            val post = save(
+                Post(
+                    postTitle = postItem.title,
+                    url = postItem.url,
+                    token = postItem.securityToken,
+                    postId = postItem.postId,
+                    threadId = postItem.threadId,
+                    total = postItem.imageCount,
+                    hosts = postItem.hosts.map { "${it.first} (${it.second})" }.toSet(),
+                    threadTitle = postItem.threadTitle,
+                    forum = postItem.forum,
+                    downloadDirectory = PathUtils.calculateDownloadPath(
+                        postItem.forum,
+                        postItem.threadTitle,
+                        postItem.title,
+                        postItem.postId,
+                        settingsService.settings
+                    ).pathString
+                )
+            )
+            val images = postItem.imageItemList.mapIndexed { index, imageItem ->
+                Image(
+                    postId = postItem.postId,
+                    url = imageItem.mainLink,
+                    thumbUrl = imageItem.thumbLink,
+                    host = imageItem.host.hostId,
+                    index = index,
+                    postIdRef = post.id!!
+                )
+            }
+            save(images)
+            sortPostsByRank()
+            Pair(post, images)
+        }
+            eventBus.publishEvent(PostCreateEvent(post))
+
+        images.forEach {
+                eventBus.publishEvent(ImageCreateEvent(it))
+
+        }
+        return post
+    }
+
+    private fun save(images: List<Image>) {
+        transaction { imageRepository.save(images) }
+    }
+
+    fun finishPost(post: Post) {
+        val imagesInErrorStatus = findByPostIdAndIsError(post.postId)
+        if (imagesInErrorStatus.isNotEmpty()) {
+            post.status = Status.ERROR
+            update(post)
+        } else {
+            if (post.done < post.total) {
+                post.status = Status.STOPPED
+                update(post)
+            } else {
+                post.status = Status.FINISHED
+                transaction {
+                    update(post)
+                    if (settingsService.settings.downloadSettings.clearCompleted) {
+                        remove(listOf(post.postId))
+                    }
+                }
+            }
+        }
+    }
+
+    private fun findByPostIdAndIsError(postId: String): List<Image> {
+        return transaction { imageRepository.findByPostIdAndIsError(postId) }
+
+    }
+
+    private fun remove(postIds: List<String>) {
+        transaction {
+            for (postId in postIds) {
+                imageRepository.deleteAllByPostId(postId)
+                metadataRepository.deleteByPostId(postId)
+                postDownloadStateRepository.deleteByPostId(postId)
+            }
+            sortPostsByRank()
+        }
+        postIds.forEach {
+
+        eventBus.publishEvent(PostDeleteEvent(it))
+
+        }
+    }
+
+    fun removeThread(threadId: String) {
+        transaction { threadRepository.deleteByThreadId(threadId) }
+
+        eventBus.publishEvent(ThreadDeleteEvent(threadId))
+
+    }
+
+    fun clearCompleted(): List<String> {
+        val completed = transaction { postDownloadStateRepository.findCompleted() }
+        remove(completed)
+        return completed
+    }
+
+    fun removeAll(postIds: List<String>?) {
+        if (postIds != null) {
+            remove(postIds)
+        } else {
+            remove(findAllPosts().map(Post::postId))
+        }
+    }
+
+    fun stopImagesByPostIdAndIsNotCompleted(postId: String) {
+        transaction { imageRepository.stopByPostIdAndIsNotCompleted(postId) }
+    }
+
+    @Synchronized
+    fun setMetadata(post: Post, metadata: Metadata) {
+        if (metadataRepository.findByPostId(post.postId).isEmpty) {
+            metadata.postIdRef = post.id
+            metadataRepository.save(metadata)
+        }
+    }
+
+    fun clearQueueLinks() {
+        transaction { threadRepository.deleteAll() }
+        eventBus.publishEvent(ThreadClearEvent())
+    }
+
+    @Synchronized
+    fun sortPostsByRank() {
+        val post =
+            findAllPosts().sortedWith(Comparator.comparing(Post::addedOn))
+        for (i in post.indices) {
+            post[i].rank = i
+        }
+        update(post)
+    }
+
+    private fun update(postList: List<Post>) {
+        transaction { postDownloadStateRepository.update(postList) }
+        postList.forEach { postIdCache.invalidate(it.id) }
+
+        postList.forEach {
+                eventBus.publishEvent(PostUpdateEvent(it))
+            }
+
+    }
+
+    fun setDownloadingToStopped() {
+        transaction { postDownloadStateRepository.setDownloadingToStopped() }
+    }
+
+    fun findAllPosts(): List<Post> {
+        return transaction { postDownloadStateRepository.findAll() }
+    }
+
+    fun findPostById(id: Long): Optional<Post> {
+        return postIdCache[id]
+    }
+
+    private fun _findPostById(id: Long): Optional<Post> {
+        return transaction { postDownloadStateRepository.findById(id) }
+    }
+
+    fun findImagesByPostId(postId: String): List<Image> {
+        return transaction { imageRepository.findByPostId(postId) }
+    }
+
+    fun findImageById(id: Long): Optional<Image> {
+        return imageIdCache[id]
+    }
+
+    private fun _findImageById(id: Long): Optional<Image> {
+        return transaction { imageRepository.findById(id) }
+    }
+
+    fun findAllThreads(): List<Thread> {
+        return transaction { threadRepository.findAll() }
+    }
+
+    fun findThreadById(id: Long): Optional<Thread> {
+        return transaction {
+            threadRepository.findById(id)
+        }
+    }
+
+    fun findByPostIdAndIsNotCompleted(postId: String): List<Image> {
+        return transaction { imageRepository.findByPostIdAndIsNotCompleted(postId) }
+    }
+
+    fun countImagesInError(): Int {
+        return transaction { imageRepository.countError() }
+    }
+
+    fun findPostsByPostId(postId: String): Optional<Post> {
+        return transaction { postDownloadStateRepository.findByPostId(postId) }
+    }
+
+    fun findThreadByThreadId(threadId: String): Optional<Thread> {
+        return transaction { threadRepository.findByThreadId(threadId) }
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/services/DatabaseMigration.kt

@@ -0,0 +1,27 @@
+package me.mnlr.vripper.services
+
+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.mnlr.vripper.ApplicationProperties.BASE_DIR_NAME
+import me.mnlr.vripper.ApplicationProperties.baseDir
+import java.sql.DriverManager
+
+object DatabaseMigration {
+
+    fun update() {
+        val database: Database = DatabaseFactory.getInstance()
+            .findCorrectDatabaseImplementation(JdbcConnection(DriverManager.getConnection("jdbc:h2:file:$baseDir/$BASE_DIR_NAME/vripper;DB_CLOSE_DELAY=-1;")))
+        Liquibase(
+            "db.changelog-master.xml",
+            ClassLoaderResourceAccessor(),
+            database
+        ).use { liquibase ->
+            liquibase.update(Contexts(), LabelExpression())
+        }
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/services/DownloadSpeedService.kt

@@ -1,14 +1,14 @@
-package me.vripper.services
+package me.mnlr.vripper.services
 
 import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.filterIsInstance
-import me.vripper.event.DownloadSpeedEvent
-import me.vripper.event.EventBus
-import me.vripper.event.QueueStateEvent
-import me.vripper.model.DownloadSpeed
+import me.mnlr.vripper.event.DownloadSpeedEvent
+import me.mnlr.vripper.event.EventBus
+import me.mnlr.vripper.event.QueueStateEvent
+import me.mnlr.vripper.formatSI
+import me.mnlr.vripper.model.DownloadSpeed
 import java.util.concurrent.atomic.AtomicLong
 
-internal class DownloadSpeedService(
+class DownloadSpeedService(
     private val eventBus: EventBus,
 ) {
 
@@ -16,23 +16,23 @@ internal class DownloadSpeedService(
         const val DOWNLOAD_POLL_RATE = 2500
     }
 
-    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
+    private val coroutineScope = CoroutineScope(Dispatchers.Default)
     private val bytesCount = AtomicLong(0)
     private var job: Job? = null
-    private var queueStateUpdateJob: Job? = null
 
     fun init() {
-        queueStateUpdateJob?.cancel()
-        queueStateUpdateJob = coroutineScope.launch {
-            eventBus.events.filterIsInstance(QueueStateEvent::class).collect {
+        coroutineScope.launch {
+            eventBus.subscribe<QueueStateEvent> {
                 if (it.queueState.running + it.queueState.remaining > 0) {
                     if (job == null || job?.isActive == false) {
                         job = coroutineScope.launch {
-                            eventBus.publishEvent(DownloadSpeedEvent(DownloadSpeed(0L)))
+                            eventBus.publishEvent(DownloadSpeedEvent(DownloadSpeed(0L.formatSI())))
                             while (isActive) {
                                 delay(DOWNLOAD_POLL_RATE.toLong())
                                 val newValue = bytesCount.getAndSet(0)
-                                eventBus.publishEvent(DownloadSpeedEvent(DownloadSpeed(((newValue * 1000) / DOWNLOAD_POLL_RATE))))
+
+                                eventBus.publishEvent(DownloadSpeedEvent(DownloadSpeed(((newValue * 1000) / DOWNLOAD_POLL_RATE).formatSI())))
+
                             }
                         }
                     }
@@ -40,18 +40,13 @@ internal class DownloadSpeedService(
                     job?.cancel()
                     coroutineScope.launch {
                         delay(DOWNLOAD_POLL_RATE + 500L)
-                        eventBus.publishEvent(DownloadSpeedEvent(DownloadSpeed(0L)))
+                        eventBus.publishEvent(DownloadSpeedEvent(DownloadSpeed(0L.formatSI())))
                     }
                 }
             }
         }
     }
 
-    fun halt() {
-        queueStateUpdateJob?.cancel()
-        job?.cancel()
-    }
-
     fun reportDownloadedBytes(count: Long) {
         bytesCount.addAndGet(count)
     }

vripper-core/src/main/kotlin/me/mnlr/vripper/services/HTTPService.kt

@@ -0,0 +1,150 @@
+package me.mnlr.vripper.services
+
+import kotlinx.coroutines.*
+import me.mnlr.vripper.event.EventBus
+import me.mnlr.vripper.event.SettingsUpdateEvent
+import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder
+import org.apache.hc.client5.http.classic.methods.HttpGet
+import org.apache.hc.client5.http.classic.methods.HttpHead
+import org.apache.hc.client5.http.classic.methods.HttpPost
+import org.apache.hc.client5.http.classic.methods.HttpUriRequest
+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.async.HttpAsyncClientBuilder
+import org.apache.hc.client5.http.impl.async.HttpAsyncClients
+import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager
+import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder
+import org.apache.hc.client5.http.protocol.HttpClientContext
+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
+import java.net.URI
+
+class HTTPService(
+    val eventBus: EventBus,
+    settingsService: SettingsService
+) {
+
+    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: PoolingAsyncClientConnectionManager
+    private lateinit var rc: RequestConfig
+    private lateinit var cc: ConnectionConfig
+    lateinit var clientBuilder: HttpAsyncClientBuilder
+    private var connectionTimeout: Long = settingsService.settings.connectionSettings.timeout
+
+    fun init() {
+        buildRequestConfig()
+        buildConnectionConfig()
+        buildConnectionPool()
+        buildClientBuilder()
+        coroutineScope.launch {
+            pcm.closeIdle(TimeValue.ofSeconds(60))
+            delay(15000)
+        }
+        coroutineScope.launch {
+            eventBus
+                .subscribe<SettingsUpdateEvent> {
+                    if (connectionTimeout != it.settings.connectionSettings.timeout) {
+                        connectionTimeout = it.settings.connectionSettings.timeout
+                        buildRequestConfig()
+                        buildConnectionConfig()
+                        pcm.close()
+                        buildConnectionPool()
+                        buildClientBuilder()
+                    }
+                }
+        }
+    }
+
+    private fun buildConnectionPool() {
+        pcm = PoolingAsyncClientConnectionManagerBuilder.create()
+            .setPoolConcurrencyPolicy(PoolConcurrencyPolicy.STRICT)
+            .setConnPoolPolicy(PoolReusePolicy.LIFO)
+            .setDefaultConnectionConfig(cc)
+            .setMaxConnTotal(Int.MAX_VALUE)
+            .setMaxConnPerRoute(Int.MAX_VALUE)
+            .build()
+    }
+
+    private fun buildRequestConfig() {
+        rc = RequestConfig.custom()
+            .setConnectionRequestTimeout(Timeout.ofSeconds(connectionTimeout))
+            .setCookieSpec(StandardCookieSpec.RELAXED)
+            .build()
+    }
+
+    private fun buildConnectionConfig() {
+        cc = ConnectionConfig.custom()
+            .setConnectTimeout(Timeout.ofSeconds(connectionTimeout))
+            .setSocketTimeout(Timeout.ofSeconds(connectionTimeout))
+            .setTimeToLive(TimeValue.ofMinutes(10))
+            .build()
+    }
+
+    private fun buildClientBuilder() {
+        clientBuilder = HttpAsyncClients.custom()
+            .setConnectionManager(pcm)
+            .setRedirectStrategy(DefaultRedirectStrategy.INSTANCE)
+            .disableAutomaticRetries()
+            .setDefaultRequestConfig(rc)
+    }
+
+    fun buildHttpGet(url: String, context: HttpClientContext): HttpGet {
+        val httpGet = HttpGet(url.replace(" ", "+"))
+        httpGet.addHeader("User-Agent", USER_AGENT)
+        addToContext(context, httpGet)
+        return httpGet
+    }
+
+    fun buildHttpHead(url: String, context: HttpClientContext): HttpHead {
+        SimpleRequestBuilder.head(url)
+        val httpHead = HttpHead(url.replace(" ", "+"))
+        httpHead.addHeader("User-Agent", USER_AGENT)
+        addToContext(context, httpHead)
+        return httpHead
+    }
+
+    fun buildHttpPost(url: String, context: HttpClientContext): HttpPost {
+        val httpPost = HttpPost(url.replace(" ", "+"))
+        httpPost.addHeader("User-Agent", USER_AGENT)
+        addToContext(context, httpPost)
+        return httpPost
+    }
+
+    fun buildHttpGet(uri: URI, context: HttpClientContext): HttpGet {
+        val httpGet = HttpGet(uri)
+        httpGet.addHeader("User-Agent", USER_AGENT)
+        addToContext(context, httpGet)
+        return httpGet
+    }
+
+    fun addToContext(context: HttpClientContext, request: HttpUriRequest) {
+        val contextAttributes =
+            context.getAttribute(
+                ContextAttributes.CONTEXT_ATTRIBUTES,
+                ContextAttributes::class.java
+            )
+        if (contextAttributes != null) {
+            synchronized(contextAttributes.requests) {
+                contextAttributes.requests.add(request)
+            }
+        }
+    }
+
+    class ContextAttributes {
+        val requests: MutableList<HttpUriRequest> = mutableListOf()
+
+        companion object {
+            const val CONTEXT_ATTRIBUTES = "CONTEXT_ATTRIBUTES"
+        }
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/services/HtmlProcessorService.kt

@@ -1,18 +1,17 @@
-package me.vripper.utilities
+package me.mnlr.vripper.services
 
-import me.vripper.exception.HtmlProcessorException
+import me.mnlr.vripper.exception.HtmlProcessorException
 import org.htmlcleaner.CleanerProperties
 import org.htmlcleaner.DomSerializer
 import org.htmlcleaner.HtmlCleaner
 import org.w3c.dom.Document
 import java.io.InputStream
 
-internal object HtmlUtils {
-
+object HtmlProcessorService {
     @Throws(HtmlProcessorException::class)
     fun clean(htmlContent: InputStream): Document {
         return try {
-            htmlContent.use { stream ->
+            htmlContent.use {
                 val clean = HtmlCleaner().clean(htmlContent)
                 DomSerializer(CleanerProperties()).createDOM(clean)
             }
@@ -20,15 +19,4 @@ internal 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)
-        }
-    }
 }

vripper-core/src/main/kotlin/me/mnlr/vripper/services/PathUtils.kt

@@ -0,0 +1,34 @@
+package me.mnlr.vripper.services
+
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.model.Settings
+import java.nio.file.Path
+
+object PathUtils {
+    private val log by LoggerDelegate()
+
+    fun calculateDownloadPath(forum: String, threadTitle: String, postTitle: String, postId: String, settings: Settings): Path {
+        var downloadDirectory =
+            if (settings.downloadSettings.forumSubfolder) Path.of(settings.downloadSettings.downloadPath, sanitize(forum)) else Path.of(
+                settings.downloadSettings.downloadPath
+            )
+        downloadDirectory = if (settings.downloadSettings.threadSubLocation) downloadDirectory.resolve(threadTitle) else downloadDirectory
+        downloadDirectory = downloadDirectory.resolve(if (settings.downloadSettings.appendPostId) "${sanitize(postTitle)}_${postId}" else sanitize(
+            postTitle
+        ))
+        return downloadDirectory
+    }
+
+    /**
+     * Will sanitize the image name and remove extension
+     *
+     * @param path
+     * @return Sanitized local path string
+     */
+    fun sanitize(path: String): String {
+        val sanitizedPath =
+            path.replace("\\.|\\\\|/|\\||:|\\?|\\*|\"|<|>|\\p{Cntrl}".toRegex(), "_")
+        log.debug(String.format("%s sanitized to %s", path, sanitizedPath))
+        return sanitizedPath
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/services/RetryPolicyService.kt

@@ -0,0 +1,49 @@
+package me.mnlr.vripper.services
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.event.EventBus
+import me.mnlr.vripper.event.SettingsUpdateEvent
+import net.jodah.failsafe.RetryPolicy
+import net.jodah.failsafe.event.ExecutionAttemptedEvent
+import java.time.temporal.ChronoUnit
+
+class RetryPolicyService(
+    val eventBus: EventBus,
+    settingsService: SettingsService
+) {
+    private val log by LoggerDelegate()
+    private var maxAttempts: Int = settingsService.settings.connectionSettings.maxAttempts
+    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
+
+    fun init() {
+        coroutineScope.launch {
+            eventBus.subscribe<SettingsUpdateEvent> {
+                if (maxAttempts != it.settings.connectionSettings.maxAttempts) {
+                    maxAttempts = it.settings.connectionSettings.maxAttempts
+                }
+            }
+        }
+    }
+
+    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)
+            }
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/services/SettingsService.kt

@@ -1,54 +1,58 @@
-package me.vripper.services
+package me.mnlr.vripper.services
 
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.decodeFromStream
-import me.vripper.event.EventBus
-import me.vripper.event.SettingsUpdateEvent
-import me.vripper.exception.ValidationException
-import me.vripper.model.Settings
-import me.vripper.utilities.ApplicationProperties.VRIPPER_DIR
-import me.vripper.utilities.LoggerDelegate
-import me.vripper.utilities.md5Hex
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
+import com.fasterxml.jackson.module.kotlin.readValue
+import com.fasterxml.jackson.module.kotlin.registerKotlinModule
+import me.mnlr.vripper.ApplicationProperties.BASE_DIR_NAME
+import me.mnlr.vripper.ApplicationProperties.baseDir
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.event.EventBus
+import me.mnlr.vripper.event.SettingsUpdateEvent
+import me.mnlr.vripper.exception.ValidationException
+import me.mnlr.vripper.model.Settings
+import org.apache.commons.codec.digest.DigestUtils
 import java.io.FileWriter
 import java.nio.file.*
-import kotlin.io.path.readText
 
 class SettingsService(private val eventBus: EventBus) {
 
     private val log by LoggerDelegate()
-    private val configPath = VRIPPER_DIR.resolve("config.json")
-    private val customProxiesPath = VRIPPER_DIR.resolve("proxies.json")
+    private val configPath = Paths.get(baseDir, BASE_DIR_NAME, "config.yml")
+    private val customProxiesPath = Paths.get(baseDir, BASE_DIR_NAME, "proxies.json")
+    private val om = ObjectMapper(YAMLFactory())
     private val proxies: MutableSet<String> = HashSet()
 
-    private val json = Json {
-        encodeDefaults = true
-        prettyPrint = true
-        ignoreUnknownKeys = true
-    }
+
     var settings = Settings()
 
-    fun init() {
+    init {
+        om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+            .findAndRegisterModules().registerKotlinModule()
+
+        init()
+    }
+
+    private fun init() {
         loadViperProxies()
         restore()
-        eventBus.publishEvent(SettingsUpdateEvent(settings))
+            eventBus.publishEvent(SettingsUpdateEvent(settings))
+
     }
 
-    @OptIn(ExperimentalSerializationApi::class)
     private fun loadViperProxies() {
         try {
-            SettingsService::class.java.getResourceAsStream("/proxies.json")?.use {
-                val defaultProxies: List<String> = json.decodeFromStream(it)
+            SettingsService::class.java.getResourceAsStream("proxies.json")?.use {
+                val defaultProxies: List<String> = om.readValue(it)
                 val customProxies: List<String> = if (customProxiesPath.toFile()
                         .exists() && Files.isRegularFile(customProxiesPath)
                 ) {
                     try {
-                        json.decodeFromString(
-                            customProxiesPath.readText()
+                        om.readValue(
+                            customProxiesPath.toFile()
                         )
                     } catch (e: Exception) {
-                        log.error("Failed to read custom proxies", e)
                         emptyList()
                     }
                 } else {
@@ -79,33 +83,36 @@ class SettingsService(private val eventBus: EventBus) {
     }
 
     fun newSettings(settings: Settings) {
-        check(settings)
-        val viperSettings = if (settings.viperSettings.login) {
+        if (settings.viperSettings.login) {
             if (this.settings.viperSettings.password != settings.viperSettings.password) {
-                settings.viperSettings.copy(password = md5Hex(settings.viperSettings.password))
-            } else {
-                settings.viperSettings
+                settings.viperSettings.password =
+                    DigestUtils.md5Hex(settings.viperSettings.password)
             }
         } else {
-            settings.viperSettings.copy(username = "", password = "", thanks = false, login = false)
+            settings.viperSettings.username = ""
+            settings.viperSettings.password = ""
+            settings.viperSettings.thanks = false
+            settings.viperSettings.login = false
         }
-        this.settings = settings.copy(viperSettings = viperSettings)
+        check(settings)
+        this.settings = settings
         save()
-        eventBus.publishEvent(SettingsUpdateEvent(this@SettingsService.settings))
+
+        eventBus.publishEvent(SettingsUpdateEvent(settings))
+
     }
 
     private fun restore() {
         try {
             if (configPath.toFile().exists()) {
-                settings = json.decodeFromString(configPath.readText())
+                settings = om.readValue(configPath.toFile())
             }
         } catch (e: Exception) {
-            log.error("Failed to restore user settings", e)
+            log.error("Failed restore user settings", e)
             settings = Settings()
         }
         if (!proxies.contains(settings.viperSettings.host)) {
-            val viperSetting = settings.viperSettings.copy(host = "https://vipergirls.to")
-            settings = settings.copy(viperSettings = viperSetting)
+            settings.viperSettings.host = "https://vipergirls.to"
         }
         try {
             check(settings)
@@ -116,11 +123,11 @@ class SettingsService(private val eventBus: EventBus) {
         save()
     }
 
-    private fun save() {
+    fun save() {
         try {
-            Files.writeString(
+            Files.write(
                 configPath,
-                json.encodeToString(settings),
+                om.writeValueAsBytes(settings),
                 StandardOpenOption.CREATE,
                 StandardOpenOption.WRITE,
                 StandardOpenOption.TRUNCATE_EXISTING,
@@ -135,7 +142,7 @@ class SettingsService(private val eventBus: EventBus) {
     fun check(settings: Settings) {
         val path: Path = try {
             Paths.get(settings.downloadSettings.downloadPath)
-        } catch (_: InvalidPathException) {
+        } catch (e: InvalidPathException) {
             throw ValidationException(
                 String.format(
                     "%s is invalid", settings.downloadSettings.downloadPath
@@ -160,12 +167,12 @@ class SettingsService(private val eventBus: EventBus) {
             throw ValidationException("Invalid auto queue settings, value must be a positive integer")
         }
 
-        if (settings.connectionSettings.maxGlobalConcurrent < 0 || settings.connectionSettings.maxGlobalConcurrent > 24) {
+        if (settings.connectionSettings.maxTotalThreads < 0 || settings.connectionSettings.maxTotalThreads > 12) {
             throw ValidationException(
-                "Invalid max global concurrent download settings, values must be in [0,24]"
+                "Invalid max global concurrent download settings, values must be in [0,12]"
             )
         }
-        if (settings.connectionSettings.maxConcurrentPerHost < 1 || settings.connectionSettings.maxConcurrentPerHost > 4) {
+        if (settings.connectionSettings.maxThreads < 1 || settings.connectionSettings.maxThreads > 4) {
             throw ValidationException("Invalid max concurrent download settings, values must be in [1,4]")
         }
         if (settings.connectionSettings.timeout < 1 || settings.connectionSettings.timeout > 300) {
@@ -176,21 +183,15 @@ class SettingsService(private val eventBus: EventBus) {
         if (settings.connectionSettings.maxAttempts < 1 || settings.connectionSettings.maxAttempts > 10) {
             throw ValidationException("Invalid maximum attempts settings, values must be in [1,10]")
         }
-        if (settings.systemSettings.maxEventLog < 10 || settings.systemSettings.maxEventLog > 10000) {
+        if (settings.maxEventLog < 100 || settings.maxEventLog > 10000) {
             throw ValidationException(
                 "Invalid maximum event log record settings, values must be in [100,10000]"
             )
         }
-        if (settings.systemSettings.clipboardPollingRate < 500) {
+        if (settings.clipboardSettings.pollingRate < 500) {
             throw ValidationException(
                 "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]"
-            )
-        }
     }
 }

vripper-core/src/main/kotlin/me/mnlr/vripper/services/ThreadCacheService.kt

@@ -0,0 +1,38 @@
+package me.mnlr.vripper.services
+
+import com.github.benmanes.caffeine.cache.Caffeine
+import com.github.benmanes.caffeine.cache.LoadingCache
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
+import me.mnlr.vripper.event.EventBus
+import me.mnlr.vripper.event.SettingsUpdateEvent
+import me.mnlr.vripper.model.ThreadItem
+import me.mnlr.vripper.parser.ThreadLookupAPIParser
+import java.util.*
+import java.util.concurrent.ExecutionException
+import java.util.concurrent.TimeUnit
+
+class ThreadCacheService(val eventBus: EventBus) {
+
+    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
+
+    fun init() {
+        coroutineScope.launch {
+            eventBus.subscribe<SettingsUpdateEvent> {
+                cache.invalidateAll()
+            }
+        }
+    }
+
+    private val cache: LoadingCache<String, ThreadItem> =
+        Caffeine.newBuilder().expireAfterWrite(5, TimeUnit.MINUTES).build { threadId: String ->
+                ThreadLookupAPIParser(threadId).parse()
+            }
+
+    @Throws(ExecutionException::class)
+    operator fun get(threadId: String): ThreadItem {
+        return cache[threadId] ?: throw NoSuchElementException("$threadId does not exist")
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/services/VGAuthService.kt

@@ -0,0 +1,151 @@
+package me.mnlr.vripper.services
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.entities.Post
+import me.mnlr.vripper.event.EventBus
+import me.mnlr.vripper.event.SettingsUpdateEvent
+import me.mnlr.vripper.event.VGUserLoginEvent
+import me.mnlr.vripper.exception.VripperException
+import me.mnlr.vripper.model.Settings
+import me.mnlr.vripper.tasks.LeaveThanksRunnable
+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.protocol.HttpClientContext
+import org.apache.hc.core5.http.NameValuePair
+import org.apache.hc.core5.http.io.entity.EntityUtils
+import org.apache.hc.core5.http.message.BasicNameValuePair
+import java.util.concurrent.CompletableFuture
+
+class VGAuthService(
+    private val cm: HTTPService,
+    private val settingsService: SettingsService,
+    private val eventBus: EventBus
+) {
+    private val log by LoggerDelegate()
+    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
+    val context: HttpClientContext = HttpClientContext.create()
+    var loggedUser = ""
+
+    private var authenticated = false
+
+    fun init() {
+        context.cookieStore = BasicCookieStore()
+        coroutineScope.launch {
+            eventBus.subscribe<SettingsUpdateEvent> {
+                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()
+            loggedUser = ""
+                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()
+            loggedUser = ""
+
+                eventBus.publishEvent(VGUserLoginEvent(loggedUser))
+
+            return
+        }
+        val postAuth =
+            cm.buildHttpPost(
+                settings.viperSettings.host + "/login.php?do=login",
+                context
+            )
+        val params: MutableList<NameValuePair> = ArrayList()
+        params.add(BasicNameValuePair("vb_login_username", username))
+        params.add(BasicNameValuePair("cookieuser", "1"))
+        params.add(BasicNameValuePair("do", "login"))
+        params.add(BasicNameValuePair("vb_login_md5password", password))
+        try {
+            postAuth.entity = UrlEncodedFormEntity(params)
+        } catch (e: Exception) {
+            context.cookieStore.clear()
+            loggedUser = ""
+
+            eventBus.publishEvent(VGUserLoginEvent(loggedUser))
+
+            log.error(
+                "Failed to authenticate user with " + settings.viperSettings.host,
+                e
+            )
+            return
+        }
+        postAuth.addHeader("Referer", settings.viperSettings.host)
+        postAuth.addHeader(
+            "Host",
+            settings.viperSettings.host.replace("https://", "")
+                .replace("http://", "")
+        )
+        val client = cm.clientBuilder.build()
+        try {
+            client.execute(postAuth, context).use { response ->
+                if (response.code / 100 != 2) {
+                    throw VripperException(
+                        String.format(
+                            "Unexpected response code returned %s", response.code
+                        )
+                    )
+                }
+                val responseBody = EntityUtils.toString(response.entity)
+                log.debug(
+                    String.format(
+                        "Authentication with ViperGirls response body:%n%s",
+                        responseBody
+                    )
+                )
+                EntityUtils.consumeQuietly(response.entity)
+                if (context.cookieStore.cookies.stream()
+                        .map { obj: Cookie -> obj.name }
+                        .noneMatch { e: String -> e == "vg_userid" }
+                ) {
+                    log.error(
+                        String.format(
+                            "Failed to authenticate user with %s, missing vg_userid cookie",
+                            settings.viperSettings.host
+                        )
+                    )
+                    return
+                }
+            }
+        } catch (e: Exception) {
+            context.cookieStore.clear()
+            loggedUser = ""
+
+            eventBus.publishEvent(VGUserLoginEvent(loggedUser))
+
+            log.error(
+                "Failed to authenticate user with " + settings.viperSettings.host,
+                e
+            )
+            return
+        }
+        authenticated = true
+        loggedUser = username
+        log.info(String.format("Authenticated: %s", username))
+
+        eventBus.publishEvent(VGUserLoginEvent(loggedUser))
+
+    }
+
+    fun leaveThanks(post: Post) {
+        CompletableFuture.runAsync(LeaveThanksRunnable(post, authenticated, context))
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/services/XpathService.kt

@@ -1,12 +1,12 @@
-package me.vripper.utilities
+package me.mnlr.vripper.services
 
-import me.vripper.exception.XpathException
 import org.w3c.dom.Node
 import org.w3c.dom.NodeList
+import me.mnlr.vripper.exception.XpathException
 import javax.xml.xpath.XPathConstants
 import javax.xml.xpath.XPathFactory
 
-internal object XpathUtils {
+object XpathService {
     private val xpath = XPathFactory.newInstance().newXPath()
 
     @Throws(XpathException::class)

vripper-core/src/main/kotlin/me/mnlr/vripper/tables/ImageTable.kt

@@ -0,0 +1,15 @@
+package me.mnlr.vripper.tables
+
+import org.jetbrains.exposed.dao.id.LongIdTable
+
+object ImageTable : LongIdTable(name = "IMAGE", columnName = "ID") {
+    val current = long("CURRENT")
+    val host = varchar("HOST", 255)
+    val index = integer("INDEX")
+    val postId = varchar("POST_ID", 255)
+    val status = varchar("STATUS", 255)
+    val total = long("TOTAL")
+    val url = varchar("URL", 3000)
+    val thumbUrl = varchar("THUMB_URL", 3000)
+    val postIdRef = long("POST_ID_REF").references(PostTable.id, fkName = "IMAGE_POST_ID_REF_POST_ID_FK")
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/tables/PostTable.kt

@@ -0,0 +1,22 @@
+package me.mnlr.vripper.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") {
+    val done = integer("DONE")
+    val hosts = varchar("HOSTS", 500)
+    val outputPath = varchar("OUTPUT_PATH", 500)
+    val postId = varchar("POST_ID", 255)
+    val status = varchar("STATUS", 255)
+    val threadId = varchar("THREAD_ID", 255)
+    val postTitle = varchar("POST_TITLE", 500)
+    val threadTitle = varchar("THREAD_TITLE", 500)
+    val forum = varchar("FORUM", 500)
+    val total = integer("TOTAL")
+    val url = varchar("URL", 3000)
+    val token = varchar("TOKEN", 500)
+    val addedAt = datetime("ADDED_AT").default(LocalDateTime.now())
+    val rank = integer("RANK").default(0)
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/tables/ThreadTable.kt

@@ -0,0 +1,10 @@
+package me.mnlr.vripper.tables
+
+import org.jetbrains.exposed.dao.id.LongIdTable
+
+object ThreadTable : LongIdTable("THREAD", columnName = "ID") {
+    val total = integer("TOTAL").default(0)
+    val url = varchar("URL", 3000)
+    val threadId = varchar("THREAD_ID", 255)
+    val title = varchar("TITLE", 500)
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/tasks/LeaveThanksRunnable.kt

@@ -0,0 +1,121 @@
+package me.mnlr.vripper.tasks
+
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.entities.LogEvent
+import me.mnlr.vripper.entities.LogEvent.Status.*
+import me.mnlr.vripper.entities.Post
+import me.mnlr.vripper.formatToString
+import me.mnlr.vripper.repositories.LogEventRepository
+import me.mnlr.vripper.services.HTTPService
+import me.mnlr.vripper.services.SettingsService
+import org.apache.hc.client5.http.classic.methods.HttpPost
+import org.apache.hc.client5.http.entity.UrlEncodedFormEntity
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient
+import org.apache.hc.client5.http.protocol.HttpClientContext
+import org.apache.hc.core5.http.NameValuePair
+import org.apache.hc.core5.http.io.entity.EntityUtils
+import org.apache.hc.core5.http.message.BasicNameValuePair
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import java.io.UnsupportedEncodingException
+
+class LeaveThanksRunnable(
+    private val post: Post,
+    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()
+    private val eventRepository: LogEventRepository by inject()
+    private val logEvent: LogEvent
+
+    init {
+        logEvent = eventRepository.save(
+            LogEvent(
+                type = LogEvent.Type.THANKS,
+                status = PENDING,
+                message = "Leaving thanks for $post.url"
+            )
+        )
+    }
+
+    override fun run() {
+        try {
+            eventRepository.update(logEvent.copy(status = PROCESSING))
+            if (!settingsService.settings.viperSettings.login) {
+                eventRepository.update(
+                    logEvent.copy(
+                        status = DONE,
+                        message = "Will not send a like for ${post.url}\nAuthentication with ViperGirls option is disabled"
+                    )
+                )
+                return
+            }
+            if (!settingsService.settings.viperSettings.thanks) {
+                eventRepository.update(
+                    logEvent.copy(
+                        status = DONE,
+                        message = "Will not send a like for ${post.url}\nLeave thanks option is disabled"
+                    )
+                )
+                return
+            }
+            if (!authenticated) {
+                eventRepository.update(
+                    logEvent.copy(
+                        status = ERROR,
+                        message = "Will not send a like for ${post.url}\nYou are not authenticated"
+                    )
+                )
+                return
+            }
+            val postThanks: HttpPost = cm.buildHttpPost(
+                "${settingsService.settings.viperSettings.host}/post_thanks.php", HttpClientContext.create()
+            )
+            val params: MutableList<NameValuePair> = ArrayList()
+            params.add(BasicNameValuePair("do", "post_thanks_add"))
+            params.add(BasicNameValuePair("using_ajax", "1"))
+            params.add(BasicNameValuePair("p", post.postId))
+            params.add(BasicNameValuePair("securitytoken", post.token))
+            try {
+                postThanks.entity = UrlEncodedFormEntity(params)
+            } catch (e: UnsupportedEncodingException) {
+                val error = "Request error for ${post.url}"
+                log.error(error, e)
+                eventRepository.update(
+                    logEvent.copy(
+                        status = ERROR, message = """
+                    $error
+                    ${e.formatToString()}
+                    """.trimIndent()
+                    )
+                )
+                return
+            }
+            postThanks.addHeader("Referer", settingsService.settings.viperSettings.host)
+            postThanks.addHeader(
+                "Host", settingsService.settings.viperSettings.host.replace("https://", "").replace("http://", "")
+            )
+            val client: CloseableHttpClient = cm.clientBuilder.build()
+            client.execute(postThanks, context).use { response ->
+                try {
+                } finally {
+                    EntityUtils.consumeQuietly(response.entity)
+                }
+            }
+            eventRepository.update(logEvent.copy(status = DONE))
+        } catch (e: Exception) {
+            val error = "Failed to leave a thanks for $post"
+            log.error(error, e)
+            eventRepository.update(
+                logEvent.copy(
+                    status = ERROR, message = """
+                $error
+                ${e.formatToString()}
+                """.trimIndent()
+                )
+            )
+        }
+    }
+}

vripper-core/src/main/kotlin/me/mnlr/vripper/tasks/ThreadLookupRunnable.kt

@@ -0,0 +1,99 @@
+package me.mnlr.vripper.tasks
+
+import me.mnlr.vripper.AppEndpointService
+import me.mnlr.vripper.delegate.LoggerDelegate
+import me.mnlr.vripper.download.PostDownloadRunnable
+import me.mnlr.vripper.entities.LogEvent
+import me.mnlr.vripper.entities.LogEvent.Status.*
+import me.mnlr.vripper.entities.Thread
+import me.mnlr.vripper.formatToString
+import me.mnlr.vripper.model.Settings
+import me.mnlr.vripper.model.ThreadItem
+import me.mnlr.vripper.repositories.LogEventRepository
+import me.mnlr.vripper.services.DataTransaction
+import me.mnlr.vripper.services.SettingsService
+import me.mnlr.vripper.services.ThreadCacheService
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import java.util.concurrent.CompletableFuture
+
+class ThreadLookupRunnable(private val threadId: String, private val settings: Settings) :
+    KoinComponent, Runnable {
+    private val log by LoggerDelegate()
+    private val dataTransaction by inject<DataTransaction>()
+    private val eventRepository by inject<LogEventRepository>()
+    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"
+    private val logEvent: LogEvent
+
+    init {
+        logEvent = eventRepository.save(
+            LogEvent(
+                type = LogEvent.Type.THREAD,
+                status = LogEvent.Status.PENDING,
+                message = "Processing multi-post link $link"
+            )
+        )
+    }
+
+    override fun run() {
+        try {
+            eventRepository.update(logEvent.copy(status = PROCESSING))
+            if (dataTransaction.findThreadByThreadId(threadId).isEmpty) {
+                val threadLookupResult = threadCacheService[threadId]
+                if (threadLookupResult.postItemList.isEmpty()) {
+                    val message = "Nothing found for $link"
+                    eventRepository.update(logEvent.copy(status = ERROR, message = message))
+                    return
+                }
+                dataTransaction.save(
+                    Thread(
+                        title = threadLookupResult.title,
+                        link = link,
+                        threadId = threadId,
+                        total = threadLookupResult.postItemList.size
+                    )
+                )
+                eventRepository.update(
+                    logEvent.copy(
+                        status = DONE, message = "New thread $link is added"
+                    )
+                )
+                autostart(threadLookupResult)
+            } else {
+                log.info("Link $link is already loaded")
+                eventRepository.update(
+                    logEvent.copy(
+                        status = ERROR,
+                        message = "$link has already been added to the queue"
+                    )
+                )
+            }
+        } catch (e: Exception) {
+            val error = "Error when adding multi-post link $link"
+            log.error(error, e)
+            eventRepository.update(
+                logEvent.copy(
+                    status = ERROR, message = """
+                $error
+                ${e.formatToString()}
+                """.trimIndent()
+                )
+            )
+        }
+    }
+
+    private fun autostart(lookupResult: ThreadItem) {
+        if (lookupResult.postItemList.size <= settings.downloadSettings.autoQueueThreshold) {
+            appEndpointService.threadRemove(listOf(lookupResult.threadId))
+            lookupResult.postItemList.forEach {
+                CompletableFuture.runAsync(PostDownloadRunnable(
+                    it.threadId, it.postId
+                ))
+            }
+        }
+    }
+}