mirror of
https://github.com/dev-claw/vripper-project.git
synced 2026-08-19 08:35:41 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d960b13a9f | ||
|
|
b26f78a576 | ||
|
|
733f5c926e | ||
|
|
0012e3b8ca | ||
|
|
564033eb03 | ||
|
|
776f996673 | ||
|
|
06942c70c8 | ||
|
|
0d95b97aee | ||
|
|
e3598769cd | ||
|
|
331749ca91 | ||
|
|
e9b4ca24eb | ||
|
|
e5bbbd651f | ||
|
|
e7a2ed6e8b | ||
|
|
2923cc350c | ||
|
|
53cdc8a4a1 | ||
|
|
592a6d44c3 | ||
|
|
dbf6e3436a | ||
|
|
f934eb07fb | ||
|
|
ac3194ca6a | ||
|
|
df89d332df | ||
|
|
2d5dc9d5cc | ||
|
|
abe5a42050 | ||
|
|
ed01b837e5 | ||
|
|
ed9b26b4ef | ||
|
|
37b54d555b | ||
|
|
0b9c78a44d | ||
|
|
6d9aa4c350 | ||
|
|
d1c8a658e4 | ||
|
|
c91d906759 | ||
|
|
673a04b173 | ||
|
|
d5a3ec8af1 | ||
|
|
c657cc7688 | ||
|
|
49fb659d08 | ||
|
|
71f9e208e6 | ||
|
|
7293d3d031 | ||
|
|
bf26100549 | ||
|
|
b6c7bd8e26 | ||
|
|
134abf791e | ||
|
|
1dcb07e124 | ||
|
|
b5db9f8d7b | ||
|
|
2130b30329 | ||
|
|
5f9c231eab | ||
|
|
537ad90084 | ||
|
|
81cf97cc50 | ||
|
|
d82cf55590 | ||
|
|
884704c70d | ||
|
|
e798218a21 | ||
|
|
04df3bcc81 | ||
|
|
7af0aeafa7 | ||
|
|
90625736e9 | ||
|
|
eff254747f | ||
|
|
b8b22f7faa | ||
|
|
6376576e9e | ||
|
|
f0c2de829a | ||
|
|
08fcd7a87d | ||
|
|
f39c7a15c7 | ||
|
|
1c239d435b | ||
|
|
d8cba97d05 | ||
|
|
a362a3fa7f | ||
|
|
4163f2a53f | ||
|
|
e556dd1804 | ||
|
|
96ad55b930 | ||
|
|
9dc1a10255 | ||
|
|
db4a041bc4 | ||
|
|
661f591bf5 | ||
|
|
e81bcfbfee | ||
|
|
e8ba07aebd | ||
|
|
9930226dc0 | ||
|
|
48491767cb | ||
|
|
49229b9dac | ||
|
|
ecf3287e61 | ||
|
|
206b305ae6 | ||
|
|
70e7a87189 | ||
|
|
5aef1c0a89 | ||
|
|
7745abbb8a | ||
|
|
e577dba7c9 | ||
|
|
ed63d5c029 | ||
|
|
2aa82a73a0 |
@@ -0,0 +1,55 @@
|
||||
name: Package
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-latest, windows-latest, macos-latest]
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- 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 with Maven
|
||||
run: mvn -B install --file pom.xml
|
||||
|
||||
- name: Rename GUI artifact
|
||||
run: mv vripper-gui/target/vripper-gui-*.jar vripper-gui/target/vripper-gui.jar
|
||||
|
||||
- name: Rename WEB artifact
|
||||
run: mv vripper-web/target/vripper-web-*.jar vripper-web/target/vripper-web.jar
|
||||
|
||||
- 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
|
||||
|
||||
- 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 == '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
|
||||
+128
-24
@@ -1,6 +1,3 @@
|
||||
# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
|
||||
# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path
|
||||
|
||||
name: Release
|
||||
|
||||
on:
|
||||
@@ -9,35 +6,142 @@ on:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Set up JDK 17
|
||||
|
||||
- name: Set up JDK 21
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: '17'
|
||||
java-version: '21'
|
||||
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 with Maven
|
||||
run: mvn -B install --file pom.xml
|
||||
- name: Rename GUI artifact
|
||||
run: mv vripper-gui/target/vripper-gui-*.jar vripper-gui/target/vripper-gui.jar
|
||||
- name: Upload GUI Binary
|
||||
uses: skx/github-action-publish-binaries@master
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Build parent project
|
||||
run: mvn -N -q install --file pom.xml
|
||||
|
||||
- name: Build Core Jar
|
||||
run: mvn -B -q install --file vripper-core/pom.xml
|
||||
|
||||
- name: Build GUI Jar
|
||||
run: mvn -B -q install --file vripper-gui/pom.xml
|
||||
|
||||
- name: Rename GUI Jar
|
||||
run: mv vripper-gui/target/vripper-gui-${{ github.event.release.tag_name }}-jar-with-dependencies.jar vripper-gui/target/vripper-noarch-gui-${{ github.event.release.tag_name }}.jar
|
||||
|
||||
- if: matrix.os == 'ubuntu-latest'
|
||||
name: Release GUI Jar
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
args: 'vripper-gui/target/vripper-gui.jar'
|
||||
- name: Rename WEB artifact
|
||||
run: mv vripper-web/target/vripper-web-*.jar vripper-web/target/vripper-web.jar
|
||||
- name: Upload WEB Binary
|
||||
uses: skx/github-action-publish-binaries@master
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
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
|
||||
run: |
|
||||
mvn -B -q install --file vripper-web-ui/pom.xml
|
||||
mvn -B -q install --file vripper-web/pom.xml
|
||||
|
||||
- if: matrix.os == 'ubuntu-latest'
|
||||
name: Rename WEB Jar
|
||||
run: mv vripper-web/target/vripper-web-${{ github.event.release.tag_name }}.jar vripper-web/target/vripper-noarch-web-${{ github.event.release.tag_name }}.jar
|
||||
|
||||
- if: matrix.os == 'ubuntu-latest'
|
||||
name: Release WEB Jar
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
args: 'vripper-web/target/vripper-web.jar'
|
||||
files: vripper-web/target/vripper-noarch-web-${{ github.event.release.tag_name }}.jar
|
||||
# End building WEB jar 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 Linux
|
||||
run: |
|
||||
cd jpackage
|
||||
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 Windows
|
||||
run: |
|
||||
cd jpackage
|
||||
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 macOS
|
||||
run: |
|
||||
cd jpackage
|
||||
jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-app-image.cfg" --icon icon.icns
|
||||
jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-macos.cfg" --type pkg
|
||||
jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-macos.cfg" --type dmg
|
||||
mv dist/VRipper-${{ github.event.release.tag_name }}.pkg dist/vripper-macos-${{ github.event.release.tag_name }}.pkg
|
||||
mv dist/VRipper-${{ github.event.release.tag_name }}.dmg dist/vripper-macos-${{ github.event.release.tag_name }}.dmg
|
||||
|
||||
- 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-${{ github.event.release.tag_name }}.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-${{ github.event.release.tag_name }}.zip'
|
||||
|
||||
- if: matrix.os == 'macos-latest'
|
||||
name: Zip MacOS portable
|
||||
uses: thedoctor0/zip-release@0.7.1
|
||||
with:
|
||||
type: 'zip'
|
||||
directory: 'jpackage/dist'
|
||||
path: 'VRipper.app'
|
||||
filename: 'vripper-macos-portable-${{ github.event.release.tag_name }}.zip'
|
||||
|
||||
- if: matrix.os == 'ubuntu-latest'
|
||||
name: Release packages for Linux
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
files: |
|
||||
jpackage/dist/vripper-linux-${{ github.event.release.tag_name }}.x86_64.rpm
|
||||
jpackage/dist/vripper-linux-${{ github.event.release.tag_name }}_amd64.deb
|
||||
jpackage/dist/vripper-linux-portable-${{ github.event.release.tag_name }}.zip
|
||||
|
||||
- if: matrix.os == 'windows-latest'
|
||||
name: Release packages for Windows
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
files: |
|
||||
jpackage/dist/vripper-windows-installer-${{ github.event.release.tag_name }}.msi
|
||||
jpackage/dist/vripper-windows-installer-${{ github.event.release.tag_name }}.exe
|
||||
jpackage/dist/vripper-windows-portable-${{ github.event.release.tag_name }}.zip
|
||||
|
||||
- if: matrix.os == 'macos-latest'
|
||||
name: Release packages for macOS
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
files: |
|
||||
jpackage/dist/vripper-macos-${{ github.event.release.tag_name }}.pkg
|
||||
jpackage/dist/vripper-macos-${{ github.event.release.tag_name }}.dmg
|
||||
jpackage/dist/vripper-macos-portable-${{ github.event.release.tag_name }}.zip
|
||||
|
||||
-763
@@ -1,763 +0,0 @@
|
||||
# Changelog
|
||||
|
||||
## [4.0.0] - 2023-05-03
|
||||
|
||||
- Drop electron app
|
||||
- Use javafx for the desktop app
|
||||
- Re-written in kotlin
|
||||
- Several enhancements
|
||||
|
||||
### Changed
|
||||
|
||||
## [3.5.4] - 2021-05-29
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix download queue bug
|
||||
|
||||
## [3.5.3] - 2021-05-24
|
||||
|
||||
### Changed
|
||||
|
||||
- Update donation infos
|
||||
|
||||
## [3.5.1] - 2021-05-22
|
||||
|
||||
### Changed
|
||||
|
||||
- Bug fix
|
||||
|
||||
## [3.5.0] - 2021-05-21
|
||||
|
||||
### Changed
|
||||
|
||||
- Download queue bug fix
|
||||
- Save window size and position
|
||||
- Resize confirmation box
|
||||
- Enhance metadata interruption
|
||||
- Add Added on and Order columns
|
||||
|
||||
## [3.4.2] - 2021-05-10
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix potential issue with imagebam host
|
||||
- Enhance download queue logic
|
||||
- Code source enhancements
|
||||
- Fix app icons
|
||||
- Fix race condition bug
|
||||
|
||||
## [3.3.8] - 2021-05-05
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix imagebam host
|
||||
- Fix font path
|
||||
|
||||
## [3.3.6] - 2021-03-20
|
||||
|
||||
### Changed
|
||||
|
||||
- Optimize build size
|
||||
|
||||
## [3.3.5] - 2021-03-18
|
||||
|
||||
### Changed
|
||||
|
||||
- Bug fixe
|
||||
|
||||
## [3.3.4] - 2021-03-18
|
||||
|
||||
### Changed
|
||||
|
||||
- Bug fixes
|
||||
|
||||
## [3.3.3] - 2021-03-13
|
||||
|
||||
### Changed
|
||||
|
||||
- Remove unnecessary event logs
|
||||
|
||||
## [3.3.2] - 2021-03-11
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix a bug with event logs
|
||||
- Change event names and add some icons
|
||||
|
||||
## [3.3.1] - 2021-02-18
|
||||
|
||||
### Added
|
||||
|
||||
- Add about menu
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix README.md
|
||||
|
||||
## [3.3.0] - 2021-02-16
|
||||
|
||||
### Changed
|
||||
|
||||
- Add support for proxies
|
||||
- Add a Event Logs
|
||||
- Fix bugs with the database
|
||||
|
||||
## [3.2.3] - 2021-01-13
|
||||
|
||||
### Changed
|
||||
|
||||
- Finished posts are not cleared from the UI
|
||||
|
||||
## [3.2.2] - 2021-01-13
|
||||
|
||||
### Changed
|
||||
|
||||
- Set total download to max value
|
||||
|
||||
## [3.2.1] - 2021-01-12
|
||||
|
||||
### Added
|
||||
|
||||
- Add settings for connection timeout
|
||||
- Add settings for maximum attempts
|
||||
|
||||
### Changed
|
||||
|
||||
- Enhance posts rename logic
|
||||
- Dependencies update
|
||||
- Switch reactive from rx-java to reactor
|
||||
|
||||
## [3.2.0] - 2020-11-16
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix build issue
|
||||
|
||||
## [3.1.0] - 2020-11-16
|
||||
|
||||
### Changed
|
||||
|
||||
- UI revamp
|
||||
- Fix bugs
|
||||
|
||||
## [3.0.11] - 2020-10-31
|
||||
|
||||
### Added
|
||||
|
||||
- Support for vipr.im
|
||||
|
||||
## [3.0.10] - 2020-10-04
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix bug on settings update
|
||||
|
||||
## [3.0.9] - 2020-09-27
|
||||
|
||||
### Changed
|
||||
|
||||
- Revert to appending post id to download folders
|
||||
- Fix a bug that lead to adding duplicate posts
|
||||
- Remove old unused settings
|
||||
|
||||
## [3.0.8] - 2020-08-22
|
||||
|
||||
### Changed
|
||||
|
||||
- Bug fix which breaks concurrent downloads
|
||||
|
||||
## [3.0.7] - 2020-08-22
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix MacOs build
|
||||
|
||||
## [3.0.6] - 2020-08-18
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix TurboImageHost
|
||||
|
||||
## [3.0.5] - 2020-08-17
|
||||
|
||||
### Changed
|
||||
|
||||
- Update packages
|
||||
- Host class refactoring
|
||||
|
||||
## [3.0.4] - 2020-08-16
|
||||
|
||||
### Changed
|
||||
|
||||
- Improve rename UI
|
||||
|
||||
## [3.0.3] - 2020-08-16
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix bugs with electron app
|
||||
|
||||
## [3.0.2] - 2020-08-15
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix bugs with download queue
|
||||
|
||||
## [3.0.1] - 2020-08-03
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix bugs with download queue
|
||||
|
||||
## [3.0.0] - 2020-08-03
|
||||
|
||||
### Changed
|
||||
|
||||
- Major rewrites
|
||||
- Introducing a proper database for persistence
|
||||
|
||||
## [2.12.1] - 2020-05-22
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix alternative name bug
|
||||
|
||||
## [2.12.0] - 2020-05-21
|
||||
|
||||
### Changed
|
||||
|
||||
- Use new user hash from the api
|
||||
|
||||
## [2.11.7] - 2020-05-08
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix bug with paths creation
|
||||
- Move Open Link button
|
||||
- Rename rename all title
|
||||
|
||||
## [2.11.6] - 2020-05-04
|
||||
|
||||
### Changed
|
||||
|
||||
- PNG filenames are now correctly named
|
||||
- Fix issue with special characters in post titles
|
||||
|
||||
## [2.11.5] - 2020-05-03
|
||||
|
||||
### Changed
|
||||
|
||||
- Reduce rows buffer size
|
||||
|
||||
## [2.11.4] - 2020-05-03
|
||||
|
||||
### Changed
|
||||
|
||||
- Code cleanup
|
||||
- Dependencies update
|
||||
|
||||
## [2.11.3] - 2020-04-30
|
||||
|
||||
### Changed
|
||||
|
||||
- Source code restructure
|
||||
- UI fixes and enhancements
|
||||
|
||||
### Added
|
||||
|
||||
- Add menu entry to rename a gallery to first alternative title
|
||||
- Add menu on toolbar for massive rename to first alternative title
|
||||
|
||||
## [2.11.2] - 2020-04-26
|
||||
|
||||
### Changed
|
||||
|
||||
- Bug fixes
|
||||
|
||||
## [2.11.1] - 2020-04-25
|
||||
|
||||
### Changed
|
||||
|
||||
- Code source maintenance
|
||||
|
||||
### Added
|
||||
|
||||
- Added option to rename gallery
|
||||
|
||||
## [2.11.0] - 2020-03-29
|
||||
|
||||
### Changed
|
||||
|
||||
- Upgrade Electron to v8
|
||||
- Upgrade Angular to v9
|
||||
- App settings are now portable in a json file
|
||||
- General code source maintenance
|
||||
|
||||
### Added
|
||||
|
||||
- Added Support for pixroute.com
|
||||
- Added grab post title from thread option
|
||||
|
||||
## [2.10.8] - 2020-01-25
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix app url
|
||||
|
||||
## [2.10.7] - 2020-01-25
|
||||
|
||||
### Changed
|
||||
|
||||
- Drop SockJs and switch to WebSocket
|
||||
- Autoreconnect front to back
|
||||
|
||||
## [2.10.6] - 2020-01-19
|
||||
|
||||
### Changed
|
||||
|
||||
- Limit cache size
|
||||
|
||||
## [2.10.5] - 2020-01-18
|
||||
|
||||
### Changed
|
||||
|
||||
- Bug fixes
|
||||
|
||||
## [2.10.4] - 2020-01-18
|
||||
|
||||
### Changed
|
||||
|
||||
- Zero value for total max download will disable the limit
|
||||
- Add system notification
|
||||
- Bug fixes
|
||||
|
||||
## [2.10.3] - 2020-01-16
|
||||
|
||||
### Changed
|
||||
|
||||
- Some bug fixes
|
||||
- Enhance download queue logic
|
||||
- Clear cache button
|
||||
- Fix the partial status
|
||||
- Sanitize URLs with spaces
|
||||
|
||||
### Added
|
||||
|
||||
- Support for Postimg host
|
||||
- Support for Imagevenue host
|
||||
|
||||
## [2.10.2] - 2019-12-29
|
||||
|
||||
### Changed
|
||||
|
||||
- Upgrade electron to v7
|
||||
- Bug fix
|
||||
|
||||
## [2.10.1] - 2019-12-27
|
||||
|
||||
### Changed
|
||||
|
||||
- Bug fix
|
||||
|
||||
## [2.10.0] - 2019-12-27
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix spring dependency bug
|
||||
|
||||
### Added
|
||||
|
||||
- Add support for imgspice
|
||||
|
||||
## [2.9.0] - 2019-12-27
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix build issue
|
||||
|
||||
## [2.9.0] - 2019-12-27
|
||||
|
||||
### Changed
|
||||
|
||||
- Decrease timeout for fast fail
|
||||
|
||||
### Added
|
||||
|
||||
- Allow many hosts to run at the same time
|
||||
- Add title to gallery
|
||||
- Add global concurrent downloads
|
||||
- Add counter badge in link collector
|
||||
|
||||
## [2.8.1] - 2019-12-24
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix issue with path creation
|
||||
|
||||
## [2.8.0] - 2019-12-24
|
||||
|
||||
### Added
|
||||
|
||||
- Photo gallery feature
|
||||
|
||||
## [2.7.1] - 2019-12-21
|
||||
|
||||
### Added
|
||||
|
||||
- Add version to title bar
|
||||
|
||||
## [2.7.0] - 2019-12-21
|
||||
|
||||
### Changed
|
||||
|
||||
- Add missing icon
|
||||
|
||||
### Added
|
||||
|
||||
- Add support for pixxxels
|
||||
|
||||
## [2.6.0] - 2019-12-21
|
||||
|
||||
### Changed
|
||||
|
||||
- Disable download button when nothing selected in Link collector grab menu
|
||||
- Better quality app icon
|
||||
- Implement context menu on download tab
|
||||
- Add stop remove and start button to context menu
|
||||
- Link will not be removed automatically from link collector tab
|
||||
- Some UI fixes
|
||||
|
||||
## [2.5.1] - 2019-12-09
|
||||
|
||||
### Changed
|
||||
|
||||
- Disable download button when nothing selected in Link collector grab menu
|
||||
|
||||
### Added
|
||||
|
||||
- Add hosts column in Link collector grab menu
|
||||
|
||||
## [2.5.0] - 2019-12-08
|
||||
|
||||
### Changed
|
||||
|
||||
- Change loading screen
|
||||
- UI Fixes
|
||||
- Fix bug with previews
|
||||
|
||||
### Added
|
||||
|
||||
- Add link collector feature
|
||||
- Add support for multiple links at a time
|
||||
|
||||
## [2.4.1] - 2019-11-26
|
||||
|
||||
### Changed
|
||||
|
||||
- Increase attempts for establishing ws connection between front and back end
|
||||
- Change default download folder to Home folder (installer), App folder (portable)
|
||||
|
||||
## [2.4.0] - 2019-11-23
|
||||
|
||||
### Changed
|
||||
|
||||
- Pimpandhost Host support
|
||||
|
||||
## [2.3.2] - 2019-11-23
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix a bug with the scan component
|
||||
|
||||
## [2.3.1] - 2019-11-22
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix connexion reset issue
|
||||
- Fix Post Status when autostart option is selected
|
||||
- Add stop all button
|
||||
|
||||
## [2.3.0] - 2019-11-21
|
||||
|
||||
### Changed
|
||||
|
||||
- UI enhancements and overhaul
|
||||
- Stability fixes with HTTP connections
|
||||
- MacOS official support
|
||||
- Use local sockjs and material icons font
|
||||
|
||||
## [2.2.5] - 2019-11-09
|
||||
|
||||
### Changed
|
||||
|
||||
- Exclude thumbs download for imagezilla and pixhost
|
||||
- Change retry on fail logic (may help avoid having download errors)
|
||||
|
||||
## [2.2.4] - 2019-10-05
|
||||
|
||||
### Added
|
||||
|
||||
- AppImage target for linux
|
||||
|
||||
## [2.2.3] - 2019-10-01
|
||||
|
||||
### Changed
|
||||
|
||||
- Strip libjvm.so for debian
|
||||
|
||||
## [2.2.2] - 2019-10-01
|
||||
|
||||
### Changed
|
||||
|
||||
- Update product name
|
||||
|
||||
## [2.2.1] - 2019-10-01
|
||||
|
||||
### Changed
|
||||
|
||||
- Update dependency list for deb package
|
||||
|
||||
## [2.2.0] - 2019-10-01
|
||||
|
||||
### Added
|
||||
|
||||
- Embedd JRE within the app
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix 'Start' on pending items
|
||||
- Upgrade to Java 11
|
||||
|
||||
## [2.1.0] - 2019-09-30
|
||||
|
||||
### Added
|
||||
|
||||
- Add a create a subfolder per thread option
|
||||
|
||||
## [2.0.4] - 2019-09-27
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix some issues with ImxHost
|
||||
|
||||
## [2.0.3] - 2019-09-23
|
||||
|
||||
### Changed
|
||||
|
||||
- Update deb dependencies
|
||||
|
||||
## [2.0.2] - 2019-09-23
|
||||
|
||||
### Changed
|
||||
|
||||
- Add portable mode
|
||||
|
||||
## [2.0.1] - 2019-09-22
|
||||
|
||||
### Changed
|
||||
|
||||
- Change app name
|
||||
|
||||
## [2.0.0] - 2019-09-22
|
||||
|
||||
### Added
|
||||
|
||||
- Add sub folder option
|
||||
- Add clear finished option
|
||||
|
||||
### Changed
|
||||
|
||||
- UI enhancements
|
||||
- Bug fixes
|
||||
- Change data and log paths
|
||||
|
||||
## [1.6.5] - 2019-09-18
|
||||
|
||||
### Changed
|
||||
|
||||
- electron update
|
||||
|
||||
## [1.6.4] - 2019-09-18
|
||||
|
||||
### Changed
|
||||
|
||||
- Change menu item name
|
||||
|
||||
## [1.6.3] - 2019-09-18
|
||||
|
||||
### Changed
|
||||
|
||||
- Better multithread management
|
||||
- Fix partial state UI
|
||||
|
||||
## [1.6.2] - 2019-09-17
|
||||
|
||||
### Changed
|
||||
|
||||
- Rework UI colors
|
||||
- Fix scan input bug
|
||||
|
||||
## [1.6.1] - 2019-09-16
|
||||
|
||||
### Changed
|
||||
|
||||
- Rework UI
|
||||
- Fix clipboard monitoring
|
||||
|
||||
## [1.6.0] - 2019-09-15
|
||||
|
||||
### Changed
|
||||
|
||||
- Rework the UI
|
||||
- Add a dark theme
|
||||
- Fix the force ordering bug
|
||||
- Other bug fixes
|
||||
|
||||
## [1.5.2] - 2019-09-01
|
||||
|
||||
### Added
|
||||
|
||||
- imx.to host fix
|
||||
|
||||
## [1.5.1] - 2019-08-24
|
||||
|
||||
### Added
|
||||
|
||||
- Bug fixes
|
||||
|
||||
## [1.5.0] - 2019-08-24
|
||||
|
||||
### Added
|
||||
|
||||
- Display logged in user
|
||||
- Add post details when clicking on main list items (Status, Post URL, Host)
|
||||
- Add open download location on main list items menu
|
||||
- Add support for multi-post threads (Show a menu to select posts to download)
|
||||
- Add link to image from details list
|
||||
|
||||
## [1.4.10] - 2019-08-15
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix a rename issue on windows
|
||||
|
||||
## [1.4.9] - 2019-08-13
|
||||
|
||||
### Changed
|
||||
|
||||
- Update Built-By to be generic
|
||||
|
||||
## [1.4.8] - 2019-08-13
|
||||
|
||||
### Changed
|
||||
|
||||
- Add option to force image ordering
|
||||
|
||||
## [1.4.7] - 2019-08-13
|
||||
|
||||
### Changed
|
||||
|
||||
- Fixed a bug in image filename extensions
|
||||
|
||||
## [1.4.6] - 2019-08-06
|
||||
|
||||
### Changed
|
||||
|
||||
- Fixed a bug when creating image file names
|
||||
- Remove unnecessary logs
|
||||
- Fix data.json init
|
||||
|
||||
## [1.4.5] - 2019-08-03
|
||||
|
||||
### Changed
|
||||
|
||||
- Add min width and height for electron app
|
||||
|
||||
### Added
|
||||
|
||||
- Add download speed to status bar
|
||||
|
||||
## [1.4.4] - 2019-08-01
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix names for ImgboxHost
|
||||
- Enhance UI
|
||||
- Minor fixes
|
||||
|
||||
### Added
|
||||
|
||||
- Add start and stop button
|
||||
|
||||
## [1.4.3] - 2019-07-14
|
||||
|
||||
### Changed
|
||||
|
||||
- Update some messages
|
||||
- Fix scrolling issue
|
||||
|
||||
## [1.4.2] - 2019-07-14
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix layout issue in web mode
|
||||
|
||||
## [1.4.1] - 2019-07-14
|
||||
|
||||
### Changed
|
||||
|
||||
- Change title's font
|
||||
|
||||
### Added
|
||||
|
||||
- Add borders
|
||||
|
||||
## [1.4.0] - 2019-07-14
|
||||
|
||||
### Changed
|
||||
|
||||
- Better error handling on startup
|
||||
- Better support for linux AppImage
|
||||
|
||||
### Added
|
||||
|
||||
- Clear all completed
|
||||
- Add clipboard support
|
||||
- Add option to remove all posts
|
||||
- Add confirmation on remove
|
||||
|
||||
## [1.3.0-rc0] - 2019-07-04
|
||||
|
||||
### Changed
|
||||
|
||||
- Change default setting for autostart false -> true
|
||||
- Change default setting for max concurrent downloads 1 -> 4
|
||||
|
||||
### Added
|
||||
|
||||
- Desktop app built with electron
|
||||
- Add the option to remove a post
|
||||
|
||||
## [1.2.0] - 2019-06-23
|
||||
|
||||
### Added
|
||||
|
||||
- Add a shutdown button to gracefully shutdown the app
|
||||
- Open and redirect the browser to the app address on startup
|
||||
- Add the option to run the app in headless mode (-Djava.awt.headless=true)
|
||||
|
||||
## [1.1.1] - 2019-06-22
|
||||
|
||||
### Changed
|
||||
|
||||
- Fix a stability issue with progress updates when the app is runninh for a long time
|
||||
|
||||
## [1.0.0] - 2019-06-22
|
||||
|
||||
### Added
|
||||
|
||||
- Add real time communication for progress updates via websocket (SockJS)
|
||||
- Add settings for download path, max concurrent download, enable/disable integration with vipergirls
|
||||
- Add integration with vipergitls.to (possibility to auto leave thanks after grab post)
|
||||
- Add support for acidimg.cc, imagezilla.net, imgbox.com, imx.to, pixhost.to, turboimagehost.com
|
||||
@@ -0,0 +1,674 @@
|
||||
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>.
|
||||
@@ -2,18 +2,70 @@
|
||||
|
||||
This is my spin for a cross-platform gallery ripper for [vipergirls.to](https://vipergirls.to).
|
||||
|
||||
|
||||

|
||||
|
||||
|
||||
## Requirements
|
||||
Direct access to vipergirls.to (or one of its [alternative domains](https://vipergirls.to/threads/5887340)), consider using a VPN otherwise.
|
||||
|
||||
## Installing VRipper
|
||||
|
||||
<img src="https://github.com/stashapp/stash/raw/develop/docs/readme_assets/windows_logo.svg" width="100%" height="75"> Windows | <img src="https://github.com/stashapp/stash/raw/develop/docs/readme_assets/mac_logo.svg" width="100%" height="75"> macOS | <img src="https://github.com/stashapp/stash/raw/develop/docs/readme_assets/linux_logo.svg" width="100%" height="75"> Linux | <img src="https://images.vexels.com/media/users/3/166401/isolated/preview/b82aa7ac3f736dd78570dd3fa3fa9e24-java-programming-language-icon-by-vexels.png" width="100%" height="75"> Java
|
||||
:---:|:---:|:---:|:---:
|
||||
[Installer (EXE)](https://github.com/death-claw/vripper-project/releases/download/5.5.0/vripper-windows-installer-5.5.0.exe) <br /> [Installer (MSI)](https://github.com/death-claw/vripper-project/releases/download/5.5.0/vripper-windows-installer-5.5.0.msi) <br /> [Portable (ZIP)](https://github.com/death-claw/vripper-project/releases/download/5.5.0/vripper-windows-portable-5.5.0.zip) | [Installer (DMG)](https://github.com/death-claw/vripper-project/releases/download/5.5.0/vripper-macos-5.5.0.dmg) <br /> [Installer (PKG)](https://github.com/death-claw/vripper-project/releases/download/5.5.0/vripper-macos-5.5.0.pkg) <br /> [Portable (ZIP)](https://github.com/death-claw/vripper-project/releases/download/5.5.0/vripper-macos-portable-5.5.0.zip) | [Linux (amd64) (DEB)](https://github.com/death-claw/vripper-project/releases/download/5.5.0/vripper-linux-5.5.0_amd64.deb) <br /> [Linux (x86_64) (RPM)](https://github.com/death-claw/vripper-project/releases/download/5.5.0/vripper-linux-5.5.0.x86_64.rpm) <br /> [Portable (ZIP)](https://github.com/death-claw/vripper-project/releases/download/5.5.0/vripper-linux-portable-5.5.0.zip) | [Java GUI (noarch)](https://github.com/death-claw/vripper-project/releases/download/5.5.0/vripper-noarch-gui-5.5.0.jar) <br /> [Java Web (noarch)](https://github.com/death-claw/vripper-project/releases/download/5.5.0/vripper-noarch-web-5.5.0.jar)
|
||||
|
||||
Source code and previous versions are available on the [Releases page](https://github.com/death-claw/vripper-project/releases).
|
||||
|
||||
Application data (application logs, settings and persisted data) is stored in `C:\USERS\<your Windows username>\vripper (Windows)` or `HOME_FOLDER/.config/vripper (Linux and macOS)`
|
||||
|
||||
|
||||
## 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
|
||||
|
||||
## 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
|
||||
|
||||
|
||||
## How to build
|
||||
|
||||
You need JDK 17 and a recent version of maven 3.6.1+
|
||||
You need JDK 21 and a recent version of maven 3.8.x+
|
||||
|
||||
To build run the following:
|
||||
To build, run the following command:
|
||||
|
||||
mvn clean install
|
||||
|
||||
Build artifact is located under
|
||||
|
||||
vripper-project\vripper-gui\target\vripper-gui-4.0.0.jar
|
||||
vripper-project\vripper-gui\target\vripper-gui-{{version}}-jar-with-dependencies.jar
|
||||
|
||||
Copy the artifact into any other folder and run:
|
||||
|
||||
java -jar vripper-gui-4.0.0.jar
|
||||
java -jar vripper-gui-{{version}}-jar-with-dependencies.jar
|
||||
|
||||
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 303 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
@@ -0,0 +1,2 @@
|
||||
--type app-image
|
||||
--java-options "-Dvripper.portable=true"
|
||||
@@ -0,0 +1,7 @@
|
||||
--icon icon.png
|
||||
--java-options "-Dvripper.portable=false"
|
||||
--linux-package-name vripper
|
||||
--linux-app-release 1
|
||||
--linux-menu-group Utility
|
||||
--linux-app-category java
|
||||
--linux-shortcut
|
||||
@@ -0,0 +1,4 @@
|
||||
--icon icon.icns
|
||||
--java-options "-Dvripper.portable=false"
|
||||
--mac-package-identifier me.mnlr.vripper.vripper-gui
|
||||
--mac-package-name VRipper
|
||||
@@ -0,0 +1,8 @@
|
||||
--icon icon.ico
|
||||
--java-options "-Dvripper.portable=false"
|
||||
--win-dir-chooser
|
||||
--win-menu
|
||||
--win-per-user-install
|
||||
--win-shortcut
|
||||
--win-shortcut-prompt
|
||||
--win-update-url https://github.com/death-claw/vripper-project/releases
|
||||
@@ -0,0 +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"
|
||||
--name VRipper
|
||||
--description "Image ripper tool for vipergirls"
|
||||
--dest dist
|
||||
--vendor "death-claw"
|
||||
@@ -1,19 +1,209 @@
|
||||
<?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.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.1.0</version>
|
||||
<properties>
|
||||
<maven.deploy.skip>true</maven.deploy.skip>
|
||||
</properties>
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>me.vripper</groupId>
|
||||
<artifactId>vripper-project</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>${revision}</version>
|
||||
<properties>
|
||||
<java.version>21</java.version>
|
||||
<maven.deploy.skip>false</maven.deploy.skip>
|
||||
<timestamp>${maven.build.timestamp}</timestamp>
|
||||
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<revision>5.8.0</revision>
|
||||
<kotlin.version>1.9.22</kotlin.version>
|
||||
<slf4j.version>2.0.12</slf4j.version>
|
||||
<logback.version>1.5.0</logback.version>
|
||||
<kotlinx-coroutines.version>1.8.0</kotlinx-coroutines.version>
|
||||
<exposed.version>0.47.0</exposed.version>
|
||||
<snakeyaml.version>2.0</snakeyaml.version>
|
||||
<koin.version>3.5.3</koin.version>
|
||||
<h2.version>2.2.224</h2.version>
|
||||
<htmlcleaner.version>2.29</htmlcleaner.version>
|
||||
<failsafe.version>2.4.4</failsafe.version>
|
||||
<caffeine.version>3.1.8</caffeine.version>
|
||||
<jna-platform.version>5.14.0</jna-platform.version>
|
||||
<kotlinx-serialization-json.version>1.6.2</kotlinx-serialization-json.version>
|
||||
<httpclient5.version>5.3.1</httpclient5.version>
|
||||
<commons-codec.version>1.16.1</commons-codec.version>
|
||||
<liquibase-core.version>4.26.0</liquibase-core.version>
|
||||
<liquibase-slf4j.version>5.0.0</liquibase-slf4j.version>
|
||||
<grpc.kotlin.version>1.4.1</grpc.kotlin.version>
|
||||
<java.grpc.version>1.62.2</java.grpc.version>
|
||||
<protobuf.version>3.25.3</protobuf.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>
|
||||
<artifactId>htmlcleaner</artifactId>
|
||||
<groupId>net.sourceforge.htmlcleaner</groupId>
|
||||
<version>${htmlcleaner.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>failsafe</artifactId>
|
||||
<groupId>net.jodah</groupId>
|
||||
<version>${failsafe.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>caffeine</artifactId>
|
||||
<groupId>com.github.ben-manes.caffeine</groupId>
|
||||
<version>${caffeine.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.java.dev.jna</groupId>
|
||||
<artifactId>jna-platform</artifactId>
|
||||
<version>${jna-platform.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>kotlin-reflect</artifactId>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<version>${kotlin.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlinx</groupId>
|
||||
<artifactId>kotlinx-serialization-json</artifactId>
|
||||
<version>${kotlinx-serialization-json.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>jcl-over-slf4j</artifactId>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<version>${slf4j.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>httpclient5</artifactId>
|
||||
<groupId>org.apache.httpcomponents.client5</groupId>
|
||||
<version>${httpclient5.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>commons-codec</artifactId>
|
||||
<groupId>commons-codec</groupId>
|
||||
<version>${commons-codec.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>liquibase-core</artifactId>
|
||||
<groupId>org.liquibase</groupId>
|
||||
<version>${liquibase-core.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>liquibase-slf4j</artifactId>
|
||||
<groupId>com.mattbertolini</groupId>
|
||||
<version>${liquibase-slf4j.version}</version>
|
||||
</dependency>
|
||||
<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>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-kotlin</artifactId>
|
||||
<version>${protobuf.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.grpc</groupId>
|
||||
<artifactId>grpc-netty-shaded</artifactId>
|
||||
<version>${java.grpc.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
</project>
|
||||
|
||||
+222
-121
@@ -1,128 +1,229 @@
|
||||
<?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>
|
||||
<parent>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<relativePath/>
|
||||
<version>3.0.6</version>
|
||||
</parent>
|
||||
<groupId>me.mnlr.vripper</groupId>
|
||||
<artifactId>vripper-core</artifactId>
|
||||
<version>4.1.0</version>
|
||||
<name>vripper-core</name>
|
||||
<description>vripper-core</description>
|
||||
<properties>
|
||||
<java.version>17</java.version>
|
||||
<kotlin.version>1.8.21</kotlin.version>
|
||||
<maven.deploy.skip>false</maven.deploy.skip>
|
||||
</properties>
|
||||
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>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<artifactId>kotlin-reflect</artifactId>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>kotlin-stdlib</artifactId>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>jackson-module-kotlin</artifactId>
|
||||
<groupId>com.fasterxml.jackson.module</groupId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>spring-boot-starter-jdbc</artifactId>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>liquibase-core</artifactId>
|
||||
<groupId>org.liquibase</groupId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>hsqldb</artifactId>
|
||||
<groupId>org.hsqldb</groupId>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>httpclient</artifactId>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>htmlcleaner</artifactId>
|
||||
<groupId>net.sourceforge.htmlcleaner</groupId>
|
||||
<version>2.26</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>reactor-core</artifactId>
|
||||
<groupId>io.projectreactor</groupId>
|
||||
</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>
|
||||
</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>
|
||||
<parent>
|
||||
<groupId>me.vripper</groupId>
|
||||
<artifactId>vripper-project</artifactId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
|
||||
<dependency>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>spring-restdocs-mockmvc</artifactId>
|
||||
<groupId>org.springframework.restdocs</groupId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<artifactId>vripper-core</artifactId>
|
||||
<name>vripper-core</name>
|
||||
<description>vripper-core</description>
|
||||
|
||||
<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>
|
||||
<configuration>
|
||||
<args>
|
||||
<arg>-Xjsr305=strict</arg>
|
||||
</args>
|
||||
<compilerPlugins>
|
||||
<plugin>spring</plugin>
|
||||
</compilerPlugins>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<artifactId>kotlin-maven-allopen</artifactId>
|
||||
<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>
|
||||
<version>${kotlin.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>github</id>
|
||||
<name>GitHub death-claw Apache Maven Packages</name>
|
||||
<url>https://maven.pkg.github.com/death-claw/vripper-project</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
</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>
|
||||
<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>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>
|
||||
<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>
|
||||
</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>compile</phase>
|
||||
<goals>
|
||||
<goal>compile</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<jvmTarget>1.8</jvmTarget>
|
||||
<compilerPlugins>
|
||||
<plugin>kotlinx-serialization</plugin>
|
||||
</compilerPlugins>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-maven-serialization</artifactId>
|
||||
<version>${kotlin.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</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>
|
||||
</project>
|
||||
|
||||
@@ -1,149 +0,0 @@
|
||||
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.repositories.ThreadRepository
|
||||
import me.mnlr.vripper.services.*
|
||||
import me.mnlr.vripper.tasks.ThreadLookupRunnable
|
||||
import org.springframework.stereotype.Service
|
||||
import java.util.*
|
||||
import java.util.regex.Pattern
|
||||
|
||||
@Service
|
||||
class AppEndpointService(
|
||||
private val downloadService: DownloadService,
|
||||
private val dataTransaction: DataTransaction,
|
||||
private val threadRepository: ThreadRepository,
|
||||
private val threadCacheService: ThreadCacheService,
|
||||
private val eventRepository: LogEventRepository,
|
||||
private val asyncTaskRunnerService: AsyncTaskRunnerService,
|
||||
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) {
|
||||
asyncTaskRunnerService.sink.emitNext(
|
||||
ThreadLookupRunnable(
|
||||
threadId, settingsService.settings
|
||||
)
|
||||
) { _, _ -> true }
|
||||
} else {
|
||||
asyncTaskRunnerService.sink.emitNext(
|
||||
PostDownloadRunnable(
|
||||
threadId, postId
|
||||
)
|
||||
) { _, _ -> true }
|
||||
}
|
||||
} 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>>) {
|
||||
for (post in posts) {
|
||||
asyncTaskRunnerService.sink.emitNext(
|
||||
PostDownloadRunnable(
|
||||
post.first, post.second
|
||||
)
|
||||
) { _, _ -> true }
|
||||
}
|
||||
}
|
||||
|
||||
@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 = threadRepository.findByThreadId(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()
|
||||
}
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package me.mnlr.vripper
|
||||
|
||||
import org.springframework.context.event.ContextRefreshedEvent
|
||||
import org.springframework.context.event.EventListener
|
||||
import org.springframework.stereotype.Component
|
||||
import me.mnlr.vripper.repositories.PostDownloadStateRepository
|
||||
import me.mnlr.vripper.services.DataTransaction
|
||||
|
||||
@Component
|
||||
class EventListenerBean(
|
||||
private val postDownloadStateRepository: PostDownloadStateRepository,
|
||||
private val dataTransaction: DataTransaction
|
||||
) {
|
||||
@EventListener
|
||||
fun onApplicationEvent(event: ContextRefreshedEvent?) {
|
||||
postDownloadStateRepository.setDownloadingToStopped()
|
||||
dataTransaction.sortPostsByRank()
|
||||
}
|
||||
}
|
||||
@@ -1,58 +0,0 @@
|
||||
package me.mnlr.vripper
|
||||
|
||||
import jakarta.annotation.PreDestroy
|
||||
import org.springframework.beans.factory.annotation.Value
|
||||
import org.springframework.jdbc.core.JdbcTemplate
|
||||
import org.springframework.stereotype.Component
|
||||
import me.mnlr.vripper.download.DownloadService
|
||||
import me.mnlr.vripper.services.AsyncTaskRunnerService
|
||||
import java.nio.file.Path
|
||||
import java.time.format.DateTimeFormatter
|
||||
import java.util.*
|
||||
import java.util.regex.Pattern
|
||||
|
||||
@Component
|
||||
class Management(
|
||||
private val jdbcTemplate: JdbcTemplate,
|
||||
@Value("\${base.dir}") baseDir: String,
|
||||
@Value("\${base.dir.name}") baseDirName: String,
|
||||
private val asyncTaskRunnerService: AsyncTaskRunnerService,
|
||||
private val downloadService: DownloadService
|
||||
) {
|
||||
private val backupFolder: Path
|
||||
|
||||
init {
|
||||
backupFolder = Path.of(baseDir, baseDirName, "backup")
|
||||
}
|
||||
|
||||
@PreDestroy
|
||||
fun destroy() {
|
||||
// taskRunnerService.destroy()
|
||||
downloadService.destroy()
|
||||
jdbcTemplate.execute("SHUTDOWN")
|
||||
}
|
||||
|
||||
// @PostConstruct
|
||||
// @Scheduled(cron = "0 0 0 ? * *")
|
||||
// private fun backup() {
|
||||
//
|
||||
// for (file in Files.list(backupFolder)) {
|
||||
// val matcher = BACKUP_FILE_PATTERN.matcher(file.fileName.toString())
|
||||
// if (matcher.find()) {
|
||||
// val localDate = LocalDate.parse(matcher.group(1), FORMATTER)
|
||||
// if (localDate.isEqual(LocalDate.now())) {
|
||||
// return
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// // create a backup file
|
||||
// val backupFile = backupFolder.resolve("db_${LocalDateTime.now().format(FORMATTER)}.tar.gz")
|
||||
// jdbcTemplate.execute("BACKUP DATABASE TO '${backupFile}' BLOCKING")
|
||||
// }
|
||||
|
||||
companion object {
|
||||
val FORMATTER: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
|
||||
private val BACKUP_FILE_PATTERN = Pattern.compile("^db_(\\d{4}-\\d{2}-\\d{2})\\.tar\\.gz$")
|
||||
}
|
||||
}
|
||||
@@ -1,37 +0,0 @@
|
||||
package me.mnlr.vripper
|
||||
|
||||
import org.springframework.beans.BeansException
|
||||
import org.springframework.context.ApplicationContext
|
||||
import org.springframework.context.ApplicationContextAware
|
||||
import org.springframework.context.ConfigurableApplicationContext
|
||||
import org.springframework.scheduling.annotation.EnableScheduling
|
||||
import org.springframework.stereotype.Component
|
||||
import me.mnlr.vripper.delegate.LoggerDelegate
|
||||
|
||||
@Component
|
||||
@EnableScheduling
|
||||
class SpringContext : ApplicationContextAware {
|
||||
@Throws(BeansException::class)
|
||||
override fun setApplicationContext(context: ApplicationContext) {
|
||||
|
||||
// store ApplicationContext reference to access required beans later on
|
||||
Companion.context = context as ConfigurableApplicationContext
|
||||
}
|
||||
|
||||
companion object {
|
||||
private val log by LoggerDelegate()
|
||||
private lateinit var context: ConfigurableApplicationContext
|
||||
fun <T> getBean(beanClass: Class<T>): T {
|
||||
return context.getBean(beanClass)
|
||||
}
|
||||
|
||||
fun <T> getBeansOfType(beanClass: Class<T>): Map<String, T> {
|
||||
return context.getBeansOfType(beanClass)
|
||||
}
|
||||
|
||||
fun close() {
|
||||
log.info("Application terminating...")
|
||||
context.close()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,286 +0,0 @@
|
||||
package me.mnlr.vripper.download
|
||||
|
||||
import jakarta.annotation.PostConstruct
|
||||
import me.mnlr.vripper.delegate.LoggerDelegate
|
||||
import me.mnlr.vripper.entities.ImageDownloadState
|
||||
import me.mnlr.vripper.entities.LogEvent
|
||||
import me.mnlr.vripper.entities.PostDownloadState
|
||||
import me.mnlr.vripper.entities.domain.Status
|
||||
import me.mnlr.vripper.formatToString
|
||||
import me.mnlr.vripper.host.Host
|
||||
import me.mnlr.vripper.repositories.ImageRepository
|
||||
import me.mnlr.vripper.repositories.LogEventRepository
|
||||
import me.mnlr.vripper.repositories.PostDownloadStateRepository
|
||||
import me.mnlr.vripper.services.*
|
||||
import net.jodah.failsafe.Failsafe
|
||||
import net.jodah.failsafe.RetryPolicy
|
||||
import org.springframework.beans.factory.annotation.Value
|
||||
import org.springframework.stereotype.Service
|
||||
import java.util.*
|
||||
import java.util.concurrent.ExecutorService
|
||||
import java.util.concurrent.Executors
|
||||
import java.util.concurrent.TimeUnit
|
||||
import java.util.concurrent.locks.ReentrantLock
|
||||
import java.util.stream.Collectors
|
||||
import kotlin.concurrent.withLock
|
||||
|
||||
@Service
|
||||
class DownloadService(
|
||||
@param:Value("\${download.pool-size}") private val maxPoolSize: Int,
|
||||
private val settingsService: SettingsService,
|
||||
private val dataTransaction: DataTransaction,
|
||||
private val hosts: List<Host>,
|
||||
private val eventRepository: LogEventRepository,
|
||||
private val retryPolicyService: RetryPolicyService,
|
||||
private val postDownloadStateRepository: PostDownloadStateRepository,
|
||||
private val imageRepository: ImageRepository,
|
||||
private val asyncTaskRunnerService: AsyncTaskRunnerService,
|
||||
) {
|
||||
private val log by LoggerDelegate()
|
||||
|
||||
// Class fields
|
||||
private val executor: ExecutorService = Executors.newFixedThreadPool(maxPoolSize)
|
||||
private val running: MutableMap<Host, MutableList<ImageDownloadRunnable>> = mutableMapOf()
|
||||
private val pending: MutableMap<Host, MutableList<ImageDownloadRunnable>> = mutableMapOf()
|
||||
private val lock = ReentrantLock()
|
||||
private val condition = lock.newCondition()
|
||||
private val pollThread: Thread
|
||||
|
||||
init {
|
||||
pollThread = Thread(
|
||||
{
|
||||
val accepted: MutableList<ImageDownloadRunnable> = mutableListOf()
|
||||
val candidates: MutableList<ImageDownloadRunnable> = mutableListOf()
|
||||
while (!Thread.interrupted()) {
|
||||
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)
|
||||
schedule(it)
|
||||
}
|
||||
accepted.clear()
|
||||
candidates.clear()
|
||||
condition.await()
|
||||
}
|
||||
}
|
||||
}, "Download scheduler thread"
|
||||
)
|
||||
}
|
||||
|
||||
@PostConstruct
|
||||
fun init() {
|
||||
pollThread.start()
|
||||
}
|
||||
|
||||
fun destroy() {
|
||||
log.info("Shutting down ExecutionService")
|
||||
pollThread.interrupt()
|
||||
executor.shutdown()
|
||||
stop(postDownloadStateRepository.findAll().map { it.postId })
|
||||
if (!executor.awaitTermination(5, TimeUnit.SECONDS)) {
|
||||
log.warn("Some jobs are still running!, forcing shutdown")
|
||||
executor.shutdownNow()
|
||||
}
|
||||
}
|
||||
|
||||
fun stopAll(postIds: List<String>?) {
|
||||
if (postIds != null) {
|
||||
stop(postIds)
|
||||
} else {
|
||||
stop(postDownloadStateRepository.findAll().map(PostDownloadState::postId))
|
||||
}
|
||||
}
|
||||
|
||||
fun restartAll(postIds: List<String> = listOf()) {
|
||||
if (postIds.isNotEmpty()) {
|
||||
restart(postIds)
|
||||
} else {
|
||||
restart(postDownloadStateRepository.findAll().map(PostDownloadState::postId))
|
||||
}
|
||||
}
|
||||
|
||||
private fun restart(postIds: List<String>) {
|
||||
lock.withLock {
|
||||
val data: MutableMap<PostDownloadState, Collection<ImageDownloadState>> = mutableMapOf()
|
||||
for (postId in postIds) {
|
||||
if (isPending(postId)) {
|
||||
log.warn("Cannot restart, jobs are currently running for post id $postIds")
|
||||
continue
|
||||
}
|
||||
val imageDownloadStates: List<ImageDownloadState> =
|
||||
imageRepository.findByPostIdAndIsNotCompleted(postId)
|
||||
if (imageDownloadStates.isEmpty()) {
|
||||
continue
|
||||
}
|
||||
val postDownloadState: PostDownloadState =
|
||||
postDownloadStateRepository.findByPostId(postId).orElseThrow()
|
||||
log.debug("Restarting ${imageDownloadStates.size} jobs for post id $postIds")
|
||||
postDownloadState.status = Status.PENDING
|
||||
dataTransaction.update(postDownloadState)
|
||||
data[postDownloadState] = imageDownloadStates
|
||||
}
|
||||
|
||||
for ((postDownloadState, imageDownloadStates) in data) {
|
||||
postDownloadState.status = Status.PENDING
|
||||
dataTransaction.update(postDownloadState)
|
||||
for (imageDownloadState in imageDownloadStates) {
|
||||
log.debug("Enqueuing a job for ${imageDownloadState.url}")
|
||||
with(imageDownloadState) {
|
||||
this.status = Status.STOPPED
|
||||
this.current = 0
|
||||
}
|
||||
dataTransaction.update(imageDownloadState)
|
||||
val imageDownloadRunnable = ImageDownloadRunnable(
|
||||
imageDownloadState.id!!, settingsService.settings
|
||||
)
|
||||
pending.computeIfAbsent(
|
||||
imageDownloadState.host
|
||||
) { mutableListOf() }
|
||||
pending[imageDownloadState.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 postDownloadState: PostDownloadState =
|
||||
postDownloadStateRepository.findByPostId(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(postDownloadState)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun canRun(host: Host): 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<Host, Int> {
|
||||
val map: MutableMap<Host, Int> = mutableMapOf()
|
||||
hosts.forEach { h: Host ->
|
||||
val imageDownloadRunnableList: List<ImageDownloadRunnable> = running.computeIfAbsent(
|
||||
h
|
||||
) { mutableListOf() }
|
||||
val count: Int =
|
||||
settingsService.settings.connectionSettings.maxThreads - imageDownloadRunnableList.size
|
||||
log.debug("Download slots for ${h.host}: $count")
|
||||
map[h] = count
|
||||
}
|
||||
return map
|
||||
}
|
||||
|
||||
private fun getCandidates(candidateCount: Map<Host, Int>): List<ImageDownloadRunnable> {
|
||||
val hostIntegerMap: MutableMap<Host, 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<Host, List<ImageDownloadRunnable>> =
|
||||
candidates.stream().collect(Collectors.groupingBy { it.context.image.host })
|
||||
collect.forEach {
|
||||
log.debug(
|
||||
"Candidate download for ${it.key.host} ${it.value.size}/${candidateCount[it.key]}"
|
||||
)
|
||||
}
|
||||
}
|
||||
return candidates.sortedWith(Comparator.comparing { v: ImageDownloadRunnable -> v.context.post.rank })
|
||||
}
|
||||
|
||||
private fun schedule(imageDownloadRunnable: ImageDownloadRunnable) {
|
||||
log.debug("Scheduling a job for ${imageDownloadRunnable.context.image.url}")
|
||||
executor.execute {
|
||||
try {
|
||||
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)
|
||||
}.onComplete {
|
||||
|
||||
afterJobFinish(imageDownloadRunnable)
|
||||
log.debug(
|
||||
"Finished downloading ${imageDownloadRunnable.context.image.url}"
|
||||
)
|
||||
}.run(imageDownloadRunnable::run)
|
||||
} catch (ignored: Exception) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun afterJobFinish(imageDownloadRunnable: ImageDownloadRunnable) {
|
||||
lock.withLock {
|
||||
running[imageDownloadRunnable.context.image.host]!!.remove(imageDownloadRunnable)
|
||||
if (!isPending(imageDownloadRunnable.context.image.postId) && !isRunning(
|
||||
imageDownloadRunnable.context.image.postId
|
||||
)
|
||||
) {
|
||||
dataTransaction.finishPost(imageDownloadRunnable.context.post)
|
||||
}
|
||||
condition.signal()
|
||||
}
|
||||
}
|
||||
|
||||
fun pendingCount(): Int {
|
||||
return pending.values.sumOf { it.size }
|
||||
}
|
||||
|
||||
fun runningCount(): Int {
|
||||
return running.values.sumOf { it.size }
|
||||
}
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
package me.mnlr.vripper.download
|
||||
|
||||
import org.apache.http.client.protocol.HttpClientContext
|
||||
import me.mnlr.vripper.SpringContext
|
||||
import me.mnlr.vripper.entities.ImageDownloadState
|
||||
import me.mnlr.vripper.entities.PostDownloadState
|
||||
import me.mnlr.vripper.repositories.ImageRepository
|
||||
import me.mnlr.vripper.repositories.PostDownloadStateRepository
|
||||
|
||||
class ImageDownloadContext(val imageId: Long) {
|
||||
|
||||
private val imageRepository: ImageRepository =
|
||||
SpringContext.getBean(ImageRepository::class.java)
|
||||
private val postDownloadStateRepository: PostDownloadStateRepository =
|
||||
SpringContext.getBean(PostDownloadStateRepository::class.java)
|
||||
|
||||
|
||||
val httpContext: HttpClientContext = HttpClientContext.create()
|
||||
val postId = image.postIdRef
|
||||
var stopped = false
|
||||
val image: ImageDownloadState
|
||||
get() = imageRepository.findById(imageId).orElseThrow()
|
||||
val post: PostDownloadState
|
||||
get() = postDownloadStateRepository.findById(postId).orElseThrow()
|
||||
}
|
||||
@@ -1,178 +0,0 @@
|
||||
package me.mnlr.vripper.download
|
||||
|
||||
import me.mnlr.vripper.SpringContext
|
||||
import me.mnlr.vripper.delegate.LoggerDelegate
|
||||
import me.mnlr.vripper.entities.ImageDownloadState
|
||||
import me.mnlr.vripper.entities.PostDownloadState
|
||||
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.ImageMimeType
|
||||
import me.mnlr.vripper.model.Settings
|
||||
import me.mnlr.vripper.services.*
|
||||
import net.jodah.failsafe.function.CheckedRunnable
|
||||
import org.apache.http.client.protocol.HttpClientContext
|
||||
import org.apache.http.impl.client.BasicCookieStore
|
||||
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
|
||||
) : CheckedRunnable {
|
||||
private val log by LoggerDelegate()
|
||||
|
||||
private val dataTransaction: DataTransaction = SpringContext.getBean(DataTransaction::class.java)
|
||||
private val pathService: PathService = SpringContext.getBean(PathService::class.java)
|
||||
|
||||
val context: ImageDownloadContext = ImageDownloadContext(imageInternalId)
|
||||
private val image: ImageDownloadState
|
||||
get() = context.image
|
||||
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(image.postId.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 downloadedImage = image.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 = pathService.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(image.postId.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(
|
||||
postDownloadState: PostDownloadState, 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(postDownloadState.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()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,162 +0,0 @@
|
||||
package me.mnlr.vripper.download
|
||||
|
||||
import net.jodah.failsafe.Failsafe
|
||||
import net.jodah.failsafe.function.CheckedSupplier
|
||||
import org.apache.http.client.HttpClient
|
||||
import org.apache.http.client.methods.CloseableHttpResponse
|
||||
import org.apache.http.client.methods.HttpGet
|
||||
import org.apache.http.client.protocol.HttpClientContext
|
||||
import org.apache.http.client.utils.URIBuilder
|
||||
import org.apache.http.util.EntityUtils
|
||||
import me.mnlr.vripper.SpringContext
|
||||
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 java.net.URISyntaxException
|
||||
import java.util.*
|
||||
import javax.xml.parsers.SAXParserFactory
|
||||
|
||||
class PostDownloadRunnable(private val threadId: String, private val postId: String) : Runnable {
|
||||
private val log by LoggerDelegate()
|
||||
private val dataTransaction: DataTransaction =
|
||||
SpringContext.getBean(DataTransaction::class.java)
|
||||
private val settingsService: SettingsService =
|
||||
SpringContext.getBean(SettingsService::class.java)
|
||||
private val vgAuthService: VGAuthService = SpringContext.getBean(VGAuthService::class.java)
|
||||
private val eventRepository: LogEventRepository =
|
||||
SpringContext.getBean(LogEventRepository::class.java)
|
||||
private val cm: HTTPService = SpringContext.getBean(HTTPService::class.java)
|
||||
private val retryPolicyService: RetryPolicyService =
|
||||
SpringContext.getBean(RetryPolicyService::class.java)
|
||||
private val downloadService: DownloadService =
|
||||
SpringContext.getBean(DownloadService::class.java)
|
||||
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.client.build()
|
||||
(connection.execute(
|
||||
httpGet, vgAuthService.context
|
||||
) as CloseableHttpResponse).use { response ->
|
||||
try {
|
||||
if (response.statusLine.statusCode / 100 != 2) {
|
||||
throw DownloadException("Unexpected response code '${response.statusLine.statusCode}' for $httpGet")
|
||||
}
|
||||
factory.newSAXParser()
|
||||
.parse(response.entity.content, threadLookupAPIResponseHandler)
|
||||
threadLookupAPIResponseHandler.result.postItemList[0]
|
||||
} finally {
|
||||
EntityUtils.consumeQuietly(response.entity)
|
||||
}
|
||||
}
|
||||
})
|
||||
} catch (e: Exception) {
|
||||
throw PostParseException(e)
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
private val factory = SAXParserFactory.newInstance()
|
||||
}
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
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
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
package me.mnlr.vripper.event
|
||||
|
||||
data class Event<T>(val kind: Kind, val data: T) {
|
||||
enum class Kind {
|
||||
POST_UPDATE, POST_REMOVE, IMAGE_UPDATE, METADATA_UPDATE, THREAD_UPDATE, THREAD_REMOVE, LOG_EVENT_UPDATE, LOG_EVENT_REMOVE, VG_USER, DOWNLOAD_STATUS, BYTES_PER_SECOND, SETTINGS_UPDATE
|
||||
}
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
package me.mnlr.vripper.event
|
||||
|
||||
import jakarta.annotation.PreDestroy
|
||||
import org.springframework.stereotype.Service
|
||||
import reactor.core.publisher.Flux
|
||||
import reactor.core.publisher.SignalType
|
||||
import reactor.core.publisher.Sinks
|
||||
import reactor.core.publisher.Sinks.EmitFailureHandler
|
||||
import reactor.core.publisher.Sinks.EmitResult
|
||||
|
||||
@Service
|
||||
class EventBus {
|
||||
private val sink = Sinks.many().multicast().onBackpressureBuffer<Event<*>>()
|
||||
fun publishEvent(event: Event<*>) {
|
||||
sink.emitNext(event, RETRY)
|
||||
}
|
||||
|
||||
fun flux(): Flux<Event<*>> {
|
||||
return sink.asFlux()
|
||||
}
|
||||
|
||||
@PreDestroy
|
||||
private fun destroy() {
|
||||
sink.emitComplete(RETRY)
|
||||
}
|
||||
|
||||
companion object {
|
||||
val RETRY = EmitFailureHandler { _: SignalType?, _: EmitResult? -> true }
|
||||
}
|
||||
}
|
||||
@@ -1,104 +0,0 @@
|
||||
package me.mnlr.vripper.host
|
||||
|
||||
import org.apache.http.NameValuePair
|
||||
import org.apache.http.client.HttpClient
|
||||
import org.apache.http.client.entity.UrlEncodedFormEntity
|
||||
import org.apache.http.client.methods.CloseableHttpResponse
|
||||
import org.apache.http.message.BasicNameValuePair
|
||||
import org.apache.http.util.EntityUtils
|
||||
import org.springframework.stereotype.Service
|
||||
import org.w3c.dom.Document
|
||||
import org.w3c.dom.Node
|
||||
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.*
|
||||
|
||||
@Service
|
||||
class AcidimgHost(
|
||||
private val httpService: HTTPService,
|
||||
private val htmlProcessorService: HtmlProcessorService,
|
||||
private val xpathService: XpathService,
|
||||
dataTransaction: DataTransaction,
|
||||
downloadSpeedService: DownloadSpeedService,
|
||||
) : Host(httpService, htmlProcessorService, dataTransaction, downloadSpeedService) {
|
||||
private val log by LoggerDelegate()
|
||||
override val host: String
|
||||
get() = Companion.host
|
||||
|
||||
@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.client.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 host = "acidimg.cc"
|
||||
private const val lookup = "acidimg.cc"
|
||||
private const val CONTINUE_BUTTON_XPATH = "//input[@id='continuebutton']"
|
||||
private const val IMG_XPATH = "//img[@class='centred']"
|
||||
}
|
||||
}
|
||||
@@ -1,233 +0,0 @@
|
||||
package me.mnlr.vripper.host
|
||||
|
||||
import org.apache.http.Header
|
||||
import org.apache.http.client.HttpClient
|
||||
import org.apache.http.client.methods.CloseableHttpResponse
|
||||
import org.apache.http.client.protocol.HttpClientContext
|
||||
import org.apache.http.util.EntityUtils
|
||||
import org.w3c.dom.Document
|
||||
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 java.io.FileOutputStream
|
||||
import java.nio.file.Files
|
||||
import java.nio.file.Path
|
||||
import kotlin.io.path.pathString
|
||||
|
||||
abstract class Host(
|
||||
private val httpService: HTTPService,
|
||||
private val htmlProcessorService: HtmlProcessorService,
|
||||
private val dataTransaction: DataTransaction,
|
||||
private val downloadSpeedService: DownloadSpeedService
|
||||
) {
|
||||
private val log by LoggerDelegate()
|
||||
|
||||
companion object {
|
||||
private const val READ_BUFFER_SIZE = 8192
|
||||
}
|
||||
|
||||
abstract val host: String
|
||||
|
||||
@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.allHeaders)
|
||||
?: throw HostException("Unsupported image type ${response.getFirstHeader("content-type")}")
|
||||
|
||||
val tempImage = Files.createTempFile("vripper", "tmp")
|
||||
return response.entity.content.use { inputStream ->
|
||||
try {
|
||||
FileOutputStream(tempImage.pathString).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.increase(read.toLong())
|
||||
dataTransaction.update(image)
|
||||
}
|
||||
Pair(tempImage, mimeType)
|
||||
}
|
||||
} finally {
|
||||
EntityUtils.consumeQuietly(response.entity)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun isSupported(url: String): Boolean {
|
||||
return url.contains(host)
|
||||
}
|
||||
|
||||
@Throws(HostException::class)
|
||||
fun head(url: String, context: HttpClientContext): Array<Header> {
|
||||
val client: HttpClient = httpService.client.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.statusLine.statusCode / 100 != 2) {
|
||||
throw HostException(
|
||||
String.format(
|
||||
"Unexpected response code: %d", response.statusLine.statusCode
|
||||
)
|
||||
)
|
||||
}
|
||||
response.allHeaders
|
||||
} 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.client.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.statusLine.statusCode / 100 != 2) {
|
||||
EntityUtils.consumeQuietly(response.entity)
|
||||
throw DownloadException(
|
||||
"Server returned code ${response.statusLine.statusCode}"
|
||||
)
|
||||
}
|
||||
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 (host != other.host) return false
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
override fun hashCode(): Int {
|
||||
return host.hashCode()
|
||||
}
|
||||
|
||||
override fun toString(): String {
|
||||
return host
|
||||
}
|
||||
}
|
||||
|
||||
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"),
|
||||
}
|
||||
@@ -1,107 +0,0 @@
|
||||
package me.mnlr.vripper.host
|
||||
|
||||
import org.apache.http.NameValuePair
|
||||
import org.apache.http.client.HttpClient
|
||||
import org.apache.http.client.entity.UrlEncodedFormEntity
|
||||
import org.apache.http.client.methods.CloseableHttpResponse
|
||||
import org.apache.http.client.methods.HttpPost
|
||||
import org.apache.http.message.BasicNameValuePair
|
||||
import org.apache.http.util.EntityUtils
|
||||
import org.springframework.stereotype.Service
|
||||
import org.w3c.dom.Document
|
||||
import org.w3c.dom.Node
|
||||
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 java.io.IOException
|
||||
|
||||
@Service
|
||||
class ImxHost(
|
||||
private val httpService: HTTPService,
|
||||
private val htmlProcessorService: HtmlProcessorService,
|
||||
private val xpathService: XpathService,
|
||||
dataTransaction: DataTransaction,
|
||||
downloadSpeedService: DownloadSpeedService,
|
||||
) : Host(httpService, htmlProcessorService, dataTransaction, downloadSpeedService) {
|
||||
private val log by LoggerDelegate()
|
||||
override val host: String
|
||||
get() = Companion.host
|
||||
|
||||
@Throws(HostException::class)
|
||||
override fun resolve(
|
||||
url: String,
|
||||
document: Document,
|
||||
context: ImageDownloadContext
|
||||
): Pair<String, String> {
|
||||
var value: String? = null
|
||||
try {
|
||||
log.debug("Looking for xpath expression $CONTINUE_BUTTON_XPATH in $url")
|
||||
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 $url")
|
||||
val client: HttpClient = httpService.client.build()
|
||||
val httpPost: HttpPost = httpService.buildHttpPost(url, 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 $url")
|
||||
xpathService.getAsNode(doc, IMG_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
} ?: throw HostException(
|
||||
"Xpath $IMG_XPATH cannot be found in $url"
|
||||
)
|
||||
return try {
|
||||
log.debug("Resolving name and image url for $url")
|
||||
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 host = "imx.to"
|
||||
private const val lookup = "imx.to"
|
||||
private const val CONTINUE_BUTTON_XPATH = "//*[@name='imgContinue']"
|
||||
private const val IMG_XPATH = "//img[@class='centred']"
|
||||
}
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package me.mnlr.vripper.model
|
||||
|
||||
data class DownloadSpeed(val speed: String) {
|
||||
|
||||
override fun equals(other: Any?): Boolean {
|
||||
if (this === other) return true
|
||||
if (javaClass != other?.javaClass) return false
|
||||
|
||||
other as DownloadSpeed
|
||||
|
||||
if (speed != other.speed) return false
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
override fun hashCode(): Int {
|
||||
return speed.hashCode()
|
||||
}
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
package me.mnlr.vripper.model
|
||||
|
||||
data class GlobalState(
|
||||
val running: Int,
|
||||
val remaining: Int,
|
||||
val error: Int,
|
||||
val loggedUser: String,
|
||||
val downloadSpeed: String
|
||||
) {
|
||||
override fun equals(other: Any?): Boolean {
|
||||
if (this === other) return true
|
||||
if (javaClass != other?.javaClass) return false
|
||||
|
||||
other as GlobalState
|
||||
|
||||
if (running != other.running) return false
|
||||
if (remaining != other.remaining) return false
|
||||
if (error != other.error) return false
|
||||
if (loggedUser != other.loggedUser) return false
|
||||
if (downloadSpeed != other.downloadSpeed) return false
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
override fun hashCode(): Int {
|
||||
var result = running
|
||||
result = 31 * result + remaining
|
||||
result = 31 * result + error
|
||||
result = 31 * result + loggedUser.hashCode()
|
||||
result = 31 * result + downloadSpeed.hashCode()
|
||||
return result
|
||||
}
|
||||
}
|
||||
@@ -1,37 +0,0 @@
|
||||
package me.mnlr.vripper.model
|
||||
|
||||
class Settings {
|
||||
var maxEventLog: Int = 1_000
|
||||
var connectionSettings = ConnectionSettings()
|
||||
var downloadSettings = DownloadSettings()
|
||||
var viperSettings = ViperSettings()
|
||||
var 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 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: Int = 30,
|
||||
var maxAttempts: Int = 3,
|
||||
)
|
||||
|
||||
data class ClipboardSettings(var enable: Boolean = false, var pollingRate: Int = 500)
|
||||
@@ -1,9 +0,0 @@
|
||||
package me.mnlr.vripper.model
|
||||
|
||||
data class ThreadItem(
|
||||
val threadId: String,
|
||||
val title: String,
|
||||
val securityToken: String,
|
||||
val forum: String,
|
||||
val postItemList: List<PostItem>
|
||||
)
|
||||
@@ -1,79 +0,0 @@
|
||||
package me.mnlr.vripper.parser
|
||||
|
||||
import net.jodah.failsafe.Failsafe
|
||||
import net.jodah.failsafe.function.CheckedSupplier
|
||||
import org.apache.http.client.HttpClient
|
||||
import org.apache.http.client.methods.CloseableHttpResponse
|
||||
import org.apache.http.client.methods.HttpGet
|
||||
import org.apache.http.client.protocol.HttpClientContext
|
||||
import org.apache.http.client.utils.URIBuilder
|
||||
import org.apache.http.util.EntityUtils
|
||||
import me.mnlr.vripper.SpringContext
|
||||
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 java.io.BufferedInputStream
|
||||
import java.net.URISyntaxException
|
||||
import java.util.*
|
||||
import javax.xml.parsers.SAXParserFactory
|
||||
|
||||
class ThreadLookupAPIParser(private val threadId: String) {
|
||||
private val log by LoggerDelegate()
|
||||
private val cm: HTTPService = SpringContext.getBean(HTTPService::class.java)
|
||||
private val retryPolicyService: RetryPolicyService =
|
||||
SpringContext.getBean(RetryPolicyService::class.java)
|
||||
private val vgAuthService: VGAuthService = SpringContext.getBean(VGAuthService::class.java)
|
||||
private val settingsService: SettingsService =
|
||||
SpringContext.getBean(SettingsService::class.java)
|
||||
|
||||
@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.client.build()
|
||||
(connection.execute(
|
||||
httpGet, vgAuthService.context
|
||||
) as CloseableHttpResponse).use { response ->
|
||||
try {
|
||||
if (response.statusLine.statusCode / 100 != 2) {
|
||||
throw DownloadException("Unexpected response code '${response.statusLine.statusCode}' 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()
|
||||
}
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
package me.mnlr.vripper.repositories
|
||||
|
||||
import me.mnlr.vripper.entities.ImageDownloadState
|
||||
import java.util.*
|
||||
|
||||
interface ImageRepository {
|
||||
fun save(imageDownloadState: ImageDownloadState): ImageDownloadState
|
||||
fun deleteAllByPostId(postId: String)
|
||||
fun findByPostId(postId: String): List<ImageDownloadState>
|
||||
fun countError(): Int
|
||||
fun findByPostIdAndIsNotCompleted(postId: String): List<ImageDownloadState>
|
||||
fun stopByPostIdAndIsNotCompleted(postId: String): Int
|
||||
fun findByPostIdAndIsError(postId: String): List<ImageDownloadState>
|
||||
fun findById(id: Long): Optional<ImageDownloadState>
|
||||
fun update(imageDownloadState: ImageDownloadState)
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
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()
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
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
|
||||
}
|
||||
-16
@@ -1,16 +0,0 @@
|
||||
package me.mnlr.vripper.repositories
|
||||
|
||||
import me.mnlr.vripper.entities.PostDownloadState
|
||||
import java.util.*
|
||||
|
||||
interface PostDownloadStateRepository {
|
||||
fun save(postDownloadState: PostDownloadState): PostDownloadState
|
||||
fun findByPostId(postId: String): Optional<PostDownloadState>
|
||||
fun findById(id: Long): Optional<PostDownloadState>
|
||||
fun findCompleted(): List<String>
|
||||
fun findAll(): List<PostDownloadState>
|
||||
fun existByPostId(postId: String): Boolean
|
||||
fun setDownloadingToStopped(): Int
|
||||
fun deleteByPostId(postId: String): Int
|
||||
fun update(postDownloadState: PostDownloadState)
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
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()
|
||||
}
|
||||
-125
@@ -1,125 +0,0 @@
|
||||
package me.mnlr.vripper.repositories.impl
|
||||
|
||||
import org.springframework.jdbc.core.JdbcTemplate
|
||||
import org.springframework.jdbc.core.RowMapper
|
||||
import org.springframework.stereotype.Service
|
||||
import me.mnlr.vripper.SpringContext
|
||||
import me.mnlr.vripper.entities.ImageDownloadState
|
||||
import me.mnlr.vripper.entities.domain.Status
|
||||
import me.mnlr.vripper.event.Event
|
||||
import me.mnlr.vripper.event.EventBus
|
||||
import me.mnlr.vripper.host.Host
|
||||
import me.mnlr.vripper.repositories.ImageRepository
|
||||
import java.sql.ResultSet
|
||||
import java.sql.SQLException
|
||||
import java.util.*
|
||||
|
||||
@Service
|
||||
class ImageRepositoryImpl(
|
||||
private val jdbcTemplate: JdbcTemplate, private val eventBus: EventBus
|
||||
) : ImageRepository {
|
||||
@Synchronized
|
||||
private fun nextId(): Long {
|
||||
return jdbcTemplate.queryForObject("CALL NEXT VALUE FOR SEQ_IMAGE", Long::class.java)!!
|
||||
}
|
||||
|
||||
override fun save(imageDownloadState: ImageDownloadState): ImageDownloadState {
|
||||
val id = nextId()
|
||||
jdbcTemplate.update(
|
||||
"INSERT INTO IMAGE (ID, CURRENT, HOST, INDEX, POST_ID, STATUS, TOTAL, URL, POST_ID_REF) VALUES (?,?,?,?,?,?,?,?,?)",
|
||||
id,
|
||||
imageDownloadState.current,
|
||||
imageDownloadState.host.host,
|
||||
imageDownloadState.index,
|
||||
imageDownloadState.postId,
|
||||
imageDownloadState.status.name,
|
||||
imageDownloadState.total,
|
||||
imageDownloadState.url,
|
||||
imageDownloadState.postIdRef
|
||||
)
|
||||
imageDownloadState.id = id
|
||||
eventBus.publishEvent(Event(Event.Kind.IMAGE_UPDATE, id))
|
||||
return imageDownloadState
|
||||
}
|
||||
|
||||
override fun deleteAllByPostId(postId: String) {
|
||||
jdbcTemplate.update("DELETE FROM IMAGE WHERE POST_ID = ?", postId)
|
||||
}
|
||||
|
||||
override fun findByPostId(postId: String): List<ImageDownloadState> {
|
||||
return jdbcTemplate.query(
|
||||
"SELECT * FROM IMAGE WHERE POST_ID = ?", ImageRowMapper(), postId
|
||||
)
|
||||
}
|
||||
|
||||
override fun countError(): Int {
|
||||
return jdbcTemplate.queryForObject(
|
||||
"SELECT COUNT(*) FROM IMAGE AS image WHERE image.STATUS = ?", Int::class.java, Status.ERROR.name
|
||||
)
|
||||
}
|
||||
|
||||
override fun findByPostIdAndIsNotCompleted(postId: String): List<ImageDownloadState> {
|
||||
return jdbcTemplate.query(
|
||||
"SELECT * FROM IMAGE AS image WHERE image.POST_ID = ? AND image.STATUS <> ?",
|
||||
ImageRowMapper(),
|
||||
postId,
|
||||
Status.FINISHED.name
|
||||
)
|
||||
}
|
||||
|
||||
override fun stopByPostIdAndIsNotCompleted(postId: String): Int {
|
||||
return jdbcTemplate.update(
|
||||
"UPDATE IMAGE AS image SET image.STATUS = ? WHERE image.POST_ID = ? AND image.STATUS <> ?",
|
||||
Status.STOPPED.name,
|
||||
postId,
|
||||
Status.FINISHED.name
|
||||
)
|
||||
}
|
||||
|
||||
override fun findByPostIdAndIsError(postId: String): List<ImageDownloadState> {
|
||||
return jdbcTemplate.query(
|
||||
"SELECT * FROM IMAGE AS image WHERE image.POST_ID = ? AND image.STATUS = ?",
|
||||
ImageRowMapper(),
|
||||
postId,
|
||||
Status.ERROR.name
|
||||
)
|
||||
}
|
||||
|
||||
override fun findById(id: Long): Optional<ImageDownloadState> {
|
||||
val images = jdbcTemplate.query(
|
||||
"SELECT * FROM IMAGE AS image WHERE image.ID = ?", ImageRowMapper(), id
|
||||
)
|
||||
return if (images.isEmpty()) {
|
||||
Optional.empty()
|
||||
} else {
|
||||
Optional.of(images[0])
|
||||
}
|
||||
}
|
||||
|
||||
override fun update(imageDownloadState: ImageDownloadState) {
|
||||
jdbcTemplate.update(
|
||||
"UPDATE IMAGE AS image SET image.STATUS = ?, image.CURRENT = ?, image.TOTAL = ? WHERE image.ID = ?",
|
||||
imageDownloadState.status.name,
|
||||
imageDownloadState.current,
|
||||
imageDownloadState.total,
|
||||
imageDownloadState.id
|
||||
)
|
||||
eventBus.publishEvent(Event(Event.Kind.IMAGE_UPDATE, imageDownloadState.id))
|
||||
}
|
||||
}
|
||||
|
||||
internal class ImageRowMapper : RowMapper<ImageDownloadState> {
|
||||
@Throws(SQLException::class)
|
||||
override fun mapRow(rs: ResultSet, rowNum: Int): ImageDownloadState {
|
||||
val id = rs.getLong("ID")
|
||||
val postId = rs.getString("POST_ID")
|
||||
val url = rs.getString("URL")
|
||||
val host = SpringContext.getBeansOfType(Host::class.java).values.filter { it.host == rs.getString("HOST") }[0]
|
||||
val index = rs.getInt("INDEX")
|
||||
val current = rs.getLong("CURRENT")
|
||||
val total = rs.getLong("TOTAL")
|
||||
val status = Status.valueOf(rs.getString("STATUS"))
|
||||
val postIdRef = rs.getLong("POST_ID_REF")
|
||||
return ImageDownloadState(id, postId, url, host, index, postIdRef, total, current, status)
|
||||
}
|
||||
}
|
||||
-107
@@ -1,107 +0,0 @@
|
||||
package me.mnlr.vripper.repositories.impl
|
||||
|
||||
import org.springframework.jdbc.core.JdbcTemplate
|
||||
import org.springframework.jdbc.core.RowMapper
|
||||
import org.springframework.stereotype.Service
|
||||
import me.mnlr.vripper.delegate.LoggerDelegate
|
||||
import me.mnlr.vripper.entities.LogEvent
|
||||
import me.mnlr.vripper.event.Event
|
||||
import me.mnlr.vripper.event.EventBus
|
||||
import me.mnlr.vripper.repositories.LogEventRepository
|
||||
import me.mnlr.vripper.services.SettingsService
|
||||
import java.sql.ResultSet
|
||||
import java.sql.SQLException
|
||||
import java.time.LocalDateTime
|
||||
import java.time.format.DateTimeFormatter
|
||||
import java.util.*
|
||||
|
||||
@Service
|
||||
class LogEventRepositoryImpl(
|
||||
private val jdbcTemplate: JdbcTemplate,
|
||||
private val settingsService: SettingsService,
|
||||
private val eventBus: EventBus
|
||||
) : LogEventRepository {
|
||||
|
||||
private val log by LoggerDelegate()
|
||||
|
||||
@Synchronized
|
||||
private fun nextId(): Long {
|
||||
return jdbcTemplate.queryForObject("CALL NEXT VALUE FOR SEQ_EVENT", Long::class.java)!!
|
||||
}
|
||||
|
||||
@Synchronized
|
||||
override fun save(logEvent: LogEvent): LogEvent {
|
||||
val maxRecords = settingsService.settings.maxEventLog - 1
|
||||
val count = jdbcTemplate.queryForObject("SELECT COUNT(*) FROM EVENT", Long::class.java) ?: 0
|
||||
if (count > maxRecords) {
|
||||
val idList = jdbcTemplate.queryForList(
|
||||
"SELECT ID FROM EVENT ORDER BY TIME ASC LIMIT ?",
|
||||
Long::class.java,
|
||||
count - maxRecords
|
||||
)
|
||||
idList.forEach { delete(it) }
|
||||
}
|
||||
val id = nextId()
|
||||
jdbcTemplate.update(
|
||||
"INSERT INTO EVENT (ID, TYPE, STATUS, TIME, MESSAGE) VALUES (?,?,?,?,?)",
|
||||
id,
|
||||
logEvent.type.name,
|
||||
logEvent.status.name,
|
||||
logEvent.time.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
|
||||
logEvent.message
|
||||
)
|
||||
eventBus.publishEvent(Event(Event.Kind.LOG_EVENT_UPDATE, id))
|
||||
return logEvent.copy(id = id)
|
||||
}
|
||||
|
||||
override fun update(logEvent: LogEvent): LogEvent {
|
||||
if (logEvent.id == null) {
|
||||
log.warn("Cannot update entity with null id")
|
||||
return logEvent
|
||||
}
|
||||
jdbcTemplate.update(
|
||||
"UPDATE EVENT SET STATUS = ?, MESSAGE = ? WHERE ID = ?",
|
||||
logEvent.status.name,
|
||||
logEvent.message,
|
||||
logEvent.id
|
||||
)
|
||||
eventBus.publishEvent(Event(Event.Kind.LOG_EVENT_UPDATE, logEvent.id))
|
||||
return logEvent
|
||||
}
|
||||
|
||||
override fun findById(id: Long): Optional<LogEvent> {
|
||||
val logEvents =
|
||||
jdbcTemplate.query("SELECT * FROM EVENT WHERE ID = ?", LogEventRowMapper(), id)
|
||||
return if (logEvents.isEmpty()) {
|
||||
Optional.empty()
|
||||
} else {
|
||||
Optional.of(logEvents[0])
|
||||
}
|
||||
}
|
||||
|
||||
override fun findAll(): List<LogEvent> {
|
||||
return jdbcTemplate.query("SELECT * FROM EVENT", LogEventRowMapper())
|
||||
}
|
||||
|
||||
override fun delete(id: Long) {
|
||||
jdbcTemplate.update("DELETE FROM EVENT WHERE ID = ?", id)
|
||||
eventBus.publishEvent(Event(Event.Kind.LOG_EVENT_REMOVE, id))
|
||||
}
|
||||
|
||||
override fun deleteAll() {
|
||||
jdbcTemplate.update("DELETE FROM EVENT")
|
||||
}
|
||||
}
|
||||
|
||||
internal class LogEventRowMapper : RowMapper<LogEvent> {
|
||||
@Throws(SQLException::class)
|
||||
override fun mapRow(rs: ResultSet, rowNum: Int): LogEvent {
|
||||
val id = rs.getLong("ID")
|
||||
val type = LogEvent.Type.valueOf(rs.getString("TYPE"))
|
||||
val status = LogEvent.Status.valueOf(rs.getString("STATUS"))
|
||||
val time =
|
||||
LocalDateTime.parse(rs.getString("TIME"), DateTimeFormatter.ISO_LOCAL_DATE_TIME)
|
||||
val message = rs.getString("MESSAGE")
|
||||
return LogEvent(id, type, status, time, message)
|
||||
}
|
||||
}
|
||||
-65
@@ -1,65 +0,0 @@
|
||||
package me.mnlr.vripper.repositories.impl
|
||||
|
||||
import org.springframework.jdbc.core.JdbcTemplate
|
||||
import org.springframework.jdbc.core.RowMapper
|
||||
import org.springframework.stereotype.Service
|
||||
import me.mnlr.vripper.entities.Metadata
|
||||
import me.mnlr.vripper.event.Event
|
||||
import me.mnlr.vripper.event.EventBus
|
||||
import me.mnlr.vripper.repositories.*
|
||||
import java.sql.ResultSet
|
||||
import java.sql.SQLException
|
||||
import java.util.*
|
||||
|
||||
@Service
|
||||
class MetadataRepositoryImpl(
|
||||
private val jdbcTemplate: JdbcTemplate,
|
||||
private val eventBus: EventBus
|
||||
) : MetadataRepository {
|
||||
override fun save(metadata: Metadata): Metadata {
|
||||
jdbcTemplate.update(
|
||||
"INSERT INTO METADATA (POST_ID_REF, POST_ID, POSTED_BY, RESOLVED_NAMES) VALUES (?,?,?,?)",
|
||||
metadata.postIdRef,
|
||||
metadata.postId,
|
||||
metadata.postedBy,
|
||||
java.lang.String.join("%sep%", metadata.resolvedNames)
|
||||
)
|
||||
eventBus.publishEvent(Event(Event.Kind.METADATA_UPDATE, metadata.postIdRef))
|
||||
return metadata
|
||||
}
|
||||
|
||||
override fun findByPostId(postId: String): Optional<Metadata> {
|
||||
val metadata = jdbcTemplate.query(
|
||||
"SELECT metadata.* FROM METADATA AS metadata WHERE metadata.POST_ID = ?",
|
||||
MetadataRowMapper(),
|
||||
postId
|
||||
)
|
||||
return if (metadata.isEmpty()) {
|
||||
Optional.empty()
|
||||
} else {
|
||||
Optional.of(metadata[0])
|
||||
}
|
||||
}
|
||||
|
||||
override fun deleteByPostId(postId: String): Int {
|
||||
return jdbcTemplate.update(
|
||||
"DELETE FROM METADATA AS metadata WHERE metadata.POST_ID = ?", postId
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
internal class MetadataRowMapper : RowMapper<Metadata> {
|
||||
@Throws(SQLException::class)
|
||||
override fun mapRow(rs: ResultSet, rowNum: Int): Metadata {
|
||||
val metadata = Metadata()
|
||||
metadata.postIdRef = rs.getLong("POST_ID_REF")
|
||||
metadata.postId = rs.getString("POST_ID")
|
||||
metadata.postedBy = rs.getString("POSTED_BY")
|
||||
val resolvedNames = rs.getString("RESOLVED_NAMES")
|
||||
if (resolvedNames != null && resolvedNames.isNotBlank()) {
|
||||
metadata.resolvedNames =
|
||||
resolvedNames.split("%sep%").dropLastWhile { it.isEmpty() }
|
||||
}
|
||||
return metadata
|
||||
}
|
||||
}
|
||||
-163
@@ -1,163 +0,0 @@
|
||||
package me.mnlr.vripper.repositories.impl
|
||||
|
||||
import org.springframework.jdbc.core.JdbcTemplate
|
||||
import org.springframework.jdbc.core.RowMapper
|
||||
import org.springframework.stereotype.Service
|
||||
import me.mnlr.vripper.entities.PostDownloadState
|
||||
import me.mnlr.vripper.entities.domain.Status
|
||||
import me.mnlr.vripper.event.Event
|
||||
import me.mnlr.vripper.event.EventBus
|
||||
import me.mnlr.vripper.repositories.PostDownloadStateRepository
|
||||
import java.sql.ResultSet
|
||||
import java.sql.SQLException
|
||||
import java.sql.Timestamp
|
||||
import java.util.*
|
||||
|
||||
@Service
|
||||
class PostDownloadStateRepositoryImpl(
|
||||
private val jdbcTemplate: JdbcTemplate, private val eventBus: EventBus
|
||||
) : PostDownloadStateRepository {
|
||||
@Synchronized
|
||||
private fun nextId(): Long {
|
||||
return jdbcTemplate.queryForObject("CALL NEXT VALUE FOR SEQ_POST", Long::class.java)!!
|
||||
}
|
||||
|
||||
override fun save(postDownloadState: PostDownloadState): PostDownloadState {
|
||||
val id = nextId()
|
||||
jdbcTemplate.update(
|
||||
"INSERT INTO POST (ID, DONE, HOSTS, POST_FOLDER_NAME, POST_ID, STATUS, THREAD_ID, POST_TITLE, THREAD_TITLE, FORUM, TOTAL, URL, TOKEN, ADDED_ON, RANK) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
|
||||
id,
|
||||
postDownloadState.done,
|
||||
java.lang.String.join(";", postDownloadState.hosts),
|
||||
postDownloadState.downloadDirectory,
|
||||
postDownloadState.postId,
|
||||
postDownloadState.status.name,
|
||||
postDownloadState.threadId,
|
||||
postDownloadState.postTitle,
|
||||
postDownloadState.threadTitle,
|
||||
postDownloadState.forum,
|
||||
postDownloadState.total,
|
||||
postDownloadState.url,
|
||||
postDownloadState.token,
|
||||
Timestamp.valueOf(postDownloadState.addedOn),
|
||||
postDownloadState.rank
|
||||
)
|
||||
eventBus.publishEvent(Event(Event.Kind.POST_UPDATE, id))
|
||||
return postDownloadState.copy(id = id)
|
||||
}
|
||||
|
||||
override fun findByPostId(postId: String): Optional<PostDownloadState> {
|
||||
val post = jdbcTemplate.query(
|
||||
"SELECT metadata.*,post.* FROM METADATA metadata FULL JOIN POST post ON metadata.POST_ID_REF = post.ID WHERE post.POST_ID = ?",
|
||||
PostRowMapper(),
|
||||
postId
|
||||
)
|
||||
return if (post.isEmpty()) {
|
||||
Optional.empty()
|
||||
} else {
|
||||
Optional.of(post[0])
|
||||
}
|
||||
}
|
||||
|
||||
override fun findCompleted(): List<String> {
|
||||
return jdbcTemplate.query(
|
||||
"SELECT POST_ID FROM POST AS post WHERE status = ? AND done >= total",
|
||||
{ rs: ResultSet, _: Int -> rs.getString("POST_ID") },
|
||||
Status.FINISHED.name
|
||||
)
|
||||
}
|
||||
|
||||
override fun findById(id: Long): Optional<PostDownloadState> {
|
||||
val post = jdbcTemplate.query(
|
||||
"SELECT metadata.*,post.* FROM METADATA metadata FULL JOIN POST post ON metadata.POST_ID_REF = post.ID WHERE post.ID = ?",
|
||||
PostRowMapper(),
|
||||
id
|
||||
)
|
||||
return if (post.isEmpty()) {
|
||||
Optional.empty()
|
||||
} else {
|
||||
Optional.of(post[0])
|
||||
}
|
||||
}
|
||||
|
||||
override fun findAll(): List<PostDownloadState> {
|
||||
return jdbcTemplate.query(
|
||||
"SELECT metadata.*,post.* FROM METADATA metadata FULL JOIN POST post ON metadata.POST_ID_REF = post.ID",
|
||||
PostRowMapper()
|
||||
)
|
||||
}
|
||||
|
||||
override fun existByPostId(postId: String): Boolean {
|
||||
val count = jdbcTemplate.queryForObject(
|
||||
"SELECT COUNT(*) FROM POST AS post WHERE post.POST_ID = ?", Int::class.java, postId
|
||||
)
|
||||
return count > 0
|
||||
}
|
||||
|
||||
override fun setDownloadingToStopped(): Int {
|
||||
return jdbcTemplate.update(
|
||||
"UPDATE POST AS post SET post.STATUS = ? WHERE post.STATUS = ? OR post.STATUS = ?",
|
||||
Status.STOPPED.name,
|
||||
Status.DOWNLOADING.name,
|
||||
Status.PENDING.name
|
||||
)
|
||||
}
|
||||
|
||||
override fun deleteByPostId(postId: String): Int {
|
||||
val mutationCount = jdbcTemplate.update("DELETE FROM POST AS post WHERE post.POST_ID = ?", postId)
|
||||
eventBus.publishEvent(Event(Event.Kind.POST_REMOVE, postId))
|
||||
return mutationCount
|
||||
}
|
||||
|
||||
override fun update(postDownloadState: PostDownloadState) {
|
||||
jdbcTemplate.update(
|
||||
"UPDATE POST AS post SET post.STATUS = ?, post.DONE = ?, post.RANK = ? WHERE post.ID = ?",
|
||||
postDownloadState.status.name,
|
||||
postDownloadState.done,
|
||||
postDownloadState.rank,
|
||||
postDownloadState.id
|
||||
)
|
||||
eventBus.publishEvent(Event(Event.Kind.POST_UPDATE, postDownloadState.id))
|
||||
}
|
||||
}
|
||||
|
||||
internal class PostRowMapper : RowMapper<PostDownloadState> {
|
||||
@Throws(SQLException::class)
|
||||
override fun mapRow(rs: ResultSet, rowNum: Int): PostDownloadState {
|
||||
val id = rs.getLong("post.ID")
|
||||
val status = Status.valueOf(rs.getString("post.STATUS"))
|
||||
val postId = rs.getString("post.POST_ID")
|
||||
val threadId = rs.getString("post.THREAD_ID")
|
||||
val postTitle = rs.getString("post.POST_TITLE")
|
||||
val threadTitle = rs.getString("post.THREAD_TITLE")
|
||||
val forum = rs.getString("post.FORUM")
|
||||
val url = rs.getString("post.URL")
|
||||
val token = rs.getString("post.TOKEN")
|
||||
val done = rs.getInt("post.DONE")
|
||||
val total = rs.getInt("post.TOTAL")
|
||||
val hosts = rs.getString("post.HOSTS").split(DELIMITER).dropLastWhile { it.isEmpty() }.toSet()
|
||||
val downloadDirectory = rs.getString("post.POST_FOLDER_NAME")
|
||||
val addedOn = rs.getTimestamp("post.ADDED_ON").toLocalDateTime()
|
||||
val rank = rs.getInt("post.RANK")
|
||||
// val metadataId = rs.getLong("metadata.POST_ID_REF")
|
||||
// if (!rs.wasNull()) {
|
||||
// val metadata = Metadata()
|
||||
// metadata.postIdRef = metadataId
|
||||
// metadata.postId = rs.getString("metadata.POST_ID")
|
||||
// val resolvedNames = rs.getString("metadata.RESOLVED_NAMES")
|
||||
// if (resolvedNames != null && resolvedNames.isNotBlank()) {
|
||||
// metadata.resolvedNames =
|
||||
// resolvedNames.split("%sep%").dropLastWhile { it.isEmpty() }
|
||||
// }
|
||||
// metadata.postedBy = rs.getString("metadata.POSTED_BY")
|
||||
// postDownloadState.metadata = metadata
|
||||
// }
|
||||
return PostDownloadState(
|
||||
id, postTitle, threadTitle, forum, url, token, postId, threadId, total, hosts, downloadDirectory, addedOn, status, done, rank
|
||||
)
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val DELIMITER = ";"
|
||||
}
|
||||
}
|
||||
-87
@@ -1,87 +0,0 @@
|
||||
package me.mnlr.vripper.repositories.impl
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired
|
||||
import org.springframework.jdbc.core.JdbcTemplate
|
||||
import org.springframework.jdbc.core.RowMapper
|
||||
import org.springframework.stereotype.Service
|
||||
import me.mnlr.vripper.entities.Thread
|
||||
import me.mnlr.vripper.event.Event
|
||||
import me.mnlr.vripper.event.EventBus
|
||||
import me.mnlr.vripper.repositories.ThreadRepository
|
||||
import java.sql.ResultSet
|
||||
import java.sql.SQLException
|
||||
import java.util.*
|
||||
|
||||
@Service
|
||||
class ThreadRepositoryImpl @Autowired constructor(
|
||||
private val jdbcTemplate: JdbcTemplate,
|
||||
private val eventBus: EventBus
|
||||
) : ThreadRepository {
|
||||
@Synchronized
|
||||
private fun nextId(): Long {
|
||||
return jdbcTemplate.queryForObject("CALL NEXT VALUE FOR SEQ_THREAD", Long::class.java)!!
|
||||
}
|
||||
|
||||
override fun save(thread: Thread): Thread {
|
||||
val id = nextId()
|
||||
jdbcTemplate.update(
|
||||
"INSERT INTO THREAD (ID, TOTAL, LINK, THREAD_ID) values (?,?,?,?)",
|
||||
id,
|
||||
thread.total,
|
||||
thread.link,
|
||||
thread.threadId
|
||||
)
|
||||
eventBus.publishEvent(Event(Event.Kind.THREAD_UPDATE, id))
|
||||
return thread.copy(id = id)
|
||||
}
|
||||
|
||||
override fun findByThreadId(threadId: String): Optional<Thread> {
|
||||
val threadList = jdbcTemplate.query(
|
||||
"SELECT * FROM THREAD AS thread WHERE thread.THREAD_ID = ?",
|
||||
ThreadRowMapper(),
|
||||
threadId
|
||||
)
|
||||
return if (threadList.isEmpty()) {
|
||||
Optional.empty()
|
||||
} else {
|
||||
Optional.of(threadList[0])
|
||||
}
|
||||
}
|
||||
|
||||
override fun findAll(): List<Thread> {
|
||||
return jdbcTemplate.query("SELECT * FROM THREAD", ThreadRowMapper())
|
||||
}
|
||||
|
||||
override fun findById(id: Long): Optional<Thread> {
|
||||
val threadList = jdbcTemplate.query(
|
||||
"SELECT * FROM THREAD AS thread WHERE thread.ID = ?", ThreadRowMapper(), id
|
||||
)
|
||||
return if (threadList.isEmpty()) {
|
||||
Optional.empty()
|
||||
} else {
|
||||
Optional.of(threadList[0])
|
||||
}
|
||||
}
|
||||
|
||||
override fun deleteByThreadId(threadId: String): Int {
|
||||
val mutationCount =
|
||||
jdbcTemplate.update("DELETE FROM THREAD AS thread WHERE THREAD_ID = ?", threadId)
|
||||
eventBus.publishEvent(Event(Event.Kind.THREAD_REMOVE, threadId))
|
||||
return mutationCount
|
||||
}
|
||||
|
||||
override fun deleteAll() {
|
||||
jdbcTemplate.update("DELETE FROM THREAD")
|
||||
}
|
||||
}
|
||||
|
||||
internal class ThreadRowMapper : RowMapper<Thread> {
|
||||
@Throws(SQLException::class)
|
||||
override fun mapRow(rs: ResultSet, rowNum: Int): Thread {
|
||||
val id = rs.getLong("ID")
|
||||
val link = rs.getString("LINK")
|
||||
val threadId = rs.getString("THREAD_ID")
|
||||
val total = rs.getInt("TOTAL")
|
||||
return Thread(id, link, threadId, total)
|
||||
}
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
package me.mnlr.vripper.services
|
||||
|
||||
import jakarta.annotation.PostConstruct
|
||||
import org.springframework.stereotype.Service
|
||||
import reactor.core.publisher.Sinks
|
||||
import reactor.core.scheduler.Schedulers
|
||||
|
||||
@Service
|
||||
class AsyncTaskRunnerService {
|
||||
val sink = Sinks.many().unicast().onBackpressureBuffer<Runnable>()
|
||||
|
||||
@PostConstruct
|
||||
fun init() {
|
||||
sink.asFlux().subscribeOn(Schedulers.parallel()).subscribe {
|
||||
it.run()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,157 +0,0 @@
|
||||
package me.mnlr.vripper.services
|
||||
|
||||
import me.mnlr.vripper.entities.ImageDownloadState
|
||||
import me.mnlr.vripper.entities.Metadata
|
||||
import me.mnlr.vripper.entities.PostDownloadState
|
||||
import me.mnlr.vripper.entities.Thread
|
||||
import me.mnlr.vripper.entities.domain.Status
|
||||
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.springframework.stereotype.Service
|
||||
import org.springframework.transaction.annotation.Transactional
|
||||
import kotlin.io.path.pathString
|
||||
|
||||
@Service
|
||||
@Transactional
|
||||
class DataTransaction(
|
||||
private val postDownloadStateRepository: PostDownloadStateRepository,
|
||||
private val imageRepository: ImageRepository,
|
||||
private val threadRepository: ThreadRepository,
|
||||
private val metadataRepository: MetadataRepository,
|
||||
private val settingsService: SettingsService,
|
||||
private val pathService: PathService
|
||||
) {
|
||||
private fun save(postDownloadState: PostDownloadState): PostDownloadState {
|
||||
return postDownloadStateRepository.save(postDownloadState)
|
||||
}
|
||||
|
||||
fun update(postDownloadState: PostDownloadState) {
|
||||
postDownloadStateRepository.update(postDownloadState)
|
||||
}
|
||||
|
||||
fun save(thread: Thread): Thread {
|
||||
return threadRepository.save(thread)
|
||||
}
|
||||
|
||||
private fun save(imageDownloadState: ImageDownloadState): ImageDownloadState {
|
||||
return imageRepository.save(imageDownloadState)
|
||||
}
|
||||
|
||||
fun update(imageDownloadState: ImageDownloadState) {
|
||||
imageRepository.update(imageDownloadState)
|
||||
}
|
||||
|
||||
fun exists(postId: String): Boolean {
|
||||
return postDownloadStateRepository.existByPostId(postId)
|
||||
}
|
||||
|
||||
fun newPost(postItem: PostItem): PostDownloadState {
|
||||
val postDownloadState = save(
|
||||
PostDownloadState(
|
||||
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 = pathService.calculateDownloadPath(
|
||||
postItem.forum,
|
||||
postItem.threadTitle,
|
||||
postItem.title,
|
||||
postItem.postId,
|
||||
settingsService.settings
|
||||
).pathString
|
||||
)
|
||||
)
|
||||
val images: MutableList<ImageDownloadState> = mutableListOf()
|
||||
postItem.imageItemList.forEachIndexed { index, imageItem ->
|
||||
val imageDownloadState = ImageDownloadState(
|
||||
postId = postItem.postId,
|
||||
url = imageItem.mainLink,
|
||||
host = imageItem.host,
|
||||
index = index,
|
||||
postIdRef = postDownloadState.id!!
|
||||
)
|
||||
images.add(save(imageDownloadState))
|
||||
}
|
||||
sortPostsByRank()
|
||||
return postDownloadState
|
||||
}
|
||||
|
||||
fun finishPost(postDownloadState: PostDownloadState) {
|
||||
if (imageRepository.findByPostIdAndIsError(postDownloadState.postId).isNotEmpty()) {
|
||||
postDownloadState.status = Status.ERROR
|
||||
update(postDownloadState)
|
||||
} else {
|
||||
if (postDownloadState.done < postDownloadState.total) {
|
||||
postDownloadState.status = Status.STOPPED
|
||||
update(postDownloadState)
|
||||
} else {
|
||||
postDownloadState.status = Status.FINISHED
|
||||
update(postDownloadState)
|
||||
if (settingsService.settings.downloadSettings.clearCompleted) {
|
||||
remove(listOf(postDownloadState.postId))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun remove(postIds: List<String>) {
|
||||
for (postId in postIds) {
|
||||
imageRepository.deleteAllByPostId(postId)
|
||||
metadataRepository.deleteByPostId(postId)
|
||||
postDownloadStateRepository.deleteByPostId(postId)
|
||||
}
|
||||
sortPostsByRank()
|
||||
}
|
||||
|
||||
fun removeThread(threadId: String) {
|
||||
threadRepository.deleteByThreadId(threadId)
|
||||
}
|
||||
|
||||
fun clearCompleted(): List<String> {
|
||||
val completed = postDownloadStateRepository.findCompleted()
|
||||
remove(completed)
|
||||
return completed
|
||||
}
|
||||
|
||||
fun removeAll(postIds: List<String>?) {
|
||||
if (postIds != null) {
|
||||
remove(postIds)
|
||||
} else {
|
||||
remove(postDownloadStateRepository.findAll().map(PostDownloadState::postId))
|
||||
}
|
||||
}
|
||||
|
||||
fun stopImagesByPostIdAndIsNotCompleted(postId: String) {
|
||||
imageRepository.stopByPostIdAndIsNotCompleted(postId)
|
||||
}
|
||||
|
||||
@Synchronized
|
||||
fun setMetadata(postDownloadState: PostDownloadState, metadata: Metadata) {
|
||||
if (metadataRepository.findByPostId(postDownloadState.postId).isEmpty) {
|
||||
metadata.postIdRef = postDownloadState.id
|
||||
metadataRepository.save(metadata)
|
||||
}
|
||||
}
|
||||
|
||||
fun clearQueueLinks() {
|
||||
threadRepository.deleteAll()
|
||||
}
|
||||
|
||||
@Synchronized
|
||||
fun sortPostsByRank() {
|
||||
val postDownloadState =
|
||||
postDownloadStateRepository.findAll().sortedWith(Comparator.comparing(PostDownloadState::addedOn))
|
||||
for (i in postDownloadState.indices) {
|
||||
postDownloadState[i].rank = i
|
||||
update(postDownloadState[i])
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
package me.mnlr.vripper.services
|
||||
|
||||
import org.springframework.scheduling.annotation.Scheduled
|
||||
import org.springframework.stereotype.Service
|
||||
import me.mnlr.vripper.event.Event
|
||||
import me.mnlr.vripper.event.EventBus
|
||||
import java.util.concurrent.atomic.AtomicLong
|
||||
|
||||
@Service
|
||||
class DownloadSpeedService(private val eventBus: EventBus) {
|
||||
private val read = AtomicLong(0)
|
||||
var currentValue = 0L
|
||||
private var allowWrite = false
|
||||
fun increase(read: Long) {
|
||||
if (allowWrite) {
|
||||
this.read.addAndGet(read)
|
||||
}
|
||||
}
|
||||
|
||||
@Scheduled(fixedDelay = 1000)
|
||||
private fun calc() {
|
||||
allowWrite = false
|
||||
val newValue = read.getAndSet(0)
|
||||
if (newValue != currentValue) {
|
||||
currentValue = newValue
|
||||
eventBus.publishEvent(Event(Event.Kind.BYTES_PER_SECOND, currentValue))
|
||||
}
|
||||
allowWrite = true
|
||||
}
|
||||
}
|
||||
@@ -1,44 +0,0 @@
|
||||
package me.mnlr.vripper.services
|
||||
|
||||
import org.springframework.scheduling.annotation.Scheduled
|
||||
import org.springframework.stereotype.Service
|
||||
import me.mnlr.vripper.download.DownloadService
|
||||
import me.mnlr.vripper.event.Event
|
||||
import me.mnlr.vripper.event.EventBus
|
||||
import me.mnlr.vripper.formatSI
|
||||
import me.mnlr.vripper.model.GlobalState
|
||||
import me.mnlr.vripper.repositories.ImageRepository
|
||||
|
||||
@Service
|
||||
class GlobalStateService(
|
||||
private val downloadService: DownloadService,
|
||||
private val imageRepository: ImageRepository,
|
||||
private val eventBus: EventBus,
|
||||
private val vgAuthService: VGAuthService,
|
||||
private val downloadSpeedService: DownloadSpeedService
|
||||
) {
|
||||
private var currentState: GlobalState = newValue()
|
||||
|
||||
@Scheduled(fixedDelay = 200)
|
||||
private fun interval() {
|
||||
val newGlobalState = newValue()
|
||||
if (newGlobalState != currentState) {
|
||||
currentState = newGlobalState
|
||||
eventBus.publishEvent(Event(Event.Kind.DOWNLOAD_STATUS, currentState))
|
||||
}
|
||||
}
|
||||
|
||||
private fun newValue(): GlobalState {
|
||||
return GlobalState(
|
||||
downloadService.runningCount(),
|
||||
downloadService.pendingCount(),
|
||||
imageRepository.countError(),
|
||||
vgAuthService.loggedUser,
|
||||
downloadSpeedService.currentValue.formatSI()
|
||||
)
|
||||
}
|
||||
|
||||
fun get(): GlobalState {
|
||||
return currentState.copy()
|
||||
}
|
||||
}
|
||||
@@ -1,131 +0,0 @@
|
||||
package me.mnlr.vripper.services
|
||||
|
||||
import jakarta.annotation.PreDestroy
|
||||
import org.apache.http.client.config.CookieSpecs
|
||||
import org.apache.http.client.config.RequestConfig
|
||||
import org.apache.http.client.methods.AbstractExecutionAwareRequest
|
||||
import org.apache.http.client.methods.HttpGet
|
||||
import org.apache.http.client.methods.HttpHead
|
||||
import org.apache.http.client.methods.HttpPost
|
||||
import org.apache.http.client.protocol.HttpClientContext
|
||||
import org.apache.http.impl.client.HttpClientBuilder
|
||||
import org.apache.http.impl.client.HttpClients
|
||||
import org.apache.http.impl.client.LaxRedirectStrategy
|
||||
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager
|
||||
import org.springframework.scheduling.annotation.Scheduled
|
||||
import org.springframework.stereotype.Service
|
||||
import reactor.core.Disposable
|
||||
import me.mnlr.vripper.event.Event
|
||||
import me.mnlr.vripper.event.EventBus
|
||||
import me.mnlr.vripper.model.Settings
|
||||
import java.net.URI
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
@Service
|
||||
class HTTPService(eventBus: EventBus, settingsService: SettingsService) {
|
||||
private val disposable: Disposable
|
||||
private lateinit var pcm: PoolingHttpClientConnectionManager
|
||||
private lateinit var rc: RequestConfig
|
||||
private var connectionTimeout: Int = settingsService.settings.connectionSettings.timeout
|
||||
|
||||
init {
|
||||
disposable = eventBus
|
||||
.flux()
|
||||
.filter { it.kind == Event.Kind.SETTINGS_UPDATE }
|
||||
.map { it.data as Settings }
|
||||
.subscribe {
|
||||
if (connectionTimeout != it.connectionSettings.timeout) {
|
||||
connectionTimeout = it.connectionSettings.timeout
|
||||
buildRequestConfig()
|
||||
}
|
||||
}
|
||||
buildRequestConfig()
|
||||
buildConnectionPool()
|
||||
}
|
||||
|
||||
@PreDestroy
|
||||
private fun destroy() {
|
||||
disposable.dispose()
|
||||
}
|
||||
|
||||
private fun buildConnectionPool() {
|
||||
pcm = PoolingHttpClientConnectionManager()
|
||||
pcm.maxTotal = Int.MAX_VALUE
|
||||
pcm.defaultMaxPerRoute = Int.MAX_VALUE
|
||||
}
|
||||
|
||||
private fun buildRequestConfig() {
|
||||
rc = RequestConfig.custom()
|
||||
.setConnectionRequestTimeout(connectionTimeout * 1000)
|
||||
.setConnectTimeout(connectionTimeout * 1000)
|
||||
.setSocketTimeout(connectionTimeout * 1000)
|
||||
.setCookieSpec(CookieSpecs.STANDARD)
|
||||
.build()
|
||||
}
|
||||
|
||||
@Scheduled(fixedDelay = 15000)
|
||||
private fun idleConnectionMonitoring() {
|
||||
pcm.closeIdleConnections(60, TimeUnit.SECONDS)
|
||||
}
|
||||
|
||||
val client: HttpClientBuilder
|
||||
get() = HttpClients.custom()
|
||||
.setConnectionManager(pcm)
|
||||
.setRedirectStrategy(LaxRedirectStrategy())
|
||||
.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 {
|
||||
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: AbstractExecutionAwareRequest) {
|
||||
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<AbstractExecutionAwareRequest> = mutableListOf()
|
||||
|
||||
companion object {
|
||||
const val CONTEXT_ATTRIBUTES = "CONTEXT_ATTRIBUTES"
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val USER_AGENT =
|
||||
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36"
|
||||
}
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
package me.mnlr.vripper.services
|
||||
|
||||
import org.springframework.stereotype.Service
|
||||
import me.mnlr.vripper.delegate.LoggerDelegate
|
||||
import me.mnlr.vripper.model.Settings
|
||||
import java.io.File
|
||||
import java.nio.file.Path
|
||||
|
||||
@Service
|
||||
class PathService {
|
||||
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
|
||||
}
|
||||
|
||||
private fun makeDir(sourceFolder: File): File {
|
||||
var counter = 1
|
||||
var folder = sourceFolder
|
||||
while (folder.exists()) {
|
||||
folder = File(sourceFolder.toString() + '.' + counter++)
|
||||
}
|
||||
if (!folder.mkdirs()) {
|
||||
throw RuntimeException(String.format("Failed to create the folder %s", sourceFolder))
|
||||
}
|
||||
return folder
|
||||
}
|
||||
|
||||
/**
|
||||
* 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
|
||||
}
|
||||
}
|
||||
@@ -1,54 +0,0 @@
|
||||
package me.mnlr.vripper.services
|
||||
|
||||
import jakarta.annotation.PreDestroy
|
||||
import net.jodah.failsafe.RetryPolicy
|
||||
import net.jodah.failsafe.event.ExecutionAttemptedEvent
|
||||
import org.springframework.stereotype.Service
|
||||
import reactor.core.Disposable
|
||||
import me.mnlr.vripper.delegate.LoggerDelegate
|
||||
import me.mnlr.vripper.event.Event
|
||||
import me.mnlr.vripper.event.EventBus
|
||||
import me.mnlr.vripper.model.Settings
|
||||
import java.time.temporal.ChronoUnit
|
||||
|
||||
@Service
|
||||
class RetryPolicyService(eventBus: EventBus, settingsService: SettingsService) {
|
||||
private val log by LoggerDelegate()
|
||||
private val disposable: Disposable
|
||||
private var maxAttempts: Int = settingsService.settings.connectionSettings.maxAttempts
|
||||
|
||||
init {
|
||||
disposable = eventBus
|
||||
.flux()
|
||||
.filter { it.kind == Event.Kind.SETTINGS_UPDATE }
|
||||
.map { it.data as Settings }
|
||||
.subscribe {
|
||||
if (maxAttempts != it.connectionSettings.maxAttempts) {
|
||||
maxAttempts = it.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)
|
||||
}
|
||||
}
|
||||
|
||||
@PreDestroy
|
||||
private fun destroy() {
|
||||
disposable.dispose()
|
||||
}
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
package me.mnlr.vripper.services
|
||||
|
||||
import com.github.benmanes.caffeine.cache.Caffeine
|
||||
import com.github.benmanes.caffeine.cache.LoadingCache
|
||||
import jakarta.annotation.PreDestroy
|
||||
import org.springframework.stereotype.Service
|
||||
import reactor.core.Disposable
|
||||
import me.mnlr.vripper.event.Event
|
||||
import me.mnlr.vripper.event.EventBus
|
||||
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
|
||||
|
||||
@Service
|
||||
class ThreadCacheService(eventBus: EventBus) {
|
||||
private val cache: LoadingCache<String, ThreadItem> =
|
||||
Caffeine.newBuilder().expireAfterWrite(5, TimeUnit.MINUTES)
|
||||
.build { threadId: String ->
|
||||
ThreadLookupAPIParser(threadId).parse()
|
||||
}
|
||||
private val disposable: Disposable
|
||||
|
||||
init {
|
||||
disposable = eventBus.flux().filter { e: Event<*> -> e.kind == Event.Kind.SETTINGS_UPDATE }
|
||||
.subscribe { cache.invalidateAll() }
|
||||
}
|
||||
|
||||
@PreDestroy
|
||||
private fun destroy() {
|
||||
disposable.dispose()
|
||||
}
|
||||
|
||||
@Throws(ExecutionException::class)
|
||||
operator fun get(threadId: String): ThreadItem {
|
||||
return cache[threadId] ?: throw NoSuchElementException("$threadId does not exist")
|
||||
}
|
||||
}
|
||||
@@ -1,151 +0,0 @@
|
||||
package me.mnlr.vripper.services
|
||||
|
||||
import jakarta.annotation.PostConstruct
|
||||
import jakarta.annotation.PreDestroy
|
||||
import me.mnlr.vripper.delegate.LoggerDelegate
|
||||
import me.mnlr.vripper.entities.PostDownloadState
|
||||
import me.mnlr.vripper.event.Event
|
||||
import me.mnlr.vripper.event.EventBus
|
||||
import me.mnlr.vripper.exception.VripperException
|
||||
import me.mnlr.vripper.tasks.LeaveThanksRunnable
|
||||
import org.apache.http.NameValuePair
|
||||
import org.apache.http.client.entity.UrlEncodedFormEntity
|
||||
import org.apache.http.client.protocol.HttpClientContext
|
||||
import org.apache.http.cookie.Cookie
|
||||
import org.apache.http.impl.client.BasicCookieStore
|
||||
import org.apache.http.message.BasicNameValuePair
|
||||
import org.apache.http.util.EntityUtils
|
||||
import org.springframework.stereotype.Service
|
||||
import reactor.core.Disposable
|
||||
|
||||
@Service
|
||||
class VGAuthService(
|
||||
private val cm: HTTPService,
|
||||
private val settingsService: SettingsService,
|
||||
private val asyncTaskRunnerService: AsyncTaskRunnerService,
|
||||
private val eventBus: EventBus
|
||||
) {
|
||||
private val log by LoggerDelegate()
|
||||
private val disposable: Disposable
|
||||
|
||||
final val context: HttpClientContext = HttpClientContext.create()
|
||||
var loggedUser = ""
|
||||
|
||||
var authenticated = false
|
||||
|
||||
init {
|
||||
context.cookieStore = BasicCookieStore()
|
||||
disposable = eventBus
|
||||
.flux()
|
||||
.filter { it.kind == Event.Kind.SETTINGS_UPDATE }
|
||||
.subscribe { authenticate() }
|
||||
}
|
||||
|
||||
@PostConstruct
|
||||
private fun init() {
|
||||
authenticate()
|
||||
}
|
||||
|
||||
@PreDestroy
|
||||
private fun destroy() {
|
||||
disposable.dispose()
|
||||
}
|
||||
|
||||
fun authenticate() {
|
||||
authenticated = false
|
||||
if (!settingsService.settings.viperSettings.login) {
|
||||
log.debug("Authentication option is disabled")
|
||||
context.cookieStore.clear()
|
||||
loggedUser = ""
|
||||
eventBus.publishEvent(Event(Event.Kind.VG_USER, loggedUser))
|
||||
return
|
||||
}
|
||||
val username = settingsService.settings.viperSettings.username
|
||||
val password = settingsService.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(Event(Event.Kind.VG_USER, loggedUser))
|
||||
return
|
||||
}
|
||||
val postAuth =
|
||||
cm.buildHttpPost(
|
||||
settingsService.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(Event(Event.Kind.VG_USER, loggedUser))
|
||||
log.error(
|
||||
"Failed to authenticate user with " + settingsService.settings.viperSettings.host,
|
||||
e
|
||||
)
|
||||
return
|
||||
}
|
||||
postAuth.addHeader("Referer", settingsService.settings.viperSettings.host)
|
||||
postAuth.addHeader(
|
||||
"Host",
|
||||
settingsService.settings.viperSettings.host.replace("https://", "")
|
||||
.replace("http://", "")
|
||||
)
|
||||
val client = cm.client.build()
|
||||
try {
|
||||
client.execute(postAuth, context).use { response ->
|
||||
if (response.statusLine.statusCode / 100 != 2) {
|
||||
throw VripperException(
|
||||
String.format(
|
||||
"Unexpected response code returned %s", response.statusLine.statusCode
|
||||
)
|
||||
)
|
||||
}
|
||||
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",
|
||||
settingsService.settings.viperSettings.host
|
||||
)
|
||||
)
|
||||
return
|
||||
}
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
context.cookieStore.clear()
|
||||
loggedUser = ""
|
||||
eventBus.publishEvent(Event(Event.Kind.VG_USER, loggedUser))
|
||||
log.error(
|
||||
"Failed to authenticate user with " + settingsService.settings.viperSettings.host,
|
||||
e
|
||||
)
|
||||
return
|
||||
}
|
||||
authenticated = true
|
||||
loggedUser = username
|
||||
log.info(String.format("Authenticated: %s", username))
|
||||
eventBus.publishEvent(Event(Event.Kind.VG_USER, loggedUser))
|
||||
}
|
||||
|
||||
fun leaveThanks(post: PostDownloadState) {
|
||||
asyncTaskRunnerService.sink
|
||||
.emitNext(LeaveThanksRunnable(post, authenticated, context)) { _, _ -> true }
|
||||
}
|
||||
}
|
||||
@@ -1,118 +0,0 @@
|
||||
package me.mnlr.vripper.tasks
|
||||
|
||||
import org.apache.http.NameValuePair
|
||||
import org.apache.http.client.entity.UrlEncodedFormEntity
|
||||
import org.apache.http.client.methods.HttpPost
|
||||
import org.apache.http.client.protocol.HttpClientContext
|
||||
import org.apache.http.impl.client.CloseableHttpClient
|
||||
import org.apache.http.message.BasicNameValuePair
|
||||
import org.apache.http.util.EntityUtils
|
||||
import me.mnlr.vripper.SpringContext
|
||||
import me.mnlr.vripper.delegate.LoggerDelegate
|
||||
import me.mnlr.vripper.entities.LogEvent
|
||||
import me.mnlr.vripper.entities.LogEvent.Status.*
|
||||
import me.mnlr.vripper.entities.PostDownloadState
|
||||
import me.mnlr.vripper.formatToString
|
||||
import me.mnlr.vripper.repositories.LogEventRepository
|
||||
import me.mnlr.vripper.services.HTTPService
|
||||
import me.mnlr.vripper.services.SettingsService
|
||||
import java.io.UnsupportedEncodingException
|
||||
|
||||
class LeaveThanksRunnable(
|
||||
private val postDownloadState: PostDownloadState,
|
||||
private val authenticated: Boolean,
|
||||
private val context: HttpClientContext
|
||||
) : Runnable {
|
||||
private val log by LoggerDelegate()
|
||||
private val cm: HTTPService = SpringContext.getBean(HTTPService::class.java)
|
||||
private val settingsService: SettingsService = SpringContext.getBean(SettingsService::class.java)
|
||||
private val eventRepository: LogEventRepository = SpringContext.getBean(LogEventRepository::class.java)
|
||||
private val logEvent: LogEvent
|
||||
|
||||
init {
|
||||
logEvent = eventRepository.save(
|
||||
LogEvent(
|
||||
type = LogEvent.Type.THANKS, status = PENDING, message = "Leaving thanks for $postDownloadState.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 ${postDownloadState.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 ${postDownloadState.url}\nLeave thanks option is disabled"
|
||||
)
|
||||
)
|
||||
return
|
||||
}
|
||||
if (!authenticated) {
|
||||
eventRepository.update(
|
||||
logEvent.copy(
|
||||
status = ERROR,
|
||||
message = "Will not send a like for ${postDownloadState.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", postDownloadState.postId))
|
||||
params.add(BasicNameValuePair("securitytoken", postDownloadState.token))
|
||||
try {
|
||||
postThanks.entity = UrlEncodedFormEntity(params)
|
||||
} catch (e: UnsupportedEncodingException) {
|
||||
val error = "Request error for ${postDownloadState.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.client.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 $postDownloadState"
|
||||
log.error(error, e)
|
||||
eventRepository.update(
|
||||
logEvent.copy(
|
||||
status = ERROR, message = """
|
||||
$error
|
||||
${e.formatToString()}
|
||||
""".trimIndent()
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,107 +0,0 @@
|
||||
package me.mnlr.vripper.tasks
|
||||
|
||||
import me.mnlr.vripper.SpringContext
|
||||
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.repositories.ThreadRepository
|
||||
import me.mnlr.vripper.services.AsyncTaskRunnerService
|
||||
import me.mnlr.vripper.services.DataTransaction
|
||||
import me.mnlr.vripper.services.SettingsService
|
||||
import me.mnlr.vripper.services.ThreadCacheService
|
||||
|
||||
class ThreadLookupRunnable(private val threadId: String, private val settings: Settings) :
|
||||
Runnable {
|
||||
private val log by LoggerDelegate()
|
||||
private val dataTransaction = SpringContext.getBean(DataTransaction::class.java)
|
||||
private val eventRepository = SpringContext.getBean(LogEventRepository::class.java)
|
||||
private val settingsService: SettingsService =
|
||||
SpringContext.getBean(SettingsService::class.java)
|
||||
private val threadCacheService = SpringContext.getBean(
|
||||
ThreadCacheService::class.java
|
||||
)
|
||||
private val threadRepository = SpringContext.getBean(
|
||||
ThreadRepository::class.java
|
||||
)
|
||||
private val asyncTaskRunnerService = SpringContext.getBean(
|
||||
AsyncTaskRunnerService::class.java
|
||||
)
|
||||
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))
|
||||
val threadLookupResult = threadCacheService[threadId]
|
||||
if (threadLookupResult.postItemList.isEmpty()) {
|
||||
val message = "Nothing found for $link"
|
||||
eventRepository.update(logEvent.copy(status = ERROR, message = message))
|
||||
return
|
||||
}
|
||||
if (threadRepository.findByThreadId(threadId).isEmpty) {
|
||||
dataTransaction.save(
|
||||
Thread(
|
||||
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) {
|
||||
lookupResult.postItemList.forEach {
|
||||
Pair(it.threadId, it.postId)
|
||||
asyncTaskRunnerService.sink.emitNext(
|
||||
PostDownloadRunnable(
|
||||
it.threadId, it.postId
|
||||
)
|
||||
) { _, _ -> true }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,116 @@
|
||||
package me.vripper
|
||||
|
||||
import me.vripper.download.DownloadService
|
||||
import me.vripper.event.EventBus
|
||||
import me.vripper.host.*
|
||||
import me.vripper.repositories.*
|
||||
import me.vripper.repositories.impl.*
|
||||
import me.vripper.services.*
|
||||
import org.koin.core.qualifier.named
|
||||
import org.koin.dsl.bind
|
||||
import org.koin.dsl.module
|
||||
|
||||
val coreModule = module {
|
||||
single<EventBus> {
|
||||
EventBus
|
||||
}
|
||||
single<SettingsService> {
|
||||
SettingsService(get())
|
||||
}
|
||||
single<ImageRepository> {
|
||||
ImageRepositoryImpl()
|
||||
}
|
||||
single<PostDownloadStateRepository> {
|
||||
PostDownloadStateRepositoryImpl()
|
||||
}
|
||||
single<MetadataRepository> {
|
||||
MetadataRepositoryImpl()
|
||||
}
|
||||
single<ThreadRepository> {
|
||||
ThreadRepositoryImpl()
|
||||
}
|
||||
single<LogRepository> {
|
||||
LogRepositoryImpl(get())
|
||||
}
|
||||
single<DataTransaction> {
|
||||
DataTransaction(get(), 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((named("localAppEndpointService"))) {
|
||||
AppEndpointService(get(), get(), get(), get(), get())
|
||||
} bind IAppEndpointService::class
|
||||
|
||||
single<MetadataService> {
|
||||
MetadataService(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
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.mnlr.vripper.delegate
|
||||
package me.vripper.delegate
|
||||
|
||||
import org.slf4j.Logger
|
||||
import org.slf4j.LoggerFactory
|
||||
@@ -0,0 +1,299 @@
|
||||
package me.vripper.download
|
||||
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Runnable
|
||||
import kotlinx.coroutines.SupervisorJob
|
||||
import kotlinx.coroutines.launch
|
||||
import me.vripper.entities.ImageEntity
|
||||
import me.vripper.entities.LogEntryEntity
|
||||
import me.vripper.entities.PostEntity
|
||||
import me.vripper.entities.domain.Status
|
||||
import me.vripper.event.ErrorCountEvent
|
||||
import me.vripper.event.EventBus
|
||||
import me.vripper.event.QueueStateEvent
|
||||
import me.vripper.event.StoppedEvent
|
||||
import me.vripper.host.Host
|
||||
import me.vripper.model.ErrorCount
|
||||
import me.vripper.model.QueueState
|
||||
import me.vripper.services.DataTransaction
|
||||
import me.vripper.services.RetryPolicyService
|
||||
import me.vripper.services.SettingsService
|
||||
import me.vripper.services.VGAuthService
|
||||
import me.vripper.utilities.GLOBAL_EXECUTOR
|
||||
import me.vripper.utilities.formatToString
|
||||
import net.jodah.failsafe.Failsafe
|
||||
import net.jodah.failsafe.RetryPolicy
|
||||
import org.jetbrains.exposed.sql.transactions.transaction
|
||||
import java.util.concurrent.CompletableFuture
|
||||
import java.util.concurrent.locks.ReentrantLock
|
||||
import kotlin.concurrent.withLock
|
||||
|
||||
class DownloadService(
|
||||
private val settingsService: SettingsService,
|
||||
private val dataTransaction: DataTransaction,
|
||||
private val retryPolicyService: RetryPolicyService,
|
||||
private val vgAuthService: VGAuthService,
|
||||
private val eventBus: EventBus
|
||||
) {
|
||||
private val maxPoolSize: Int = 24
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
private val running: MutableMap<Byte, MutableList<ImageDownloadRunnable>> = mutableMapOf()
|
||||
private val pending: MutableMap<Byte, MutableList<ImageDownloadRunnable>> = mutableMapOf()
|
||||
private val lock = ReentrantLock()
|
||||
private val condition = lock.newCondition()
|
||||
private val coroutineScope = CoroutineScope(SupervisorJob())
|
||||
|
||||
init {
|
||||
Thread.ofVirtual().name("Download Loop").unstarted(Runnable {
|
||||
val accepted: MutableList<ImageDownloadRunnable> = mutableListOf()
|
||||
val candidates: MutableList<ImageDownloadRunnable> = mutableListOf()
|
||||
while (!Thread.currentThread().isInterrupted) {
|
||||
lock.withLock {
|
||||
candidates.addAll(getCandidates(candidateCount()))
|
||||
candidates.forEach {
|
||||
if (canRun(it.context.imageEntity.host)) {
|
||||
accepted.add(it)
|
||||
running[it.context.imageEntity.host]!!.add(it)
|
||||
log.debug("${it.context.imageEntity.url} accepted to run")
|
||||
}
|
||||
}
|
||||
accepted.forEach {
|
||||
pending[it.context.imageEntity.host]?.remove(it)
|
||||
scheduleForDownload(it)
|
||||
}
|
||||
accepted.clear()
|
||||
candidates.clear()
|
||||
try {
|
||||
condition.await()
|
||||
} catch (e: InterruptedException) {
|
||||
Thread.currentThread().interrupt()
|
||||
}
|
||||
}
|
||||
}
|
||||
}).start()
|
||||
}
|
||||
|
||||
fun stop(postIds: List<Long> = emptyList()) {
|
||||
if (postIds.isNotEmpty()) {
|
||||
stopInternal(postIds)
|
||||
coroutineScope.launch {
|
||||
eventBus.publishEvent(StoppedEvent(postIds))
|
||||
}
|
||||
} else {
|
||||
stopAll()
|
||||
coroutineScope.launch {
|
||||
eventBus.publishEvent(StoppedEvent(listOf(-1)))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun restartAll(postEntityIds: List<PostEntity> = emptyList()) {
|
||||
if (postEntityIds.isNotEmpty()) {
|
||||
restart(postEntityIds.associateWith { dataTransaction.findByPostIdAndIsNotCompleted(it.postId) })
|
||||
} else {
|
||||
restart(dataTransaction.findAllPosts()
|
||||
.associateWith { dataTransaction.findByPostIdAndIsNotCompleted(it.postId) })
|
||||
}
|
||||
}
|
||||
|
||||
private fun restart(posts: Map<PostEntity, List<ImageEntity>>) {
|
||||
lock.withLock {
|
||||
val toProcess = mutableMapOf<PostEntity, List<ImageEntity>>()
|
||||
|
||||
for ((post, images) in posts) {
|
||||
if (images.isEmpty()) {
|
||||
continue
|
||||
}
|
||||
if (isPending(post.postId)) {
|
||||
continue
|
||||
}
|
||||
toProcess[post] = images
|
||||
}
|
||||
|
||||
toProcess.forEach { (post, images) ->
|
||||
post.status = Status.PENDING
|
||||
images.forEach { image ->
|
||||
with(image) {
|
||||
this.status = Status.PENDING
|
||||
this.downloaded = 0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
transaction {
|
||||
dataTransaction.updatePosts(
|
||||
toProcess.keys.toList()
|
||||
)
|
||||
dataTransaction.updateImages(
|
||||
toProcess.values.flatten()
|
||||
)
|
||||
}
|
||||
|
||||
toProcess.keys.forEach {
|
||||
vgAuthService.leaveThanks(it)
|
||||
}
|
||||
|
||||
|
||||
toProcess.entries.forEach { (post, images) ->
|
||||
images.forEach { image ->
|
||||
log.debug("Enqueuing a job for ${image.url}")
|
||||
val imageDownloadRunnable = ImageDownloadRunnable(
|
||||
image, post.rank, settingsService.settings
|
||||
)
|
||||
pending.computeIfAbsent(
|
||||
image.host
|
||||
) { mutableListOf() }
|
||||
pending[image.host]!!.add(imageDownloadRunnable)
|
||||
}
|
||||
}
|
||||
|
||||
condition.signal()
|
||||
}
|
||||
}
|
||||
|
||||
private fun isPending(postId: Long): Boolean {
|
||||
return pending.values.flatten().any { it.context.imageEntity.postId == postId }
|
||||
}
|
||||
|
||||
private fun isRunning(postId: Long): Boolean {
|
||||
return running.values.flatten().any { it.context.imageEntity.postId == postId }
|
||||
}
|
||||
|
||||
private fun stopAll() {
|
||||
lock.withLock {
|
||||
pending.values.clear()
|
||||
running.values.flatten().forEach { obj: ImageDownloadRunnable -> obj.stop() }
|
||||
dataTransaction.findAllNonCompletedPostIds().forEach {
|
||||
dataTransaction.stopImagesByPostIdAndIsNotCompleted(it)
|
||||
dataTransaction.finishPost(it)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun stopInternal(postIds: List<Long>) {
|
||||
lock.withLock {
|
||||
for (postId in postIds) {
|
||||
pending.values.forEach { pending ->
|
||||
pending.removeIf { it.context.imageEntity.postId == postId }
|
||||
}
|
||||
running.values.flatten()
|
||||
.filter { p: ImageDownloadRunnable -> p.context.imageEntity.postId == postId }
|
||||
.forEach { obj: ImageDownloadRunnable -> obj.stop() }
|
||||
}
|
||||
postIds.forEach {
|
||||
dataTransaction.stopImagesByPostIdAndIsNotCompleted(it)
|
||||
dataTransaction.finishPost(it)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun canRun(host: Byte): Boolean {
|
||||
val totalRunning = running.values.sumOf { it.size }
|
||||
return (running[host]!!.size < settingsService.settings.connectionSettings.maxConcurrentPerHost && if (settingsService.settings.connectionSettings.maxGlobalConcurrent == 0) totalRunning < maxPoolSize else totalRunning < settingsService.settings.connectionSettings.maxGlobalConcurrent)
|
||||
}
|
||||
|
||||
private fun candidateCount(): Map<Byte, Int> {
|
||||
val map: MutableMap<Byte, Int> = mutableMapOf()
|
||||
Host.getHosts().values.forEach { host: Byte ->
|
||||
val imageDownloadRunnableList: List<ImageDownloadRunnable> = running.computeIfAbsent(
|
||||
host
|
||||
) { mutableListOf() }
|
||||
val count: Int =
|
||||
settingsService.settings.connectionSettings.maxConcurrentPerHost - imageDownloadRunnableList.size
|
||||
log.debug("Download slots for $host: $count")
|
||||
map[host] = count
|
||||
}
|
||||
return map
|
||||
}
|
||||
|
||||
private fun getCandidates(candidateCount: Map<Byte, Int>): List<ImageDownloadRunnable> {
|
||||
val hostIntegerMap: MutableMap<Byte, Int> = candidateCount.toMutableMap()
|
||||
val candidates: MutableList<ImageDownloadRunnable> = mutableListOf()
|
||||
hosts@ for (host in pending.keys) {
|
||||
|
||||
val list: List<ImageDownloadRunnable> =
|
||||
pending[host]!!.sortedWith(Comparator.comparingInt<ImageDownloadRunnable> { it.postRank }
|
||||
.thenComparingInt { it.context.imageEntity.index })
|
||||
|
||||
for (imageDownloadRunnable in list) {
|
||||
val count = hostIntegerMap[host] ?: 0
|
||||
if (count > 0) {
|
||||
candidates.add(imageDownloadRunnable)
|
||||
hostIntegerMap[host] = count - 1
|
||||
} else {
|
||||
continue@hosts
|
||||
}
|
||||
}
|
||||
}
|
||||
return candidates
|
||||
}
|
||||
|
||||
private fun scheduleForDownload(imageDownloadRunnable: ImageDownloadRunnable) {
|
||||
log.debug("Scheduling a job for ${imageDownloadRunnable.context.imageEntity.url}")
|
||||
CompletableFuture.runAsync({
|
||||
coroutineScope.launch {
|
||||
eventBus.publishEvent(QueueStateEvent(QueueState(runningCount(), pendingCount())))
|
||||
}
|
||||
Failsafe.with<Any, RetryPolicy<Any>>(retryPolicyService.buildRetryPolicyForDownload())
|
||||
.onFailure {
|
||||
try {
|
||||
dataTransaction.saveLog(
|
||||
LogEntryEntity(
|
||||
type = LogEntryEntity.Type.DOWNLOAD,
|
||||
status = LogEntryEntity.Status.ERROR,
|
||||
message = "Failed to download ${imageDownloadRunnable.context.imageEntity.url}\n ${it.failure.formatToString()}"
|
||||
)
|
||||
)
|
||||
} catch (exp: Exception) {
|
||||
log.error("Failed to save event", exp)
|
||||
}
|
||||
log.error(
|
||||
"Failed to download ${imageDownloadRunnable.context.imageEntity.url} after ${it.attemptCount} tries",
|
||||
it.failure
|
||||
)
|
||||
val image = imageDownloadRunnable.context.imageEntity
|
||||
image.status = Status.ERROR
|
||||
dataTransaction.updateImage(image)
|
||||
}.onComplete {
|
||||
afterJobFinish(imageDownloadRunnable)
|
||||
coroutineScope.launch {
|
||||
eventBus.publishEvent(
|
||||
QueueStateEvent(
|
||||
QueueState(
|
||||
runningCount(), pendingCount()
|
||||
)
|
||||
)
|
||||
)
|
||||
}
|
||||
coroutineScope.launch {
|
||||
eventBus.publishEvent(ErrorCountEvent(ErrorCount(dataTransaction.countImagesInError())))
|
||||
}
|
||||
log.debug(
|
||||
"Finished downloading ${imageDownloadRunnable.context.imageEntity.url}"
|
||||
)
|
||||
}.run(imageDownloadRunnable::run)
|
||||
}, GLOBAL_EXECUTOR)
|
||||
}
|
||||
|
||||
private fun afterJobFinish(imageDownloadRunnable: ImageDownloadRunnable) {
|
||||
lock.withLock {
|
||||
val image = imageDownloadRunnable.context.imageEntity
|
||||
running[image.host]!!.remove(imageDownloadRunnable)
|
||||
if (!isPending(image.postId) && !isRunning(
|
||||
image.postId
|
||||
) && !imageDownloadRunnable.context.stopped
|
||||
) {
|
||||
dataTransaction.finishPost(image.postId, true)
|
||||
}
|
||||
condition.signal()
|
||||
}
|
||||
}
|
||||
|
||||
private fun pendingCount(): Int {
|
||||
return pending.values.sumOf { it.size }
|
||||
}
|
||||
|
||||
private fun runningCount(): Int {
|
||||
return running.values.sumOf { it.size }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package me.vripper.download
|
||||
|
||||
import me.vripper.entities.ImageEntity
|
||||
import me.vripper.model.Settings
|
||||
import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase
|
||||
import org.apache.hc.client5.http.cookie.BasicCookieStore
|
||||
import org.apache.hc.client5.http.protocol.HttpClientContext
|
||||
import org.koin.core.component.KoinComponent
|
||||
|
||||
class ImageDownloadContext(val imageEntity: ImageEntity, val settings: Settings) : KoinComponent {
|
||||
|
||||
val httpContext: HttpClientContext =
|
||||
HttpClientContext.create().apply { cookieStore = BasicCookieStore() }
|
||||
val requests = mutableListOf<HttpUriRequestBase>()
|
||||
val postId = imageEntity.postIdRef
|
||||
var stopped = false
|
||||
}
|
||||
@@ -0,0 +1,149 @@
|
||||
package me.vripper.download
|
||||
|
||||
import kotlinx.coroutines.*
|
||||
import me.vripper.entities.ImageEntity
|
||||
import me.vripper.entities.domain.Status
|
||||
import me.vripper.exception.DownloadException
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.host.DownloadedImage
|
||||
import me.vripper.host.Host
|
||||
import me.vripper.host.ImageMimeType
|
||||
import me.vripper.model.Settings
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.PathUtils.getExtension
|
||||
import me.vripper.utilities.PathUtils.getFileNameWithoutExtension
|
||||
import me.vripper.utilities.PathUtils.sanitize
|
||||
import net.jodah.failsafe.function.CheckedRunnable
|
||||
import org.koin.core.component.KoinComponent
|
||||
import org.koin.core.component.inject
|
||||
import java.io.IOException
|
||||
import java.nio.file.Files
|
||||
import java.nio.file.Path
|
||||
import java.nio.file.StandardCopyOption
|
||||
import java.util.*
|
||||
import kotlin.io.path.Path
|
||||
import kotlin.io.path.pathString
|
||||
|
||||
class ImageDownloadRunnable(
|
||||
private val imageEntity: ImageEntity, val postRank: Int, private val settings: Settings
|
||||
) : KoinComponent, CheckedRunnable {
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
|
||||
private val dataTransaction: DataTransaction by inject()
|
||||
private val hosts: List<Host> = getKoin().getAll()
|
||||
|
||||
val context: ImageDownloadContext = ImageDownloadContext(imageEntity, settings)
|
||||
private var stopped: Boolean
|
||||
get() = context.stopped
|
||||
set(value) {
|
||||
context.stopped = value
|
||||
}
|
||||
|
||||
@Throws(DownloadException::class)
|
||||
fun download() {
|
||||
try {
|
||||
imageEntity.status = Status.DOWNLOADING
|
||||
imageEntity.downloaded = 0
|
||||
dataTransaction.updateImage(imageEntity)
|
||||
synchronized(imageEntity.postId.toString().intern()) {
|
||||
val post = dataTransaction.findPostById(context.postId).orElseThrow()
|
||||
if (post.status != Status.DOWNLOADING) {
|
||||
post.status = Status.DOWNLOADING
|
||||
dataTransaction.updatePost(post)
|
||||
}
|
||||
}
|
||||
log.debug("Getting image url and name from ${imageEntity.url} using ${imageEntity.host}")
|
||||
val host = hosts.first { it.isSupported(imageEntity.url) }
|
||||
val downloadedImage = host.downloadInternal(imageEntity.url, context)
|
||||
log.debug("Resolved name for ${imageEntity.url}: ${downloadedImage.name}")
|
||||
log.debug("Downloaded image {} to {}", imageEntity.url, downloadedImage.path)
|
||||
synchronized(imageEntity.postId.toString().intern()) {
|
||||
val post = dataTransaction.findPostById(context.postId).orElseThrow()
|
||||
val downloadDirectory = Path(post.downloadDirectory, post.folderName).pathString
|
||||
checkImageTypeAndRename(
|
||||
downloadDirectory, downloadedImage, imageEntity.index
|
||||
)
|
||||
if (imageEntity.downloaded == imageEntity.size && imageEntity.size > 0) {
|
||||
imageEntity.status = Status.FINISHED
|
||||
post.done += 1
|
||||
post.downloaded += imageEntity.size
|
||||
dataTransaction.updatePost(post)
|
||||
} else {
|
||||
imageEntity.status = Status.ERROR
|
||||
}
|
||||
dataTransaction.updateImage(imageEntity)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
if (stopped) {
|
||||
return
|
||||
}
|
||||
imageEntity.status = Status.ERROR
|
||||
dataTransaction.updateImage(imageEntity)
|
||||
throw DownloadException(e)
|
||||
}
|
||||
}
|
||||
|
||||
@Throws(HostException::class)
|
||||
private fun checkImageTypeAndRename(
|
||||
downloadDirectory: String, downloadedImage: DownloadedImage, index: Int
|
||||
) {
|
||||
val existingExtension = getExtension(downloadedImage.name).lowercase()
|
||||
val fileNameWithoutExtension = getFileNameWithoutExtension(downloadedImage.name)
|
||||
val extension = when (downloadedImage.type) {
|
||||
ImageMimeType.IMAGE_BMP -> "BMP"
|
||||
ImageMimeType.IMAGE_GIF -> "GIF"
|
||||
ImageMimeType.IMAGE_JPEG -> "JPG"
|
||||
ImageMimeType.IMAGE_PNG -> "PNG"
|
||||
ImageMimeType.IMAGE_WEBP -> "WEBP"
|
||||
}
|
||||
val filename =
|
||||
if (existingExtension.isBlank()) "${sanitize(downloadedImage.name)}.$extension" else "${
|
||||
sanitize(
|
||||
fileNameWithoutExtension
|
||||
)
|
||||
}.$extension"
|
||||
try {
|
||||
val downloadDestinationFolder = Path.of(downloadDirectory)
|
||||
Files.createDirectories(downloadDestinationFolder)
|
||||
val finalFilename = "${
|
||||
if (settings.downloadSettings.forceOrder) String.format(
|
||||
"%03d_", index + 1
|
||||
) else ""
|
||||
}$filename"
|
||||
imageEntity.filename = finalFilename
|
||||
val imageDownloadPath = downloadDestinationFolder.resolve(finalFilename)
|
||||
Files.copy(downloadedImage.path, imageDownloadPath, StandardCopyOption.REPLACE_EXISTING)
|
||||
} catch (e: Exception) {
|
||||
throw HostException("Failed to rename the image", e)
|
||||
} finally {
|
||||
try {
|
||||
Files.delete(downloadedImage.path)
|
||||
} catch (_: IOException) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@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 imageEntity.id == that.imageEntity.id
|
||||
}
|
||||
|
||||
override fun hashCode(): Int {
|
||||
return Objects.hash(imageEntity.id)
|
||||
}
|
||||
|
||||
fun stop() {
|
||||
context.requests.forEach { it.abort() }
|
||||
stopped = true
|
||||
}
|
||||
}
|
||||
+12
-11
@@ -1,24 +1,25 @@
|
||||
package me.mnlr.vripper.entities
|
||||
package me.vripper.entities
|
||||
|
||||
import me.mnlr.vripper.entities.domain.Status
|
||||
import me.mnlr.vripper.host.Host
|
||||
import me.vripper.entities.domain.Status
|
||||
|
||||
data class ImageDownloadState(
|
||||
var id: Long? = null,
|
||||
val postId: String,
|
||||
data class ImageEntity(
|
||||
val id: Long = -1,
|
||||
val postId: Long,
|
||||
val url: String,
|
||||
val host: Host,
|
||||
val thumbUrl: String,
|
||||
val host: Byte,
|
||||
val index: Int,
|
||||
val postIdRef: Long,
|
||||
var total: Long = -1,
|
||||
var current: Long = 0,
|
||||
val postIdRef: Long = -1,
|
||||
var size: Long = -1,
|
||||
var downloaded: Long = 0,
|
||||
var status: Status = Status.STOPPED,
|
||||
var filename: String = "",
|
||||
) {
|
||||
override fun equals(other: Any?): Boolean {
|
||||
if (this === other) return true
|
||||
if (javaClass != other?.javaClass) return false
|
||||
|
||||
other as ImageDownloadState
|
||||
other as ImageEntity
|
||||
|
||||
if (url != other.url) return false
|
||||
|
||||
+5
-6
@@ -1,13 +1,12 @@
|
||||
package me.mnlr.vripper.entities
|
||||
package me.vripper.entities
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat
|
||||
import java.time.LocalDateTime
|
||||
|
||||
data class LogEvent(
|
||||
val id: Long? = null,
|
||||
data class LogEntryEntity(
|
||||
val id: Long = -1,
|
||||
val type: Type,
|
||||
val status: Status,
|
||||
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") val time: LocalDateTime = LocalDateTime.now(),
|
||||
val time: LocalDateTime = LocalDateTime.now(),
|
||||
val message: String,
|
||||
) {
|
||||
|
||||
@@ -20,4 +19,4 @@ data class LogEvent(
|
||||
enum class Status(val stringValue: String) {
|
||||
PENDING("Pending"), PROCESSING("Processing"), DONE("Done"), ERROR("Error")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package me.vripper.entities
|
||||
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
data class MetadataEntity(val postId: Long, val data: Data) {
|
||||
@Serializable
|
||||
data class Data(
|
||||
val postedBy: String,
|
||||
val resolvedNames: List<String>
|
||||
)
|
||||
}
|
||||
+14
-13
@@ -1,35 +1,36 @@
|
||||
package me.mnlr.vripper.entities
|
||||
package me.vripper.entities
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat
|
||||
import me.mnlr.vripper.entities.domain.Status
|
||||
import me.vripper.entities.domain.Status
|
||||
import java.time.LocalDateTime
|
||||
|
||||
data class PostDownloadState(
|
||||
var id: Long? = null,
|
||||
data class PostEntity(
|
||||
val 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 postId: Long,
|
||||
val threadId: Long,
|
||||
val total: Int,
|
||||
val hosts: Set<String>,
|
||||
val downloadDirectory: String,
|
||||
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") val addedOn: LocalDateTime = LocalDateTime.now(),
|
||||
val addedOn: LocalDateTime = LocalDateTime.now(),
|
||||
var folderName: String,
|
||||
var status: Status = Status.STOPPED,
|
||||
var done: Int = 0,
|
||||
var rank: Int = Int.MAX_VALUE
|
||||
var rank: Int = Int.MAX_VALUE,
|
||||
var size: Long = -1,
|
||||
var downloaded: Long = 0,
|
||||
) {
|
||||
|
||||
override fun equals(other: Any?): Boolean {
|
||||
if (this === other) return true
|
||||
if (javaClass != other?.javaClass) return false
|
||||
|
||||
other as PostDownloadState
|
||||
other as PostEntity
|
||||
|
||||
if (postId != other.postId) return false
|
||||
|
||||
return true
|
||||
return postId == other.postId
|
||||
}
|
||||
|
||||
override fun hashCode(): Int {
|
||||
+6
-5
@@ -1,16 +1,17 @@
|
||||
package me.mnlr.vripper.entities
|
||||
package me.vripper.entities
|
||||
|
||||
data class Thread(
|
||||
val id: Long? = null,
|
||||
data class ThreadEntity(
|
||||
val id: Long = -1,
|
||||
val title: String,
|
||||
val link: String,
|
||||
val threadId: String,
|
||||
val threadId: Long,
|
||||
var total: Int = 0,
|
||||
) {
|
||||
override fun equals(other: Any?): Boolean {
|
||||
if (this === other) return true
|
||||
if (javaClass != other?.javaClass) return false
|
||||
|
||||
other as Thread
|
||||
other as ThreadEntity
|
||||
|
||||
return threadId == other.threadId
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.mnlr.vripper.entities.domain
|
||||
package me.vripper.entities.domain
|
||||
|
||||
enum class Status(val stringValue: String) {
|
||||
PENDING("Pending"), DOWNLOADING("Downloading"), FINISHED("Finished"), ERROR("Error"), STOPPED("Stopped")
|
||||
@@ -0,0 +1,27 @@
|
||||
package me.vripper.event
|
||||
|
||||
import me.vripper.entities.*
|
||||
import me.vripper.model.DownloadSpeed
|
||||
import me.vripper.model.ErrorCount
|
||||
import me.vripper.model.QueueState
|
||||
import me.vripper.model.Settings
|
||||
|
||||
data class PostCreateEvent(val postEntities: List<PostEntity>)
|
||||
data class PostUpdateEvent(val postEntities: List<PostEntity>)
|
||||
data class PostDeleteEvent(val postIds: List<Long>)
|
||||
data class ImageEvent(val imageEntities: List<ImageEntity>)
|
||||
data class ThreadCreateEvent(val threadEntity: ThreadEntity)
|
||||
data class ThreadUpdateEvent(val threadEntity: ThreadEntity)
|
||||
data class ThreadDeleteEvent(val threadId: Long)
|
||||
class ThreadClearEvent
|
||||
data class VGUserLoginEvent(val username: String)
|
||||
data class DownloadSpeedEvent(val downloadSpeed: DownloadSpeed)
|
||||
data class QueueStateEvent(val queueState: QueueState)
|
||||
data class ErrorCountEvent(val errorCount: ErrorCount)
|
||||
data class SettingsUpdateEvent(val settings: Settings)
|
||||
data class MetadataUpdateEvent(val metadataEntity: MetadataEntity)
|
||||
data class LogCreateEvent(val logEntryEntity: LogEntryEntity)
|
||||
data class LogUpdateEvent(val logEntryEntity: LogEntryEntity)
|
||||
data class LogDeleteEvent(val deleted: List<Long>)
|
||||
data class LoadingTasks(val loading: Boolean)
|
||||
data class StoppedEvent(val postIds: List<Long>)
|
||||
@@ -0,0 +1,14 @@
|
||||
package me.vripper.event
|
||||
|
||||
import kotlinx.coroutines.flow.MutableSharedFlow
|
||||
import kotlinx.coroutines.flow.asSharedFlow
|
||||
|
||||
object EventBus {
|
||||
|
||||
private val _events = MutableSharedFlow<Any>()
|
||||
val events = _events.asSharedFlow()
|
||||
|
||||
suspend fun publishEvent(event: Any) {
|
||||
_events.emit(event)
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.mnlr.vripper.exception
|
||||
package me.vripper.exception
|
||||
|
||||
class DownloadException : Exception {
|
||||
constructor(message: String?) : super(message)
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.mnlr.vripper.exception
|
||||
package me.vripper.exception
|
||||
|
||||
class HostException : Exception {
|
||||
constructor(e: Throwable?) : super(e)
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
package me.mnlr.vripper.exception
|
||||
package me.vripper.exception
|
||||
|
||||
class HtmlProcessorException(e: Throwable?) : Exception(e)
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.mnlr.vripper.exception
|
||||
package me.vripper.exception
|
||||
|
||||
class PostParseException : Exception {
|
||||
constructor(message: String?) : super(message)
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.mnlr.vripper.exception
|
||||
package me.vripper.exception
|
||||
|
||||
class QueueException : Exception {
|
||||
constructor(message: String?) : super(message)
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
package me.mnlr.vripper.exception
|
||||
package me.vripper.exception
|
||||
|
||||
class RenameException(message: String?, e: Exception?) : Exception(message, e)
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
package me.mnlr.vripper.exception
|
||||
package me.vripper.exception
|
||||
|
||||
class ValidationException(message: String) : Exception(message)
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.mnlr.vripper.exception
|
||||
package me.vripper.exception
|
||||
|
||||
class VripperException : Exception {
|
||||
constructor(message: String?) : super(message)
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
package me.mnlr.vripper.exception
|
||||
package me.vripper.exception
|
||||
|
||||
class XpathException(e: Throwable?) : Exception(e)
|
||||
@@ -0,0 +1,86 @@
|
||||
package me.vripper.host
|
||||
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.exception.XpathException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.HtmlUtils
|
||||
import me.vripper.utilities.XpathUtils
|
||||
import org.apache.hc.client5.http.classic.methods.HttpPost
|
||||
import org.apache.hc.client5.http.entity.UrlEncodedFormEntity
|
||||
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", 0, httpService, dataTransaction, downloadSpeedService) {
|
||||
private val log by me.vripper.delegate.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
|
||||
)
|
||||
)
|
||||
XpathUtils.getAsNode(document, CONTINUE_BUTTON_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
}
|
||||
log.debug(String.format("Click button found for %s", url))
|
||||
val httpPost = HttpPost(url).also {
|
||||
it.addHeader("Referer", url)
|
||||
it.entity = UrlEncodedFormEntity(
|
||||
listOf(
|
||||
BasicNameValuePair(
|
||||
"imgContinue",
|
||||
"Continue to your image"
|
||||
)
|
||||
)
|
||||
)
|
||||
}.also { context.requests.add(it) }
|
||||
log.debug(String.format("Requesting %s", httpPost))
|
||||
val doc = try {
|
||||
httpService.client.execute(
|
||||
httpPost, context.httpContext
|
||||
)
|
||||
{ response ->
|
||||
log.debug(String.format("Cleaning response for %s", httpPost))
|
||||
HtmlUtils.clean(response.entity.content)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
throw HostException(e)
|
||||
}
|
||||
val imgNode: Node = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
|
||||
XpathUtils.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']"
|
||||
}
|
||||
}
|
||||
+9
-17
@@ -1,26 +1,20 @@
|
||||
package me.mnlr.vripper.host
|
||||
package me.vripper.host
|
||||
|
||||
import org.springframework.stereotype.Service
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.exception.XpathException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.XpathUtils
|
||||
import org.w3c.dom.Document
|
||||
import org.w3c.dom.Node
|
||||
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 java.util.*
|
||||
|
||||
@Service
|
||||
class DPicMeHost(
|
||||
private val xpathService: XpathService,
|
||||
httpService: HTTPService,
|
||||
htmlProcessorService: HtmlProcessorService,
|
||||
dataTransaction: DataTransaction,
|
||||
downloadSpeedService: DownloadSpeedService,
|
||||
) : Host(httpService, htmlProcessorService, dataTransaction, downloadSpeedService) {
|
||||
private val log by LoggerDelegate()
|
||||
override val host: String
|
||||
get() = Companion.host
|
||||
) : Host("dpic.me", 1, httpService, dataTransaction, downloadSpeedService) {
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
|
||||
@Throws(HostException::class)
|
||||
override fun resolve(
|
||||
@@ -30,7 +24,7 @@ class DPicMeHost(
|
||||
): Pair<String, String> {
|
||||
val imgNode: Node = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
|
||||
xpathService.getAsNode(document, IMG_XPATH)
|
||||
XpathUtils.getAsNode(document, IMG_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
} ?: throw HostException(
|
||||
@@ -62,8 +56,6 @@ class DPicMeHost(
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val host = "dpic.me"
|
||||
private const val lookup = "dpic.me"
|
||||
private const val IMG_XPATH = "//img[@id='pic']"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,217 @@
|
||||
package me.vripper.host
|
||||
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.DownloadException
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.HtmlUtils
|
||||
import me.vripper.utilities.PathUtils.getFileNameWithoutExtension
|
||||
import org.apache.hc.client5.http.classic.methods.HttpGet
|
||||
import org.apache.hc.client5.http.classic.methods.HttpHead
|
||||
import org.apache.hc.core5.http.ClassicHttpResponse
|
||||
import org.apache.hc.core5.http.Header
|
||||
import org.jetbrains.exposed.sql.transactions.transaction
|
||||
import org.w3c.dom.Document
|
||||
import java.nio.file.Files
|
||||
import java.nio.file.Path
|
||||
|
||||
abstract class Host(
|
||||
val hostName: String,
|
||||
val hostId: Byte,
|
||||
private val httpService: HTTPService,
|
||||
private val dataTransaction: DataTransaction,
|
||||
private val downloadSpeedService: DownloadSpeedService
|
||||
) {
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
|
||||
companion object {
|
||||
private const val READ_BUFFER_SIZE = 8192
|
||||
private val hosts: MutableMap<String, Byte> = mutableMapOf()
|
||||
|
||||
fun getHosts(): Map<String, Byte> {
|
||||
return hosts.toMap()
|
||||
}
|
||||
}
|
||||
|
||||
init {
|
||||
hosts[hostName] = 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)
|
||||
// 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) {
|
||||
HtmlUtils.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: ClassicHttpResponse,
|
||||
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.systemSettings.tempPath),
|
||||
"vripper_",
|
||||
".tmp"
|
||||
)
|
||||
return Files.newOutputStream(tempImage).use { fos ->
|
||||
val image = context.imageEntity
|
||||
synchronized(image.postId.toString().intern()) {
|
||||
val post = dataTransaction.findPostById(context.postId).orElseThrow()
|
||||
val size = if (image.size < 0) {
|
||||
response.entity.contentLength
|
||||
} else {
|
||||
0
|
||||
}
|
||||
image.size = response.entity.contentLength
|
||||
post.size += size
|
||||
transaction {
|
||||
dataTransaction.updateImage(image)
|
||||
dataTransaction.updatePost(post)
|
||||
}
|
||||
}
|
||||
log.debug(
|
||||
"Length is ${image.size}"
|
||||
)
|
||||
log.debug(
|
||||
"Starting data transfer"
|
||||
)
|
||||
val buffer = ByteArray(READ_BUFFER_SIZE)
|
||||
var read: Int
|
||||
while (response.entity.content.read(buffer, 0, READ_BUFFER_SIZE)
|
||||
.also { read = it } != -1 && !context.stopped
|
||||
) {
|
||||
fos.write(buffer, 0, read)
|
||||
image.downloaded += read
|
||||
dataTransaction.updateImage(image)
|
||||
downloadSpeedService.reportDownloadedBytes(read.toLong())
|
||||
}
|
||||
Pair(tempImage, mimeType)
|
||||
}
|
||||
}
|
||||
|
||||
fun isSupported(url: String): Boolean {
|
||||
return url.contains(hostName)
|
||||
}
|
||||
|
||||
@Throws(HostException::class)
|
||||
fun head(url: String, context: ImageDownloadContext): Array<Header> {
|
||||
val httpHead = HttpHead(url).also { context.requests.add(it) }
|
||||
log.debug(String.format("Requesting %s", url))
|
||||
return httpService.client.execute(
|
||||
httpHead,
|
||||
context.httpContext
|
||||
) {
|
||||
if (it.code / 100 != 2) {
|
||||
throw HostException("Unexpected response code: ${it.code}")
|
||||
}
|
||||
it.headers
|
||||
}
|
||||
}
|
||||
|
||||
@Throws(HostException::class)
|
||||
fun <T> fetch(
|
||||
url: String,
|
||||
context: ImageDownloadContext,
|
||||
transformer: (ClassicHttpResponse) -> T
|
||||
): T {
|
||||
val httpGet =
|
||||
HttpGet(url).also { it.addHeader("Referer", context.imageEntity.url) }.also { context.requests.add(it) }
|
||||
log.debug(String.format("Requesting %s", url))
|
||||
return httpService.client.execute(httpGet, context.httpContext) {
|
||||
if (it.code / 100 != 2) {
|
||||
throw DownloadException("Server returned code ${it.code}")
|
||||
}
|
||||
transformer(it)
|
||||
}
|
||||
}
|
||||
|
||||
@OptIn(ExperimentalStdlibApi::class)
|
||||
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.entries.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
|
||||
|
||||
return hostName == other.hostName
|
||||
}
|
||||
|
||||
override fun hashCode(): Int {
|
||||
return hostName.hashCode()
|
||||
}
|
||||
|
||||
override fun toString(): String {
|
||||
return hostName
|
||||
}
|
||||
}
|
||||
|
||||
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"),
|
||||
}
|
||||
+13
-20
@@ -1,30 +1,25 @@
|
||||
package me.mnlr.vripper.host
|
||||
package me.vripper.host
|
||||
|
||||
import org.apache.http.impl.cookie.BasicClientCookie
|
||||
import org.springframework.stereotype.Service
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.exception.XpathException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.HtmlUtils
|
||||
import me.vripper.utilities.XpathUtils
|
||||
import org.apache.hc.client5.http.impl.cookie.BasicClientCookie
|
||||
import org.w3c.dom.Document
|
||||
import org.w3c.dom.Node
|
||||
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 java.sql.Date
|
||||
import java.time.LocalDateTime
|
||||
import java.time.ZoneId
|
||||
import java.util.*
|
||||
|
||||
@Service
|
||||
class ImageBamHost(
|
||||
private val htmlProcessorService: HtmlProcessorService,
|
||||
private val xpathService: XpathService,
|
||||
httpService: HTTPService,
|
||||
dataTransaction: DataTransaction,
|
||||
downloadSpeedService: DownloadSpeedService,
|
||||
) : Host(httpService, htmlProcessorService, dataTransaction, downloadSpeedService) {
|
||||
private val log by LoggerDelegate()
|
||||
override val host: String
|
||||
get() = Companion.host
|
||||
) : Host("imagebam.com", 2, httpService, dataTransaction, downloadSpeedService) {
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
|
||||
@Throws(HostException::class)
|
||||
override fun resolve(
|
||||
@@ -34,7 +29,7 @@ class ImageBamHost(
|
||||
): Pair<String, String> {
|
||||
val doc = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", CONTINUE_XPATH, url))
|
||||
if (xpathService.getAsNode(document, CONTINUE_XPATH) != null) {
|
||||
if (XpathUtils.getAsNode(document, CONTINUE_XPATH) != null) {
|
||||
val clientCookie = BasicClientCookie("nsfw_inter", "1")
|
||||
clientCookie.domain = "www.imagebam.com"
|
||||
clientCookie.path = "/"
|
||||
@@ -44,7 +39,7 @@ class ImageBamHost(
|
||||
)
|
||||
context.httpContext.cookieStore.addCookie(clientCookie)
|
||||
fetch(url, context) {
|
||||
htmlProcessorService.clean(it.entity.content)
|
||||
HtmlUtils.clean(it.entity.content)
|
||||
}
|
||||
} else {
|
||||
document
|
||||
@@ -54,7 +49,7 @@ class ImageBamHost(
|
||||
}
|
||||
val imgNode: Node = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
|
||||
xpathService.getAsNode(doc, IMG_XPATH)
|
||||
XpathUtils.getAsNode(doc, IMG_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
} ?: throw HostException(
|
||||
@@ -84,8 +79,6 @@ class ImageBamHost(
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val host = "imagebam.com"
|
||||
private const val lookup = "imagebam.com"
|
||||
private const val IMG_XPATH = "//img[contains(@class,'main-image')]"
|
||||
private const val CONTINUE_XPATH = "//*[contains(text(), 'Continue')]"
|
||||
}
|
||||
+9
-17
@@ -1,26 +1,20 @@
|
||||
package me.mnlr.vripper.host
|
||||
package me.vripper.host
|
||||
|
||||
import org.springframework.stereotype.Service
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.exception.XpathException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.XpathUtils
|
||||
import org.w3c.dom.Document
|
||||
import org.w3c.dom.Node
|
||||
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 java.util.*
|
||||
|
||||
@Service
|
||||
class ImageTwistHost(
|
||||
private val xpathService: XpathService,
|
||||
httpService: HTTPService,
|
||||
htmlProcessorService: HtmlProcessorService,
|
||||
dataTransaction: DataTransaction,
|
||||
downloadSpeedService: DownloadSpeedService,
|
||||
) : Host(httpService, htmlProcessorService, dataTransaction, downloadSpeedService) {
|
||||
private val log by LoggerDelegate()
|
||||
override val host: String
|
||||
get() = Companion.host
|
||||
) : Host("imagetwist.com", 3, httpService, dataTransaction, downloadSpeedService) {
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
|
||||
@Throws(HostException::class)
|
||||
override fun resolve(
|
||||
@@ -30,7 +24,7 @@ class ImageTwistHost(
|
||||
): Pair<String, String> {
|
||||
val imgNode: Node = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
|
||||
xpathService.getAsNode(document, IMG_XPATH)
|
||||
XpathUtils.getAsNode(document, IMG_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
} ?: throw HostException(
|
||||
@@ -54,8 +48,6 @@ class ImageTwistHost(
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val host = "imagetwist.com"
|
||||
private const val lookup = "imagetwist.com"
|
||||
private const val IMG_XPATH = "//img[contains(@class, 'img')]"
|
||||
}
|
||||
}
|
||||
+13
-20
@@ -1,25 +1,20 @@
|
||||
package me.mnlr.vripper.host
|
||||
package me.vripper.host
|
||||
|
||||
import org.springframework.stereotype.Service
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.exception.XpathException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.HtmlUtils
|
||||
import me.vripper.utilities.XpathUtils
|
||||
import org.w3c.dom.Document
|
||||
import org.w3c.dom.Node
|
||||
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.*
|
||||
|
||||
@Service
|
||||
class ImageVenueHost(
|
||||
private val htmlProcessorService: HtmlProcessorService,
|
||||
private val xpathService: XpathService,
|
||||
httpService: HTTPService,
|
||||
dataTransaction: DataTransaction,
|
||||
downloadSpeedService: DownloadSpeedService,
|
||||
) : Host(httpService, htmlProcessorService, dataTransaction, downloadSpeedService) {
|
||||
private val log by LoggerDelegate()
|
||||
override val host: String
|
||||
get() = Companion.host
|
||||
) : Host("imagevenue.com", 4, httpService, dataTransaction, downloadSpeedService) {
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
|
||||
@Throws(HostException::class)
|
||||
override fun resolve(
|
||||
@@ -35,10 +30,10 @@ class ImageVenueHost(
|
||||
url
|
||||
)
|
||||
)
|
||||
if (xpathService.getAsNode(document, CONTINUE_BUTTON_XPATH) != null) {
|
||||
if (XpathUtils.getAsNode(document, CONTINUE_BUTTON_XPATH) != null) {
|
||||
// Button detected. No need to actually click it, just make the call again.
|
||||
fetch(url, context) {
|
||||
htmlProcessorService.clean(it.entity.content)
|
||||
HtmlUtils.clean(it.entity.content)
|
||||
}
|
||||
} else {
|
||||
document
|
||||
@@ -48,7 +43,7 @@ class ImageVenueHost(
|
||||
}
|
||||
val imgNode: Node = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
|
||||
xpathService.getAsNode(doc, IMG_XPATH)
|
||||
XpathUtils.getAsNode(doc, IMG_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
} ?: throw HostException(
|
||||
@@ -72,9 +67,7 @@ class ImageVenueHost(
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val host = "imagevenue.com"
|
||||
private const val lookup = "imagevenue.com"
|
||||
private const val CONTINUE_BUTTON_XPATH = "//a[@title='Continue to ImageVenue']"
|
||||
private const val IMG_XPATH = "//a[@data-toggle='full']/img"
|
||||
private const val IMG_XPATH = "//a[@data-toggle='full']/img[@id='main-image']"
|
||||
}
|
||||
}
|
||||
+9
-17
@@ -1,24 +1,18 @@
|
||||
package me.mnlr.vripper.host
|
||||
package me.vripper.host
|
||||
|
||||
import org.springframework.stereotype.Service
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.exception.XpathException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.XpathUtils
|
||||
import org.w3c.dom.Document
|
||||
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.*
|
||||
|
||||
@Service
|
||||
class ImageZillaHost(
|
||||
private val xpathService: XpathService,
|
||||
httpService: HTTPService,
|
||||
htmlProcessorService: HtmlProcessorService,
|
||||
dataTransaction: DataTransaction,
|
||||
downloadSpeedService: DownloadSpeedService,
|
||||
) : Host(httpService, htmlProcessorService, dataTransaction, downloadSpeedService) {
|
||||
private val log by LoggerDelegate()
|
||||
override val host: String
|
||||
get() = Companion.host
|
||||
) : Host("imagezilla.net", 5, httpService, dataTransaction, downloadSpeedService) {
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
|
||||
@Throws(HostException::class)
|
||||
override fun resolve(
|
||||
@@ -28,7 +22,7 @@ class ImageZillaHost(
|
||||
): 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)
|
||||
XpathUtils.getAsNode(document, IMG_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
} ?: throw HostException(
|
||||
@@ -52,8 +46,6 @@ class ImageZillaHost(
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val host = "imagezilla.net"
|
||||
private const val lookup = "imagezilla.net/show"
|
||||
private const val IMG_XPATH = "//img[@id='photo']"
|
||||
}
|
||||
}
|
||||
+9
-17
@@ -1,25 +1,19 @@
|
||||
package me.mnlr.vripper.host
|
||||
package me.vripper.host
|
||||
|
||||
import org.springframework.stereotype.Service
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.exception.XpathException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.XpathUtils
|
||||
import org.w3c.dom.Document
|
||||
import org.w3c.dom.Node
|
||||
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.*
|
||||
|
||||
@Service
|
||||
class ImgSpiceHost(
|
||||
private val xpathService: XpathService,
|
||||
httpService: HTTPService,
|
||||
htmlProcessorService: HtmlProcessorService,
|
||||
dataTransaction: DataTransaction,
|
||||
downloadSpeedService: DownloadSpeedService,
|
||||
) : Host(httpService, htmlProcessorService, dataTransaction, downloadSpeedService) {
|
||||
private val log by LoggerDelegate()
|
||||
override val host: String
|
||||
get() = Companion.host
|
||||
) : Host("imgspice.com", 7, httpService, dataTransaction, downloadSpeedService) {
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
|
||||
@Throws(HostException::class)
|
||||
override fun resolve(
|
||||
@@ -29,7 +23,7 @@ class ImgSpiceHost(
|
||||
): Pair<String, String> {
|
||||
val imgNode: Node = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
|
||||
xpathService.getAsNode(document, IMG_XPATH)
|
||||
XpathUtils.getAsNode(document, IMG_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
} ?: throw HostException(
|
||||
@@ -52,8 +46,6 @@ class ImgSpiceHost(
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val host = "imgspice.com"
|
||||
private const val lookup = "imgspice.com"
|
||||
private const val IMG_XPATH = "//img[@id='imgpreview']"
|
||||
}
|
||||
}
|
||||
+9
-17
@@ -1,25 +1,19 @@
|
||||
package me.mnlr.vripper.host
|
||||
package me.vripper.host
|
||||
|
||||
import org.springframework.stereotype.Service
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.exception.XpathException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.XpathUtils
|
||||
import org.w3c.dom.Document
|
||||
import org.w3c.dom.Node
|
||||
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.*
|
||||
|
||||
@Service
|
||||
class ImgboxHost(
|
||||
private val xpathService: XpathService,
|
||||
httpService: HTTPService,
|
||||
htmlProcessorService: HtmlProcessorService,
|
||||
dataTransaction: DataTransaction,
|
||||
downloadSpeedService: DownloadSpeedService,
|
||||
) : Host(httpService, htmlProcessorService, dataTransaction, downloadSpeedService) {
|
||||
private val log by LoggerDelegate()
|
||||
override val host: String
|
||||
get() = Companion.host
|
||||
) : Host("imgbox.com", 6, httpService, dataTransaction, downloadSpeedService) {
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
|
||||
@Throws(HostException::class)
|
||||
override fun resolve(
|
||||
@@ -29,7 +23,7 @@ class ImgboxHost(
|
||||
): Pair<String, String> {
|
||||
val imgNode: Node = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
|
||||
xpathService.getAsNode(document, IMG_XPATH)
|
||||
XpathUtils.getAsNode(document, IMG_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
} ?: throw HostException(
|
||||
@@ -50,8 +44,6 @@ class ImgboxHost(
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val host = "imgbox.com"
|
||||
private const val lookup = "imgbox.com"
|
||||
private const val IMG_XPATH = "//img[@id='img']"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
package me.vripper.host
|
||||
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.exception.HtmlProcessorException
|
||||
import me.vripper.exception.XpathException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.HtmlUtils
|
||||
import me.vripper.utilities.XpathUtils
|
||||
import org.apache.hc.client5.http.classic.methods.HttpPost
|
||||
import org.apache.hc.client5.http.entity.UrlEncodedFormEntity
|
||||
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", 8, httpService, dataTransaction, downloadSpeedService) {
|
||||
private val log by me.vripper.delegate.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 = XpathUtils.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 httpPost: HttpPost = HttpPost(httpsUrl).also {
|
||||
it.entity = UrlEncodedFormEntity(listOf(BasicNameValuePair("imgContinue", value)))
|
||||
}.also { context.requests.add(it) }
|
||||
log.debug("Requesting {}", httpPost)
|
||||
val doc = try {
|
||||
httpService.client.execute(
|
||||
httpPost, context.httpContext
|
||||
) { response ->
|
||||
log.debug("Cleaning response for {}", httpPost)
|
||||
HtmlUtils.clean(response.entity.content)
|
||||
}
|
||||
} 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")
|
||||
XpathUtils.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']"
|
||||
}
|
||||
}
|
||||
+13
-20
@@ -1,27 +1,22 @@
|
||||
package me.mnlr.vripper.host
|
||||
package me.vripper.host
|
||||
|
||||
import org.springframework.stereotype.Service
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.exception.XpathException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.HtmlUtils
|
||||
import me.vripper.utilities.XpathUtils
|
||||
import org.w3c.dom.Document
|
||||
import org.w3c.dom.Node
|
||||
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 java.net.URI
|
||||
import java.net.URISyntaxException
|
||||
|
||||
@Service
|
||||
class PimpandhostHost(
|
||||
private val xpathService: XpathService,
|
||||
private val htmlProcessorService: HtmlProcessorService,
|
||||
httpService: HTTPService,
|
||||
dataTransaction: DataTransaction,
|
||||
downloadSpeedService: DownloadSpeedService,
|
||||
) : Host(httpService, htmlProcessorService, dataTransaction, downloadSpeedService) {
|
||||
private val log by LoggerDelegate()
|
||||
override val host: String
|
||||
get() = Companion.host
|
||||
) : Host("pimpandhost.com", 9, httpService, dataTransaction, downloadSpeedService) {
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
|
||||
@Throws(HostException::class)
|
||||
override fun resolve(
|
||||
@@ -31,16 +26,16 @@ class PimpandhostHost(
|
||||
): Pair<String, String> {
|
||||
val newUrl: String
|
||||
try {
|
||||
newUrl = appendUri(url.replace("http://", "https://"), "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) {
|
||||
htmlProcessorService.clean(it.entity.content)
|
||||
HtmlUtils.clean(it.entity.content)
|
||||
}
|
||||
val imgNode: Node = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, newUrl))
|
||||
xpathService.getAsNode(doc, IMG_XPATH)
|
||||
XpathUtils.getAsNode(doc, IMG_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
} ?: throw HostException(
|
||||
@@ -78,8 +73,6 @@ class PimpandhostHost(
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val host = "pimpandhost.com"
|
||||
private const val lookup = "pimpandhost.com"
|
||||
private const val IMG_XPATH = "//img[contains(@class, 'original')]"
|
||||
}
|
||||
}
|
||||
}
|
||||
+9
-17
@@ -1,25 +1,19 @@
|
||||
package me.mnlr.vripper.host
|
||||
package me.vripper.host
|
||||
|
||||
import org.springframework.stereotype.Service
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.exception.XpathException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.XpathUtils
|
||||
import org.w3c.dom.Document
|
||||
import org.w3c.dom.Node
|
||||
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.*
|
||||
|
||||
@Service
|
||||
class PixRouteHost(
|
||||
private val xpathService: XpathService,
|
||||
httpService: HTTPService,
|
||||
htmlProcessorService: HtmlProcessorService,
|
||||
dataTransaction: DataTransaction,
|
||||
downloadSpeedService: DownloadSpeedService,
|
||||
) : Host(httpService, htmlProcessorService, dataTransaction, downloadSpeedService) {
|
||||
private val log by LoggerDelegate()
|
||||
override val host: String
|
||||
get() = Companion.host
|
||||
) : Host("pixroute.com", 11, httpService, dataTransaction, downloadSpeedService) {
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
|
||||
@Throws(HostException::class)
|
||||
override fun resolve(
|
||||
@@ -29,7 +23,7 @@ class PixRouteHost(
|
||||
): Pair<String, String> {
|
||||
val imgNode: Node = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
|
||||
xpathService.getAsNode(document, IMG_XPATH)
|
||||
XpathUtils.getAsNode(document, IMG_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
} ?: throw HostException(
|
||||
@@ -49,8 +43,6 @@ class PixRouteHost(
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val host = "pixroute.com"
|
||||
private const val lookup = "pixroute.com"
|
||||
private const val IMG_XPATH = "//img[@id='imgpreview']"
|
||||
}
|
||||
}
|
||||
+9
-17
@@ -1,25 +1,19 @@
|
||||
package me.mnlr.vripper.host
|
||||
package me.vripper.host
|
||||
|
||||
import org.springframework.stereotype.Service
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.exception.XpathException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.XpathUtils
|
||||
import org.w3c.dom.Document
|
||||
import org.w3c.dom.Node
|
||||
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.*
|
||||
|
||||
@Service
|
||||
class PixhostHost(
|
||||
private val xpathService: XpathService,
|
||||
httpService: HTTPService,
|
||||
htmlProcessorService: HtmlProcessorService,
|
||||
dataTransaction: DataTransaction,
|
||||
downloadSpeedService: DownloadSpeedService,
|
||||
) : Host(httpService, htmlProcessorService, dataTransaction, downloadSpeedService) {
|
||||
private val log by LoggerDelegate()
|
||||
override val host: String
|
||||
get() = Companion.host
|
||||
) : Host("pixhost.to", 10, httpService, dataTransaction, downloadSpeedService) {
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
|
||||
@Throws(HostException::class)
|
||||
override fun resolve(
|
||||
@@ -29,7 +23,7 @@ class PixhostHost(
|
||||
): Pair<String, String> {
|
||||
val imgNode: Node = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
|
||||
xpathService.getAsNode(document, IMG_XPATH)
|
||||
XpathUtils.getAsNode(document, IMG_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
} ?: throw HostException(
|
||||
@@ -50,8 +44,6 @@ class PixhostHost(
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val host = "pixhost.to"
|
||||
private const val lookup = "pixhost.to"
|
||||
private const val IMG_XPATH = "//img[@id='image']"
|
||||
}
|
||||
}
|
||||
+10
-18
@@ -1,24 +1,18 @@
|
||||
package me.mnlr.vripper.host
|
||||
package me.vripper.host
|
||||
|
||||
import org.springframework.stereotype.Service
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.exception.XpathException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.XpathUtils
|
||||
import org.w3c.dom.Document
|
||||
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.*
|
||||
|
||||
@Service
|
||||
class PixxxelsHost(
|
||||
private val xpathService: XpathService,
|
||||
httpService: HTTPService,
|
||||
htmlProcessorService: HtmlProcessorService,
|
||||
dataTransaction: DataTransaction,
|
||||
downloadSpeedService: DownloadSpeedService,
|
||||
) : Host(httpService, htmlProcessorService, dataTransaction, downloadSpeedService) {
|
||||
private val log by LoggerDelegate()
|
||||
override val host: String
|
||||
get() = Companion.host
|
||||
) : Host("pixxxels.cc", 12, httpService, dataTransaction, downloadSpeedService) {
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
|
||||
@Throws(HostException::class)
|
||||
override fun resolve(
|
||||
@@ -28,7 +22,7 @@ class PixxxelsHost(
|
||||
): Pair<String, String> {
|
||||
val imgNode = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
|
||||
xpathService.getAsNode(document, IMG_XPATH)
|
||||
XpathUtils.getAsNode(document, IMG_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
} ?: throw HostException(
|
||||
@@ -40,7 +34,7 @@ class PixxxelsHost(
|
||||
)
|
||||
val titleNode = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url))
|
||||
xpathService.getAsNode(document, TITLE_XPATH)
|
||||
XpathUtils.getAsNode(document, TITLE_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
} ?: throw HostException(
|
||||
@@ -63,8 +57,6 @@ class PixxxelsHost(
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val host = "pixxxels.cc"
|
||||
private const val lookup = "pixxxels.cc"
|
||||
private const val IMG_XPATH = "//*[@id='download']"
|
||||
private const val TITLE_XPATH = "//*[contains(@class,'imagename')]"
|
||||
}
|
||||
+10
-18
@@ -1,26 +1,20 @@
|
||||
package me.mnlr.vripper.host
|
||||
package me.vripper.host
|
||||
|
||||
import org.springframework.stereotype.Service
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.exception.XpathException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.XpathUtils
|
||||
import org.w3c.dom.Document
|
||||
import org.w3c.dom.Node
|
||||
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 java.util.*
|
||||
|
||||
@Service
|
||||
class PostImgHost(
|
||||
private val xpathService: XpathService,
|
||||
httpService: HTTPService,
|
||||
htmlProcessorService: HtmlProcessorService,
|
||||
dataTransaction: DataTransaction,
|
||||
downloadSpeedService: DownloadSpeedService,
|
||||
) : Host(httpService, htmlProcessorService, dataTransaction, downloadSpeedService) {
|
||||
private val log by LoggerDelegate()
|
||||
override val host: String
|
||||
get() = Companion.host
|
||||
) : Host("postimg.cc", 13, httpService, dataTransaction, downloadSpeedService) {
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
|
||||
@Throws(HostException::class)
|
||||
override fun resolve(
|
||||
@@ -30,7 +24,7 @@ class PostImgHost(
|
||||
): Pair<String, String> {
|
||||
val titleNode = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url))
|
||||
xpathService.getAsNode(document, TITLE_XPATH)
|
||||
XpathUtils.getAsNode(document, TITLE_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
} ?: throw HostException(
|
||||
@@ -42,7 +36,7 @@ class PostImgHost(
|
||||
)
|
||||
val urlNode = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
|
||||
xpathService.getAsNode(document, IMG_XPATH)
|
||||
XpathUtils.getAsNode(document, IMG_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
} ?: throw HostException(
|
||||
@@ -64,8 +58,6 @@ class PostImgHost(
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val host = "postimg.cc"
|
||||
private const val lookup = "postimg.cc"
|
||||
private const val TITLE_XPATH = "//span[contains(@class,'imagename')]"
|
||||
private const val IMG_XPATH = "//a[@id='download']"
|
||||
}
|
||||
+10
-18
@@ -1,25 +1,19 @@
|
||||
package me.mnlr.vripper.host
|
||||
package me.vripper.host
|
||||
|
||||
import org.springframework.stereotype.Service
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.exception.XpathException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.XpathUtils
|
||||
import org.w3c.dom.Document
|
||||
import org.w3c.dom.Node
|
||||
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.*
|
||||
|
||||
@Service
|
||||
class TurboImageHost(
|
||||
private val xpathService: XpathService,
|
||||
httpService: HTTPService,
|
||||
htmlProcessorService: HtmlProcessorService,
|
||||
dataTransaction: DataTransaction,
|
||||
downloadSpeedService: DownloadSpeedService,
|
||||
) : Host(httpService, htmlProcessorService, dataTransaction, downloadSpeedService) {
|
||||
private val log by LoggerDelegate()
|
||||
override val host: String
|
||||
get() = Companion.host
|
||||
) : Host("turboimagehost.com", 14, httpService, dataTransaction, downloadSpeedService) {
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
|
||||
@Throws(HostException::class)
|
||||
override fun resolve(
|
||||
@@ -30,7 +24,7 @@ class TurboImageHost(
|
||||
var title: String?
|
||||
title = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url))
|
||||
val titleNode: Node? = xpathService.getAsNode(document, TITLE_XPATH)
|
||||
val titleNode: Node? = XpathUtils.getAsNode(document, TITLE_XPATH)
|
||||
log.debug(String.format("Resolving name for %s", url))
|
||||
titleNode?.textContent?.trim { it <= ' ' }
|
||||
} catch (e: XpathException) {
|
||||
@@ -39,7 +33,7 @@ class TurboImageHost(
|
||||
if (title.isNullOrEmpty()) {
|
||||
title = getDefaultImageName(url)
|
||||
}
|
||||
val urlNode: Node = xpathService.getAsNode(document, IMG_XPATH)
|
||||
val urlNode: Node = XpathUtils.getAsNode(document, IMG_XPATH)
|
||||
?: throw HostException(
|
||||
String.format(
|
||||
"Xpath '%s' cannot be found in '%s'",
|
||||
@@ -51,8 +45,6 @@ class TurboImageHost(
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val host = "turboimagehost.com"
|
||||
private const val lookup = "turboimagehost.com"
|
||||
private const val TITLE_XPATH = "//div[contains(@class,'titleFullS')]/h1"
|
||||
private const val IMG_XPATH = "//img[@id='imageid']"
|
||||
}
|
||||
+9
-14
@@ -1,25 +1,20 @@
|
||||
package me.mnlr.vripper.host
|
||||
package me.vripper.host
|
||||
|
||||
import org.springframework.stereotype.Service
|
||||
import me.vripper.download.ImageDownloadContext
|
||||
import me.vripper.exception.HostException
|
||||
import me.vripper.exception.XpathException
|
||||
import me.vripper.services.*
|
||||
import me.vripper.utilities.XpathUtils
|
||||
import org.w3c.dom.Document
|
||||
import org.w3c.dom.Node
|
||||
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 java.util.*
|
||||
|
||||
@Service
|
||||
class ViprImHost(
|
||||
private val xpathService: XpathService,
|
||||
httpService: HTTPService,
|
||||
htmlProcessorService: HtmlProcessorService,
|
||||
dataTransaction: DataTransaction,
|
||||
downloadSpeedService: DownloadSpeedService,
|
||||
) : Host(httpService, htmlProcessorService, dataTransaction, downloadSpeedService) {
|
||||
private val log by LoggerDelegate()
|
||||
override val host: String = "vipr.im"
|
||||
) : Host("vipr.im", 15, httpService, dataTransaction, downloadSpeedService) {
|
||||
private val log by me.vripper.delegate.LoggerDelegate()
|
||||
|
||||
@Throws(HostException::class)
|
||||
override fun resolve(
|
||||
@@ -29,7 +24,7 @@ class ViprImHost(
|
||||
): Pair<String, String> {
|
||||
val imgNode: Node = try {
|
||||
log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url))
|
||||
xpathService.getAsNode(document, IMG_XPATH)
|
||||
XpathUtils.getAsNode(document, IMG_XPATH)
|
||||
} catch (e: XpathException) {
|
||||
throw HostException(e)
|
||||
} ?: throw HostException(
|
||||
@@ -0,0 +1,30 @@
|
||||
package me.vripper.listeners
|
||||
|
||||
import me.vripper.utilities.ApplicationProperties.VRIPPER_DIR
|
||||
import java.io.RandomAccessFile
|
||||
import java.nio.file.Files
|
||||
import kotlin.io.path.pathString
|
||||
import kotlin.system.exitProcess
|
||||
|
||||
object AppLock {
|
||||
fun exclusiveLock() {
|
||||
val lock = VRIPPER_DIR.resolve("lock")
|
||||
try {
|
||||
val randomFile = RandomAccessFile(lock.pathString, "rw")
|
||||
val channel = randomFile.channel
|
||||
val fileLock = channel.tryLock()
|
||||
if (fileLock == null) {
|
||||
System.err.println("Another instance is already running in ${lock.parent.pathString}")
|
||||
exitProcess(-1)
|
||||
} else {
|
||||
Runtime.getRuntime().addShutdownHook(Thread {
|
||||
fileLock.release()
|
||||
channel.close()
|
||||
Files.deleteIfExists(lock)
|
||||
})
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
println(e.toString())
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package me.vripper.listeners
|
||||
|
||||
import me.vripper.services.DataTransaction
|
||||
import me.vripper.services.MetadataService
|
||||
import org.koin.core.component.KoinComponent
|
||||
import org.koin.core.component.inject
|
||||
|
||||
open class OnStartupListener : KoinComponent {
|
||||
private val dataTransaction: DataTransaction by inject()
|
||||
private val metadataService: MetadataService by inject()
|
||||
|
||||
open fun run() {
|
||||
dataTransaction.setDownloadingToStopped()
|
||||
metadataService.init()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
package me.vripper.model
|
||||
|
||||
data class DownloadSpeed(val speed: Long)
|
||||
@@ -0,0 +1,3 @@
|
||||
package me.vripper.model
|
||||
|
||||
data class ErrorCount(val count: Int)
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user