Compare commits

...
53 Commits
Author SHA1 Message Date
death-claw 667376301a v2.2.5 2019-11-09 13:26:54 +01:00
death-claw 128e6b68a3 More robust parsing
Fix pixhost and imagezilla to exclude thumbs
2019-11-09 13:16:09 +01:00
death-claw a7c2844ab4 Change Retry duration 2019-11-09 10:13:12 +01:00
death-claw bd0b7d274b Fix macOs paths 2019-10-06 13:33:29 +01:00
death-claw bc57fad52b Remove failing rule 2019-10-06 12:00:01 +01:00
death-claw b81ef53cb9 Add support for macOs 2019-10-06 11:22:48 +01:00
death-claw c182bf0a08 v2.2.4 2019-10-05 18:06:40 +01:00
death-claw 07802b4b13 Add AppImage target 2019-10-05 18:03:32 +01:00
death-claw 50c4d947ed v2.2.3 2019-10-01 23:28:12 +01:00
death-claw b9b20e86dd Strip libjvm.so for debian 2019-10-01 23:27:01 +01:00
death-claw 64b93ce7e1 v2.2.2 2019-10-01 22:59:39 +01:00
death-claw 0bde4399e3 Update product name 2019-10-01 22:57:13 +01:00
death-claw 9b7818c5a7 v2.2.1 2019-10-01 22:44:19 +01:00
death-claw 1f2dcff353 Update dependency list for deb package 2019-10-01 22:42:28 +01:00
death-claw 4d82622fdb v2.2.0 2019-10-01 21:26:27 +01:00
death-claw e7393caf01 Fix 'Start' on pending items
Upgrade to Java 11
Embedd JRE within the app
2019-10-01 21:24:02 +01:00
death-claw 8e5cb958ea v2.1.0 2019-09-30 21:12:56 +01:00
death-claw bc2cf02ec6 Add a create a subfolder per thread option 2019-09-30 21:06:40 +01:00
death-claw 7a8ecb306f v2.0.4 2019-09-27 20:52:25 +01:00
death-claw 76c3901afa Fix some issues with ImxHost 2019-09-27 20:50:51 +01:00
death-claw f16b2227a1 v2.0.3 2019-09-23 17:38:36 +01:00
death-claw d8d7ca5408 Update deb dependencies 2019-09-23 17:36:10 +01:00
death-claw 28c6b71e99 v2.0.2 2019-09-23 16:46:37 +01:00
death-claw c40d3e2377 Add portable mode 2019-09-23 16:43:52 +01:00
death-claw 2217fea0ad v2.0.1 2019-09-22 21:55:30 +01:00
death-claw 94746441b5 Update app name 2019-09-22 21:48:35 +01:00
death-claw c3e861fa8b v2.0.0 2019-09-22 20:58:24 +01:00
death-claw ae1d644dba Update icons 2019-09-22 20:41:32 +01:00
death-claw 1fcb7e4e42 Fix a bug in data file 2019-09-22 20:29:34 +01:00
death-claw 646cbba21c Update package.json 2019-09-22 20:21:05 +01:00
death-claw eef4d13235 Change data and log paths 2019-09-22 20:15:03 +01:00
death-claw 9d1fe4c6b6 Electron app changes 2019-09-22 18:41:27 +01:00
death-claw 610d08f4ca Add sub folder option
Add clear finished option
UI enhancements
Bug fixes
2019-09-22 16:23:52 +01:00
death-claw 7e52d0d6de v1.6.5 2019-09-18 23:20:58 +01:00
death-claw 4f0c5925ad electron update 2019-09-18 23:19:01 +01:00
death-claw 245668b374 v1.6.4 2019-09-18 20:29:18 +01:00
death-claw d3f5a70bfb Change menu item name 2019-09-18 20:27:36 +01:00
death-claw 5fd70a821b v1.6.3 2019-09-18 19:44:45 +01:00
death-claw 6e9c912118 Better multithread management
Fix partial state UI
2019-09-18 19:41:48 +01:00
death-claw 19a98ea056 v1.6.2 2019-09-17 23:00:55 +01:00
death-claw 229bc46227 Rework UI colors
Fix scan input bug
2019-09-17 22:59:04 +01:00
death-claw 374946c6f2 v1.6.1 2019-09-16 22:56:57 +01:00
death-claw f8eccfb4ad Rework UI
Fix clipboard monitoring
2019-09-16 22:54:18 +01:00
death-claw 4223bce5f3 v1.6.0 2019-09-15 22:19:53 +01:00
death-claw ea9a98bb3e Rework the UI
Add a dark theme
Fix the force ordering bug
Other bug fixes
2019-09-15 22:14:17 +01:00
death-claw a416a7e7d7 v1.5.2 2019-09-01 15:46:41 +01:00
death-claw 24dd46ab2c Fix imx host 2019-09-01 15:40:34 +01:00
death-claw 82f4d1bc6a v1.5.1 2019-08-24 19:23:49 +01:00
death-claw 819d844f23 Bug fixes and electron upgrade 2019-08-24 19:19:31 +01:00
death-claw ab4711ffef v1.5.0
- 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
2019-08-24 14:57:43 +01:00
death-claw f107acf376 Merge branch 'master' of https://github.com/death-claw/vripper-project into development 2019-08-16 11:50:24 +01:00
death-claw 35cd3c53e1 Implement thread parse with vr api 2019-08-06 20:03:13 +01:00
death-claw 13d1d134f6 INTERMEDIATE COMMIT 2019-08-06 18:24:20 +01:00
111 changed files with 3326 additions and 1583 deletions
+1
View File
@@ -2,4 +2,5 @@
/**/*/node_modules
/**/*/target
/**/*/build-dir
/**/*/java-runtime
.idea
+103
View File
@@ -1,5 +1,108 @@
# Changelog
## [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 -1
View File
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>tn.mnlr</groupId>
<artifactId>vripper</artifactId>
<version>1.4.10</version>
<version>2.2.5</version>
<packaging>pom</packaging>
<parent>
<groupId>org.springframework.boot</groupId>
Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

+31 -9
View File
@@ -34,16 +34,15 @@ if (!commandExists("java")) {
function createWindow() {
let icon;
if(process.platform === "win32") {
icon = path.join(__dirname, `icon.ico`);
icon = __dirname + '/icon.ico';
} else {
icon = path.join(__dirname, `icon.icns`);
icon = __dirname + '/icon.png';
}
win = new BrowserWindow({
width: 1024,
height: 768,
minWidth: 640,
minHeight: 480,
frame: false,
height: 800,
minWidth: 800,
minHeight: 600,
webPreferences: {
nodeIntegration: true
},
@@ -51,6 +50,8 @@ function createWindow() {
});
win.removeMenu();
win.setMenu(null);
win.setMenuBarVisibility(false);
win.loadURL(
url.format({
@@ -72,11 +73,32 @@ getPort().then(port => {
ipcMain.on("get-port", event => {
event.reply("port", port);
});
vripperServer = spawn("java", [
let javaBinPath;
if(appDir !== undefined) {
javaBinPath = path.join(appDir, "java-runtime/bin/java");
} else {
if(process.platform === 'darwin') {
javaBinPath = path.join(app.getPath('exe'), "../../java-runtime/bin/java");
} else {
javaBinPath = path.join(app.getPath('exe'), "../java-runtime/bin/java");
}
}
let jarPath;
if(appDir !== undefined) {
jarPath = path.join(appDir, "bin/vripper-server.jar");
} else {
if(process.platform === 'darwin') {
jarPath = path.join(app.getPath('exe'), "../../bin/vripper-server.jar");
} else {
jarPath = path.join(app.getPath('exe'), "../bin/vripper-server.jar");
}
}
vripperServer = spawn(javaBinPath, [
"-Xms256m",
"-Xmx1024m",
"-Dvripper.server.port=" + port,
"-jar",
appDir !== undefined ? path.join(appDir, "bin/vripper-server.jar") :
path.join(app.getPath('exe'), "../bin/vripper-server.jar")
jarPath
], {
stdio: 'ignore'
});
+237 -419
View File
File diff suppressed because it is too large Load Diff
+44 -8
View File
@@ -1,12 +1,14 @@
{
"name": "vripper-electron",
"version": "1.4.10",
"description": "",
"version": "2.2.5",
"description": "A ripper for vipergirls.to built using web technolgies",
"main": "main.js",
"author": "",
"author": "death-claw <53543762+death-claw@users.noreply.github.com>",
"homepage": "https://github.com/death-claw/vripper-project",
"license": "ISC",
"build": {
"appId": "tn.mnlr.vripper",
"productName": "vripper",
"files": [
"**/*",
"!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme}",
@@ -29,24 +31,58 @@
{
"from": "../vripper-server/target/vripper-server-${version}-electron.jar",
"to": "bin/vripper-server.jar"
},
{
"from": "java-runtime",
"to": "java-runtime"
}
],
"win": {
"target": "nsis"
"icon": "icon.png",
"target": [
"nsis"
]
},
"nsis": {
"createDesktopShortcut": "always",
"oneClick": false,
"perMachine": false
},
"linux": {
"synopsis": "vipergirls.to ripper",
"category": "Utility",
"packageCategory": "Utility",
"icon": "icons",
"target": [
"zip"
"deb",
"AppImage"
]
},
"deb": {
"depends": [
"gconf2",
"gconf-service",
"libnotify4",
"libappindicator1",
"libxtst6",
"libnss3"
]
},
"mac": {
"category": "public.app-category.utilities",
"target": [
"dmg"
],
"icon": "icon.png"
}
},
"scripts": {
"start": "electron .",
"dist": "node pre-build.js && build"
"dist": "node pre-build.js && electron-builder"
},
"devDependencies": {
"electron": "^5.0.5",
"electron-builder": "^20.44.4"
"electron": "^6.0.9",
"electron-builder": "^21.2.0"
},
"dependencies": {
"axios": "^0.19.0",
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>tn.mnlr</groupId>
<artifactId>vripper</artifactId>
<version>1.4.10</version>
<version>2.2.5</version>
</parent>
<artifactId>vripper-electron</artifactId>
<name>vripper-electron</name>
+8 -1
View File
@@ -2,7 +2,7 @@ const cheerio = require('cheerio');
const fs = require('fs');
const rimraf = require("rimraf");
const copydir = require("copy-dir");
const { execSync } = require("child_process");
rimraf.sync('./build/vripper-ui');
copydir.sync('../vripper-ui/dist/vripper-ui', './build/vripper-ui', {});
@@ -16,3 +16,10 @@ $('body').prepend(`<script>require('../renderer.js')</script>`);
fs.writeFileSync('./build/vripper-ui/index.html', $.html());
console.log('Building runtime environment');
rimraf.sync('java-runtime');
execSync('jlink --no-header-files --no-man-pages --compress=2 --strip-debug --add-modules java.base,java.desktop,java.instrument,java.management,java.naming,java.prefs,java.rmi,java.scripting,java.security.jgss,java.sql,jdk.httpserver,jdk.unsupported,jdk.crypto.ec --output java-runtime');
if(process.platform === 'linux') {
console.log('Stripping libjvm.so');
execSync('strip -p --strip-unneeded java-runtime/lib/server/libjvm.so');
}
+1 -10
View File
@@ -1,12 +1,3 @@
console.log("renderer intialized");
const customTitlebar = require("custom-electron-titlebar");
const electron = require("electron").remote;
const contextMenu = require("electron-context-menu");
contextMenu({});
const menu = new electron.Menu();
const titlebar = new customTitlebar.Titlebar({
backgroundColor: customTitlebar.Color.fromHex("#3f51b5"),
menu: menu
});
titlebar.updateTitle("Viper Ripper");
contextMenu({});
+2 -2
View File
@@ -5,14 +5,14 @@
<parent>
<groupId>tn.mnlr</groupId>
<artifactId>vripper</artifactId>
<version>1.4.10</version>
<version>2.2.5</version>
</parent>
<artifactId>vripper-server</artifactId>
<name>vripper-server</name>
<description>vripper-server</description>
<properties>
<java.version>1.8</java.version>
<java.version>11</java.version>
</properties>
<dependencies>
@@ -1,8 +1,10 @@
package tn.mnlr.vripper;
import lombok.Getter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -12,14 +14,19 @@ import tn.mnlr.vripper.services.AppSettingsService;
import tn.mnlr.vripper.services.PersistenceService;
import tn.mnlr.vripper.services.VipergirlsAuthService;
import javax.annotation.PostConstruct;
import java.io.File;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@SpringBootApplication
public class VripperApplication {
private static final Logger logger = LoggerFactory.getLogger(VripperApplication.class);
public static final String dataPath = System.getProperty("vripper.datapath", ".") + File.separator + "data.json";
// public static final String dataPath = System.getProperty("user.home", ".") + File.separator + ".vripper" + File.separator + "data.json";
public static final ExecutorService commonExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
public static void main(String[] args) {
@@ -42,6 +49,17 @@ public class VripperApplication {
@Autowired
private AppSettingsService appSettingsService;
@Value("${base.dir}")
private String baseDir;
@Getter
private String dataPath;
@PostConstruct
public void init() {
dataPath = baseDir + File.separator + ".vripper" + File.separator + "data.json";
}
@Override
public void run(String... args) {
@@ -61,5 +79,3 @@ public class VripperApplication {
}
}
}
@@ -5,6 +5,8 @@ import io.reactivex.processors.BehaviorProcessor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import tn.mnlr.vripper.host.Host;
import tn.mnlr.vripper.services.AppStateService;
@@ -15,8 +17,10 @@ import java.util.concurrent.atomic.AtomicLong;
@NoArgsConstructor
public class Image {
@Setter
private static final Logger logger = LoggerFactory.getLogger(Image.class);
private AppStateService appStateService;
private Disposable subscription;
private final String type = "img";
@@ -38,18 +42,20 @@ public class Image {
@Setter
private long total = 0;
public Image(String url, String postId, String postName, Host host, AppStateService appStateService, int index) {
public Image(String url, String postId, String postName, Host host, int index) {
this.url = url;
this.postId = postId;
this.postName = postName;
this.host = host;
this.appStateService = appStateService;
this.index = index;
status = Status.PENDING;
imageStateProcessor = BehaviorProcessor.create();
}
public void setAppStateService(AppStateService appStateService) {
this.appStateService = appStateService;
appStateService.getCurrentImages().put(this.url, this);
appStateService.getLiveImageUpdates().onNext(this);
init();
}
public void setStatus(Status status) {
@@ -62,12 +68,11 @@ public class Image {
}
public void init() {
if (imageStateProcessor != null) {
imageStateProcessor.onComplete();
}
if (subscription != null) {
subscription.dispose();
if (appStateService == null) {
logger.warn("Attempting to init the image whilst the App State is null, unexpected behaviour could occur from this");
return;
}
cleanup();
imageStateProcessor = BehaviorProcessor.create();
subscription = imageStateProcessor
.onBackpressureLatest()
@@ -79,6 +84,15 @@ public class Image {
imageStateProcessor.onNext(this);
}
public void cleanup() {
if (imageStateProcessor != null) {
imageStateProcessor.onComplete();
}
if (subscription != null) {
subscription.dispose();
}
}
public void setCurrent(int current) {
this.current.set(current);
update();
@@ -2,21 +2,22 @@ package tn.mnlr.vripper.entities;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import tn.mnlr.vripper.host.Host;
import tn.mnlr.vripper.services.AppStateService;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@Getter
@ToString
@NoArgsConstructor
public class Post {
@Setter
private AppStateService appStateService;
private Status status;
@@ -25,48 +26,65 @@ public class Post {
private String postId;
private String title;
private String threadTitle;
private String postCounter;
private String threadId;
private String title;
private String url;
private List<Image> images;
private Map<String, String> metadata;
private Map<String, Object> metadata;
private AtomicInteger done = new AtomicInteger(0);
private int total;
private Set<String> hosts;
private boolean removed = false;
public Post(String title, String url, List<Image> images, Map<String, String> metadata, String postId, String postCounter, AppStateService appStateService) {
private String forum;
public Post(String title, String url, List<Image> images, Map<String, Object> metadata, String postId, String threadId, String threadTitle, String forum) {
this.title = title;
this.url = url;
this.images = images;
this.metadata = metadata;
this.postId = postId;
this.postCounter = postCounter;
this.appStateService = appStateService;
this.forum = forum;
this.threadId = threadId;
this.threadTitle = threadTitle;
this.images.stream().map(e -> e.getHost()).map(Host::getHost).collect(Collectors.toSet());
this.hosts = this.images.stream().map(e -> e.getHost()).map(Host::getHost).collect(Collectors.toSet());
total = images.size();
status = Status.PENDING;
appStateService.getCurrentPosts().put(postId, this);
appStateService.getLivePostsState().onNext(this);
}
public void setAppStateService(AppStateService appStateService) {
this.appStateService = appStateService;
this.appStateService.getCurrentPosts().put(postId, this);
this.appStateService.getLivePostsState().onNext(this);
}
public void setRemoved(boolean removed) {
this.removed = removed;
appStateService.getLivePostsState().onNext(this);
updateNotification();
}
public void increase() {
done.incrementAndGet();
appStateService.getLivePostsState().onNext(this);
updateNotification();
}
public void setStatus(Status status) {
this.status = status;
updateNotification();
}
private void updateNotification() {
if (appStateService != null) {
appStateService.getLivePostsState().onNext(this);
}
@@ -5,16 +5,12 @@ import tn.mnlr.vripper.entities.Image;
import tn.mnlr.vripper.services.AppStateService;
import java.util.List;
import java.util.Map;
public abstract class PostUIMixin {
@JsonIgnore
private List<Image> images;
@JsonIgnore
private Map<String, String> metadata;
@JsonIgnore
private AppStateService appStateService;
}
@@ -6,7 +6,7 @@ public class DownloadException extends Exception {
super(message);
}
public DownloadException(Exception e) {
public DownloadException(Throwable e) {
super(e);
}
}
@@ -1,7 +1,7 @@
package tn.mnlr.vripper.exception;
public class HostException extends Exception {
public HostException(Exception e) {
public HostException(Throwable e) {
super(e);
}
@@ -9,7 +9,7 @@ public class HostException extends Exception {
super(message);
}
public HostException(String message, Exception e) {
public HostException(String message, Throwable e) {
super(message,e);
}
}
@@ -2,7 +2,7 @@ package tn.mnlr.vripper.exception;
public class HtmlProcessorException extends Exception {
public HtmlProcessorException(Exception e) {
public HtmlProcessorException(Throwable e) {
super(e);
}
}
@@ -1,7 +1,16 @@
package tn.mnlr.vripper.exception;
public class PostParseException extends Exception {
public PostParseException(Exception e) {
public PostParseException(String message) {
super(message);
}
public PostParseException(String message, Throwable e) {
super(message, e);
}
public PostParseException(Throwable e) {
super(e);
}
}
@@ -5,7 +5,7 @@ public class VripperException extends Exception {
super(message);
}
public VripperException(Exception e) {
public VripperException(Throwable e) {
super(e);
}
}
@@ -1,7 +1,7 @@
package tn.mnlr.vripper.exception;
public class XpathException extends Exception {
public XpathException(Exception e) {
public XpathException(Throwable e) {
super(e);
}
}
@@ -34,7 +34,12 @@ public class AcidimgHost extends Host {
private ConnectionManager cm;
@Override
protected String getHost() {
public String getHost() {
return host;
}
@Override
public String getLookup() {
return host;
}
@@ -45,22 +45,32 @@ abstract public class Host {
@Autowired
private AppSettingsService appSettingsService;
@Autowired
private AppStateService appStateService;
@Autowired
private ConnectionManager cm;
@Autowired
private DownloadSpeedService downloadSpeedService;
abstract protected String getHost();
@Autowired
private PathService pathService;
abstract public String getHost();
abstract public String getLookup();
public boolean isSupported(String url) {
return url.contains(getHost());
return url.contains(getLookup());
}
public void download(Image image, ImageFileData imageFileData) throws DownloadException, InterruptedException {
try {
appStateService.postDownloadingUpdate(image.getPostId());
imageFileData.setPageUrl(image.getUrl());
/**
@@ -77,8 +87,10 @@ abstract public class Host {
* END HOST SPECIFIC
*/
imageFileData.setImageName(formatImageFileName(imageFileData.getImageName()));
File destinationFolder = new File(appSettingsService.getDownloadPath(), sanitize(image.getPostName() + "_" + image.getPostId()));
String formatImageFileName = pathService.formatImageFileName(imageFileData.getImageName());
logger.info(String.format("Sanitizing image name from %s to %s", imageFileData.getImageName(), formatImageFileName));
imageFileData.setImageName(formatImageFileName);
File destinationFolder = pathService.getDownloadDestinationFolder(image.getPostId());
logger.info(String.format("Saving to %s", destinationFolder.getPath()));
if (!destinationFolder.exists()) {
logger.info(String.format("Creating %s", destinationFolder.getPath()));
@@ -145,30 +157,16 @@ abstract public class Host {
throw new HostException("Failed to guess image format", e);
}
try {
String outImageName = (appSettingsService.isForceOrder() ? String.format("%03d_", index) : "") + imageName + "." + formatName.toLowerCase();
Files.move(outputFile.toPath(), new File(outputFile.getParent(), outImageName).toPath());
File outImage = new File(outputFile.getParent(), (appSettingsService.isForceOrder() ? String.format("%03d_", index) : "") + imageName + "." + formatName.toLowerCase());
if (outImage.exists()) {
outImage.delete();
}
Files.move(outputFile.toPath(), outImage.toPath());
} catch (Exception e) {
throw new HostException("Failed to rename the image", e);
}
}
/**
* Will sanitize the image name and remove extension
*
* @param imageName
* @return
*/
protected String formatImageFileName(String imageName) {
int extensionIndex = imageName.lastIndexOf('.');
String fileName;
if (extensionIndex != -1) {
fileName = imageName.substring(0, extensionIndex);
} else {
fileName = imageName;
}
return sanitize(fileName);
}
/**
* Just for testing, you may ignore
* @throws Exception
@@ -181,14 +179,6 @@ abstract public class Host {
}
}
protected final String sanitize(final String folderName) {
String sanitizedFolderName = folderName.replaceAll("\\.|\\\\|/|\\||:|\\?|\\*|\"|<|>|\\p{Cntrl}", "_");
logger.debug(String.format("%s sanitized to %s", folderName, sanitizedFolderName));
return sanitizedFolderName;
}
protected final String getDefaultImageName(final String imgUrl) {
String imageTitle = imgUrl.substring(imgUrl.lastIndexOf('/') + 1);
logger.debug(String.format("Extracting name from url %s: %s", imgUrl, imageTitle));
@@ -239,4 +229,9 @@ abstract public class Host {
private Document document;
private Header[] headers;
}
@Override
public String toString() {
return getHost();
}
}
@@ -34,7 +34,12 @@ public class ImageBamHost extends Host {
private ConnectionManager cm;
@Override
protected String getHost() {
public String getHost() {
return host;
}
@Override
public String getLookup() {
return host;
}
@@ -23,7 +23,12 @@ public class ImageTwistHost extends Host {
private ConnectionManager cm;
@Override
protected String getHost() {
public String getHost() {
return host;
}
@Override
public String getLookup() {
return host;
}
@@ -17,16 +17,22 @@ public class ImageZillaHost extends Host {
private static final Logger logger = LoggerFactory.getLogger(ImageZillaHost.class);
private static final String host = "imagezilla.net";
private static final String lookup = "imagezilla.net/show";
public static final String IMG_XPATH = "//img[@id='photo']";
@Autowired
private ConnectionManager cm;
@Override
protected String getHost() {
public String getHost() {
return host;
}
@Override
public String getLookup() {
return lookup;
}
@Override
protected void setNameAndUrl(final String url, final ImageFileData imageFileData) throws HostException {
@@ -23,7 +23,12 @@ public class ImgboxHost extends Host {
private ConnectionManager cm;
@Override
protected String getHost() {
public String getHost() {
return host;
}
@Override
public String getLookup() {
return host;
}
@@ -29,37 +29,51 @@ public class ImxHost extends Host {
private static final Logger logger = LoggerFactory.getLogger(ImxHost.class);
private static final String host = "imx.to";
public static final String CONTINUE_BUTTON_XPATH = "//div[@id='continuetoimage']";
public static final String CONTINUE_BUTTON_XPATH = "//*[@name='imgContinue']";
public static final String IMG_XPATH = "//img[@class='centred']";
@Autowired
private ConnectionManager cm;
@Override
protected String getHost() {
public String getHost() {
return host;
}
@Override
protected void setNameAndUrl(final String url, final ImageFileData imageFileData) throws HostException {
public String getLookup() {
return host;
}
Document doc = getResponse(url).getDocument();
@Override
protected void setNameAndUrl(final String _url, final ImageFileData imageFileData) throws HostException {
String url = _url.replace("http://", "https://");
Response resp = getResponse(url);
Document doc = resp.getDocument();
Node contDiv;
String value = null;
try {
logger.info(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
contDiv = xpathService.getAsNode(doc, CONTINUE_BUTTON_XPATH);
Node node = contDiv.getAttributes().getNamedItem("value");
if (node != null) {
value = node.getTextContent();
}
} catch (XpathException e) {
throw new HostException(e);
}
if (contDiv != null) {
if (value == null) {
throw new HostException("Failed to obtain value attribute from continue input");
}
logger.info(String.format("Click button found for %s", url));
HttpClient client = cm.getClient().build();
HttpPost httpPost = cm.buildHttpPost(url);
httpPost.addHeader("Referer", url);
List<NameValuePair> params = new ArrayList<>();
params.add(new BasicNameValuePair("imgContinue", "Continue to image ... "));
params.add(new BasicNameValuePair("imgContinue", value));
try {
httpPost.setEntity(new UrlEncodedFormEntity(params));
} catch (Exception e) {
@@ -17,16 +17,22 @@ public class PixhostHost extends Host {
private static final Logger logger = LoggerFactory.getLogger(PixhostHost.class);
private static final String host = "pixhost.to";
private static final String lookup = "pixhost.to/show";
public static final String IMG_XPATH = "//img[@id='image']";
@Autowired
private ConnectionManager cm;
@Override
protected String getHost() {
public String getHost() {
return host;
}
@Override
public String getLookup() {
return lookup;
}
@Override
protected void setNameAndUrl(final String url, final ImageFileData imageFileData) throws HostException {
@@ -24,7 +24,12 @@ public class TurboImageHost extends Host {
private ConnectionManager cm;
@Override
protected String getHost() {
public String getHost() {
return host;
}
@Override
public String getLookup() {
return host;
}
@@ -34,11 +34,14 @@ public class DownloadQ {
@Getter
private boolean notPauseQ = true;
public synchronized void put(Image image) throws InterruptedException {
logger.info(String.format("Enqueuing a job for %s", image.getUrl()));
DownloadJob downloadJob = new DownloadJob(image);
downloadQ.put(downloadJob);
appStateService.newDownloadJob(downloadJob);
public void put(Image image) throws InterruptedException {
synchronized (appStateService) {
logger.info(String.format("Enqueuing a job for %s", image.getUrl()));
image.init();
DownloadJob downloadJob = new DownloadJob(image);
downloadQ.put(downloadJob);
appStateService.newDownloadJob(downloadJob);
}
}
public DownloadJob take() throws InterruptedException {
@@ -47,53 +50,57 @@ public class DownloadQ {
return downloadJob;
}
public void enqueue(Post post) throws InterruptedException {
public synchronized void enqueue(Post post) throws InterruptedException {
for (Image image : post.getImages()) {
put(image);
}
}
public void restart(String postId) throws InterruptedException {
if (appStateService.getRunningPosts().get(postId) != null && appStateService.getRunningPosts().get(postId).get() > 0) {
logger.warn(String.format("Cannot restart, jobs are currently running for post id %s", postId));
return;
}
List<Image> images = appStateService.getPost(postId)
.getImages()
.stream()
.filter(e -> !e.getStatus().equals(Image.Status.COMPLETE))
.collect(Collectors.toList());
if (images.isEmpty()) {
return;
}
appStateService.getPost(postId).setStatus(Post.Status.PENDING);
logger.info(String.format("Restarting %d jobs for post id %s", images.size(), postId));
for (Image image : images) {
image.init();
put(image);
synchronized (appStateService) {
if (appStateService.getRunningPosts().get(postId) != null && appStateService.getRunningPosts().get(postId).get() > 0) {
logger.warn(String.format("Cannot restart, jobs are currently running for post id %s", postId));
return;
}
List<Image> images = appStateService.getPost(postId)
.getImages()
.stream()
.filter(e -> !e.getStatus().equals(Image.Status.COMPLETE))
.collect(Collectors.toList());
if (images.isEmpty()) {
return;
}
appStateService.getPost(postId).setStatus(Post.Status.PENDING);
logger.info(String.format("Restarting %d jobs for post id %s", images.size(), postId));
for (Image image : images) {
put(image);
}
}
}
public void removeScheduled(Image image) {
image.setStatus(Image.Status.STOPPED);
logger.info(String.format("Removing scheduled job for %s", image.getUrl()));
synchronized (appStateService) {
image.setStatus(Image.Status.STOPPED);
logger.info(String.format("Removing scheduled job for %s", image.getUrl()));
Iterator<DownloadJob> iterator = downloadQ.iterator();
boolean removed = false;
while(iterator.hasNext()) {
DownloadJob next = iterator.next();
if(next.getImage().getPostId().equals(image.getPostId())) {
iterator.remove();
appStateService.doneDownloadJob(image);
logger.info(String.format("Scheduled job for %s is removed", image.getUrl()));
removed = true;
break;
Iterator<DownloadJob> iterator = downloadQ.iterator();
boolean removed = false;
while (iterator.hasNext()) {
DownloadJob next = iterator.next();
if (next.getImage().getPostId().equals(image.getPostId())) {
iterator.remove();
appStateService.doneDownloadJob(image);
logger.info(String.format("Scheduled job for %s is removed", image.getUrl()));
removed = true;
break;
}
}
}
if(!removed) {
logger.warn(String.format("Job for %s does not exist", image.getUrl()));
if (!removed) {
logger.warn(String.format("Job for %s does not exist", image.getUrl()));
}
image.cleanup();
}
}
@@ -103,24 +110,26 @@ public class DownloadQ {
}
public synchronized void stop(String postId) {
public void stop(String postId) {
try {
if (FINISHED.contains(appStateService.getPost(postId).getStatus())) {
return;
synchronized (appStateService) {
if (FINISHED.contains(appStateService.getPost(postId).getStatus())) {
return;
}
notPauseQ = false;
appStateService.getPost(postId).setStatus(Post.Status.STOPPED);
List<Image> images = appStateService.getPost(postId)
.getImages()
.stream()
.filter(e -> !e.getStatus().equals(Image.Status.COMPLETE))
.collect(Collectors.toList());
if (images.isEmpty()) {
return;
}
logger.info(String.format("Stopping %d jobs for post id %s", images.size(), postId));
images.forEach(image -> removeScheduled(image));
removeRunning(postId);
}
notPauseQ = false;
appStateService.getPost(postId).setStatus(Post.Status.STOPPED);
List<Image> images = appStateService.getPost(postId)
.getImages()
.stream()
.filter(e -> !e.getStatus().equals(Image.Status.COMPLETE))
.collect(Collectors.toList());
if (images.isEmpty()) {
return;
}
logger.info(String.format("Stopping %d jobs for post id %s", images.size(), postId));
images.forEach(image -> removeScheduled(image));
removeRunning(postId);
} finally {
notPauseQ = true;
}
@@ -130,14 +139,18 @@ public class DownloadQ {
return downloadQ.size();
}
public synchronized void stopAll() {
appStateService.getCurrentPosts().values().stream().map(Post::getPostId).forEach(this::stop);
public void stopAll() {
synchronized (appStateService) {
appStateService.getCurrentPosts().values().stream().map(Post::getPostId).forEach(this::stop);
}
}
public synchronized void restartAll() throws InterruptedException {
for (Post post : appStateService.getCurrentPosts().values()) {
String postId = post.getPostId();
restart(postId);
public void restartAll() throws InterruptedException {
synchronized (appStateService) {
for (Post post : appStateService.getCurrentPosts().values()) {
String postId = post.getPostId();
restart(postId);
}
}
}
}
@@ -13,7 +13,7 @@ import tn.mnlr.vripper.services.AppStateService;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -53,8 +53,8 @@ public class ExecutionService {
retryPolicy = new RetryPolicy<>()
.handleIf(e -> !(e instanceof InterruptedException))
.withDelay(Duration.ofSeconds(20))
.withMaxRetries(2)
.withBackoff(10, 60, ChronoUnit.SECONDS)
.withMaxRetries(4)
.abortOn(InterruptedException.class)
.onFailedAttempt(e -> logger.warn(String.format("#%d tries failed", e.getAttemptCount()), e.getLastFailure()));
@@ -87,6 +87,7 @@ public class ExecutionService {
if(e.getImageFileData().getImageRequest() != null) {
e.getImageFileData().getImageRequest().abort();
}
e.getImage().cleanup();
});
}
@@ -2,6 +2,7 @@ package tn.mnlr.vripper.services;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.apache.commons.codec.digest.DigestUtils;
import org.slf4j.Logger;
@@ -35,6 +36,10 @@ public class AppSettingsService {
private final String V_THANKS = "VTHANKS";
private final String DESKTOP_CLIPBOARD = "DESKTOP_CLIPBOARD";
private final String FORCE_ORDER = "FORCE_ORDER";
private final String SUBFOLDER = "SUBFOLDER";
private final String THREADSUBFOLDER = "THREADSUBFOLDER";
private final String CLEAR = "CLEAR";
private final String DARK_THEME = "DARK_THEME";
private String downloadPath;
private int maxThreads;
@@ -44,7 +49,11 @@ public class AppSettingsService {
private String vPassword;
private boolean vThanks;
private boolean desktopClipboard;
private boolean subLocation;
private boolean threadSubLocation;
private boolean forceOrder;
private boolean clearCompleted;
private boolean darkTheme;
public void setVPassword(String vPassword) {
if(vPassword.isEmpty()) {
@@ -65,6 +74,10 @@ public class AppSettingsService {
vThanks = prefs.getBoolean(V_THANKS, false);
desktopClipboard = prefs.getBoolean(DESKTOP_CLIPBOARD, false);
forceOrder = prefs.getBoolean(FORCE_ORDER, false);
subLocation = prefs.getBoolean(SUBFOLDER, false);
threadSubLocation = prefs.getBoolean(THREADSUBFOLDER, false);
clearCompleted = prefs.getBoolean(CLEAR, false);
darkTheme = prefs.getBoolean(DARK_THEME, false);
}
@PreDestroy
@@ -79,6 +92,10 @@ public class AppSettingsService {
prefs.putBoolean(V_THANKS, vThanks);
prefs.putBoolean(DESKTOP_CLIPBOARD, desktopClipboard);
prefs.putBoolean(FORCE_ORDER, forceOrder);
prefs.putBoolean(SUBFOLDER, subLocation);
prefs.putBoolean(THREADSUBFOLDER, threadSubLocation);
prefs.putBoolean(CLEAR, clearCompleted);
prefs.putBoolean(DARK_THEME, darkTheme);
try {
prefs.sync();
@@ -106,6 +123,27 @@ public class AppSettingsService {
}
}
public Theme getTheme() {
return new Theme(this.darkTheme);
}
public void setTheme(Theme theme) {
this.darkTheme = theme.darkTheme;
save();
}
@Getter
@NoArgsConstructor
public static class Theme {
@JsonProperty("darkTheme")
private boolean darkTheme;
public Theme(boolean darkTheme) {
this.darkTheme = darkTheme;
}
}
@Getter
public static class Settings {
@@ -127,8 +165,14 @@ public class AppSettingsService {
private boolean desktopClipboard;
@JsonProperty("forceOrder")
private boolean forceOrder;
@JsonProperty("subLocation")
private boolean subLocation;
@JsonProperty("threadSubLocation")
private boolean threadSubLocation;
@JsonProperty("clearCompleted")
private boolean clearCompleted;
public Settings(String downloadPath, int maxThreads, boolean autoStart, boolean vLogin, String vUsername, String vPassword, boolean vThanks, boolean desktopClipboard, boolean forceOrder) {
public Settings(String downloadPath, int maxThreads, boolean autoStart, boolean vLogin, String vUsername, String vPassword, boolean vThanks, boolean desktopClipboard, boolean forceOrder, boolean subLocation, boolean threadSubLocation, boolean clearCompleted) {
this.downloadPath = downloadPath;
this.maxThreads = maxThreads;
this.autoStart = autoStart;
@@ -138,6 +182,9 @@ public class AppSettingsService {
this.vThanks = vThanks;
this.desktopClipboard = desktopClipboard;
this.forceOrder = forceOrder;
this.subLocation = subLocation;
this.threadSubLocation = threadSubLocation;
this.clearCompleted = clearCompleted;
}
}
}
@@ -1,12 +1,15 @@
package tn.mnlr.vripper.services;
import io.reactivex.disposables.Disposable;
import io.reactivex.processors.PublishProcessor;
import lombok.Getter;
import lombok.Setter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import tn.mnlr.vripper.entities.Image;
import tn.mnlr.vripper.entities.Post;
import tn.mnlr.vripper.host.Host;
import tn.mnlr.vripper.q.DownloadJob;
import java.util.Iterator;
@@ -20,6 +23,8 @@ import java.util.stream.Collectors;
@Getter
public class AppStateService {
private static final Logger logger = LoggerFactory.getLogger(AppStateService.class);
private Map<String, Image> currentImages = new ConcurrentHashMap<>();
private Map<String, Post> currentPosts = new ConcurrentHashMap<>();
@@ -33,6 +38,11 @@ public class AppStateService {
@Autowired
private PersistenceService persistenceService;
@Autowired
private AppSettingsService appSettingsService;
private Disposable subscription;
public void onImageUpdate(Image imageState) {
persistenceService.getProcessor().onNext(currentPosts);
@@ -45,14 +55,6 @@ public class AppStateService {
}
}
public Image createImage(String pageUrl, String postId, String postName, Host host, int index) {
return new Image(pageUrl, postId, postName, host, this, index);
}
public Post createPost(String title, String url, List<Image> images, Map<String, String> metadata, String postId, String postCounter) {
return new Post(title, url, images, metadata, postId, postCounter, this);
}
public Post getPost(String postId) {
return currentPosts.get(postId);
}
@@ -60,9 +62,12 @@ public class AppStateService {
public synchronized void newDownloadJob(DownloadJob downloadJob) {
String postId = downloadJob.getImage().getPostId();
checkKeyRunningPosts(postId);
int i = runningPosts.get(postId).incrementAndGet();
if (i > 0) {
Post post = currentPosts.get(postId);
runningPosts.get(postId).incrementAndGet();
}
public synchronized void postDownloadingUpdate(String postId) {
Post post = currentPosts.get(postId);
if (!post.getStatus().equals(Post.Status.DOWNLOADING)) {
post.setStatus(Post.Status.DOWNLOADING);
livePostsState.onNext(post);
}
@@ -81,9 +86,11 @@ public class AppStateService {
} else {
if (!Post.Status.STOPPED.equals(post.getStatus())) {
post.setStatus(Post.Status.COMPLETE);
if (appSettingsService.isClearCompleted()) {
remove(image.getPostId());
}
}
}
livePostsState.onNext(post);
}
}
@@ -127,4 +134,15 @@ public class AppStateService {
toRemove.forEach(this::remove);
return toRemove;
}
@Getter
public static class CachedThread {
private Map<String, Post> posts = new ConcurrentHashMap<>();
private AtomicInteger parsed = new AtomicInteger(0);
@Setter
private int total = 0;
}
}
@@ -7,9 +7,12 @@ import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
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.stereotype.Service;
import java.net.URI;
@Service
public class ConnectionManager {
@@ -36,6 +39,7 @@ public class ConnectionManager {
public HttpClientBuilder getClient() {
return HttpClients.custom()
.setConnectionManager(pcm)
.setRedirectStrategy(new LaxRedirectStrategy())
.setRetryHandler(new DefaultHttpRequestRetryHandler(5, true))
.setDefaultRequestConfig(rc);
}
@@ -51,4 +55,10 @@ public class ConnectionManager {
httpPost.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36");
return httpPost;
}
public HttpGet buildHttpGet(URI uri) {
HttpGet httpGet = new HttpGet(uri);
httpGet.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36");
return httpGet;
}
}
@@ -14,15 +14,27 @@ public class DownloadSpeedService {
private AtomicLong read = new AtomicLong(0);
private long currentValue;
@Getter
private PublishProcessor<Long> readBytesPerSecond = PublishProcessor.create();
private boolean allowWrite = false;
public void increase(long read) {
this.read.addAndGet(read);
if (allowWrite) {
this.read.addAndGet(read);
}
}
@Scheduled(fixedDelay = 1000)
private void calc() {
readBytesPerSecond.onNext(read.getAndSet(0));
allowWrite = false;
long newValue = read.getAndSet(0);
if (newValue != currentValue) {
currentValue = newValue;
readBytesPerSecond.onNext(currentValue);
}
allowWrite = true;
}
}
@@ -0,0 +1,53 @@
package tn.mnlr.vripper.services;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import tn.mnlr.vripper.entities.Post;
import java.io.File;
@Service
public class PathService {
private static final Logger logger = LoggerFactory.getLogger(PathService.class);
@Autowired
private AppStateService appStateService;
@Autowired
private AppSettingsService appSettingsService;
public final File getDownloadDestinationFolder(String postId) {
Post post = appStateService.getCurrentPosts().get(postId);
String postTitle = post.getTitle();
String threadTitle = post.getThreadTitle();
File sourceFolder = appSettingsService.isSubLocation() ? new File(appSettingsService.getDownloadPath(), sanitize(post.getForum())) : new File(appSettingsService.getDownloadPath());
sourceFolder = appSettingsService.isThreadSubLocation() ? new File(sourceFolder, threadTitle) : sourceFolder;
return new File(sourceFolder, sanitize(postTitle + "_" + postId));
}
public final String sanitize(final String folderName) {
String sanitizedFolderName = folderName.replaceAll("\\.|\\\\|/|\\||:|\\?|\\*|\"|<|>|\\p{Cntrl}", "_");
logger.debug(String.format("%s sanitized to %s", folderName, sanitizedFolderName));
return sanitizedFolderName;
}
/**
* Will sanitize the image name and remove extension
*
* @param imageName
* @return
*/
public final String formatImageFileName(String imageName) {
int extensionIndex = imageName.lastIndexOf('.');
String fileName;
if (extensionIndex != -1) {
fileName = imageName.substring(0, extensionIndex);
} else {
fileName = imageName;
}
return sanitize(fileName);
}
}
@@ -8,12 +8,14 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import tn.mnlr.vripper.SpringContext;
import tn.mnlr.vripper.VripperApplication;
import tn.mnlr.vripper.entities.Image;
import tn.mnlr.vripper.entities.Post;
import tn.mnlr.vripper.entities.mixin.persistance.ImagePersistanceMixin;
import tn.mnlr.vripper.entities.mixin.persistance.PostPersistanceMixin;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import java.io.File;
import java.io.FileWriter;
@@ -23,6 +25,7 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -36,6 +39,9 @@ public class PersistenceService {
@Autowired
private AppStateService stateService;
@Autowired
private VripperApplication.AppCommandRunner appCommandRunner;
private ObjectMapper om;
private Disposable subscription;
@@ -44,22 +50,6 @@ public class PersistenceService {
private PublishProcessor<Map<String, Post>> processor = PublishProcessor.create();
private PersistenceService() {
File dataFile = new File(VripperApplication.dataPath);
if(!dataFile.exists()) {
try {
if(dataFile.createNewFile()) {
logger.info("Data file successfully created");
try (FileWriter fw = new FileWriter(dataFile)) {
fw.write("{}");
}
} else {
logger.info("Data file already exists");
}
} catch (IOException e) {
logger.error("Unable to create data file", e);
System.exit(-1);
}
}
om = new ObjectMapper();
om.addMixIn(Image.class, ImagePersistanceMixin.class);
om.addMixIn(Post.class, PostPersistanceMixin.class);
@@ -72,6 +62,32 @@ public class PersistenceService {
.subscribe();
}
@PostConstruct
public void init() {
File dataFile = new File(appCommandRunner.getDataPath());
if (!dataFile.exists()) {
try {
dataFile.getParentFile().mkdirs();
if (!dataFile.getParentFile().isDirectory() || !dataFile.getParentFile().canWrite()) {
logger.error(String.format("Unable to write in %s", dataFile.getParent()));
SpringContext.close();
}
if (dataFile.createNewFile()) {
logger.info("Data file successfully created");
try (FileWriter fw = new FileWriter(dataFile)) {
fw.write("{}");
}
} else {
logger.info("Data file already exists");
}
} catch (IOException e) {
logger.error("Unable to create data file", e);
SpringContext.close();
}
}
}
@PreDestroy
public void preDestroy() {
this.subscription.dispose();
@@ -82,7 +98,7 @@ public class PersistenceService {
public void persist(Map<String, Post> currentPosts) {
try (PrintWriter out = new PrintWriter(VripperApplication.dataPath, "UTF-8")) {
try (PrintWriter out = new PrintWriter(appCommandRunner.getDataPath(), "UTF-8")) {
out.print(om.writeValueAsString(currentPosts));
} catch (IOException e) {
logger.error("Failed to persist app state", e);
@@ -95,6 +111,14 @@ public class PersistenceService {
return om.readValue(content, om.getTypeFactory().constructMapType(HashMap.class, String.class, Post.class));
} catch (IOException e) {
logger.error("Failed to read app state", e);
long timestamp = new Date().getTime();
logger.warn(String.format("trying to rename old data file from %s to %s", appCommandRunner.getDataPath(), appCommandRunner.getDataPath() + "." + timestamp + ".old"));
try {
Files.move(new File(appCommandRunner.getDataPath()).toPath(), new File(appCommandRunner.getDataPath() + "." + timestamp + ".old").toPath());
} catch (IOException ex) {
logger.error(String.format("Failed to rename %s to %s", appCommandRunner.getDataPath(), appCommandRunner.getDataPath() + ".old"));
SpringContext.close();
}
}
return new HashMap<>();
@@ -102,12 +126,12 @@ public class PersistenceService {
public void restore() {
String jsonContent;
String jsonContent = null;
try {
jsonContent = Files.readAllLines(Paths.get(VripperApplication.dataPath), StandardCharsets.UTF_8).stream().collect(Collectors.joining());
jsonContent = Files.readAllLines(Paths.get(appCommandRunner.getDataPath()), StandardCharsets.UTF_8).stream().collect(Collectors.joining());
} catch (Exception e) {
logger.warn("data file not found, previous state cannot be restored", e);
return;
logger.error("data file cannot be read, previous state cannot be restored", e);
SpringContext.close();
}
Map<String, Post> read = read(jsonContent);
@@ -1,46 +1,52 @@
package tn.mnlr.vripper.services;
import io.reactivex.processors.PublishProcessor;
import lombok.Getter;
import net.jodah.failsafe.Failsafe;
import net.jodah.failsafe.RetryPolicy;
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.utils.URIBuilder;
import org.apache.http.util.EntityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
import tn.mnlr.vripper.entities.Image;
import tn.mnlr.vripper.entities.Post;
import tn.mnlr.vripper.exception.DownloadException;
import tn.mnlr.vripper.exception.PostParseException;
import tn.mnlr.vripper.host.Host;
import tn.mnlr.vripper.q.DownloadQ;
import javax.annotation.PostConstruct;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.net.URISyntaxException;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
@Service
public class PostParser {
private static final Logger logger = LoggerFactory.getLogger(PostParser.class);
private final static String VIPER_GIRLS_BASE_ADRESS = "https://vipergirls.to/";
private final static String POSTS_XPATH = "//li[contains(@id,'post_')][not(contains(@id,'post_thank'))]";
private final static String REAL_THREAD_XPATH = ".//a[@class='postcounter']";
private final static String THREAD_TITLE_XPATH = "//li[contains(@class, 'lastnavbit')]/span";
private final static String POST_TITLE_XPATH = ".//h2[contains(@class, 'title')]";
private final static String POST_COUNTER_XPATH = ".//a[contains(@class, 'postcounter')]";
private final static String POST_LINKS_XPATH = ".//a";
private static final String VR_API = "https://vipergirls.to/vr.php";
@Autowired
private ConnectionManager cm;
@Autowired
private HtmlProcessorService htmlProcessorService;
@Autowired
private XpathService xpathService;
SAXParserFactory factory = SAXParserFactory.newInstance();
@Autowired
private List<Host> supportedHosts;
@@ -48,155 +54,381 @@ public class PostParser {
@Autowired
private AppStateService appStateService;
public List<Post> parse(String threadUrl) throws PostParseException {
@Autowired
private VipergirlsAuthService authService;
logger.info(String.format("Parsing thread %s", threadUrl));
List<Post> posts = new ArrayList<>();
String postResponse;
@Autowired
private AppSettingsService appSettingsService;
HttpClient connection = cm.getClient().build();
HttpGet httpGet = cm.buildHttpGet(threadUrl);
@Autowired
private DownloadQ downloadQ;
logger.info(String.format("Requesting %s", httpGet));
try (CloseableHttpResponse response = (CloseableHttpResponse) connection.execute(httpGet)) {
if (response.getStatusLine().getStatusCode() / 100 != 2) {
throw new DownloadException(String.format("Unexpected response code '%d' for %s", response.getStatusLine().getStatusCode(), httpGet));
}
postResponse = EntityUtils.toString(response.getEntity());
logger.debug(String.format("Content received for %s:%n%s", httpGet, postResponse));
EntityUtils.consumeQuietly(response.getEntity());
} catch (Exception e) {
throw new PostParseException(e);
@Autowired
private VipergirlsAuthService vipergirlsAuthService;
private RetryPolicy<Object> retryPolicy;
public PostParser() throws ParserConfigurationException, SAXException {
}
@PostConstruct
private void init() {
retryPolicy = new RetryPolicy<>()
.handleIf(e -> e instanceof IOException)
.withBackoff(2, 20, ChronoUnit.SECONDS)
.withMaxRetries(4)
.abortOn(InterruptedException.class)
.onFailedAttempt(e -> logger.warn(String.format("#%d tries failed", e.getAttemptCount()), e.getLastFailure()));
}
public void addPost(String postId, String threadId) throws PostParseException {
if (appStateService.getCurrentPosts().containsKey(postId)) {
logger.info(String.format("skipping %s, already loaded", postId));
return;
}
Document document;
try {
logger.debug(String.format("Cleaning HTML response for XML parsing: %s", postResponse));
document = htmlProcessorService.clean(postResponse);
} catch (Exception e) {
throw new PostParseException(e);
}
VRPostParser vrPostParser = new VRPostParser(threadId, postId);
Post post = vrPostParser.parse();
String threadTitle = null;
try {
logger.info(String.format("Looking for thread title using xpath: %s", THREAD_TITLE_XPATH));
Node threadTitleNode = xpathService.getAsNode(document, THREAD_TITLE_XPATH);
if (threadTitleNode != null) {
threadTitle = threadTitleNode.getTextContent().trim();
logger.info(String.format("Thread title found %s", threadTitle));
}
if (threadTitle == null) {
logger.warn("Cannot find thread's title");
}
} catch (Exception e) {
throw new PostParseException(e);
}
NodeList postsNodeList;
try {
logger.info(String.format("Looking for posts using xpath: %s", POSTS_XPATH));
postsNodeList = xpathService.getAsNodeList(document, POSTS_XPATH);
} catch (Exception e) {
throw new PostParseException(e);
}
logger.info(String.format("Found %d posts in thread %s", postsNodeList.getLength(), threadUrl));
for (int i = 0; i < postsNodeList.getLength(); i++) {
String realUrl;
logger.info(String.format("Parsing post #%d", i + 1));
post.setAppStateService(appStateService);
post.getImages().forEach(e -> e.setAppStateService(appStateService));
authService.leaveThanks(post.getUrl(), post.getPostId());
if (appSettingsService.isAutoStart()) {
logger.info("Auto start downloads option is enabled");
logger.info(String.format("Starting to enqueue %d jobs for %s", post.getImages().size(), post.getUrl()));
try {
logger.info(String.format("Finding posts's link"));
realUrl = VIPER_GIRLS_BASE_ADRESS.concat(xpathService
.getAsNode(postsNodeList.item(i), REAL_THREAD_XPATH)
.getAttributes()
.getNamedItem("href")
.getTextContent()
.trim());
logger.info(String.format("Post's link: %s", realUrl));
} catch (Exception e) {
throw new PostParseException(e);
downloadQ.enqueue(post);
} catch (InterruptedException e) {
logger.warn("Interruption was caught");
Thread.currentThread().interrupt();
return;
}
logger.info(String.format("Done enqueuing jobs for %s", post.getUrl()));
} else {
logger.info("Auto start downloads option is disabled");
}
}
logger.info("Finding posts's id");
String postId = realUrl.substring(realUrl.indexOf("#")).replace("#post", "");
logger.info(String.format("Post's id: %s", postId));
@Getter
public static abstract class VRPostState {
private final String threadId;
if (appStateService.getCurrentPosts().containsKey(postId)) {
logger.warn(String.format("Post with id %s is already loaded, skipping", postId));
continue;
}
protected VRPostState(String threadId) {
this.threadId = threadId;
}
}
String postTitle;
@Getter
public static class VRPostParse extends VRPostState {
private final String type = "postParse";
private String postId;
private int number;
private String title;
private int imageCount;
private String url;
private List<String> previews;
public VRPostParse(String threadId, String postId, int number, String title, int imageCount, String url, List<String> previews) {
super(threadId);
this.postId = postId;
this.number = number;
this.title = title;
this.imageCount = imageCount;
this.previews = previews;
this.url = url;
}
}
@Getter
public static class VRThreadParseState extends VRPostState {
private final String type = "threadParseState";
private final String state;
public VRThreadParseState(String threadId, String state) {
super(threadId);
this.state = state;
}
}
public class VRThreadParser {
@Getter
private final PublishProcessor<VRPostState> postPublishProcessor = PublishProcessor.create();
private String threadId;
public VRThreadParser(String threadId) {
this.threadId = threadId;
}
public Void parse() throws PostParseException {
logger.info(String.format("Parsing thread %s", threadId));
HttpGet httpGet;
try {
logger.info(String.format("Finding post's title"));
Node titleNode = xpathService.getAsNode(postsNodeList.item(i), POST_TITLE_XPATH);
if (titleNode != null) {
postTitle = titleNode.getTextContent().trim();
logger.info(String.format("Found post's title: %s", postTitle));
} else {
logger.info("Cannot find post's title");
if (threadTitle != null) {
logger.info("Falling back to thread title to generate a post name");
postTitle = threadTitle + "#" + postId;
} else {
logger.info("Falling back to post id to generate a post name");
postTitle = "#" + postId;
}
URIBuilder uriBuilder = new URIBuilder(VR_API);
uriBuilder.setParameter("t", threadId);
httpGet = cm.buildHttpGet(uriBuilder.build());
if (vipergirlsAuthService.getCookies() != null) {
httpGet.addHeader("Cookie", vipergirlsAuthService.getCookies());
}
} catch (Exception e) {
} catch (URISyntaxException e) {
throw new PostParseException(e);
}
String postCounter;
try {
logger.info(String.format("Finding post's counter"));
Node counterNode = xpathService.getAsNode(postsNodeList.item(i), POST_COUNTER_XPATH);
if (counterNode != null) {
postCounter = counterNode.getTextContent().trim();
logger.info(String.format("Found post's counter: %s", postCounter));
} else {
postCounter = "";
}
} catch (Exception e) {
throw new PostParseException(e);
VRThreadHandler handler = new VRThreadHandler(threadId, postPublishProcessor);
HttpClient connection = cm.getClient().build();
AtomicReference<Throwable> thr = new AtomicReference<>();
logger.info(String.format("Requesting %s", httpGet));
Failsafe.with(retryPolicy)
.onFailure(e -> thr.set(e.getFailure()))
.get(() -> {
try (CloseableHttpResponse response = (CloseableHttpResponse) connection.execute(httpGet)) {
if (response.getStatusLine().getStatusCode() / 100 != 2) {
throw new DownloadException(String.format("Unexpected response code '%d' for %s", response.getStatusLine().getStatusCode(), httpGet));
}
try {
factory.newSAXParser().parse(new BufferedInputStream(response.getEntity().getContent()), handler);
} catch (Exception e) {
throw new PostParseException(String.format("Failed to parse thread %s", threadId), e);
} finally {
EntityUtils.consumeQuietly(response.getEntity());
}
}
return null;
});
if (thr.get() != null) {
logger.error(String.format("parsing failed for thread %s", threadId), thr.get());
throw new PostParseException(thr.get());
}
return null;
}
}
ArrayList<Image> imagesList = new ArrayList<>();
try {
logger.info(String.format("Finding all links for post with id %s using xpath %s", postId, POST_LINKS_XPATH));
NodeList imagesNodeList = xpathService.getAsNodeList(postsNodeList.item(i), POST_LINKS_XPATH);
for (int j = 0; j < imagesNodeList.getLength(); j++) {
private class VRThreadHandler extends DefaultHandler {
Node imageHref = imagesNodeList.item(j).getAttributes().getNamedItem("href");
Host foundHost;
if (imageHref != null) {
String imageUrl = imageHref.getTextContent().trim();
logger.info(String.format("Scanning %s", imageUrl));
foundHost = supportedHosts.stream().filter(host -> host.isSupported(imageUrl)).findFirst().orElse(null);
} else {
logger.warn("href is null, skipping");
continue;
private final String threadId;
private final PublishProcessor<VRPostState> vrPostPublishProcessor;
private String threadTitle;
private String postId;
private String postTitle;
private int imageCount;
private int postCounter;
private int previewCounter = 0;
private List<String> previews = new ArrayList<>();
public VRThreadHandler(String threadId, PublishProcessor<VRPostState> vrPostPublishProcessor) {
this.vrPostPublishProcessor = vrPostPublishProcessor;
this.threadId = threadId;
}
@Override
public void startDocument() {
vrPostPublishProcessor.onNext(new VRThreadParseState(threadId, "START"));
}
@Override
public void startElement(String uri, String localName, String qName, Attributes attributes) {
switch (qName.toLowerCase()) {
case "thread":
threadTitle = attributes.getValue("title").trim();
break;
case "post":
imageCount = Integer.parseInt(attributes.getValue("imagecount").trim());
postId = attributes.getValue("id").trim();
postCounter = Integer.parseInt(attributes.getValue("number").trim());
postTitle = Optional.ofNullable(attributes.getValue("title")).map(e -> e.trim().isEmpty() ? null : e.trim()).orElse(threadTitle);
break;
case "image":
if (previewCounter++ < 4) {
String thumbUrl = Optional.ofNullable(attributes.getValue("thumb_url")).map(String::trim).orElse(null);
if (thumbUrl != null) {
previews.add(thumbUrl);
}
}
if (foundHost != null) {
logger.info(String.format("Found supported host %s for %s", foundHost.getClass().getSimpleName(), imageHref));
imagesList.add(appStateService.createImage(imageHref.getTextContent(), postId, postTitle, foundHost, imagesList.size() + 1));
} else {
logger.warn(String.format("unsupported host for %s, skipping", imageHref));
continue;
break;
}
}
@Override
public void endElement(String uri, String localName, String qName) {
switch (qName.toLowerCase()) {
case "post":
if (imageCount != 0) {
vrPostPublishProcessor.onNext(new VRPostParse(
threadId,
postId,
postCounter,
postTitle,
imageCount,
String.format("https://vipergirls.to/threads/%s/?p=%s&viewfull=1#post%s", threadId, postId, postId),
previews
));
}
previewCounter = 0;
previews = new ArrayList<>();
break;
}
}
@Override
public void endDocument() {
vrPostPublishProcessor.onNext(new VRThreadParseState(threadId, "END"));
vrPostPublishProcessor.onComplete();
}
}
public class VRPostParser {
private String threadId;
private String postId;
public VRPostParser(String threadId, String postId) {
this.threadId = threadId;
this.postId = postId;
}
public Post parse() throws PostParseException {
logger.info(String.format("Parsing post %s", postId));
HttpGet httpGet;
try {
URIBuilder uriBuilder = new URIBuilder(VR_API);
uriBuilder.setParameter("p", postId);
httpGet = cm.buildHttpGet(uriBuilder.build());
if (vipergirlsAuthService.getCookies() != null) {
httpGet.addHeader("Cookie", vipergirlsAuthService.getCookies());
}
} catch (Exception e) {
} catch (URISyntaxException e) {
throw new PostParseException(e);
}
VRPostHandler handler = new VRPostHandler(threadId, postId);
HttpClient connection = cm.getClient().build();
AtomicReference<Throwable> thr = new AtomicReference<>();
logger.info(String.format("Requesting %s", httpGet));
Post post = Failsafe.with(retryPolicy)
.onFailure(e -> thr.set(e.getFailure()))
.get(() -> {
try (CloseableHttpResponse response = (CloseableHttpResponse) connection.execute(httpGet)) {
if (response.getStatusLine().getStatusCode() / 100 != 2) {
throw new DownloadException(String.format("Unexpected response code '%d' for %s", response.getStatusLine().getStatusCode(), httpGet));
}
try {
factory.newSAXParser().parse(new BufferedInputStream(response.getEntity().getContent()), handler);
return handler.getParsedPost();
} catch (Exception e) {
throw new PostParseException(String.format("Failed to parse thread %s, post %s", threadId, postId), e);
} finally {
EntityUtils.consumeQuietly(response.getEntity());
}
}
});
if (thr.get() != null || post == null) {
logger.error(String.format("parsing failed for thread %s, post %s", threadId, postId), thr.get());
throw new PostParseException(thr.get());
}
return post;
}
}
private class VRPostHandler extends DefaultHandler {
private final String threadId;
private final String postId;
private String threadTitle;
private int previewCounter = 0;
private int index = 0;
private String postTitle;
private int imageCount;
private String forum;
private List<String> previews = new ArrayList<>();
private List<Image> images = new ArrayList<>();
@Getter
private Post parsedPost;
public VRPostHandler(String threadId, String postId) {
this.threadId = threadId;
this.postId = postId;
}
@Override
public void startDocument() {
}
@Override
public void startElement(String uri, String localName, String qName, Attributes attributes) {
switch (qName.toLowerCase()) {
case "forum":
forum = attributes.getValue("title").trim();
break;
case "thread":
threadTitle = attributes.getValue("title").trim();
break;
case "post":
imageCount = Integer.parseInt(attributes.getValue("imagecount").trim());
postTitle = Optional.ofNullable(attributes.getValue("title")).map(e -> e.trim().isEmpty() ? null : e.trim()).orElse(threadTitle);
break;
case "image":
index++;
if (previewCounter++ < 4) {
String thumbUrl = Optional.ofNullable(attributes.getValue("thumb_url")).map(String::trim).orElse(null);
if (thumbUrl != null) {
previews.add(thumbUrl);
}
}
String mainUrl = Optional.ofNullable(attributes.getValue("main_url")).map(String::trim).orElse(null);
if (mainUrl != null) {
Host foundHost = supportedHosts.stream().filter(host -> host.isSupported(mainUrl)).findFirst().orElse(null);
if (foundHost != null) {
logger.info(String.format("Found supported host %s for %s", foundHost.getClass().getSimpleName(), mainUrl));
images.add(new Image(mainUrl, postId, postTitle, foundHost, index));
} else {
logger.warn(String.format("unsupported host for %s, skipping", mainUrl));
}
}
break;
}
}
if (!imagesList.isEmpty()) {
logger.info(String.format("Found %d images for post with id %s", imagesList.size(), postId));
posts.add(appStateService.createPost(postTitle, realUrl, imagesList, null, postId, postCounter));
} else {
logger.warn(String.format("No images found for post with id %s, skipping", postId));
@Override
public void endElement(String uri, String localName, String qName) {
switch (qName.toLowerCase()) {
case "post":
if (imageCount != 0) {
HashMap<String, Object> metadata = new HashMap<>();
metadata.put("PREVIEWS", previews);
parsedPost = new Post(
postTitle,
String.format("https://vipergirls.to/threads/%s/?p=%s&viewfull=1#post%s", threadId, postId, postId),
images,
metadata,
postId,
threadId,
threadTitle,
forum
);
}
index = 0;
previewCounter = 0;
previews = new ArrayList<>();
images = new ArrayList<>();
break;
}
}
return posts;
}
}
@@ -1,5 +1,7 @@
package tn.mnlr.vripper.services;
import io.reactivex.processors.PublishProcessor;
import lombok.Getter;
import org.apache.http.NameValuePair;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
@@ -13,11 +15,14 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.w3c.dom.Document;
import tn.mnlr.vripper.VripperApplication;
import tn.mnlr.vripper.exception.VripperException;
import javax.annotation.PreDestroy;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.TimeUnit;
@Service
public class VipergirlsAuthService {
@@ -36,10 +41,24 @@ public class VipergirlsAuthService {
@Autowired
private AppSettingsService appSettingsService;
@Getter
private String cookies;
private boolean authenticated = false;
@Getter
private String loggedUser;
@Getter
private PublishProcessor<String> loggedInUser = PublishProcessor.create();
@PreDestroy
private void destroy() throws InterruptedException {
logger.info("Shutting down VipergirlsAuthService");
VripperApplication.commonExecutor.shutdown();
VripperApplication.commonExecutor.awaitTermination(10, TimeUnit.SECONDS);
}
public void authenticate() throws VripperException {
logger.info("Authenticating using ViperGirls credentials");
@@ -48,6 +67,8 @@ public class VipergirlsAuthService {
if(!appSettingsService.isVLogin()) {
logger.warn("Authentication option is disabled");
cookies = null;
loggedUser = "";
loggedInUser.onNext(loggedUser);
return;
}
@@ -56,6 +77,9 @@ public class VipergirlsAuthService {
if (username == null || password == null || username.isEmpty() || password.isEmpty()) {
logger.error("Cannot authenticate with ViperGirls credentials, username or password is empty");
cookies = null;
loggedUser = "";
loggedInUser.onNext(loggedUser);
return;
}
@@ -73,6 +97,9 @@ public class VipergirlsAuthService {
try {
postAuth.setEntity(new UrlEncodedFormEntity(params));
} catch (Exception e) {
cookies = null;
loggedUser = "";
loggedInUser.onNext(loggedUser);
throw new VripperException(e);
}
@@ -83,6 +110,9 @@ public class VipergirlsAuthService {
try (CloseableHttpResponse response = client.execute(postAuth)) {
if (response.getStatusLine().getStatusCode() / 100 != 2) {
throw new VripperException(String.format("Unexpected response code returned %s", response.getStatusLine().getStatusCode()));
}
StringBuilder sb = new StringBuilder();
Arrays.asList(response.getHeaders("set-cookie"))
.stream()
@@ -99,31 +129,41 @@ public class VipergirlsAuthService {
}
this.cookies = cookies;
} catch (Exception e) {
throw new VripperException(e);
cookies = null;
loggedUser = "";
loggedInUser.onNext(loggedUser);
if (e instanceof VripperException) {
throw (VripperException) e;
} else {
throw new VripperException(e);
}
}
authenticated = true;
loggedUser = username;
logger.info(String.format("Authenticated: %s", username));
loggedInUser.onNext(loggedUser);
}
public void leaveThanks(String postUrl, String postId) throws VripperException {
if (!appSettingsService.isVLogin()) {
logger.warn("Authentication with ViperGirls option is disabled");
return;
}
if (!appSettingsService.isVThanks()) {
logger.warn("Leave thanks option is disabled");
return;
}
if (!authenticated) {
logger.error("You are not authenticated");
return;
}
try {
postThanks(postId, getSecurityToken(postUrl));
} catch (VripperException e) {
throw new VripperException(e);
}
public void leaveThanks(String postUrl, String postId) {
VripperApplication.commonExecutor.submit(() -> {
if (!appSettingsService.isVLogin()) {
logger.warn("Authentication with ViperGirls option is disabled");
return;
}
if (!appSettingsService.isVThanks()) {
logger.warn("Leave thanks option is disabled");
return;
}
if (!authenticated) {
logger.error("You are not authenticated");
return;
}
try {
postThanks(postId, getSecurityToken(postUrl));
} catch (Exception e) {
logger.error(String.format("Failed to leave a thanks for url %s, post id %s", postUrl, postId), e);
}
});
}
private String getSecurityToken(String url) throws VripperException {
@@ -183,7 +223,6 @@ public class VipergirlsAuthService {
CloseableHttpClient client = cm.getClient().build();
try (CloseableHttpResponse response = client.execute(postThanks)) {
EntityUtils.consumeQuietly(response.getEntity());
} catch (Exception e) {
throw new VripperException(e);
@@ -8,14 +8,18 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import tn.mnlr.vripper.entities.Post;
import tn.mnlr.vripper.VripperApplication;
import tn.mnlr.vripper.exception.PostParseException;
import tn.mnlr.vripper.q.DownloadQ;
import tn.mnlr.vripper.services.AppSettingsService;
import tn.mnlr.vripper.services.AppStateService;
import tn.mnlr.vripper.services.PathService;
import tn.mnlr.vripper.services.PostParser;
import tn.mnlr.vripper.services.VipergirlsAuthService;
import java.io.File;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@RestController
@CrossOrigin(value = "*")
@@ -23,6 +27,9 @@ public class PostRestEndpoint {
private static final Logger logger = LoggerFactory.getLogger(PostRestEndpoint.class);
private static final Pattern VG_URL_PATTERN = Pattern.compile("https:\\/\\/vipergirls\\.to\\/threads\\/(\\d+)((.*p=)(\\d+))?");
@Autowired
private AppStateService appStateService;
@@ -30,7 +37,7 @@ public class PostRestEndpoint {
private AppSettingsService appSettingsService;
@Autowired
private VipergirlsAuthService authService;
private PathService pathService;
@ExceptionHandler(Exception.class)
public ResponseEntity handleException(Exception e) {
@@ -55,33 +62,20 @@ public class PostRestEndpoint {
} else if (!url.url.startsWith("https://vipergirls.to")) {
return new ResponseEntity<>("ViperGirls only links are supported", HttpStatus.BAD_REQUEST);
}
List<Post> parsed = postParser.parse(url.url);
logger.info(String.format("%d posts found from thread %s", parsed.size(), url.url));
parsed.forEach(p -> {
try {
authService.leaveThanks(p.getUrl(), p.getPostId());
} catch (Exception e) {
logger.error(String.format("Failed to leave thanks for %s", p.getUrl()), e);
}
});
if(appSettingsService.isAutoStart()) {
logger.info("Auto start downloads option is enabled");
logger.info(String.format("Starting to enqueue %d jobs for %s", parsed.stream().flatMap(e -> e.getImages().stream()).count(), url.url));
for (Post post : parsed) {
downloadQ.enqueue(post);
}
logger.info(String.format("Done enqueuing jobs for %s", url.url));
} else {
logger.info("Auto start downloads option is disabled");
}
logger.info(String.format("Done processing thread: %s", url.url));
return ResponseEntity.ok(new ParseResult(parsed.size()));
}
@PostMapping("/clipboard/post")
@ResponseStatus(value = HttpStatus.OK)
public ResponseEntity processPostFromClipboard(@RequestBody ThreadUrl url) throws Exception {
return this.processPost(url);
String threadId, postId;
try {
Matcher m = VG_URL_PATTERN.matcher(url.url);
if (m.find()) {
threadId = m.group(1);
postId = m.group(4);
} else {
throw new PostParseException(String.format("Cannot retrieve thread id from URL %s", url));
}
} catch (Exception e) {
throw new PostParseException(String.format("Cannot retrieve thread id from URL %s", url), e);
}
return ResponseEntity.ok(new PairThreadIdPostId(threadId, postId));
}
@PostMapping("/post/restart")
@@ -90,6 +84,27 @@ public class PostRestEndpoint {
downloadQ.restart(postId.getPostId());
}
@PostMapping("/post/add")
@ResponseStatus(value = HttpStatus.OK)
public void addPost(@RequestBody List<PostToAdd> posts) {
for (PostToAdd post : posts) {
VripperApplication.commonExecutor.submit(() -> {
try {
postParser.addPost(post.postId, post.threadId);
} catch (PostParseException e) {
logger.error(String.format("Failed to add post %s", post.postId), e);
}
});
}
}
@GetMapping("/post/path/{postId}")
@ResponseStatus(value = HttpStatus.OK)
public ResponseEntity<DownloadPath> folderPath(@PathVariable("postId") String postId) {
File destinationFolder = pathService.getDownloadDestinationFolder(postId);
return ResponseEntity.ok(new DownloadPath(destinationFolder.getPath()));
}
@PostMapping("/post/restart/all")
@ResponseStatus(value = HttpStatus.OK)
public void restartPost() throws Exception {
@@ -140,11 +155,52 @@ public class PostRestEndpoint {
}
@Getter
private static class PairThreadIdPostId {
private String threadId;
private String postId;
public PairThreadIdPostId(String threadId, String postId) {
this.threadId = threadId;
this.postId = postId;
}
}
@Getter
private static class PostToAdd {
private String threadId;
private String postId;
}
@Getter
private static class ParseResult {
ParseResult(int parsed) {
this.parsed = parsed;
private List<PostResult> posts;
private int count;
private String threadId;
public ParseResult(List<PostResult> posts, int count, String threadId) {
this.posts = posts;
this.count = count;
this.threadId = threadId;
}
@Getter
public static class PostResult {
private String title;
private int counter;
private String url;
private String postId;
private List<String> previews;
public PostResult(String title, int counter, String url, String postId, List<String> previews) {
this.title = title;
this.counter = counter;
this.url = url;
this.postId = postId;
this.previews = previews;
}
}
private int parsed;
}
@Getter
@@ -166,4 +222,13 @@ public class PostRestEndpoint {
this.postId = postId;
}
}
@Getter
private static class DownloadPath {
private String path;
DownloadPath(String path) {
this.path = path;
}
}
}
@@ -31,43 +31,63 @@ public class SettingsRestEndpoint {
.body(e.getMessage());
}
@PostMapping("/settings/theme")
@ResponseStatus(value = HttpStatus.OK)
public AppSettingsService.Theme postTheme(@RequestBody AppSettingsService.Theme theme) {
synchronized (this.settings) {
this.settings.setTheme(theme);
return settings.getTheme();
}
}
@GetMapping("/settings/theme")
@ResponseStatus(value = HttpStatus.OK)
public AppSettingsService.Theme getTheme() {
return settings.getTheme();
}
@PostMapping("/settings")
@ResponseStatus(value = HttpStatus.OK)
public ResponseEntity postSettings(@RequestBody AppSettingsService.Settings settings) throws Exception {
try {
this.settings.check(settings);
} catch (ValidationException e) {
return new ResponseEntity(new Response(e.getMessage()), HttpStatus.BAD_REQUEST);
}
this.settings.setDownloadPath(settings.getDownloadPath());
this.settings.setMaxThreads(settings.getMaxThreads());
this.settings.setAutoStart(settings.isAutoStart());
this.settings.setVLogin(settings.isVLogin());
if(settings.isVLogin()) {
this.settings.setVUsername(settings.getVUsername());
if (!this.settings.getVPassword().equals(settings.getVPassword())) {
this.settings.setVPassword(settings.getVPassword());
synchronized (this.settings) {
try {
this.settings.check(settings);
} catch (ValidationException e) {
return new ResponseEntity(new Response(e.getMessage()), HttpStatus.BAD_REQUEST);
}
this.settings.setVThanks(settings.isVThanks());
} else {
this.settings.setVUsername("");
this.settings.setVPassword("");
this.settings.setVThanks(false);
this.settings.setDownloadPath(settings.getDownloadPath());
this.settings.setMaxThreads(settings.getMaxThreads());
this.settings.setAutoStart(settings.isAutoStart());
this.settings.setVLogin(settings.isVLogin());
if (settings.isVLogin()) {
this.settings.setVUsername(settings.getVUsername());
if (!this.settings.getVPassword().equals(settings.getVPassword())) {
this.settings.setVPassword(settings.getVPassword());
}
this.settings.setVThanks(settings.isVThanks());
} else {
this.settings.setVUsername("");
this.settings.setVPassword("");
this.settings.setVThanks(false);
}
this.settings.setDesktopClipboard(settings.isDesktopClipboard());
this.settings.setForceOrder(settings.isForceOrder());
this.settings.setSubLocation(settings.isSubLocation());
this.settings.setThreadSubLocation(settings.isThreadSubLocation());
this.settings.setClearCompleted(settings.isClearCompleted());
this.settings.save();
vipergirlsAuthService.authenticate();
}
this.settings.setDesktopClipboard(settings.isDesktopClipboard());
this.settings.setForceOrder(settings.isForceOrder());
this.settings.save();
vipergirlsAuthService.authenticate();
return ResponseEntity.ok(getSettings());
}
@GetMapping("/settings")
@ResponseStatus(value = HttpStatus.OK)
public AppSettingsService.Settings getSettings() throws Exception {
public AppSettingsService.Settings getSettings() {
return new AppSettingsService.Settings(
settings.getDownloadPath(),
@@ -78,7 +98,10 @@ public class SettingsRestEndpoint {
settings.getVPassword(),
settings.isVThanks(),
settings.isDesktopClipboard(),
settings.isForceOrder()
settings.isForceOrder(),
settings.isSubLocation(),
settings.isThreadSubLocation(),
settings.isClearCompleted()
);
}
@@ -12,20 +12,19 @@ import org.springframework.web.socket.CloseStatus;
import org.springframework.web.socket.TextMessage;
import org.springframework.web.socket.WebSocketSession;
import org.springframework.web.socket.handler.TextWebSocketHandler;
import tn.mnlr.vripper.VripperApplication;
import tn.mnlr.vripper.entities.Image;
import tn.mnlr.vripper.entities.Post;
import tn.mnlr.vripper.entities.mixin.ui.ImageUIMixin;
import tn.mnlr.vripper.entities.mixin.ui.PostUIMixin;
import tn.mnlr.vripper.services.AppStateService;
import tn.mnlr.vripper.services.DownloadSpeed;
import tn.mnlr.vripper.services.DownloadSpeedService;
import tn.mnlr.vripper.services.GlobalStateService;
import tn.mnlr.vripper.services.*;
import java.io.IOException;
import java.util.Arrays;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -47,10 +46,20 @@ public class WebSocketHandler extends TextWebSocketHandler {
@Autowired
private DownloadSpeedService downloadSpeedService;
@Autowired
private VipergirlsAuthService vipergirlsAuthService;
@Autowired
private PostParser postParser;
private Map<String, Disposable> postsSubscriptions = new ConcurrentHashMap<>();
private Map<String, Disposable> postDetailsSubscriptions = new ConcurrentHashMap<>();
private Map<String, Disposable> vrPostParserSubscriptions = new ConcurrentHashMap<>();
private Map<String, Disposable> stateSubscriptions = new ConcurrentHashMap<>();
private Map<String, Disposable> downloadSpeedSubscriptions = new ConcurrentHashMap<>();
private Map<String, Disposable> userSubscriptions = new ConcurrentHashMap<>();
private Map<String, Future<Void>> threadParseRequests = new ConcurrentHashMap<>();
private ObjectMapper om = new ObjectMapper();
@@ -66,9 +75,15 @@ public class WebSocketHandler extends TextWebSocketHandler {
case SPEED_SUB:
subscribeForSpeed(session);
break;
case USER_SUB:
subscribeForUser(session);
break;
case POSTS_SUB:
subscribeForPosts(session);
break;
case THREAD_PARSING_SUB:
subscribeForThreadParsing(session, wsMessage.getPayload());
break;
case POST_DETAILS_SUB:
subscribeForPostDetails(session, wsMessage.getPayload());
break;
@@ -76,6 +91,11 @@ public class WebSocketHandler extends TextWebSocketHandler {
logger.info(String.format("Client %s unsubscribed from post details", session.getId()));
Optional.ofNullable(postDetailsSubscriptions.remove(session.getId())).ifPresent(d -> d.dispose());
break;
case THREAD_PARSING_UNSUB:
logger.info(String.format("Client %s unsubscribed from thread parsing", session.getId()));
Optional.ofNullable(vrPostParserSubscriptions.remove(session.getId())).ifPresent(d -> d.dispose());
Optional.ofNullable(threadParseRequests.remove(session.getId())).ifPresent(d -> d.cancel(true));
break;
case POSTS_UNSUB:
logger.info(String.format("Client %s unsubscribed from posts", session.getId()));
Optional.ofNullable(postsSubscriptions.remove(session.getId())).ifPresent(d -> d.dispose());
@@ -88,6 +108,10 @@ public class WebSocketHandler extends TextWebSocketHandler {
logger.info(String.format("Client %s unsubscribed from download speed info", session.getId()));
Optional.ofNullable(downloadSpeedSubscriptions.remove(session.getId())).ifPresent(d -> d.dispose());
break;
case USER_UNSUB:
logger.info(String.format("Client %s unsubscribed from user info", session.getId()));
Optional.ofNullable(userSubscriptions.remove(session.getId())).ifPresent(d -> d.dispose());
break;
}
}
@@ -108,9 +132,9 @@ public class WebSocketHandler extends TextWebSocketHandler {
globalStateService.getLiveGlobalState()
.onBackpressureBuffer()
.observeOn(Schedulers.io())
.map(Arrays::asList)
.buffer(5000, TimeUnit.MILLISECONDS)
.filter(e -> !e.isEmpty())
.map(e -> e.subList(0, 1))
.map(e -> e.subList(e.size() - 1, e.size()))
.map(om::writeValueAsString)
.map(TextMessage::new)
.subscribe(msg -> send(session, msg), e -> logger.error("Failed to send data to client", e))
@@ -134,9 +158,9 @@ public class WebSocketHandler extends TextWebSocketHandler {
downloadSpeedService.getReadBytesPerSecond()
.onBackpressureBuffer()
.observeOn(Schedulers.io())
.map(Arrays::asList)
.buffer(5000, TimeUnit.MILLISECONDS)
.filter(e -> !e.isEmpty())
.map(e -> e.subList(0, 1))
.map(e -> e.subList(e.size() - 1, e.size()))
.map(e -> e.stream().map(DownloadSpeed::new).collect(Collectors.toList()))
.map(om::writeValueAsString)
.map(TextMessage::new)
@@ -144,6 +168,30 @@ public class WebSocketHandler extends TextWebSocketHandler {
);
}
private void subscribeForUser(WebSocketSession session) {
logger.info(String.format("Client %s subscribed for user info", session.getId()));
if (userSubscriptions.containsKey(session.getId())) {
userSubscriptions.get(session.getId()).dispose();
}
try {
send(session, new TextMessage(om.writeValueAsString(Arrays.asList(new LoggedUser(vipergirlsAuthService.getLoggedUser())))));
} catch (Exception e) {
logger.error("Unexpected error occurred", e);
}
userSubscriptions.put(session.getId(),
vipergirlsAuthService.getLoggedInUser()
.onBackpressureBuffer()
.observeOn(Schedulers.io())
.map(e -> Arrays.asList(new LoggedUser(e)))
.map(om::writeValueAsString)
.map(TextMessage::new)
.subscribe(msg -> send(session, msg), e -> logger.error("Failed to send data to client", e))
);
}
private void subscribeForPosts(WebSocketSession session) {
logger.info(String.format("Client %s subscribed for posts", session.getId()));
@@ -161,8 +209,7 @@ public class WebSocketHandler extends TextWebSocketHandler {
appStateService.getLivePostsState()
.onBackpressureBuffer()
.observeOn(Schedulers.io())
.filter(e -> !e.isRemoved())
.buffer(500, TimeUnit.MILLISECONDS, 50)
.buffer(2000, TimeUnit.MILLISECONDS, 200)
.filter(e -> !e.isEmpty())
.map(e -> e.stream().distinct().collect(Collectors.toList()))
.map(om::writeValueAsString)
@@ -171,6 +218,32 @@ public class WebSocketHandler extends TextWebSocketHandler {
);
}
private void subscribeForThreadParsing(WebSocketSession session, String threadId) {
logger.info(String.format("Client %s subscribed for thread parsing with threadId = %s", session.getId(), threadId));
if (vrPostParserSubscriptions.containsKey(session.getId())) {
vrPostParserSubscriptions.get(session.getId()).dispose();
}
if (threadParseRequests.containsKey(session.getId())) {
threadParseRequests.get(session.getId()).cancel(true);
}
PostParser.VRThreadParser vrThreadParser = postParser.new VRThreadParser(threadId);
vrPostParserSubscriptions.put(session.getId(), vrThreadParser.getPostPublishProcessor()
.onBackpressureBuffer()
.observeOn(Schedulers.io())
.buffer(200)
.filter(e -> !e.isEmpty())
.map(om::writeValueAsString)
.map(TextMessage::new)
.subscribe(msg -> send(session, msg), e -> logger.error("Failed to send data to client", e))
);
threadParseRequests.put(session.getId(), VripperApplication.commonExecutor.submit(vrThreadParser::parse));
}
private void subscribeForPostDetails(WebSocketSession session, String postId) {
logger.info(String.format("Client %s subscribed for post details with id = %s", session.getId(), postId));
@@ -194,7 +267,7 @@ public class WebSocketHandler extends TextWebSocketHandler {
.onBackpressureBuffer()
.observeOn(Schedulers.io())
.filter(e -> e.getPostId().equals(postId))
.buffer(500, TimeUnit.MILLISECONDS, 50)
.buffer(2000, TimeUnit.MILLISECONDS, 500)
.filter(e -> !e.isEmpty())
.map(e -> e.stream().distinct().collect(Collectors.toList()))
.map(om::writeValueAsString)
@@ -209,7 +282,7 @@ public class WebSocketHandler extends TextWebSocketHandler {
@Override
public void afterConnectionEstablished(WebSocketSession session) {
logger.info(String.format("Connection open for client id: %s", session.getId()));
}
@Override
@@ -219,6 +292,11 @@ public class WebSocketHandler extends TextWebSocketHandler {
Optional.ofNullable(postDetailsSubscriptions.remove(session.getId())).ifPresent(d -> d.dispose());
Optional.ofNullable(stateSubscriptions.remove(session.getId())).ifPresent(d -> d.dispose());
Optional.ofNullable(downloadSpeedSubscriptions.remove(session.getId())).ifPresent(d -> d.dispose());
Optional.ofNullable(userSubscriptions.remove(session.getId())).ifPresent(d -> d.dispose());
Optional.ofNullable(vrPostParserSubscriptions.remove(session.getId())).ifPresent(d -> d.dispose());
Optional.ofNullable(threadParseRequests.remove(session.getId())).ifPresent(d -> d.cancel(true));
logger.info(String.format("Connection closed for client id: %s", session.getId()));
}
@Getter
@@ -235,7 +313,22 @@ public class WebSocketHandler extends TextWebSocketHandler {
GLOBAL_STATE_SUB,
GLOBAL_STATE_UNSUB,
SPEED_SUB,
SPEED_UNSUB
SPEED_UNSUB,
THREAD_PARSING_SUB,
THREAD_PARSING_UNSUB,
USER_SUB,
USER_UNSUB
}
}
@Getter
private static class LoggedUser {
private final String type = "user";
private String user;
public LoggedUser(String user) {
this.user = user;
}
}
}
@@ -0,0 +1 @@
base.dir=${user.home}
@@ -0,0 +1 @@
base.dir=${user.dir}
@@ -1,8 +1,10 @@
logging.level.org.springframework.web=INFO
logging.level.root=INFO
logging.level.org.apache.http=INFO
logging.file=${user.dir}/vripper.log
logging.file=${base.dir}/.vripper/vripper.log
server.port=${vripper.server.port:8080}
management.endpoints.web.exposure.include=shutdown
management.endpoint.shutdown.enabled=true
endpoints.shutdown.enabled=true
endpoints.shutdown.enabled=true
#spring.profiles.active=portable
spring.profiles.active=installer
@@ -7,8 +7,17 @@
<include resource=
"org/springframework/boot/logging/logback/console-appender.xml" />
<root level="INFO">
<appender name="ASYNC-FILE" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="FILE" />
</appender>
<appender name="ASYNC-CONSOLE" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="CONSOLE" />
</appender>
<root level="INFO">
<appender-ref ref="ASYNC-FILE"/>
<appender-ref ref="ASYNC-CONSOLE"/>
</root>
</configuration>
+13 -13
View File
@@ -1,6 +1,6 @@
{
"name": "vripper-ui",
"version": "1.4.10",
"version": "2.2.5",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -1588,14 +1588,14 @@
"dev": true
},
"ag-grid-angular": {
"version": "21.0.1",
"resolved": "https://registry.npmjs.org/ag-grid-angular/-/ag-grid-angular-21.0.1.tgz",
"integrity": "sha512-o0mhoPXbZDlxLAlwK+LPpBm5/RA6bYHqXV26yfJmx2wZ/khtT7VOiMbe9XAsGskMv+sxuR7G2FkxbxhluZzTnA=="
"version": "21.2.1",
"resolved": "https://registry.npmjs.org/ag-grid-angular/-/ag-grid-angular-21.2.1.tgz",
"integrity": "sha512-4bJ7+Gv6AY+MEJACGD16ZKDhQnBrU7wIaXsAwGbShb8jt8xDRhaS9Hf1jnEhY7vaLfYj+zR9vrXGXbTvwTtY2Q=="
},
"ag-grid-community": {
"version": "21.0.1",
"resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-21.0.1.tgz",
"integrity": "sha512-wqm6W39kImPonjRxHvnt/L6roJLxPXSopXF4pvcE1paxN7S25HNsBgTOB1uaLlQ4/xt3xSpccPbTDqVUnSxrmQ=="
"version": "21.2.1",
"resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-21.2.1.tgz",
"integrity": "sha512-UmS0j7pOz6SqN++Thg1a82LghW1zKk0k30kpPWxlOzC5On5b8MyKVsYZbGFtpdIHyJlPH3qbkw+PcFWSK168sw=="
},
"agent-base": {
"version": "4.2.1",
@@ -3510,9 +3510,9 @@
"dev": true
},
"electron": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/electron/-/electron-5.0.5.tgz",
"integrity": "sha512-GzVQhImBX3rSCFPyJ1u1KbxquoidAHzGeCH2FTs3lzAh1H8m4vd7xh6CNC111mT/I8pxFk5D8s3atJlJQLPAeg==",
"version": "6.0.9",
"resolved": "https://registry.npmjs.org/electron/-/electron-6.0.9.tgz",
"integrity": "sha512-lFpSmDNyjpvJFwEnK897Soone3DV7D3ASFUb315H2VTVZSbKib9Kbrsovxf4c+e1q5hTdaONsGIm3Lb4CXIW1g==",
"dev": true,
"requires": {
"@types/node": "^10.12.18",
@@ -3521,9 +3521,9 @@
},
"dependencies": {
"@types/node": {
"version": "10.14.10",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.10.tgz",
"integrity": "sha512-V8wj+w2YMNvGuhgl/MA5fmTxgjmVHVoasfIaxMMZJV6Y8Kk+Ydpi1z2whoShDCJ2BuNVoqH/h1hrygnBxkrw/Q==",
"version": "10.14.18",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.18.tgz",
"integrity": "sha512-ryO3Q3++yZC/+b8j8BdKd/dn9JlzlHBPdm80656xwYUdmPkpTGTjkAdt6BByiNupGPE8w0FhBgvYy/fX9hRNGQ==",
"dev": true
}
}
+4 -4
View File
@@ -1,6 +1,6 @@
{
"name": "vripper-ui",
"version": "1.4.10",
"version": "2.2.5",
"scripts": {
"ng": "ng",
"start": "ng serve",
@@ -24,8 +24,8 @@
"@angular/platform-browser": "~7.2.0",
"@angular/platform-browser-dynamic": "~7.2.0",
"@angular/router": "~7.2.0",
"ag-grid-angular": "^21.0.1",
"ag-grid-community": "^21.0.1",
"ag-grid-angular": "^21.2.1",
"ag-grid-community": "^21.2.1",
"core-js": "^2.5.4",
"hammerjs": "^2.0.8",
"ngx-electron": "^2.1.1",
@@ -42,7 +42,7 @@
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"codelyzer": "~4.5.0",
"electron": "^5.0.5",
"electron": "^6.0.9",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "^4.2.0",
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>tn.mnlr</groupId>
<artifactId>vripper</artifactId>
<version>1.4.10</version>
<version>2.2.5</version>
</parent>
<artifactId>vripper-ui</artifactId>
<name>vripper-ui</name>
+28 -16
View File
@@ -1,33 +1,45 @@
<div fxLayout="column" *ngIf="connecting()" class="overlay loading" fxLayoutAlign="center center">
<mat-spinner></mat-spinner>
<h2>Connecting</h2>
<h2>Loading...</h2>
</div>
<div fxLayout="column" *ngIf="noConnectionState()" class="overlay no-connection" fxLayoutAlign="center center">
<mat-icon class="overlay-icon">error</mat-icon>
<h2>Connection with the server is closed</h2>
<h2>The app seems to be shutdown</h2>
</div>
<div [ngClass]="{'electron': electronService.isElectronApp}" id="app-container" fxLayout="column" fxLayoutGap="20px">
<div id="app-header" fxFlex="nogrow">
<mat-toolbar class="mat-elevation-z2" color="primary">
<mat-toolbar-row fxLayout="row" fxLayoutAlign="center center">
<span id="logo" fxFlex="0 0 48px"></span>
<span id="title">Viper Ripper</span>
<span fxFlex="grow"></span>
<div>
<button mat-icon-button [matMenuTriggerFor]="menu" aria-label="settings">
<mat-icon>more_vert</mat-icon>
<mat-toolbar class="mat-elevation-z8" color="accent">
<mat-toolbar-row fxLayout="row" fxLayoutAlign="center center" fxLayoutGap="10px">
<div id="left-controls">
<button (click)="scan()" class="add-button" color="primary" mat-icon-button>
<mat-icon>add</mat-icon>
</button>
<button (click)="restartAll()" aria-label="Start" mat-icon-button title="Start">
<mat-icon>play_arrow</mat-icon>
</button>
<button (click)="stopAll()" aria-label="Stop" mat-icon-button title="Stop">
<mat-icon>stop</mat-icon>
</button>
<button (click)="clear()" aria-label="Clear completed" mat-icon-button title="Clear completed">
<mat-icon>clear_all</mat-icon>
</button>
<button (click)="remove()" aria-label="Remove All" mat-icon-button title="Remove All">
<mat-icon>delete</mat-icon>
</button>
</div>
<span fxFlex="grow" fxLayoutAlign="end center">
<p style="font-size: 16px">Logged in as: {{loggedUser.user == null || loggedUser.user === '' ? 'guest': loggedUser.user }}</p>
</span>
<div id="right-controls">
<button (click)="openSettings()" aria-label="settings" mat-icon-button>
<mat-icon>menu</mat-icon>
</button>
<mat-menu #menu="matMenu">
<button (click)="openSettings()" mat-menu-item>
<mat-icon>settings</mat-icon>
<span>Settings</span>
</button>
</mat-menu>
</div>
</mat-toolbar-row>
</mat-toolbar>
</div>
<div id="app-body" fxFlex="grow">
<router-outlet></router-outlet>
<app-status-bar style="width: 100%"></app-status-bar>
</div>
</div>
-12
View File
@@ -1,11 +1,3 @@
#logo {
height: 48px;
margin-right: 10px;
background-image: url('../assets/logo.png');
background-repeat: no-repeat;
background-size: 48px 48px;
}
#title {
user-select: none
}
@@ -19,7 +11,3 @@
.no-connection {
color: #eb6060;
}
.electron {
margin-top: 30px;
}
@@ -0,0 +1,11 @@
@import '~@angular/material/theming';
@mixin app-component-theme($theme) {
$background: map-get($theme, background);
button.add-button {
background-color: mat-color($background, background);
}
}
+139 -18
View File
@@ -1,40 +1,59 @@
import { AppService } from './app.service';
import { ClipboardService } from './clipboard.service';
import { ElectronService } from 'ngx-electron';
import { SettingsComponent } from './settings/settings.component';
import { Component, OnInit } from '@angular/core';
import { MatDialog } from '@angular/material';
import { Component, OnInit, OnDestroy, NgZone, Renderer2, AfterViewInit } from '@angular/core';
import { MatDialog, MatSnackBar } from '@angular/material';
import { BreakpointObserver, BreakpointState, Breakpoints } from '@angular/cdk/layout';
import { Observable } from 'rxjs';
import { Observable, Subscription } from 'rxjs';
import { WsConnectionService, WSState } from './ws-connection.service';
import { LoggedUser } from './common/logged-user.model';
import { WsHandler } from './ws-handler';
import { CMD } from './common/cmd.enum';
import { WSMessage } from './common/ws-message.model';
import { HttpClient } from '@angular/common/http';
import { RemoveAllResponse } from './common/remove-all-response.model';
import { ServerService } from './server-service';
import { ConfirmDialogComponent } from './common/confirmation-component/confirmation-dialog';
import { filter, flatMap } from 'rxjs/operators';
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss']
})
export class AppComponent implements OnInit {
export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
constructor(
public dialog: MatDialog,
private breakpointObserver: BreakpointObserver,
private ws: WsConnectionService,
public electronService: ElectronService,
private clipboardService: ClipboardService
) {
this.currentState = WSState.INIT;
this.ws.state.subscribe(e => {
this.currentState = e;
if (this.currentState === WSState.CLOSE || this.currentState === WSState.ERROR) {
this.dialog.closeAll();
} else if(this.currentState === WSState.OPEN) {
this.clipboardService.init();
}
});
}
private clipboardService: ClipboardService,
private ngZone: NgZone,
private httpClient: HttpClient,
private serverService: ServerService,
private _snackBar: MatSnackBar,
private renderer: Renderer2,
private appService: AppService
) {
this.websocketHandlerPromise = this.ws.getConnection();
}
subscriptions: Subscription[] = [];
websocketHandlerPromise: Promise<WsHandler>;
currentState: WSState;
themeLoaded = false;
loggedUser: LoggedUser = new LoggedUser(null);
isExtraSmall: Observable<BreakpointState> = this.breakpointObserver.observe(Breakpoints.XSmall);
ngAfterViewInit() {
this.appService.renderer = this.renderer;
}
scan() {
this.appService.scan();
}
openSettings(): void {
const dialogRef = this.dialog.open(SettingsComponent, {
width: '70%',
@@ -61,9 +80,111 @@ export class AppComponent implements OnInit {
}
connecting(): boolean {
return this.currentState === WSState.INIT || this.currentState === WSState.CONNECTING;
return (this.currentState === WSState.INIT || this.currentState === WSState.CONNECTING) && !this.themeLoaded ;
}
ngOnInit() {
this.websocketHandlerPromise.then((handler: WsHandler) => {
console.log('Connecting to user stream');
this.subscriptions.push(
handler.subscribeForUser((e: LoggedUser[]) => {
this.ngZone.run(() => {
this.loggedUser = e[0];
});
})
);
handler.send(new WSMessage(CMD.USER_SUB.toString()));
});
this.currentState = WSState.INIT;
this.ws.state.subscribe(e => {
this.currentState = e;
if (this.currentState === WSState.CLOSE || this.currentState === WSState.ERROR) {
this.dialog.closeAll();
} else if (this.currentState === WSState.OPEN) {
this.clipboardService.init();
this.appService
.loadTheme()
.subscribe(() => this.ngZone.run(() => this.themeLoaded = true));
}
});
}
clear() {
this.ngZone.run(() => {
this.httpClient.post<RemoveAllResponse>(this.serverService.baseUrl + '/post/clear/all', {}).subscribe(
data => {
this._snackBar.open(`${data.removed} items cleared`, null, { duration: 5000 });
},
error => {
this._snackBar.open(error.error, null, {
duration: 5000
});
}
);
});
}
remove() {
this.ngZone.run(() => {
this.dialog
.open(ConfirmDialogComponent, {
maxHeight: '100vh',
maxWidth: '100vw',
height: '200px',
width: '60%',
data: { header: 'Confirmation', content: 'Are you sure you want to remove all items ?' }
})
.afterClosed()
.pipe(
filter(e => e === 'yes'),
flatMap(e => this.httpClient.post<RemoveAllResponse>(this.serverService.baseUrl + '/post/remove/all', {}))
)
.subscribe(
data => {
this._snackBar.open(`${data.removed} items removed`, null, { duration: 5000 });
},
error => {
this._snackBar.open(error.error, null, {
duration: 5000
});
}
);
});
}
stopAll() {
this.ngZone.run(() => {
this.httpClient.post(this.serverService.baseUrl + '/post/stop/all', {}).subscribe(
() => {
this._snackBar.open(`Download stopped`, null, { duration: 5000 });
},
error => {
this._snackBar.open(error.error, null, {
duration: 5000
});
}
);
});
}
restartAll() {
this.ngZone.run(() => {
this.httpClient.post(this.serverService.baseUrl + '/post/restart/all', {}).subscribe(
() => {
this._snackBar.open(`Download started`, null, { duration: 5000 });
},
error => {
this._snackBar.open(error.error, null, {
duration: 5000
});
}
);
});
}
ngOnDestroy() {
this.subscriptions.forEach(e => {
e.unsubscribe();
});
}
}
+35 -7
View File
@@ -1,3 +1,4 @@
import { AppPreviewDirective } from './common/preview-tooltip.directive';
import { WsConnectionService } from './ws-connection.service';
import { AppService } from './app.service';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
@@ -13,7 +14,6 @@ import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { AgGridModule } from 'ag-grid-angular';
import { PostProgressRendererComponent } from './posts/post-progress.renderer.component';
import { MenuRendererComponent } from './posts/menu.renderer.component';
import { PostDetailsProgressRendererComponent } from './post-detail/post-details-progress.component';
import { LoginComponent } from './login/login.component';
import { XhrInterceptorService } from './xhr-interceptor.service';
@@ -23,6 +23,14 @@ import { SettingsComponent } from './settings/settings.component';
import { NgxElectronModule } from 'ngx-electron';
import { ServerService } from './server-service';
import { ConfirmDialogComponent } from './common/confirmation-component/confirmation-dialog';
import { SharedService } from './posts/shared.service';
import { MultiPostComponent } from './multi-post/multi-post.component';
import { OverlayModule } from '@angular/cdk/overlay';
import { AppPreviewComponent } from './common/preview-tooltip.component';
import { UrlRendererComponent } from './multi-post/url-renderer.component';
import { FilterComponent } from './filter/filter.component';
import { ScanComponent } from './scan/scan.component';
import { StatusBarComponent } from './status-bar/status-bar.component';
@NgModule({
declarations: [
@@ -30,17 +38,26 @@ import { ConfirmDialogComponent } from './common/confirmation-component/confirma
PostsComponent,
PostDetailComponent,
PostProgressRendererComponent,
MenuRendererComponent,
PostDetailsProgressRendererComponent,
LoginComponent,
HomeComponent,
SettingsComponent,
ConfirmDialogComponent
ConfirmDialogComponent,
MultiPostComponent,
AppPreviewComponent,
AppPreviewDirective,
UrlRendererComponent,
FilterComponent,
ScanComponent,
StatusBarComponent
],
entryComponents: [
PostDetailComponent,
SettingsComponent,
ConfirmDialogComponent
ConfirmDialogComponent,
// MultiPostComponent,
AppPreviewComponent,
ScanComponent
],
imports: [
BrowserAnimationsModule,
@@ -51,9 +68,20 @@ import { ConfirmDialogComponent } from './common/confirmation-component/confirma
AppRoutingModule,
NgxElectronModule,
ReactiveFormsModule,
AgGridModule.withComponents([PostProgressRendererComponent, MenuRendererComponent, PostDetailsProgressRendererComponent])
AgGridModule.withComponents([
PostProgressRendererComponent,
PostDetailsProgressRendererComponent,
UrlRendererComponent
]),
OverlayModule
],
providers: [
AppService,
WsConnectionService,
{ provide: HTTP_INTERCEPTORS, useClass: XhrInterceptorService, multi: true },
ServerService,
SharedService
],
providers: [AppService, WsConnectionService, { provide: HTTP_INTERCEPTORS, useClass: XhrInterceptorService, multi: true }, ServerService],
bootstrap: [AppComponent]
})
export class AppModule { }
export class AppModule {}
+73 -2
View File
@@ -1,8 +1,79 @@
import { Injectable } from '@angular/core';
import { MatDialog } from '@angular/material';
import { HttpClient } from '@angular/common/http';
import { Injectable, Renderer2, NgZone } from '@angular/core';
import { ServerService } from './server-service';
import { tap } from 'rxjs/operators';
import { ScanComponent } from './scan/scan.component';
import { Observable } from 'rxjs';
import { BreakpointState, Breakpoints, BreakpointObserver } from '@angular/cdk/layout';
@Injectable()
export class AppService {
constructor(
private httpClient: HttpClient,
private serverService: ServerService,
public dialog: MatDialog,
private breakpointObserver: BreakpointObserver,
) {}
constructor() {
darkTheme = false;
_renderer: Renderer2;
set renderer(renderer: Renderer2) {
this._renderer = renderer;
}
isExtraSmall: Observable<BreakpointState> = this.breakpointObserver.observe(Breakpoints.XSmall);
isScanOpen = false;
updateTheme(darkTheme: boolean) {
this.darkTheme = darkTheme;
if (this.darkTheme) {
this._renderer.addClass(document.body, 'dark-theme');
this._renderer.removeClass(document.body, 'light-theme');
} else {
this._renderer.addClass(document.body, 'light-theme');
this._renderer.removeClass(document.body, 'dark-theme');
}
this.httpClient
.post<Theme>(this.serverService.baseUrl + '/settings/theme', {
darkTheme: this.darkTheme
})
.subscribe();
}
loadTheme() {
return this.httpClient
.get<Theme>(this.serverService.baseUrl + '/settings/theme')
.pipe(tap(theme => this.updateTheme(theme.darkTheme)));
}
scan(url?: string) {
const scanDialog = this.dialog.open(ScanComponent, {
width: '70%',
height: '70%',
maxWidth: '100vw',
maxHeight: '100vh',
data: {url: url}
});
const smallDialogSubscription = this.isExtraSmall.subscribe(result => {
if (result.matches) {
scanDialog.updateSize('100%', '100%');
} else {
scanDialog.updateSize('70%', '70%');
}
});
scanDialog.afterOpened().subscribe(() => this.isScanOpen = true);
scanDialog.afterClosed().subscribe(() => {
smallDialogSubscription.unsubscribe();
this.isScanOpen = false;
});
}
}
export interface Theme {
darkTheme: boolean;
}
+5 -1
View File
@@ -3,8 +3,12 @@ export enum CMD {
POST_DETAILS_SUB = 'POST_DETAILS_SUB',
GLOBAL_STATE_SUB = 'GLOBAL_STATE_SUB',
SPEED_SUB = 'SPEED_SUB',
USER_SUB = 'USER_SUB',
THREAD_PARSING_SUB = 'THREAD_PARSING_SUB',
POSTS_UNSUB = 'POSTS_UNSUB',
POST_DETAILS_UNSUB = 'POST_DETAILS_UNSUB',
GLOBAL_STATE_UNSUB = 'GLOBAL_STATE_UNSUB',
SPEED_UNSUB = 'SPEED_UNSUB'
SPEED_UNSUB = 'SPEED_UNSUB',
USER_UNSUB = 'USER_UNSUB',
THREAD_PARSING_UNSUB = 'THREAD_PARSING_UNSUB'
}
@@ -0,0 +1,3 @@
export interface DownloadPath {
path: string;
}
@@ -0,0 +1,3 @@
export class LoggedUser {
constructor(public user: string) {}
}
@@ -1,3 +0,0 @@
export interface ParseResponse {
parsed: number;
}
@@ -0,0 +1,37 @@
import { Component, Input } from '@angular/core';
import { trigger, state, style, transition, animate } from '@angular/animations';
@Component({
selector: 'app-preview',
template: `
<div class="previews" style="display: inline-block; white-space: nowrap;">
<ng-container *ngFor="let link of links">
<img
[@simpleFadeAnimation]="'in'"
class="mat-elevation-z8"
[src]="link"
/>
</ng-container>
</div>
`,
styles: [
`
img {
max-height: 200px;
max-width: 200px;
margin-left: 5px;
border: 1px solid #900000;
}
`
],
animations: [
trigger('simpleFadeAnimation', [
state('in', style({ opacity: 1 })),
transition(':enter', [style({ opacity: 0 }), animate(300)])
])
]
})
export class AppPreviewComponent {
@Input() links: string[] = [];
}
@@ -0,0 +1,44 @@
import { AppPreviewComponent } from './preview-tooltip.component';
import { Directive, Input, HostListener, ComponentRef, OnInit, ElementRef, NgZone } from '@angular/core';
import { OverlayRef, Overlay, OverlayPositionBuilder } from '@angular/cdk/overlay';
import { ComponentPortal } from '@angular/cdk/portal';
@Directive({ selector: '[appPreview]' })
export class AppPreviewDirective implements OnInit {
private overlayRef: OverlayRef;
tooltipPortal = new ComponentPortal(AppPreviewComponent);
@Input() appPreview: string[];
constructor(private overlayPositionBuilder: OverlayPositionBuilder,
private elementRef: ElementRef,
private overlay: Overlay,
private ngZone: NgZone) {}
ngOnInit() {
const positionStrategy = this.overlayPositionBuilder
.flexibleConnectedTo(this.elementRef)
.withPositions([{
originX: 'center',
originY: 'top',
overlayX: 'center',
overlayY: 'bottom',
}]);
this.overlayRef = this.overlay.create({ positionStrategy });
}
@HostListener('mouseenter')
show() {
this.ngZone.run(() => {
const tooltipRef: ComponentRef<AppPreviewComponent> = this.overlayRef.attach(this.tooltipPortal);
tooltipRef.instance.links = this.appPreview;
});
}
@HostListener('mouseout')
hide() {
this.ngZone.run(() => {
this.overlayRef.detach();
});
}
}
@@ -0,0 +1,15 @@
export class VRPostParse {
constructor(
public threadId: string,
public postId: string,
public number: number,
public title: string,
public imageCount: number,
public url: string,
public previews: string[]
) {}
}
export class VRThreadParseState {
constructor(public threadId: string, public state: string) {}
}
@@ -0,0 +1,3 @@
<mat-chip-list>
<mat-chip (click)="select(c)" *ngFor="let c of criteria" [selected]="c.selected" color="accent">{{c.value}}</mat-chip>
</mat-chip-list>
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { FilterComponent } from './filter.component';
describe('FilterComponent', () => {
let component: FilterComponent;
let fixture: ComponentFixture<FilterComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ FilterComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(FilterComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -0,0 +1,26 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-filter',
templateUrl: './filter.component.html',
styleUrls: ['./filter.component.scss']
})
export class FilterComponent implements OnInit {
constructor() { }
criteria = [
{value: 'All', selected: true},
{value: 'Downloading', selected: false},
{value: 'Completed', selected: false},
{value: 'Error', selected: false},
];
select(chip: {value: string, selected: boolean}) {
this.criteria.forEach(e => e.selected = false);
chip.selected = true;
}
ngOnInit() {
}
}
+5 -41
View File
@@ -1,46 +1,10 @@
<div *ngIf="loading" class="overlay loading" fxLayout="row" fxLayoutAlign="center center">
<mat-spinner></mat-spinner>
<mat-progress-spinner [mode]="spinnerMode" [value]="spinnerValue" style="position: absolute;"></mat-progress-spinner>
</div>
<div fxLayout="column" fxLayoutGap="10px" style="height: 100%">
<div fxFlex="nogrow">
<form
#f="ngForm"
(ngSubmit)="submit(f)"
autocomplete="off"
fxLayout="row"
fxLayoutAlign="center center"
fxLayoutGap="20px"
>
<mat-form-field fxFlex="grow">
<input [(ngModel)]="input" matInput name="url" placeholder="Put a vipergirls.to link" required/>
</mat-form-field>
<div>
<button type="submit" mat-raised-button color="primary" [disabled]="f.invalid">Grab</button>
</div>
</form>
</div>
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="10px" id="controls">
<button (click)="restartAll()" aria-label="Start" color="primary" mat-mini-fab title="Start">
<mat-icon>play_arrow</mat-icon>
</button>
<button (click)="stopAll()" aria-label="Stop" color="primary" mat-mini-fab title="Stop">
<mat-icon>stop</mat-icon>
</button>
<div fxFlex="grow"></div>
<button (click)="clear()" aria-label="Clear completed" color="primary" mat-mini-fab title="Clear completed">
<mat-icon>clear_all</mat-icon>
</button>
<button (click)="remove()" aria-label="Remove All" color="primary" mat-mini-fab title="Remove All">
<mat-icon>delete_forever</mat-icon>
</button>
</div>
<mat-divider></mat-divider>
<div [fxFlex]="electronService.isElectronApp ? '0 0 calc(100% - 190px)' : '0 0 calc(100% - 163px)'">
<app-posts [ngStyle]="{'height': electronService.isElectronApp ? 'calc(100% - 37px)' : '100%'}"
style="width: 100%;"></app-posts>
</div>
<div style="text-align: end">{{ downloadSpeed!.speed + '/s' }} | Downloading: {{ globalState!.running }} | Queued: {{
globalState!.queued }} | Remaining:
{{ globalState!.remaining }} | Error: {{ globalState!.error }}
<div fxFlex="0 0 calc(100% - 90px)">
<app-posts
style="width: 100%; height: 100%;"
></app-posts>
</div>
</div>
@@ -1,4 +0,0 @@
div#controls {
margin-left: 10px;
margin-right: 10px;
}
+18 -164
View File
@@ -1,22 +1,11 @@
import { GlobalState } from './../common/global-state.model';
import { AppService } from './../app.service';
import { ElectronService } from 'ngx-electron';
import { ClipboardService } from './../clipboard.service';
import { ParseResponse } from './../common/parse-response.model';
import { Component, OnInit, ViewChild, Inject, NgZone, OnDestroy } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { finalize, filter, flatMap } from 'rxjs/operators';
import { MatSnackBar, MatDialog } from '@angular/material';
import { NgForm } from '@angular/forms';
import { ServerService } from '../server-service';
import { RemoveAllResponse } from '../common/remove-all-response.model';
import { PostsComponent } from '../posts/posts.component';
import { ConfirmDialogComponent } from '../common/confirmation-component/confirmation-dialog';
import { Component, OnInit, OnDestroy, NgZone } from '@angular/core';
import { MatDialog, MatSnackBar } from '@angular/material';
import { WsConnectionService } from '../ws-connection.service';
import { WsHandler } from '../ws-handler';
import { Subscription } from 'rxjs';
import { WSMessage } from '../common/ws-message.model';
import { CMD } from '../common/cmd.enum';
import { DownloadSpeed } from '../common/download-speed.model';
@Component({
selector: 'app-home',
@@ -24,180 +13,45 @@ import { DownloadSpeed } from '../common/download-speed.model';
styleUrls: ['./home.component.scss']
})
export class HomeComponent implements OnInit, OnDestroy {
@ViewChild(PostsComponent)
private postsComponent: PostsComponent;
loading = false;
input: string;
spinnerMode = 'indeterminate';
spinnerValue = 0;
parseEndSubscription: Subscription;
constructor(
private httpClient: HttpClient,
private _snackBar: MatSnackBar,
private serverService: ServerService,
private clipboardService: ClipboardService,
public dialog: MatDialog,
public electronService: ElectronService,
private ngZone: NgZone,
private wsConnectionService: WsConnectionService,
private appService: AppService,
private _snackBar: MatSnackBar,
private ngZone: NgZone
) {
this.websocketHandlerPromise = this.wsConnectionService.getConnection();
}
websocketHandlerPromise: Promise<WsHandler>;
subscriptions: Subscription[] = [];
globalState: GlobalState = new GlobalState(0, 0, 0, 0);
downloadSpeed: DownloadSpeed = new DownloadSpeed('0 B');
ngOnInit() {
this.clipboardService.links.subscribe(e => {
this.ngZone.run(() => {
this.loading = true;
this.httpClient
.post<ParseResponse>(this.serverService.baseUrl + '/clipboard/post', { url: e })
.pipe(
finalize(() => {
this.loading = false;
})
)
.subscribe(
data => {
this._snackBar.open(`${data.parsed} posts parsed`, null, { duration: 5000 });
},
error => {
this._snackBar.open(error.error, null, {
duration: 5000
});
}
);
});
});
this.websocketHandlerPromise.then((handler: WsHandler) => {
console.log('Connecting to global state and download speed');
this.subscriptions.push(
handler.subscribeForGlobalState((e: GlobalState[]) => {
this.ngZone.run(() => {
this.globalState = e[0];
});
})
);
this.subscriptions.push(
handler.subscribeForSpeed((e: DownloadSpeed[]) => {
this.ngZone.run(() => {
this.downloadSpeed = e[0];
});
})
);
handler.send(new WSMessage(CMD.GLOBAL_STATE_SUB.toString()));
handler.send(new WSMessage(CMD.SPEED_SUB.toString()));
});
}
submit(form: NgForm) {
this.ngZone.run(() => {
this.loading = true;
this.httpClient
.post<ParseResponse>(this.serverService.baseUrl + '/post', { url: this.input })
.pipe(
finalize(() => {
this.loading = false;
this.input = null;
form.resetForm();
})
)
.subscribe(
data => {
this._snackBar.open(`${data.parsed} posts parsed`, null, { duration: 5000 });
},
error => {
this._snackBar.open(error.error, null, {
duration: 5000
});
}
);
});
}
clear() {
this.ngZone.run(() => {
this.httpClient.post<RemoveAllResponse>(this.serverService.baseUrl + '/post/clear/all', {}).subscribe(
data => {
this.postsComponent.removeRows(data.postIds);
this._snackBar.open(`${data.removed} items cleared`, null, { duration: 5000 });
},
error => {
this._snackBar.open(error.error, null, {
if (this.appService.isScanOpen) {
this._snackBar.open(e + ' was not processed, the app is busy parsing another thread', null, {
duration: 5000
});
return;
}
);
this.appService.scan(e);
});
});
}
remove() {
this.ngZone.run(() => {
this.dialog
.open(ConfirmDialogComponent, {
maxHeight: '100vh',
maxWidth: '100vw',
height: '200px',
width: '60%',
data: { header: 'Confirmation', content: 'Are you sure you want to remove all items ?' }
})
.afterClosed()
.pipe(
filter(e => e === 'yes'),
flatMap(e => this.httpClient.post<RemoveAllResponse>(this.serverService.baseUrl + '/post/remove/all', {}))
)
.subscribe(
data => {
this.postsComponent.removeRows(data.postIds);
this._snackBar.open(`${data.removed} items removed`, null, { duration: 5000 });
},
error => {
this._snackBar.open(error.error, null, {
duration: 5000
});
}
);
});
}
stopAll() {
this.ngZone.run(() => {
this.httpClient.post(this.serverService.baseUrl + '/post/stop/all', {})
.subscribe(
() => {
this._snackBar.open(`Download stopped`, null, { duration: 5000 });
},
error => {
this._snackBar.open(error.error, null, {
duration: 5000
});
}
);
});
}
restartAll() {
this.ngZone.run(() => {
this.httpClient.post(this.serverService.baseUrl + '/post/restart/all', {})
.subscribe(
() => {
this._snackBar.open(`Download started`, null, { duration: 5000 });
},
error => {
this._snackBar.open(error.error, null, {
duration: 5000
});
}
);
});
view(chip) {
console.log(chip);
}
ngOnDestroy() {
this.subscriptions.forEach(e => e.unsubscribe());
this.websocketHandlerPromise.then((handler: WsHandler) => {
handler.send(new WSMessage(CMD.GLOBAL_STATE_UNSUB.toString()));
});
}
}
+4 -2
View File
@@ -15,7 +15,8 @@ import {
MatSnackBarModule,
MatSnackBar,
MatTabsModule,
MatDividerModule
MatDividerModule,
MatChipsModule
} from '@angular/material';
@NgModule({
@@ -34,7 +35,8 @@ import {
MatSlideToggleModule,
MatSnackBarModule,
MatTabsModule,
MatDividerModule
MatDividerModule,
MatChipsModule
],
providers: [MatSnackBar]
})
@@ -0,0 +1,14 @@
<div fxLayout="column" style="height: 100%;">
<div fxFlex="nogrow">
<form autocomplete="off" fxLayout="row" fxLayoutAlign="left center" fxLayoutGap="20px">
<mat-form-field fxFlex="1 1 50%">
<input (ngModelChange)="search($event)" matInput name="search" ngModel placeholder="Search"/>
</mat-form-field>
</form>
</div>
<ag-grid-angular [gridOptions]="gridOptions" class="ag-theme-material" style="width: 100%; height: 100%;">
</ag-grid-angular>
<div style="height: 4px; width: 100%; padding: 5px 0 0">
<mat-progress-bar *ngIf="loading" mode="indeterminate"></mat-progress-bar>
</div>
</div>
@@ -0,0 +1,9 @@
$cell-space: 8px;
.title-cell {
margin-right: $cell-space;
}
.progress-cell {
margin-left: $cell-space;
}
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MultiPostComponent } from './multi-post.component';
describe('MultiPostComponent', () => {
let component: MultiPostComponent;
let fixture: ComponentFixture<MultiPostComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ MultiPostComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(MultiPostComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -0,0 +1,160 @@
import { VRPostParse, VRThreadParseState } from './../common/vr-post-parse.model';
import { Component, OnInit, NgZone, OnDestroy, Input, Output, EventEmitter } from '@angular/core';
import { MatSnackBar } from '@angular/material';
import { GridOptions } from 'ag-grid-community';
import { UrlRendererComponent } from './url-renderer.component';
import { WsHandler } from '../ws-handler';
import { Subscription } from 'rxjs';
import { WSMessage } from '../common/ws-message.model';
import { CMD } from '../common/cmd.enum';
import { WsConnectionService } from '../ws-connection.service';
import { HttpClient } from '@angular/common/http';
import { ServerService } from '../server-service';
@Component({
selector: 'app-multi-post',
templateUrl: './multi-post.component.html',
styleUrls: ['./multi-post.component.scss']
})
export class MultiPostComponent implements OnInit, OnDestroy {
@Input()
threadId: string;
@Output()
done: EventEmitter<boolean> = new EventEmitter();
gridOptions: GridOptions;
websocketHandlerPromise: Promise<WsHandler>;
subscription: Subscription;
loading = true;
constructor(
private ngZone: NgZone,
private _snackBar: MatSnackBar,
private wsConnectionService: WsConnectionService,
private httpClient: HttpClient,
private serverService: ServerService
) {
this.websocketHandlerPromise = this.wsConnectionService.getConnection();
}
ngOnInit(): void {
this.gridOptions = <GridOptions>{
columnDefs: [
{
headerName: 'Number',
field: 'number',
cellClass: 'no-padding',
maxWidth: 100,
checkboxSelection: true,
headerCheckboxSelection: true,
headerCheckboxSelectionFilteredOnly: false,
sort: 'asc'
},
{
headerName: 'Title',
field: 'title',
cellClass: 'no-padding'
},
{
headerName: 'URL',
field: 'url',
cellClass: 'no-padding',
cellRenderer: 'urlCellRenderer'
}
],
defaultColDef: {
sortable: true
},
frameworkComponents: {
urlCellRenderer: UrlRendererComponent
},
rowSelection: 'multiple',
rowMultiSelectWithClick: true,
suppressRowClickSelection: true,
rowHeight: 48,
animateRows: true,
rowData: [],
overlayLoadingTemplate: '<span></span>',
overlayNoRowsTemplate: '<span></span>',
getRowNodeId: data => data['url'],
onGridReady: () => {
this.gridOptions.api.sizeColumnsToFit();
this.connect();
},
onGridSizeChanged: () => this.gridOptions.api.sizeColumnsToFit(),
onRowDataUpdated: () => this.gridOptions.api.sizeColumnsToFit()
};
}
ngOnDestroy() {
this.unsubscribe();
}
search(event) {
this.gridOptions.api.setQuickFilter(event);
}
private unsubscribe() {
if (this.subscription != null) {
this.subscription.unsubscribe();
}
this.websocketHandlerPromise.then((handler: WsHandler) => {
handler.send(new WSMessage(CMD.THREAD_PARSING_UNSUB.toString()));
});
}
connect() {
this.websocketHandlerPromise.then((handler: WsHandler) => {
console.log('Connecting to thread parsing');
this.subscription = handler.subscribeForThreadParsing(
(states: Array<VRThreadParseState>, data: Array<VRPostParse>) => {
if (data[0].threadId === this.threadId) {
this.gridOptions.api.updateRowData({ add: data });
}
if (states.length > 0 && states[states.length - 1].state === 'END' && states[0].threadId === this.threadId) {
this.ngZone.run(() => {
this.loading = false;
if (this.gridOptions.api.getDisplayedRowCount() === 1) {
this.addPosts(
[this.gridOptions.api.getDisplayedRowAtIndex(0).data].map(e => ({
threadId: e.threadId,
postId: e.postId
}))
);
this.done.emit(true);
}
});
}
}
);
handler.send(new WSMessage(CMD.THREAD_PARSING_SUB.toString(), this.threadId));
});
}
submit() {
const data = (<VRPostParse[]>this.gridOptions.api.getSelectedRows()).map(e => ({
postId: e.postId,
threadId: this.threadId
}));
this.addPosts(data);
}
addPosts(data: { postId: string; threadId: string }[]) {
this.httpClient.post(this.serverService.baseUrl + '/post/add', data).subscribe(
() => {
this._snackBar.open('Adding posts to queue', null, {
duration: 5000
});
this.done.emit();
},
error => {
this._snackBar.open(error.error, null, {
duration: 5000
});
}
);
}
}
@@ -0,0 +1,41 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
import { AgRendererComponent } from 'ag-grid-angular';
import { ICellRendererParams } from 'ag-grid-community';
import { VRPostParse } from '../common/vr-post-parse.model';
import { ElectronService } from 'ngx-electron';
@Component({
selector: 'app-url-cell',
template: `
<a href="javascript:void(0)" [appPreview]="postResult.previews" (click)="goTo()"
>https://vipergirls/threads/?p={{ postResult.postId }}</a
>
`
})
export class UrlRendererComponent implements OnInit, OnDestroy, AgRendererComponent {
constructor(public electronService: ElectronService) {}
postResult: VRPostParse;
params: ICellRendererParams;
ngOnInit(): void {}
ngOnDestroy(): void {}
agInit(params: ICellRendererParams): void {
this.params = params;
this.postResult = this.params.data;
}
refresh(params: ICellRendererParams): boolean {
return false;
}
goTo() {
if (this.electronService.isElectronApp) {
this.electronService.shell.openExternal(this.postResult.url);
} else {
window.open(this.postResult.url, '_blank');
}
}
}
@@ -1,7 +1,7 @@
import { PostDetailsProgressRendererComponent } from './post-details-progress.component';
import { WsConnectionService } from './../ws-connection.service';
import { Component, OnInit, ViewChild, Inject, OnDestroy, NgZone } from '@angular/core';
import { MatSort, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { Component, OnInit, Inject, OnDestroy, NgZone } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { PostDetailsDataSource } from './post-details.datasource';
import { PostState } from '../posts/post-state.model';
import { GridOptions } from 'ag-grid-community';
@@ -25,13 +25,12 @@ export class PostDetailComponent implements OnInit, OnDestroy {
headerName: 'URL',
field: 'url',
sortable: true,
tooltipField: 'url',
cellRenderer: 'progressCellRenderer',
cellClass: 'no-padding'
}
],
enableBrowserTooltips: true,
rowHeight: 48,
animateRows: true,
rowData: [],
frameworkComponents: {
progressCellRenderer: PostDetailsProgressRendererComponent
@@ -0,0 +1,30 @@
<div class="container" style="height: 100%; background-color: white">
<div
[ngClass]="{
error: postDetails.status === 'ERROR'
}"
class="progress-bar-back"
style="position: relative; height: 100%;"
>
<div
class="progress-foreground"
fxLayout="row"
fxLayoutAlign="space-between"
style="background-color: transparent; width: 100%; height: 100%;"
>
<div class="progress-bar" style="position: absolute; width: 100%; top: 37px; padding: 0 20px">
<mat-progress-bar [value]="postDetails.progress" class="example-margin" color="primary" mode="determinate">
</mat-progress-bar>
</div>
<span fxLayout="row">
<span style="padding-left: 20px"
><a (click)="goTo()" href="javascript:void(0)" style="color: rgba(0, 0, 0, 0.87);">{{
postDetails.url
}}</a></span
>
<span class="filler" fxFlex="grow"></span>
</span>
<span class="progress-percentage" style="padding-right: 20px">{{ trunc(postDetails.progress) + '%' }}</span>
</div>
</div>
</div>
@@ -0,0 +1,24 @@
@import '~@angular/material/theming';
@mixin post-detail-renderer-component-theme($theme) {
$blue: mat-palette($mat-blue);
$red: mat-palette($mat-red);
.progress-bar .mat-progress-bar-fill::after {
background-color: mat-color($blue, 300);
}
.progress-bar .mat-progress-bar-buffer {
background-color: mat-color($blue, 100);
}
app-details-cell .error {
background-color: mat-color($red, 50);
& .progress-bar .mat-progress-bar-fill::after {
background-color: mat-color($red, 300);
}
& .progress-bar .mat-progress-bar-buffer {
background-color: mat-color($red, 100);
}
}
}
@@ -5,71 +5,19 @@ import { Subscription } from 'rxjs';
import { PostDetails } from './post-details.model';
import { WsHandler } from '../ws-handler';
import { ICellRendererParams } from 'ag-grid-community';
import { ElectronService } from 'ngx-electron';
@Component({
selector: 'app-progress-cell',
template: `
<div style="height: 100%;">
<div
class="progress-bar"
[ngClass]="{
complete: postDetails.status === 'COMPLETE',
downloading: postDetails.status === 'DOWNLOADING'
}"
[style.width]="trunc(postDetails.progress) + '%'"
></div>
<div
class="progress-bar-back"
fxLayout="row"
fxLayoutAlign="space-between"
[ngClass]="{
error: postDetails.status === 'ERROR',
stopped: postDetails.status === 'STOPPED',
pending: postDetails.status === 'PENDING'
}"
>
<div>{{ postDetails.url }}</div>
<div>{{ trunc(postDetails.progress) + '%' }}</div>
</div>
</div>
`,
styles: [
`
.progress-bar-back {
position: relative;
height: 45px;
bottom: 45px;
padding: 0 8px;
transition: background-color 0.5s;
}
.progress-bar {
background-color: #87a2c7;
height: 100%;
transition: width 0.5s, background-color 0.5s;
}
.complete {
background-color: #3865a3;
}
.pending {
background-color: white;
}
.error {
background-color: #eb6060;
}
.downloading {
background-color: #87a2c7;
}
.stopped {
background-color: grey;
}
`
]
selector: 'app-details-cell',
templateUrl: 'post-details-progress.component.html',
styleUrls: ['post-details-progress.component.scss']
})
export class PostDetailsProgressRendererComponent implements AgRendererComponent, OnInit, OnDestroy {
constructor(
private wsConnectionService: WsConnectionService,
private zone: NgZone
) {
private zone: NgZone,
public electronService: ElectronService
) {
this.websocketHandlerPromise = this.wsConnectionService.getConnection();
}
@@ -96,8 +44,18 @@ export class PostDetailsProgressRendererComponent implements AgRendererComponent
});
}
goTo() {
if (this.electronService.isElectronApp) {
this.electronService.shell.openExternal(this.postDetails.url);
} else {
window.open(this.postDetails.url, '_blank');
}
}
ngOnDestroy(): void {
this.subscription.unsubscribe();
if (this.subscription != null) {
this.subscription.unsubscribe();
}
}
agInit(params: ICellRendererParams): void {
@@ -106,7 +64,6 @@ export class PostDetailsProgressRendererComponent implements AgRendererComponent
}
refresh(params: ICellRendererParams): boolean {
this.postDetails = params.data;
return true;
return false;
}
}
@@ -1,187 +0,0 @@
import { Component, OnInit, OnDestroy, NgZone } from '@angular/core';
import { AgRendererComponent } from 'ag-grid-angular';
import { PostState } from './post-state.model';
import { PostDetailComponent } from '../post-detail/post-detail.component';
import { MatDialog, MatSnackBar } from '@angular/material';
import { HttpClient } from '@angular/common/http';
import { BreakpointObserver, BreakpointState, Breakpoints } from '@angular/cdk/layout';
import { Observable, Subscription } from 'rxjs';
import { WsConnectionService } from '../ws-connection.service';
import { WsHandler } from '../ws-handler';
import { ServerService } from '../server-service';
import { ICellRendererParams } from 'ag-grid-community';
import { RemoveResponse } from '../common/remove-response.model';
import { ConfirmDialogComponent } from '../common/confirmation-component/confirmation-dialog';
import { filter, flatMap } from 'rxjs/operators';
@Component({
selector: 'app-menu-cell',
template: `
<div fxLayout="column" fxLayoutAlign="center center" style="height: 100%">
<button fxFlex="nogrow" mat-icon-button [matMenuTriggerFor]="menu">
<mat-icon>more_vert</mat-icon>
</button>
</div>
<mat-menu #menu="matMenu">
<button
*ngIf="
postData.status === 'PENDING' ||
(postData.status === 'COMPLETE' && postData.progress !== 100) ||
postData.status === 'ERROR' ||
postData.status === 'STOPPED'
"
(click)="restart()"
mat-menu-item
>
<mat-icon>play_arrow</mat-icon>
<span>Start</span>
</button>
<button *ngIf="postData.status === 'DOWNLOADING' || postData.status === 'PARTIAL'" (click)="stop()" mat-menu-item>
<ng-container>
<mat-icon>stop</mat-icon>
<span>Stop</span>
</ng-container>
</button>
<button (click)="seeDetails()" mat-menu-item>
<mat-icon>list</mat-icon>
<span>Details</span>
</button>
<button (click)="remove()" mat-menu-item>
<mat-icon>delete</mat-icon>
<span>Remove</span>
</button>
</mat-menu>
`
})
export class MenuRendererComponent implements OnInit, OnDestroy, AgRendererComponent {
constructor(
public dialog: MatDialog,
private httpClient: HttpClient,
private breakpointObserver: BreakpointObserver,
private wsConnectionService: WsConnectionService,
private serverService: ServerService,
private zone: NgZone,
private _snackBar: MatSnackBar
) {
this.websocketHandlerPromise = this.wsConnectionService.getConnection();
}
isExtraSmall: Observable<BreakpointState> = this.breakpointObserver.observe(Breakpoints.XSmall);
params: ICellRendererParams;
postData: PostState;
subscription: Subscription;
websocketHandlerPromise: Promise<WsHandler>;
ngOnInit(): void {
this.websocketHandlerPromise.then((handler: WsHandler) => {
this.subscription = handler.subscribeForPosts(e => {
this.zone.run(() => {
e.forEach(v => {
if (this.postData.postId === v.postId) {
this.postData = v;
}
});
});
});
});
}
ngOnDestroy(): void {
this.subscription.unsubscribe();
}
seeDetails() {
const dialogRef = this.dialog.open(PostDetailComponent, {
width: '90%',
height: '90%',
maxWidth: '100vw',
maxHeight: '100vh',
data: this.postData
});
const smallDialogSubscription = this.isExtraSmall.subscribe(result => {
if (result.matches) {
dialogRef.updateSize('100%', '100%');
} else {
dialogRef.updateSize('90%', '90%');
}
});
dialogRef.afterClosed().subscribe(() => {
smallDialogSubscription.unsubscribe();
});
}
restart() {
this.httpClient.post(this.serverService.baseUrl + '/post/restart', { postId: this.postData.postId }).subscribe(
() => {
this._snackBar.open('Download started', null, {
duration: 5000
});
},
error => {
console.error(error);
}
);
}
remove() {
this.dialog
.open(ConfirmDialogComponent, {
maxHeight: '100vh',
maxWidth: '100vw',
height: '200px',
width: '60%',
data: { header: 'Confirmation', content: 'Are you sure you want to remove this item ?' }
})
.afterClosed()
.pipe(
filter(e => e === 'yes'),
flatMap(e =>
this.httpClient.post<RemoveResponse>(this.serverService.baseUrl + '/post/remove', {
postId: this.postData.postId
})
)
)
.subscribe(
data => {
const toRemove = [];
const nodeToDelete = this.params.api.getRowNode(data.postId);
if (nodeToDelete != null) {
toRemove.push(nodeToDelete.data);
}
this.params.api.updateRowData({ remove: toRemove });
},
error => {
console.error(error);
}
);
}
stop() {
this.httpClient.post(this.serverService.baseUrl + '/post/stop', { postId: this.postData.postId }).subscribe(
() => {
this._snackBar.open('Download stopped', null, {
duration: 5000
});
},
error => {
console.error(error);
}
);
}
agInit(params: ICellRendererParams): void {
this.params = params;
this.postData = params.data;
}
refresh(params: ICellRendererParams): boolean {
return false;
}
}
@@ -0,0 +1,104 @@
<div class="container" style="height: 100%; background-color: white">
<div
[ngClass]="{
'error': postState.status === 'ERROR',
'downloading': postState.status === 'DOWNLOADING' || postState.status === 'PARTIAL',
'complete': postState.status === 'COMPLETE',
'stopped': postState.status === 'STOPPED'
}"
class="progress-bar-back"
style="position: relative; height: 100%; max-height: 48px;"
>
<div
class="progress-foreground"
fxLayout="row"
fxLayoutAlign="space-between"
style="background-color: transparent; width: 100%; height: 100%;"
>
<div class="progress-bar" color="accent" style="position: absolute; width: 100%; top: 37px; padding: 0 50px">
<mat-progress-bar [value]="postState.progress" class="example-margin" color="primary" mode="determinate">
</mat-progress-bar>
</div>
<span fxLayout="row">
<span (click)="toggleExpand()" class="chevron">
<button *ngIf="expanded; else notExpanded" mat-icon-button>
<mat-icon>expand_more</mat-icon>
</button>
<ng-template #notExpanded>
<button mat-icon-button>
<mat-icon>chevron_right</mat-icon>
</button>
</ng-template>
</span>
<span>{{ postState.title }}</span>
<span class="filler" fxFlex="grow"></span>
</span>
<span>
<span class="progress-percentage">{{ postState.done + '/' + postState.total }}</span>
<button [matMenuTriggerFor]="menu" mat-icon-button>
<mat-icon>more_vert</mat-icon>
</button>
<mat-menu #menu="matMenu">
<button
(click)="restart()"
*ngIf="
(postState.status === 'COMPLETE' && postState.progress !== 100) ||
postState.status === 'ERROR' ||
postState.status === 'STOPPED'
"
mat-menu-item
>
<mat-icon>play_arrow</mat-icon>
<span>Start</span>
</button>
<button
(click)="stop()"
*ngIf="postState.status === 'DOWNLOADING' || postState.status === 'PARTIAL' || postState.status === 'PENDING'"
mat-menu-item
>
<ng-container>
<mat-icon>stop</mat-icon>
<span>Stop</span>
</ng-container>
</button>
<button (click)="seeDetails()" mat-menu-item>
<mat-icon>list</mat-icon>
<span>Files</span>
</button>
<button (click)="remove()" mat-menu-item>
<mat-icon>delete</mat-icon>
<span>Remove</span>
</button>
<button (click)="open()" *ngIf="electronService.isElectronApp" mat-menu-item>
<mat-icon>open_in_new</mat-icon>
<span>Download Location</span>
</button>
</mat-menu>
</span>
</div>
</div>
<section *ngIf="expanded">
<div class="details table">
<div class="row" style="display: table-row">
<h4 class="cell attribute">Status:</h4>
<p class="cell value">
{{ postState.status | titlecase }}
</p>
</div>
<div class="row" style="display: table-row">
<h4 class="cell attribute">Post URL:</h4>
<p class="cell value">
<a (click)="goTo()" [appPreview]="postState.previews" href="javascript:void(0)"
>https://vipergirls/threads/?p={{ postState.postId }}</a
>
</p>
</div>
<div style="display: table-row">
<h4 class="cell attribute">Host:</h4>
<p class="cell value">
{{ postState.hosts }}
</p>
</div>
</div>
</section>
</div>
@@ -0,0 +1,28 @@
.progress-bar-back {
transition: background-color 0.5s;
}
.table {
display: table;
}
.row {
display: table-row;
}
.cell {
display: table-cell;
}
section {
width: 100%;
position: absolute;
top: 48px;
padding: 10px;
}
.details {
line-height: 24px;
}
.value {
padding-left: 5px;
}
@@ -0,0 +1,49 @@
@import '~@angular/material/theming';
@mixin post-progress-renderer-component-theme($theme) {
$red: mat-palette($mat-red);
$grey: mat-palette($mat-grey);
$green: mat-palette($mat-green);
app-progress-cell .progress-bar .mat-progress-bar-fill::after {
background-color: mat-color($grey, 400);
}
app-progress-cell .progress-bar .mat-progress-bar-buffer {
background-color: mat-color($grey, 200);
}
app-progress-cell .error {
background-color: mat-color($red, 50);
& .progress-bar .mat-progress-bar-fill::after {
background-color: mat-color($red, 300);
}
& .progress-bar .mat-progress-bar-buffer {
background-color: mat-color($red, 100);
}
}
app-progress-cell .downloading {
background-color: mat-color($green, 50);
& .progress-bar .mat-progress-bar-fill::after {
background-color: mat-color($green, 300);
}
& .progress-bar .mat-progress-bar-buffer {
background-color: mat-color($green, 100);
}
}
app-progress-cell .complete {
background-color: mat-color($green, 100);
& .progress-bar .mat-progress-bar-fill::after {
background-color: mat-color($green, 300);
}
& .progress-bar .mat-progress-bar-buffer {
background-color: mat-color($green, 100);
}
}
app-progress-cell .stopped {
background-color: mat-color($grey, 100);
}
}
@@ -1,112 +1,53 @@
import { SharedService } from './shared.service';
import { WsConnectionService } from '../ws-connection.service';
import { PostState } from './post-state.model';
import { Component, OnInit, OnDestroy, NgZone } from '@angular/core';
import { AgRendererComponent } from 'ag-grid-angular';
import { Subscription } from 'rxjs';
import { Subscription, Observable } from 'rxjs';
import { WsHandler } from '../ws-handler';
import { ICellRendererParams } from 'ag-grid-community';
import { ElectronService } from 'ngx-electron';
import { BreakpointState, Breakpoints, BreakpointObserver } from '@angular/cdk/layout';
import { MatDialog, MatSnackBar } from '@angular/material';
import { PostDetailComponent } from '../post-detail/post-detail.component';
import { HttpClient } from '@angular/common/http';
import { ServerService } from '../server-service';
import { ConfirmDialogComponent } from '../common/confirmation-component/confirmation-dialog';
import { filter, flatMap } from 'rxjs/operators';
import { RemoveResponse } from '../common/remove-response.model';
import { DownloadPath } from '../common/download-path.model';
@Component({
selector: 'app-progress-cell',
template: `
<div style="height: 100%;">
<div class="progress-text" fxLayout="row" fxLayoutAlign="space-between">
<div>{{ postState.title + postState.postCounter }}</div>
<div>{{ trunc(postState.progress) + '%' }}</div>
</div>
<div
class="progress-bar"
[ngClass]="{
'complete': postState.status === 'COMPLETE',
'downloading': postState.status === 'DOWNLOADING',
'stopped': postState.status === 'STOPPED',
'partial': postState.status === 'PARTIAL',
'error': postState.status === 'ERROR',
'pending': postState.status === 'PENDING'
}"
[style.width]="trunc(postState.progress) + '%'"
></div>
<div
class="progress-bar-back"
[ngClass]="{
'complete-back': postState.status === 'COMPLETE',
'downloading-back': postState.status === 'DOWNLOADING',
'stopped-back': postState.status === 'STOPPED',
'partial-back': postState.status === 'PARTIAL',
'error-back': postState.status === 'ERROR',
'pending-back': postState.status === 'PENDING'
}"
></div>
</div>
`,
styles: [
`
.progress-text {
position: relative;
padding: 0 8px;
z-index: 2;
}
.progress-bar {
position: relative;
height: 100%;
bottom: 45px;
transition: width 0.5s, background-color 0.5s;
z-index: 1;
}
.progress-bar-back {
position: relative;
height: 100%;
bottom: 90px;
transition: background-color 0.5s;
}
.complete {
background-color: #3865a3;
}
.complete-back {
background-color: lightgrey;
}
.pending {
background-color: white;
}
.pending-back {
background-color: lightgrey;
}
.error {
background-color: #eb6060;
}
.error-back {
background-color: #eb6060;
}
.downloading {
background-color: #87a2c7;
}
.downloading-back {
background-color: white;
}
.stopped {
background-color: grey;
}
.stopped-back {
background-color: lightgrey;
}
.partial {
background-color: #ffcc00;
}
.partial-back {
background-color: white;
}
`
]
templateUrl: 'post-progress.renderer.component.html',
styleUrls: ['post-progress.renderer.component.scss']
})
export class PostProgressRendererComponent implements AgRendererComponent, OnInit, OnDestroy {
constructor(private wsConnectionService: WsConnectionService, private zone: NgZone) {
constructor(
private wsConnectionService: WsConnectionService,
private zone: NgZone,
private sharedService: SharedService,
public electronService: ElectronService,
private breakpointObserver: BreakpointObserver,
public dialog: MatDialog,
private httpClient: HttpClient,
private serverService: ServerService,
private _snackBar: MatSnackBar,
) {
this.websocketHandlerPromise = this.wsConnectionService.getConnection();
if (this.electronService.isElectronApp) {
this.fs = this.electronService.remote.require('fs');
}
}
websocketHandlerPromise: Promise<WsHandler>;
params: ICellRendererParams;
postState: PostState;
subscription: Subscription;
updatesSubscription: Subscription;
expandSubscription: Subscription;
expanded = false;
isExtraSmall: Observable<BreakpointState> = this.breakpointObserver.observe(Breakpoints.XSmall);
fs;
trunc(value: number): number {
return Math.trunc(value);
@@ -114,7 +55,7 @@ export class PostProgressRendererComponent implements AgRendererComponent, OnIni
ngOnInit(): void {
this.websocketHandlerPromise.then((handler: WsHandler) => {
this.subscription = handler.subscribeForPosts(e => {
this.updatesSubscription = handler.subscribeForPosts(e => {
this.zone.run(() => {
e.forEach(v => {
if (this.postState.postId === v.postId) {
@@ -124,19 +65,160 @@ export class PostProgressRendererComponent implements AgRendererComponent, OnIni
});
});
});
this.expandSubscription = this.sharedService.expandedPost.subscribe(postId => {
if (this.expanded && this.postState.postId !== postId) {
this.toggleExpand();
}
});
}
ngOnDestroy(): void {
this.subscription.unsubscribe();
if (this.updatesSubscription != null) {
this.updatesSubscription.unsubscribe();
}
if (this.expandSubscription != null) {
this.expandSubscription.unsubscribe();
}
}
agInit(params: ICellRendererParams): void {
this.params = params;
this.postState = params.data;
this.params.node.setRowHeight(48);
}
refresh(params: ICellRendererParams): boolean {
this.postState = params.data;
return true;
return false;
}
toggleExpand() {
if (this.expanded) {
this.params.node.setRowHeight(48);
} else {
this.params.node.setRowHeight(130);
this.sharedService.publishExpanded(this.postState.postId);
}
this.params.api.onRowHeightChanged();
this.expanded = !this.expanded;
}
goTo() {
if (this.electronService.isElectronApp) {
this.electronService.shell.openExternal(this.postState.url);
} else {
window.open(this.postState.url, '_blank');
}
}
seeDetails() {
const dialogRef = this.dialog.open(PostDetailComponent, {
width: '90%',
height: '90%',
maxWidth: '100vw',
maxHeight: '100vh',
data: this.postState
});
const smallDialogSubscription = this.isExtraSmall.subscribe(result => {
if (result.matches) {
dialogRef.updateSize('100%', '100%');
} else {
dialogRef.updateSize('90%', '90%');
}
});
dialogRef.afterClosed().subscribe(() => {
if (smallDialogSubscription != null) {
smallDialogSubscription.unsubscribe();
}
});
}
restart() {
this.httpClient.post(this.serverService.baseUrl + '/post/restart', { postId: this.postState.postId }).subscribe(
() => {
this._snackBar.open('Download started', null, {
duration: 5000
});
},
error => {
console.error(error);
}
);
}
remove() {
this.dialog
.open(ConfirmDialogComponent, {
maxHeight: '100vh',
maxWidth: '100vw',
height: '200px',
width: '60%',
data: { header: 'Confirmation', content: 'Are you sure you want to remove this item ?' }
})
.afterClosed()
.pipe(
filter(e => e === 'yes'),
flatMap(e =>
this.httpClient.post<RemoveResponse>(this.serverService.baseUrl + '/post/remove', {
postId: this.postState.postId
})
)
)
.subscribe(
data => {
const toRemove = [];
const nodeToDelete = this.params.api.getRowNode(data.postId);
if (nodeToDelete != null) {
toRemove.push(nodeToDelete.data);
}
this.params.api.updateRowData({ remove: toRemove });
},
error => {
console.error(error);
}
);
}
open() {
if (!this.electronService.isElectronApp) {
console.error('Cannot open downloader folder, not electron app');
return;
}
// Request the server to give the correct file location
this.httpClient.get<DownloadPath>(this.serverService.baseUrl + '/post/path/' + this.postState.postId).subscribe(
path => {
if (this.fs.existsSync(path.path)) {
this.electronService.shell.openItem(path.path);
} else {
if(this.postState.done <= 0) {
this._snackBar.open('Download has not been started yet for this post', null, {
duration: 5000
});
} else {
this._snackBar.open(path.path + ' does not exist, you probably removed it', null, {
duration: 5000
});
}
}
},
error => {
console.error(error);
}
);
}
stop() {
this.httpClient.post(this.serverService.baseUrl + '/post/stop', { postId: this.postState.postId }).subscribe(
() => {
this._snackBar.open('Download stopped', null, {
duration: 5000
});
},
error => {
console.error(error);
}
);
}
}
+6 -2
View File
@@ -2,10 +2,14 @@ export class PostState {
constructor(
public type: string,
public postId: string,
public postCounter: string,
public title: string,
public progress: number,
public status: string,
public removed: boolean
public removed: boolean,
public url: string,
public done: number,
public total: number,
public hosts: string[],
public previews: string[]
) {}
}
+11 -1
View File
@@ -1,2 +1,12 @@
<div fxLayout="row" fxLayoutAlign="center center">
<!-- <app-filter fxFlex="noshrink"></app-filter> -->
<span fxFlex="grow"></span>
<form autocomplete="off">
<mat-form-field>
<input (ngModelChange)="search($event)" matInput name="search" ngModel placeholder="Search"/>
<mat-icon matSuffix>search</mat-icon>
</mat-form-field>
</form>
</div>
<ag-grid-angular style="width: 100%; height: 100%;" class="ag-theme-material" [gridOptions]="gridOptions">
</ag-grid-angular>
</ag-grid-angular>
@@ -14,4 +14,8 @@ $cell-space: 8px;
flex: 0 0 $menu-width;
justify-content: flex-end;
margin-left: $cell-space;
}
}
:host ::ng-deep .ag-row-hover {
background-color: transparent !important;
}
+14 -26
View File
@@ -1,9 +1,8 @@
import { Component, OnInit, OnDestroy, NgZone } from '@angular/core';
import { PostsDataSource } from './post.datasource';
import { WsConnectionService } from '../ws-connection.service';
import { GridOptions } from 'ag-grid-community';
import { GridOptions, IFilterComp } from 'ag-grid-community';
import { PostProgressRendererComponent } from './post-progress.renderer.component';
import { MenuRendererComponent } from './menu.renderer.component';
import { Subject } from 'rxjs';
@Component({
@@ -12,41 +11,27 @@ import { Subject } from 'rxjs';
styleUrls: ['./posts.component.scss']
})
export class PostsComponent implements OnInit, OnDestroy {
constructor(
private wsConnection: WsConnectionService,
private zone: NgZone
) {
this.gridOptions = <GridOptions> {
constructor(private wsConnection: WsConnectionService, private zone: NgZone) {
this.gridOptions = <GridOptions>{
columnDefs: [
{
headerName: 'Title',
headerName: 'Posts',
field: 'title',
sortable: true,
tooltipField: 'title',
cellRenderer: 'progressCellRenderer',
cellClass: 'no-padding'
},
{
headerName: 'Menu',
cellRenderer: 'menuCellRenderer',
sortable: true,
width: 60,
minWidth: 60,
maxWidth: 60,
suppressAutoSize: true
cellClass: 'no-padding',
sort: 'asc'
}
],
enableBrowserTooltips: true,
rowHeight: 48,
animateRows: true,
rowData: [],
frameworkComponents: {
progressCellRenderer: PostProgressRendererComponent,
menuCellRenderer: MenuRendererComponent
progressCellRenderer: PostProgressRendererComponent
},
overlayLoadingTemplate: '<span></span>',
overlayNoRowsTemplate: '<span></span>',
getRowNodeId: (data) => data['postId'],
getRowNodeId: data => data['postId'],
onGridReady: () => {
this.gridOptions.api.sizeColumnsToFit();
this.dataSource = new PostsDataSource(this.wsConnection, this.gridOptions, this.zone);
@@ -61,6 +46,10 @@ export class PostsComponent implements OnInit, OnDestroy {
gridOptions: GridOptions;
dataSource: PostsDataSource;
search(event) {
this.gridOptions.api.setQuickFilter(event);
}
removeRows(postIds: string[]): void {
if (postIds == null) {
return;
@@ -77,8 +66,7 @@ export class PostsComponent implements OnInit, OnDestroy {
this.gridOptions.api.updateRowData({ remove: toRemove });
}
ngOnInit() {
}
ngOnInit() {}
ngOnDestroy(): void {
this.dataSource.disconnect();
@@ -0,0 +1,16 @@
import { Injectable } from '@angular/core';
import { Subject, Observable } from 'rxjs';
@Injectable()
export class SharedService {
private expandedPost$ = new Subject<string>();
get expandedPost(): Observable<string> {
return this.expandedPost$.asObservable();
}
publishExpanded(postId: string) {
this.expandedPost$.next(postId);
}
}
@@ -0,0 +1,39 @@
<div class="dialog-container" fxLayout="column" style="height: 100%;">
<div fxFlex="nogrow">
<h2 class="no-wrap" mat-dialog-title>Scan</h2>
</div>
<mat-dialog-content fxFlex="grow" fxLayout="column">
<div *ngIf="!hideScan">
<form
#f="ngForm"
(ngSubmit)="submit(f)"
autocomplete="off"
fxLayout="row"
fxLayoutAlign="center center"
fxLayoutGap="20px"
>
<mat-form-field fxFlex="grow">
<input
[(ngModel)]="input"
matInput
name="url"
placeholder="Put a vipergirls.to link"
required
/>
</mat-form-field>
<div>
<button [disabled]="f.invalid" color="primary" mat-raised-button type="submit">Scan</button>
</div>
</form>
</div>
<ng-container *ngIf="threadId != null">
<app-multi-post (done)="done($event)" [threadId]="threadId" style="height: 100%"></app-multi-post>
</ng-container>
</mat-dialog-content>
<mat-dialog-actions align="end">
<button (click)="close()" mat-raised-button>Close</button>
<button (click)="addPosts()" *ngIf="threadId != null" color="primary" mat-raised-button type="submit">
Download
</button>
</mat-dialog-actions>
</div>
@@ -0,0 +1,3 @@
:host ::ng-deep .ag-cell {
background-color: snow !important;
}
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ScanComponent } from './scan.component';
describe('ScanComponent', () => {
let component: ScanComponent;
let fixture: ComponentFixture<ScanComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ScanComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ScanComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
+112
View File
@@ -0,0 +1,112 @@
import { Component, OnInit, NgZone, ViewChild, Inject } from '@angular/core';
import { NgForm } from '@angular/forms';
import { MatSnackBar, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { HttpClient } from '@angular/common/http';
import { finalize } from 'rxjs/operators';
import { ServerService } from '../server-service';
import { MultiPostComponent } from '../multi-post/multi-post.component';
@Component({
selector: 'app-scan',
templateUrl: './scan.component.html',
styleUrls: ['./scan.component.scss']
})
export class ScanComponent implements OnInit {
constructor(
private ngZone: NgZone,
private httpClient: HttpClient,
private serverService: ServerService,
private _snackBar: MatSnackBar,
public dialogRef: MatDialogRef<ScanComponent>,
@Inject(MAT_DIALOG_DATA) public data: DialogData
) {}
@ViewChild(MultiPostComponent)
multipost: MultiPostComponent;
input: string;
threadId: string;
hideScan = false;
submit(form: NgForm) {
this.ngZone.run(() => {
this.hideScan = true;
this.threadId = null;
this.processUrl(this.input, form);
});
}
done(done: boolean) {
this.ngZone.run(() => {
if (done) {
this.dialogRef.close();
}
});
}
processUrl(url: string, form?: NgForm) {
this.httpClient
.post<{ threadId: string; postId: string }>(this.serverService.baseUrl + '/post', { url: url })
.pipe(
finalize(() => {
this.ngZone.run(() => {
if (form != null) {
form.resetForm();
this.input = null;
}
});
})
)
.subscribe(response => {
this.ngZone.run(() => {
if (response.postId != null) {
this.httpClient
.post(this.serverService.baseUrl + '/post/add', [response])
.pipe(finalize(() => this.dialogRef.close()))
.subscribe(
() => {
this._snackBar.open('Adding posts to queue', null, {
duration: 5000
});
},
error => {
this._snackBar.open(error.error, null, {
duration: 5000
});
}
);
return;
}
this.threadId = response.threadId;
});
});
}
addPosts() {
this.ngZone.run(() => {
if (this.multipost != null) {
this.multipost.submit();
}
this.dialogRef.close();
});
}
ngOnInit() {
this.ngZone.run(() => {
if (this.data.url != null) {
this.hideScan = true;
this.processUrl(this.data.url);
}
});
}
close() {
this.ngZone.run(() => {
this.dialogRef.close();
});
}
}
export interface DialogData {
url: string;
}
@@ -1,6 +1,9 @@
<div fxLayout="column" class="dialog-container" style="height: 100%;">
<div fxFlex="nogrow">
<div fxFlex="nogrow" fxLayout="row" fxLayoutAlign="space-between center">
<h2 class="no-wrap" mat-dialog-title>Settings</h2>
<mat-slide-toggle (change)="updateTheme()" [(ngModel)]="darkTheme"
>{{ darkTheme ? 'Dark theme' : 'Light theme' }}
</mat-slide-toggle>
</div>
<mat-dialog-content fxFlex="grow">
<div class="container">
@@ -35,15 +38,27 @@
/>
</mat-form-field>
<mat-checkbox color="primary" formControlName="subLocation" name="subLocation"
>Save posts in sub folders
</mat-checkbox>
<mat-checkbox *ngIf="generalSettingsForm.get('subLocation').value" color="primary"
formControlName="threadSubLocation" name="threadSubLocation" style="margin-left: 15px"
>Create a subfolder per thread
</mat-checkbox>
<mat-checkbox color="primary" formControlName="forceOrder" name="forceOrder"
>Force image ordering (prepend incremental numbers)
</mat-checkbox
>
</mat-checkbox>
<mat-checkbox color="primary" formControlName="autoStart" name="autoStart"
>Auto start downloads</mat-checkbox
>
<mat-checkbox color="primary" formControlName="clearCompleted" name="clearCompleted"
>Clear Finished
</mat-checkbox>
<mat-slide-toggle color="primary" formControlName="vLogin" name="vLogin">
ViperGirls Authentication
</mat-slide-toggle>
@@ -86,7 +101,11 @@
(click)="onSubmit()"
color="primary"
type="submit"
[disabled]="(generalSettingsForm.pristine && desktopSettingsForm.pristine) || generalSettingsForm.invalid || desktopSettingsForm.invalid"
[disabled]="
(generalSettingsForm.pristine && desktopSettingsForm.pristine) ||
generalSettingsForm.invalid ||
desktopSettingsForm.invalid
"
>
Apply
</button>
@@ -1,3 +1,4 @@
import { AppService } from './../app.service';
import { ClipboardService } from './../clipboard.service';
import { Component, OnInit } from '@angular/core';
import { HttpClient } from '@angular/common/http';
@@ -6,6 +7,7 @@ import { MatSnackBar } from '@angular/material';
import { ServerService } from '../server-service';
import { ElectronService } from 'ngx-electron';
import { Settings } from '../common/settings.model';
import { OpenDialogReturnValue } from 'electron';
@Component({
selector: 'app-settings',
@@ -18,7 +20,8 @@ export class SettingsComponent implements OnInit {
private _snackBar: MatSnackBar,
private serverService: ServerService,
public electronService: ElectronService,
private clipboardService: ClipboardService
private clipboardService: ClipboardService,
private appService: AppService
) {}
generalSettingsForm = new FormGroup({
@@ -26,17 +29,27 @@ export class SettingsComponent implements OnInit {
maxThreads: new FormControl(''),
autoStart: new FormControl(false),
forceOrder: new FormControl(false),
subLocation: new FormControl(false),
threadSubLocation: new FormControl(false),
clearCompleted: new FormControl(false),
vLogin: new FormControl(false),
vUsername: new FormControl(''),
vPassword: new FormControl(''),
vThanks: new FormControl(false)
vThanks: new FormControl(false),
});
desktopSettingsForm = new FormGroup({
desktopClipboard: new FormControl(false)
});
darkTheme = false;
updateTheme() {
this.appService.updateTheme(this.darkTheme);
}
ngOnInit() {
this.darkTheme = this.appService.darkTheme;
this.httpClient.get<Settings>(this.serverService.baseUrl + '/settings').subscribe(
data => {
this.generalSettingsForm.reset(data);
@@ -49,18 +62,19 @@ export class SettingsComponent implements OnInit {
}
browse() {
const result: string[] | undefined = this.electronService.remote.dialog.showOpenDialog(
this.electronService.remote.dialog.showOpenDialog(
this.electronService.remote.getCurrentWindow(),
{
properties: ['openDirectory']
}
);
).then((value: OpenDialogReturnValue) => {
if (value.filePaths !== undefined) {
this.generalSettingsForm.get('downloadPath').setValue(value.filePaths[0]);
this.generalSettingsForm.get('downloadPath').markAsDirty();
this.generalSettingsForm.get('downloadPath').markAsTouched();
}
});
if (result !== undefined) {
this.generalSettingsForm.get('downloadPath').setValue(result[0]);
this.generalSettingsForm.get('downloadPath').markAsDirty();
this.generalSettingsForm.get('downloadPath').markAsTouched();
}
}
onSubmit(): void {
@@ -79,7 +93,7 @@ export class SettingsComponent implements OnInit {
this.clipboardService.init(data);
},
error => {
this._snackBar.open(error.error.message, null, {
this._snackBar.open(error.error, null, {
duration: 5000
});
}
@@ -0,0 +1,7 @@
<div class="status-bar">
<span>{{ downloadSpeed!.speed + '/s' }}</span>
<span>Downloading: {{ globalState!.running }}</span>
<span>Queued: {{ globalState!.queued }}</span>
<span>Remaining: {{ globalState!.remaining }}</span>
<span>Error: {{ globalState!.error }}</span>
</div>
@@ -0,0 +1,14 @@
.status-bar {
position: fixed;
width: 100%;
bottom: 0;
left: 0;
text-align: end;
padding: 2px 0;
}
span {
margin: 0 8px;
user-select: none;
font-size: small;
}
@@ -0,0 +1,11 @@
@import '~@angular/material/theming';
@mixin status-bar-component-theme($theme) {
$foreground: map-get($theme, foreground);
$background: map-get($theme, background);
.status-bar {
background-color: mat-color($background, status-bar);
color: mat-color($foreground, base);
}
}

Some files were not shown because too many files have changed in this diff Show More