mirror of
https://github.com/dev-claw/vripper-project.git
synced 2026-08-19 08:35:41 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 death-claw
|
e556dd1804 | ||
|
death-claw
|
96ad55b930 | ||
|
death-claw
|
9dc1a10255 | ||
|
death-claw
|
db4a041bc4 | ||
|
death-claw
|
661f591bf5 | ||
|
death-claw
|
e81bcfbfee | ||
|
death-claw
|
e8ba07aebd | ||
|
death-clawandGitHub
|
9930226dc0 | ||
|
death-clawandGitHub
|
48491767cb | ||
|
death-clawandGitHub
|
49229b9dac | ||
|
|
ecf3287e61 | ||
|
death-clawandGitHub
|
206b305ae6 | ||
|
death-clawandGitHub
|
70e7a87189 | ||
|
|
5aef1c0a89 |
@@ -27,70 +27,118 @@ jobs:
|
||||
- name: Build GUI Jar
|
||||
run: mvn -B -q install --file vripper-gui/pom.xml
|
||||
|
||||
- name: Rename GUI Jar
|
||||
run: mv vripper-gui/target/vripper-gui-${{ github.event.release.tag_name }}.jar vripper-gui/target/vripper-noarch-gui-${{ github.event.release.tag_name }}.jar
|
||||
|
||||
- if: matrix.os == 'ubuntu-latest'
|
||||
name: Upload GUI Jar
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
files: vripper-gui/target/vripper-noarch-gui-${{ github.event.release.tag_name }}.jar
|
||||
|
||||
# Start building WEB jar in ubuntu only
|
||||
- if: matrix.os == 'ubuntu-latest'
|
||||
name: Build WEB Jar
|
||||
run: |
|
||||
mvn -B -q install --file vripper-web-ui/pom.xml
|
||||
mvn -B -q install --file vripper-web/pom.xml
|
||||
|
||||
- name: Rename GUI Jar
|
||||
run: mv vripper-gui/target/vripper-gui-*.jar vripper-gui/target/vripper-gui.jar
|
||||
|
||||
- if: matrix.os == 'ubuntu-latest'
|
||||
name: Upload GUI Jar
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
files: vripper-gui/target/vripper-gui.jar
|
||||
|
||||
- if: matrix.os == 'ubuntu-latest'
|
||||
name: Rename WEB Jar
|
||||
run: mv vripper-web/target/vripper-web-*.jar vripper-web/target/vripper-web.jar
|
||||
run: mv vripper-web/target/vripper-web-${{ github.event.release.tag_name }}.jar vripper-web/target/vripper-noarch-web-${{ github.event.release.tag_name }}.jar
|
||||
|
||||
- if: matrix.os == 'ubuntu-latest'
|
||||
name: Upload WEB Jar
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
files: vripper-web/target/vripper-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-gui.jar jpackage/jar/vripper-gui.jar
|
||||
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 }} --type deb "@jpackage.cfg" "@jpackage-linux.cfg"
|
||||
jpackage --app-version ${{ github.event.release.tag_name }} --type rpm "@jpackage.cfg" "@jpackage-linux.cfg"
|
||||
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 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 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 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: Upload DEB and RPM package for Linux
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
files: |
|
||||
jpackage/dist/vripper-${{ github.event.release.tag_name }}-1.x86_64.rpm
|
||||
jpackage/dist/vripper_${{ github.event.release.tag_name }}-1_amd64.deb
|
||||
|
||||
- if: matrix.os == 'windows-latest'
|
||||
name: Package Windows
|
||||
run: |
|
||||
cd jpackage
|
||||
jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-windows.cfg"
|
||||
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: Upload packages for Windows
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
files: jpackage/dist/VRipper-${{ github.event.release.tag_name }}.msi
|
||||
|
||||
- if: matrix.os == 'macos-latest'
|
||||
name: Package macOS
|
||||
run: |
|
||||
cd jpackage
|
||||
jpackage --app-version ${{ github.event.release.tag_name }} "@jpackage.cfg" "@jpackage-macos.cfg"
|
||||
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: Upload package for macOS
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
files: jpackage/dist/VRipper-${{ github.event.release.tag_name }}.pkg
|
||||
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
|
||||
@@ -12,8 +12,8 @@ To build run the following:
|
||||
|
||||
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
|
||||
|
||||
Copy the artifact into any other folder and run:
|
||||
|
||||
java -jar vripper-gui-4.0.0.jar
|
||||
java -jar vripper-gui-{{version}}.jar
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,2 @@
|
||||
--type app-image
|
||||
--java-options "-Dbase.dir=${user.dir}"
|
||||
@@ -1,5 +1,4 @@
|
||||
--type pkg
|
||||
--icon icon.png
|
||||
--icon icon.icns
|
||||
--java-options "-Dbase.dir=${user.home}/.config"
|
||||
--mac-package-identifier me.mnlr.vripper.vripper-gui
|
||||
--mac-package-name VRipper
|
||||
@@ -1,4 +1,3 @@
|
||||
--type msi
|
||||
--icon icon.ico
|
||||
--java-options "-Dbase.dir=${user.home}"
|
||||
--win-dir-chooser
|
||||
|
||||
@@ -12,5 +12,5 @@
|
||||
<module>vripper-gui</module>
|
||||
</modules>
|
||||
<packaging>pom</packaging>
|
||||
<version>4.2.0</version>
|
||||
<version>4.3.0</version>
|
||||
</project>
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<relativePath/>
|
||||
<version>3.0.6</version>
|
||||
<version>3.1.3</version>
|
||||
</parent>
|
||||
<groupId>me.mnlr.vripper</groupId>
|
||||
<artifactId>vripper-core</artifactId>
|
||||
<version>4.2.0</version>
|
||||
<version>4.3.0</version>
|
||||
<name>vripper-core</name>
|
||||
<description>vripper-core</description>
|
||||
<properties>
|
||||
@@ -49,6 +49,7 @@
|
||||
<dependency>
|
||||
<artifactId>httpclient</artifactId>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<version>4.5.14</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>htmlcleaner</artifactId>
|
||||
@@ -80,6 +81,11 @@
|
||||
<groupId>com.fasterxml.jackson.datatype</groupId>
|
||||
<artifactId>jackson-datatype-jsr310</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.java.dev.jna</groupId>
|
||||
<artifactId>jna-platform</artifactId>
|
||||
<version>5.13.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
|
||||
@@ -1,58 +1,19 @@
|
||||
package me.mnlr.vripper
|
||||
|
||||
import jakarta.annotation.PreDestroy
|
||||
import org.springframework.beans.factory.annotation.Value
|
||||
import me.mnlr.vripper.download.DownloadService
|
||||
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$")
|
||||
}
|
||||
}
|
||||
@@ -67,7 +67,11 @@ class DownloadService(
|
||||
}
|
||||
accepted.clear()
|
||||
candidates.clear()
|
||||
condition.await()
|
||||
try {
|
||||
condition.await()
|
||||
} catch (e: InterruptedException) {
|
||||
Thread.currentThread().interrupt()
|
||||
}
|
||||
}
|
||||
}
|
||||
}, "Download scheduler thread"
|
||||
|
||||
@@ -4,10 +4,11 @@ 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.model.Settings
|
||||
import me.mnlr.vripper.repositories.ImageRepository
|
||||
import me.mnlr.vripper.repositories.PostDownloadStateRepository
|
||||
|
||||
class ImageDownloadContext(val imageId: Long) {
|
||||
class ImageDownloadContext(val imageId: Long, val settings: Settings) {
|
||||
|
||||
private val imageRepository: ImageRepository =
|
||||
SpringContext.getBean(ImageRepository::class.java)
|
||||
|
||||
@@ -30,7 +30,7 @@ class ImageDownloadRunnable(
|
||||
private val dataTransaction: DataTransaction = SpringContext.getBean(DataTransaction::class.java)
|
||||
private val pathService: PathService = SpringContext.getBean(PathService::class.java)
|
||||
|
||||
val context: ImageDownloadContext = ImageDownloadContext(imageInternalId)
|
||||
val context: ImageDownloadContext = ImageDownloadContext(imageInternalId, settings)
|
||||
private val image: ImageDownloadState
|
||||
get() = context.image
|
||||
private var stopped: Boolean
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package me.mnlr.vripper.event
|
||||
|
||||
data class Event<T>(val kind: Kind, val data: T) {
|
||||
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
|
||||
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, THREAD_CLEAR
|
||||
}
|
||||
}
|
||||
@@ -1,21 +1,19 @@
|
||||
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 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 java.nio.file.Files
|
||||
import java.nio.file.Path
|
||||
import kotlin.io.path.pathString
|
||||
|
||||
abstract class Host(
|
||||
private val httpService: HTTPService,
|
||||
@@ -84,10 +82,10 @@ abstract class Host(
|
||||
val mimeType = getImageMimeType(response.allHeaders)
|
||||
?: throw HostException("Unsupported image type ${response.getFirstHeader("content-type")}")
|
||||
|
||||
val tempImage = Files.createTempFile("vripper", "tmp")
|
||||
val tempImage = Files.createTempFile(Path.of(context.settings.downloadSettings.tempPath), "vripper_", ".tmp")
|
||||
return response.entity.content.use { inputStream ->
|
||||
try {
|
||||
FileOutputStream(tempImage.pathString).use { fos ->
|
||||
Files.newOutputStream(tempImage).use { fos ->
|
||||
val image = context.image
|
||||
image.total = response.entity.contentLength
|
||||
dataTransaction.update(image)
|
||||
|
||||
@@ -18,6 +18,7 @@ data class ViperSettings(
|
||||
|
||||
data class DownloadSettings(
|
||||
var downloadPath: String = System.getProperty("user.home"),
|
||||
var tempPath: String = System.getProperty("java.io.tmpdir"),
|
||||
var autoStart: Boolean = true,
|
||||
var autoQueueThreshold: Int = 1,
|
||||
var forceOrder: Boolean = false,
|
||||
|
||||
@@ -72,6 +72,7 @@ class ThreadRepositoryImpl @Autowired constructor(
|
||||
|
||||
override fun deleteAll() {
|
||||
jdbcTemplate.update("DELETE FROM THREAD")
|
||||
eventBus.publishEvent(Event(Event.Kind.THREAD_CLEAR, null))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package me.mnlr.vripper.tasks
|
||||
|
||||
import me.mnlr.vripper.AppEndpointService
|
||||
import me.mnlr.vripper.SpringContext
|
||||
import me.mnlr.vripper.delegate.LoggerDelegate
|
||||
import me.mnlr.vripper.download.PostDownloadRunnable
|
||||
@@ -32,6 +33,9 @@ class ThreadLookupRunnable(private val threadId: String, private val settings: S
|
||||
private val asyncTaskRunnerService = SpringContext.getBean(
|
||||
AsyncTaskRunnerService::class.java
|
||||
)
|
||||
private val appEndpointService = SpringContext.getBean(
|
||||
AppEndpointService::class.java
|
||||
)
|
||||
private val link: String =
|
||||
"${settingsService.settings.viperSettings.host}/threads/$threadId"
|
||||
private val logEvent: LogEvent
|
||||
@@ -94,8 +98,8 @@ class ThreadLookupRunnable(private val threadId: String, private val settings: S
|
||||
|
||||
private fun autostart(lookupResult: ThreadItem) {
|
||||
if (lookupResult.postItemList.size <= settings.downloadSettings.autoQueueThreshold) {
|
||||
appEndpointService.threadRemove(listOf(lookupResult.threadId))
|
||||
lookupResult.postItemList.forEach {
|
||||
Pair(it.threadId, it.postId)
|
||||
asyncTaskRunnerService.sink.emitNext(
|
||||
PostDownloadRunnable(
|
||||
it.threadId, it.postId
|
||||
|
||||
+3
-3
@@ -7,11 +7,11 @@
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<relativePath/>
|
||||
<version>3.0.6</version> <!-- lookup parent from repository -->
|
||||
<version>3.1.3</version> <!-- lookup parent from repository -->
|
||||
</parent>
|
||||
<groupId>me.mnlr.vripper</groupId>
|
||||
<artifactId>vripper-gui</artifactId>
|
||||
<version>4.2.0</version>
|
||||
<version>4.3.0</version>
|
||||
<name>vripper-gui</name>
|
||||
<description>vripper-gui</description>
|
||||
<dependencies>
|
||||
@@ -99,7 +99,7 @@
|
||||
<dependency>
|
||||
<artifactId>vripper-core</artifactId>
|
||||
<groupId>me.mnlr.vripper</groupId>
|
||||
<version>4.2.0</version>
|
||||
<version>4.3.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
||||
@@ -37,6 +37,7 @@ class SettingsController : Controller() {
|
||||
settingsService.newSettings(Settings().apply {
|
||||
downloadSettings = DownloadSettings(
|
||||
downloadSettingsModel.downloadPath,
|
||||
downloadSettingsModel.tempPath,
|
||||
downloadSettingsModel.autoStart,
|
||||
downloadSettingsModel.autoQueueThreshold,
|
||||
downloadSettingsModel.forceOrder,
|
||||
|
||||
@@ -7,6 +7,9 @@ class DownloadSettingsModel {
|
||||
val downloadPathProperty = SimpleStringProperty()
|
||||
var downloadPath: String by downloadPathProperty
|
||||
|
||||
val tempPathProperty = SimpleStringProperty()
|
||||
var tempPath: String by tempPathProperty
|
||||
|
||||
val autoStartProperty = SimpleBooleanProperty()
|
||||
var autoStart: Boolean by autoStartProperty
|
||||
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
package me.mnlr.vripper.utils
|
||||
|
||||
import com.sun.jna.Native
|
||||
import com.sun.jna.WString
|
||||
import com.sun.jna.platform.win32.ShellAPI
|
||||
import com.sun.jna.platform.win32.WinDef
|
||||
import com.sun.jna.win32.StdCallLibrary
|
||||
|
||||
interface Shell32 : ShellAPI, StdCallLibrary {
|
||||
fun ShellExecuteW(
|
||||
hwnd: WinDef.HWND?,
|
||||
lpOperation: WString?,
|
||||
lpFile: WString?,
|
||||
lpParameters: WString?,
|
||||
lpDirectory: WString?,
|
||||
nShowCmd: Int
|
||||
): WinDef.HINSTANCE?
|
||||
|
||||
companion object {
|
||||
val INSTANCE = Native.load(
|
||||
"shell32",
|
||||
Shell32::class.java
|
||||
) as Shell32
|
||||
}
|
||||
}
|
||||
@@ -46,7 +46,6 @@ class ThreadActionsView : View() {
|
||||
action {
|
||||
confirm("Clean threads", "Confirm removal of threads", ButtonType.YES, ButtonType.NO) {
|
||||
threadController.clearAll()
|
||||
threadTableView.tableView.items.clear()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ class DownloadSettingsView : View("Download Settings") {
|
||||
override fun onDock() {
|
||||
val downloadSettings = settingsController.findDownloadSettings()
|
||||
downloadSettingsModel.downloadPath = downloadSettings.downloadPath
|
||||
downloadSettingsModel.tempPath = downloadSettings.tempPath
|
||||
downloadSettingsModel.autoStart = downloadSettings.autoStart
|
||||
downloadSettingsModel.autoQueueThreshold = downloadSettings.autoQueueThreshold
|
||||
downloadSettingsModel.forceOrder = downloadSettings.forceOrder
|
||||
@@ -38,6 +39,19 @@ class DownloadSettingsView : View("Download Settings") {
|
||||
}
|
||||
}
|
||||
}
|
||||
field("Temporary Path") {
|
||||
textfield(downloadSettingsModel.tempPathProperty) {
|
||||
isEditable = false
|
||||
}
|
||||
button("Browse") {
|
||||
action {
|
||||
val directory = chooseDirectory(title = "Select temporary folder")
|
||||
if(directory != null) {
|
||||
downloadSettingsModel.tempPathProperty.set(directory.path)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
field("Auto start downloads") {
|
||||
checkbox {
|
||||
bind(downloadSettingsModel.autoStartProperty)
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package me.mnlr.vripper.view.tables
|
||||
|
||||
import com.sun.jna.WString
|
||||
import javafx.collections.FXCollections
|
||||
import javafx.collections.ObservableList
|
||||
import javafx.scene.control.*
|
||||
@@ -9,6 +10,7 @@ import me.mnlr.vripper.controller.PostController
|
||||
import me.mnlr.vripper.event.Event
|
||||
import me.mnlr.vripper.event.EventBus
|
||||
import me.mnlr.vripper.model.PostModel
|
||||
import me.mnlr.vripper.utils.Shell32
|
||||
import tornadofx.*
|
||||
|
||||
|
||||
@@ -107,8 +109,17 @@ class PostsTableView : View("Download") {
|
||||
detailsIcon.fitHeight = 18.0
|
||||
detailsItem.graphic = detailsIcon
|
||||
|
||||
val locationItem = MenuItem("Open Download Directory")
|
||||
locationItem.setOnAction {
|
||||
openFileDirectory(tableRow.item.path)
|
||||
}
|
||||
val locationIcon = ImageView("file-explorer.png")
|
||||
locationIcon.fitWidth = 18.0
|
||||
locationIcon.fitHeight = 18.0
|
||||
locationItem.graphic = locationIcon
|
||||
|
||||
contextMenu.items.addAll(
|
||||
startItem, stopItem, deleteItem, SeparatorMenuItem(), detailsItem
|
||||
startItem, stopItem, deleteItem, SeparatorMenuItem(), detailsItem, locationItem
|
||||
)
|
||||
tableRow.contextMenuProperty()
|
||||
.bind(tableRow.emptyProperty().map { empty -> if (empty) null else contextMenu })
|
||||
@@ -157,6 +168,17 @@ class PostsTableView : View("Download") {
|
||||
}
|
||||
}
|
||||
|
||||
private fun openFileDirectory(path: String) {
|
||||
val os = System.getProperty("os.name")
|
||||
if(os.contains("Windows")) {
|
||||
Shell32.INSTANCE.ShellExecuteW(null, WString("open"), WString(path), null, null, 1)
|
||||
} else if(os.contains("Linux")) {
|
||||
Runtime.getRuntime().exec("xdg-open $path")
|
||||
} else if(os.contains("Mac")) {
|
||||
Runtime.getRuntime().exec("open -R $path")
|
||||
}
|
||||
}
|
||||
|
||||
fun deleteSelected() {
|
||||
val postIdList = tableView.selectionModel.selectedItems.map { it.postId }
|
||||
confirm(
|
||||
|
||||
@@ -23,23 +23,39 @@ class ThreadTableView : View("Threads") {
|
||||
init {
|
||||
items.addAll(threadController.findAll())
|
||||
|
||||
eventBus.flux().filter { it!!.kind == Event.Kind.THREAD_UPDATE }.subscribe { event ->
|
||||
threadController.find(event!!.data as Long).ifPresent {
|
||||
// search
|
||||
val find = items.find { threadModel -> threadModel.threadId == it.threadId }
|
||||
if (find != null) {
|
||||
find.apply {
|
||||
total = it.total
|
||||
}
|
||||
} else {
|
||||
items.add(it)
|
||||
runLater {
|
||||
find<MainView>().root.selectionModel.select(1)
|
||||
tableView.selectionModel.clearSelection()
|
||||
tableView.selectionModel.select(it)
|
||||
eventBus.flux()
|
||||
.filter { it!!.kind == Event.Kind.THREAD_UPDATE || it.kind == Event.Kind.THREAD_REMOVE || it.kind == Event.Kind.THREAD_CLEAR }
|
||||
.subscribe { event ->
|
||||
when (event!!.kind) {
|
||||
Event.Kind.THREAD_UPDATE -> {
|
||||
threadController.find(event.data as Long).ifPresent {
|
||||
// search
|
||||
val find =
|
||||
items.find { threadModel -> threadModel.threadId == it.threadId }
|
||||
if (find != null) {
|
||||
find.apply {
|
||||
total = it.total
|
||||
}
|
||||
} else {
|
||||
items.add(it)
|
||||
runLater {
|
||||
find<MainView>().root.selectionModel.select(1)
|
||||
tableView.selectionModel.clearSelection()
|
||||
tableView.selectionModel.select(it)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Event.Kind.THREAD_REMOVE -> {
|
||||
tableView.items.removeIf { it.threadId == event.data as String }
|
||||
}
|
||||
|
||||
Event.Kind.THREAD_CLEAR -> {
|
||||
tableView.items.clear()
|
||||
}
|
||||
else -> {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -79,8 +95,8 @@ class ThreadTableView : View("Threads") {
|
||||
deleteItem.graphic = deleteIcon
|
||||
|
||||
contextMenu.items.addAll(selectItem, SeparatorMenuItem(), deleteItem)
|
||||
tableRow.contextMenuProperty()
|
||||
.bind(tableRow.emptyProperty().map { empty -> if (empty) null else contextMenu })
|
||||
tableRow.contextMenuProperty().bind(tableRow.emptyProperty()
|
||||
.map { empty -> if (empty) null else contextMenu })
|
||||
tableRow
|
||||
}
|
||||
column("URL", ThreadModel::linkProperty) {
|
||||
@@ -99,7 +115,6 @@ class ThreadTableView : View("Threads") {
|
||||
ButtonType.NO
|
||||
) {
|
||||
threadController.delete(threadIdList)
|
||||
tableView.items.removeIf { threadIdList.contains(it.threadId) }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 364 B |
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module version="4">
|
||||
<component name="AdditionalModuleElements">
|
||||
<content url="file://$MODULE_DIR$" dumb="true">
|
||||
<excludeFolder url="file://$MODULE_DIR$/vripper-web-ui/dist" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vripper-web-ui/tmp" />
|
||||
</content>
|
||||
</component>
|
||||
</module>
|
||||
Generated
+6
-6
@@ -13952,9 +13952,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/socket.io-parser": {
|
||||
"version": "4.2.2",
|
||||
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz",
|
||||
"integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==",
|
||||
"version": "4.2.4",
|
||||
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
|
||||
"integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"@socket.io/component-emitter": "~3.1.0",
|
||||
@@ -15572,9 +15572,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/word-wrap": {
|
||||
"version": "1.2.3",
|
||||
"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
|
||||
"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
|
||||
"version": "1.2.4",
|
||||
"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
|
||||
"integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>me.mnlr</groupId>
|
||||
<artifactId>vripper-web-ui</artifactId>
|
||||
<version>4.2.0</version>
|
||||
<version>4.3.0</version>
|
||||
<name>vripper-web-ui</name>
|
||||
<build>
|
||||
<resources>
|
||||
|
||||
@@ -38,8 +38,7 @@
|
||||
</mat-icon>
|
||||
</ng-template>
|
||||
<app-thread-table
|
||||
(rowCountChange)="threadCount.set($event)"
|
||||
[clear]="clearThreads"></app-thread-table>
|
||||
(rowCountChange)="threadCount.set($event)"></app-thread-table>
|
||||
</mat-tab>
|
||||
<mat-tab>
|
||||
<ng-template mat-tab-label>
|
||||
|
||||
@@ -14,6 +14,7 @@ export interface ConnectionSettings {
|
||||
|
||||
export interface DownloadSettings {
|
||||
downloadPath: string;
|
||||
tempPath: string;
|
||||
autoStart: boolean;
|
||||
autoQueueThreshold: number;
|
||||
forceOrder: boolean;
|
||||
|
||||
@@ -45,6 +45,12 @@ export class ApplicationEndpointService {
|
||||
return this.threadRemove;
|
||||
}
|
||||
|
||||
private threadRemoveAll!: Observable<void>;
|
||||
|
||||
get threadRemoveAll$(): Observable<void> {
|
||||
return this.threadRemoveAll;
|
||||
}
|
||||
|
||||
private logs!: Observable<Log[]>;
|
||||
|
||||
get logs$(): Observable<Log[]> {
|
||||
@@ -130,6 +136,13 @@ export class ApplicationEndpointService {
|
||||
share()
|
||||
);
|
||||
|
||||
this.threadRemoveAll = this.rxStomp.watch('/topic/threads/deletedAll').pipe(
|
||||
map(() => {
|
||||
return;
|
||||
}),
|
||||
share()
|
||||
);
|
||||
|
||||
this.globalState = this.rxStomp.watch('/topic/state').pipe(
|
||||
map(e => {
|
||||
const state: GlobalState = JSON.parse(e.body);
|
||||
@@ -205,12 +218,6 @@ export class ApplicationEndpointService {
|
||||
.pipe(map(v => v.map(p => ({ ...p, hosts: p.hosts }))));
|
||||
}
|
||||
|
||||
// send(wsMessage: WSMessage) {
|
||||
// this.rxStomp.publish({
|
||||
// destination: wsMessage.destination,
|
||||
// body: wsMessage.payload,
|
||||
// });
|
||||
// }
|
||||
startDownload() {
|
||||
return this.httpClient.post<void>(
|
||||
this.baseUrl + '/api/post/restart/all',
|
||||
|
||||
@@ -22,6 +22,10 @@
|
||||
name="downloadPath"
|
||||
required />
|
||||
</mat-form-field>
|
||||
<mat-form-field appearance="outline">
|
||||
<mat-label>Temporary Path</mat-label>
|
||||
<input formControlName="tempPath" matInput name="tempPath" required />
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field appearance="outline">
|
||||
<mat-label
|
||||
|
||||
@@ -62,6 +62,7 @@ export class SettingsComponent {
|
||||
|
||||
downloadSettingsForm = new FormGroup({
|
||||
downloadPath: new FormControl(''),
|
||||
tempPath: new FormControl(''),
|
||||
autoStart: new FormControl(false),
|
||||
autoQueueThreshold: new FormControl(0),
|
||||
forceOrder: new FormControl(false),
|
||||
|
||||
@@ -56,12 +56,9 @@ import {
|
||||
styleUrls: ['./thread-table.component.scss'],
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
})
|
||||
export class ThreadTableComponent implements OnInit, OnDestroy {
|
||||
export class ThreadTableComponent implements OnDestroy {
|
||||
@ViewChild('agGrid') agGrid!: AgGridAngular;
|
||||
|
||||
@Input({ required: true })
|
||||
clear!: Observable<void>;
|
||||
|
||||
@Output()
|
||||
rowCountChange = new EventEmitter<number>();
|
||||
|
||||
@@ -181,10 +178,6 @@ export class ThreadTableComponent implements OnInit, OnDestroy {
|
||||
};
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.clear.subscribe(() => this.agGrid.api.setRowData([]));
|
||||
}
|
||||
|
||||
private connect() {
|
||||
this.subscriptions.push(
|
||||
this.applicationEndpoint.threads$.subscribe((e: Thread[]) => {
|
||||
@@ -214,6 +207,12 @@ export class ThreadTableComponent implements OnInit, OnDestroy {
|
||||
this.agGrid.api.applyTransaction({ remove: toRemove });
|
||||
})
|
||||
);
|
||||
|
||||
this.subscriptions.push(
|
||||
this.applicationEndpoint.threadRemoveAll$.subscribe(() => {
|
||||
this.agGrid.api.setRowData([]);
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
private disconnect() {
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module version="4">
|
||||
<component name="AdditionalModuleElements">
|
||||
<content url="file://$MODULE_DIR$" dumb="true">
|
||||
<excludeFolder url="file://$MODULE_DIR$/dist" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
||||
</content>
|
||||
</component>
|
||||
</module>
|
||||
+4
-4
@@ -5,12 +5,12 @@
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>3.0.4</version>
|
||||
<version>3.1.3</version>
|
||||
<relativePath/> <!-- lookup parent from repository -->
|
||||
</parent>
|
||||
<groupId>me.mnlr.vripper</groupId>
|
||||
<artifactId>vripper-web</artifactId>
|
||||
<version>4.2.0</version>
|
||||
<version>4.3.0</version>
|
||||
<name>vripper-web</name>
|
||||
<description>vripper-web</description>
|
||||
<properties>
|
||||
@@ -41,12 +41,12 @@
|
||||
<dependency>
|
||||
<groupId>me.mnlr.vripper</groupId>
|
||||
<artifactId>vripper-core</artifactId>
|
||||
<version>4.2.0</version>
|
||||
<version>4.3.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>me.mnlr</groupId>
|
||||
<artifactId>vripper-web-ui</artifactId>
|
||||
<version>4.2.0</version>
|
||||
<version>4.3.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
||||
@@ -82,6 +82,11 @@ class DataBroadcast constructor(
|
||||
eventList
|
||||
.map { (_, data): Event<*> -> data as String })
|
||||
|
||||
Event.Kind.THREAD_CLEAR -> template.convertAndSend(
|
||||
"/topic/threads/deletedAll",
|
||||
eventList
|
||||
.map { true })
|
||||
|
||||
Event.Kind.LOG_EVENT_UPDATE -> template.convertAndSend(
|
||||
"/topic/logs",
|
||||
eventList
|
||||
|
||||
Reference in New Issue
Block a user