Compare commits

...
17 Commits
Author SHA1 Message Date
death-claw 2faefba98e Update changelog 2019-07-14 14:35:25 +01:00
death-claw d2141d6c10 v1.4.2 2019-07-14 14:27:58 +01:00
death-claw 6b7da93562 * Fix layout issue in web mode 2019-07-14 14:23:38 +01:00
death-claw 0b3e4ee295 v1.4.1 2019-07-14 13:44:04 +01:00
death-claw 42fddde18c * Add borders
* Fix layout issues
* Update title bar font
2019-07-14 13:36:29 +01:00
death-claw dcbdaf8e41 Update version to 1.4.0 2019-07-14 09:45:12 +01:00
death-claw 62bfe72611 * Refactor remove rows mechanism
* Ignore the stdio on spawn node process
* Reset the title to default for ImageZillaHost
* Add option to remove all posts
* Fix bug when persisting state
* Remove the headless mode option (not needed anymore)
* Add confirmation on remove
* Fix websocket handler bug that causes creating more than one connection per client with the server
2019-07-14 09:11:07 +01:00
death-claw 6c8d3229f1 * Persist on interrupt before closing
* Add console logger back
2019-07-10 22:30:00 +01:00
death-claw fea9697817 Update version to 1.4.0-SNAPSHOT 2019-07-10 22:29:15 +01:00
death-claw 74ad8ce8ee Update icon.icns 2019-07-10 21:38:35 +01:00
death-claw df5aae8cf3 Update icon.png 2019-07-10 19:30:14 +01:00
death-claw cbf8da2723 Rename logo.png 2019-07-10 19:26:43 +01:00
death-claw 0d752fa9bd Add logo.png 2019-07-10 19:25:00 +01:00
death-claw b9c9b820ba Better support for icons 2019-07-10 18:57:23 +01:00
death-claw 402025fbda 1.4.0
### Changed
- Better error handling on startup
- Better support for linux AppImage
### Added
- Clear all completed
- Add clipboard support
2019-07-09 19:55:33 +01:00
death-claw 8d497947a3 v1.3.0-rc0
### Changed
- Change default setting for autostart false -> true
- Change default setting for max concurrent downloads 1 -> 4
### Added
- Desktop app built with electron
- Add the option to remove a post
2019-07-04 22:13:45 +01:00
death-claw e5f58e9079 v1.3.0
### Changed
- Change default setting for autostart false -> true
- Change default setting for max concurrent downloads 1 -> 4
### Added
- Desktop app built with electron
- Add the option to remove a post
2019-07-04 21:49:08 +01:00
74 changed files with 4964 additions and 586 deletions
+28
View File
@@ -1,5 +1,33 @@
# Changelog
## [1.4.2] - 2019-07-14
### Changed
- Fix layout issue in web mode
## [1.4.1] - 2019-07-14
### Changed
- Change title's font
### Added
- Add borders
## [1.4.0] - 2019-07-14
### Changed
- Better error handling on startup
- Better support for linux AppImage
### Added
- Clear all completed
- Add clipboard support
- Add option to remove all posts
- Add confirmation on remove
## [1.3.0-rc0] - 2019-07-04
### Changed
- Change default setting for autostart false -> true
- Change default setting for max concurrent downloads 1 -> 4
### Added
- Desktop app built with electron
- Add the option to remove a post
## [1.2.0] - 2019-06-23
### Added
- Add a shutdown button to gracefully shutdown the app
+1 -1
View File
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>tn.mnlr</groupId>
<artifactId>vripper</artifactId>
<version>1.2.0</version>
<version>1.4.2</version>
<packaging>pom</packaging>
<parent>
<groupId>org.springframework.boot</groupId>
+47
View File
@@ -0,0 +1,47 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# compiled output
/dist
/tmp
/out-tsc
# dependencies
/node_modules
# profiling files
chrome-profiler-events.json
speed-measure-plugin.json
# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace
# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*
# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings
# System Files
.DS_Store
Thumbs.db
dist
build/vripper-ui
+7
View File
@@ -0,0 +1,7 @@
{
"esversion": 6,
"node": true,
"globals": {
"BigInt": false
}
}
Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

+104
View File
@@ -0,0 +1,104 @@
const { app, BrowserWindow } = require("electron");
const path = require("path");
const url = require("url");
const getPort = require("get-port");
const { spawn } = require("child_process");
const { ipcMain } = require("electron");
const commandExists = require("command-exists").sync;
const { dialog } = require("electron");
const appDir = process.env.APPDIR;
console.log('App path', path.join(app.getPath('exe'), "../bin/vripper-server.jar"));
console.log('App image path', appDir);
let win;
let vripperServer;
process.on("uncaughtException", err => {
dialog.showErrorBox(err.message, err.stack);
process.exit(1);
});
if (!commandExists("java")) {
dialog.showErrorBox(
"Java command is missing",
"Java cannot be found on your PATH, make sure to install java before running Viper Ripper"
);
process.exit(1);
}
function createWindow() {
let icon;
if(process.platform === "win32") {
icon = path.join(__dirname, `icon.ico`);
} else {
icon = path.join(__dirname, `icon.icns`);
}
win = new BrowserWindow({
width: 1024,
height: 768,
frame: false,
webPreferences: {
nodeIntegration: true
},
icon: icon
});
win.removeMenu();
win.loadURL(
url.format({
pathname: path.join(__dirname, `vripper-ui/index.html`),
protocol: "file:",
slashes: true
})
);
// win.webContents.openDevTools();
win.on("closed", () => {
win = null;
});
}
getPort().then(port => {
ipcMain.on("get-port", event => {
event.reply("port", port);
});
vripperServer = spawn("java", [
"-Dvripper.server.port=" + port,
"-jar",
appDir !== undefined ? path.join(appDir, "bin/vripper-server.jar") :
path.join(app.getPath('exe'), "../bin/vripper-server.jar")
], {stdio: 'ignore'});
});
const gotTheLock = app.requestSingleInstanceLock();
if (!gotTheLock) {
app.quit();
} else {
app.on("second-instance", (event, commandLine, workingDirectory) => {
if (win) {
if (win.isMinimized()) win.restore();
win.focus();
}
});
app.on("ready", createWindow);
app.on("window-all-closed", () => {
if (process.platform !== "darwin") {
if(vripperServer != null) {
vripperServer.kill("SIGTERM");
}
app.quit();
}
});
app.on("activate", () => {
if (win === null) {
createWindow();
}
});
}
+3232
View File
File diff suppressed because it is too large Load Diff
+60
View File
@@ -0,0 +1,60 @@
{
"name": "vripper-electron",
"version": "1.4.2",
"description": "",
"main": "main.js",
"author": "",
"license": "ISC",
"build": {
"appId": "tn.mnlr.vripper",
"files": [
"**/*",
"!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme}",
"!**/node_modules/*/{test,__tests__,tests,powered-test,example,examples}",
"!**/node_modules/*.d.ts",
"!**/node_modules/.bin",
"!**/*.{iml,o,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,xproj}",
"!.editorconfig",
"!**/._*",
"!**/{.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,.gitignore,.gitattributes}",
"!**/{__pycache__,thumbs.db,.flowconfig,.idea,.vs,.nyc_output}",
"!**/{appveyor.yml,.travis.yml,circle.yml}",
"!**/{npm-debug.log,yarn.lock,.yarn-integrity,.yarn-metadata.json}",
{
"from": "./build/",
"to": "."
}
],
"extraFiles": [
{
"from": "../vripper-server/target/vripper-server-${version}.jar",
"to": "bin/vripper-server.jar"
}
],
"win": {
"target": "nsis"
},
"linux": {
"target": [
"AppImage"
]
}
},
"scripts": {
"start": "electron .",
"dist": "node pre-build.js && build"
},
"devDependencies": {
"electron": "^5.0.5",
"electron-builder": "^20.44.4"
},
"dependencies": {
"cheerio": "^1.0.0-rc.3",
"command-exists": "^1.2.8",
"copy-dir": "^1.1.0",
"custom-electron-titlebar": "^3.0.10",
"electron-context-menu": "^0.13.0",
"get-port": "^5.0.0",
"rimraf": "^2.6.3"
}
}
+18
View File
@@ -0,0 +1,18 @@
const cheerio = require('cheerio');
const fs = require('fs');
const rimraf = require("rimraf");
const copydir = require("copy-dir");
rimraf.sync('./build/vripper-ui');
copydir.sync('../vripper-ui/dist/vripper-ui', './build/vripper-ui', {});
const index = fs.readFileSync('./build/vripper-ui/index.html');
const $ = cheerio.load(index);
$('body').prepend(`<script>require('../renderer.js')</script>`);
fs.writeFileSync('./build/vripper-ui/index.html', $.html());
+12
View File
@@ -0,0 +1,12 @@
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");
+2 -2
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>tn.mnlr</groupId>
<artifactId>vripper</artifactId>
<version>1.2.0</version>
<version>1.4.2</version>
</parent>
<artifactId>vripper-server</artifactId>
<name>vripper-server</name>
@@ -73,7 +73,7 @@
</dependencies>
<build>
<finalName>${project.artifactId}-${project.version}-${git.commit.id.describe-short}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
@@ -7,6 +7,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.stereotype.Component;
import tn.mnlr.vripper.services.PersistenceService;
import java.util.Map;
@@ -17,6 +18,8 @@ public class SpringContext implements ApplicationContextAware {
private static ConfigurableApplicationContext context;
private PersistenceService persistenceService;
/**
* Returns the Spring managed bean instance of the given class type (if it exists).
* Returns null otherwise.
@@ -35,6 +38,7 @@ public class SpringContext implements ApplicationContextAware {
public static void close() {
logger.info("Application terminating...");
context.close();
}
@Override
@@ -4,19 +4,15 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
import tn.mnlr.vripper.exception.VripperException;
import tn.mnlr.vripper.services.AppSettingsService;
import tn.mnlr.vripper.services.PersistenceService;
import tn.mnlr.vripper.services.VipergirlsAuthService;
import java.awt.*;
import java.io.File;
import java.net.URI;
@SpringBootApplication
public class VripperApplication {
@@ -25,25 +21,18 @@ public class VripperApplication {
public static final String dataPath = System.getProperty("vripper.datapath", ".") + File.separator + "data.json";
public static boolean headless = false;
public static void main(String[] args) {
String headless = System.getProperty("java.awt.headless");
if (headless != null && headless.trim().toLowerCase().equals("true")) {
VripperApplication.headless = true;
try {
SpringApplication.run(VripperApplication.class, args);
} catch (Exception e) {
logger.error("Failed to run the application", e);
}
SpringApplicationBuilder builder = new SpringApplicationBuilder(VripperApplication.class);
builder.headless(VripperApplication.headless).run(args);
}
@Component
public class AppCommandRunner implements CommandLineRunner {
@Autowired
Environment environment;
@Autowired
private VipergirlsAuthService authService;
@@ -55,10 +44,9 @@ public class VripperApplication {
@Override
public void run(String... args) {
persistenceService.restore();
appSettingsService.restore();
openInBrowser();
registerShutdownHook();
try {
@@ -71,35 +59,6 @@ public class VripperApplication {
private void registerShutdownHook() {
Runtime.getRuntime().addShutdownHook(new Thread(SpringContext::close));
}
private void openInBrowser() {
if (VripperApplication.headless) {
logger.warn("Headless mode is activated, skipping open in browser");
return;
} else {
logger.info("Not in headless mode, good to open default browser");
}
try {
if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
new Thread(() -> {
try {
String serverPort = environment.getProperty("server.port", "8080");
Desktop.getDesktop().browse(new URI(String.format("http://localhost:%s", serverPort)));
} catch (Exception e) {
logger.error("Unable to open link in browser", e);
}
}).start();
} else {
logger.warn("Current platform does not support browser opening");
}
} catch (Exception e) {
logger.error("Unable to verify Desktop compatibility", e);
}
}
}
}
@@ -37,6 +37,8 @@ public class Post {
private int total;
private boolean removed = false;
public Post(String title, String url, List<Image> images, Map<String, String> metadata, String postId, AppStateService appStateService) {
this.title = title;
this.url = url;
@@ -50,6 +52,11 @@ public class Post {
appStateService.getLivePostsState().onNext(this);
}
public void setRemoved(boolean removed) {
this.removed = removed;
appStateService.getLivePostsState().onNext(this);
}
public void increase() {
done.incrementAndGet();
appStateService.getLivePostsState().onNext(this);
@@ -10,4 +10,8 @@ public abstract class PostPersistanceMixin {
@JsonIgnore
private AppStateService appStateService;
@JsonIgnore
private boolean removed;
}
@@ -4,7 +4,6 @@ import org.apache.http.NameValuePair;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
@@ -42,7 +41,7 @@ public class AcidimgHost extends Host {
@Override
protected void setNameAndUrl(final String url, final ImageFileData imageFileData) throws HostException {
Document doc = getDocument(url);
Document doc = getResponse(url).getDocument();
Node contDiv;
try {
@@ -1,5 +1,7 @@
package tn.mnlr.vripper.host;
import lombok.Getter;
import org.apache.http.Header;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
@@ -145,14 +147,15 @@ abstract public class Host {
return imgUrl;
}
protected final Document getDocument(final String url) throws HostException {
protected final Response getResponse(final String url) throws HostException {
String basePage;
HttpClient client = cm.getClient().build();
HttpGet httpGet = cm.buildHttpGet(url);
Header[] headers;
logger.info(String.format("Requesting %s", url));
try (CloseableHttpResponse response = (CloseableHttpResponse) client.execute(httpGet)) {
headers = response.getAllHeaders();
basePage = EntityUtils.toString(response.getEntity());
logger.debug(String.format("%s response: %n%s", url, basePage));
EntityUtils.consumeQuietly(response.getEntity());
@@ -162,7 +165,7 @@ abstract public class Host {
try {
logger.info(String.format("Cleaning %s response", url));
return htmlProcessorService.clean(basePage);
return new Response(htmlProcessorService.clean(basePage), headers);
} catch (HtmlProcessorException e) {
throw new HostException(e);
}
@@ -175,4 +178,14 @@ abstract public class Host {
}
protected abstract void setNameAndUrl(final String url, final ImageFileData imageFileData) throws HostException;
@Getter
public static class Response {
protected Response(Document document, Header[] headers) {
this.document = document;
this.headers = headers;
}
private Document document;
private Header[] headers;
}
}
@@ -0,0 +1,99 @@
package tn.mnlr.vripper.host;
import org.apache.http.Header;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
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 tn.mnlr.vripper.exception.HostException;
import tn.mnlr.vripper.exception.HtmlProcessorException;
import tn.mnlr.vripper.exception.XpathException;
import tn.mnlr.vripper.q.ImageFileData;
import tn.mnlr.vripper.services.ConnectionManager;
import java.io.IOException;
import java.util.Arrays;
import java.util.stream.Collectors;
@Service
public class ImageBamHost extends Host {
private static final Logger logger = LoggerFactory.getLogger(ImageBamHost.class);
private static final String host = "imagebam.com";
public static final String CONTINUE_BUTTON_XPATH = "//a[@title='Continue to your image']";
public static final String IMG_XPATH = "//img[@class='image']";
@Autowired
private ConnectionManager cm;
@Override
protected String getHost() {
return host;
}
@Override
protected void setNameAndUrl(final String url, final ImageFileData imageFileData) throws HostException {
Response response = getResponse(url);
Document doc = response.getDocument();
Header[] headers = response.getHeaders();
String cookies = Arrays.asList(headers)
.stream()
.filter(e -> e.getName().toLowerCase().contains("Set-Cookie".toLowerCase()))
.map(e -> e.getValue().split(";")[0].trim())
.collect(Collectors.joining("; "));
Node contDiv;
try {
logger.info(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
contDiv = xpathService.getAsNode(doc, CONTINUE_BUTTON_XPATH);
} catch (XpathException e) {
throw new HostException(e);
}
if (contDiv != null) {
logger.info(String.format("Getting cookies to use for %s", url));
logger.info(String.format("Click button found for %s", url));
HttpClient client = cm.getClient().build();
HttpGet httpGet = cm.buildHttpGet(url);
httpGet.addHeader("Referer", url);
httpGet.addHeader("Cookie", cookies);
logger.info(String.format("Requesting %s", httpGet));
try (CloseableHttpResponse res = (CloseableHttpResponse) client.execute(httpGet)) {
String s = EntityUtils.toString(res.getEntity());
logger.debug(String.format("%s response is:%n%s", httpGet, s));
logger.debug(String.format("Cleaning response for %s", httpGet));
doc = htmlProcessorService.clean(s);
EntityUtils.consumeQuietly(res.getEntity());
} catch (IOException | HtmlProcessorException e) {
throw new HostException(e);
}
}
Node imgNode;
try {
logger.info(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
imgNode = xpathService.getAsNode(doc, IMG_XPATH);
} catch (XpathException e) {
throw new HostException(e);
}
try {
logger.info(String.format("Resolving name and image url for %s", url));
String imgTitle = imgNode.getAttributes().getNamedItem("id").getTextContent().trim();
String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
imageFileData.setImageUrl(imgUrl);
imageFileData.setImageName(imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle);
} catch(Exception e) {
throw new HostException("Unexpected error occurred", e);
}
}
}
@@ -1,6 +1,5 @@
package tn.mnlr.vripper.host;
import org.apache.http.client.methods.HttpGet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,8 +11,6 @@ import tn.mnlr.vripper.exception.XpathException;
import tn.mnlr.vripper.q.ImageFileData;
import tn.mnlr.vripper.services.ConnectionManager;
import java.io.IOException;
@Service
public class ImageZillaHost extends Host {
@@ -33,7 +30,7 @@ public class ImageZillaHost extends Host {
@Override
protected void setNameAndUrl(final String url, final ImageFileData imageFileData) throws HostException {
Document doc = getDocument(url);
Document doc = getResponse(url).getDocument();
String title;
try {
@@ -55,7 +52,7 @@ public class ImageZillaHost extends Host {
try {
imageFileData.setImageUrl(url.replace("show", "images"));
imageFileData.setImageName(title.substring(8));
imageFileData.setImageName(title);
} catch (Exception e) {
throw new HostException("Unexpected error occurred", e);
}
@@ -30,7 +30,7 @@ public class ImgboxHost extends Host {
@Override
protected void setNameAndUrl(final String url, final ImageFileData imageFileData) throws HostException {
Document doc = getDocument(url);
Document doc = getResponse(url).getDocument();
Node imgNode;
try {
@@ -43,7 +43,7 @@ public class ImxHost extends Host {
@Override
protected void setNameAndUrl(final String url, final ImageFileData imageFileData) throws HostException {
Document doc = getDocument(url);
Document doc = getResponse(url).getDocument();
Node contDiv;
try {
@@ -30,7 +30,7 @@ public class PixhostHost extends Host {
@Override
protected void setNameAndUrl(final String url, final ImageFileData imageFileData) throws HostException {
Document doc = getDocument(url);
Document doc = getResponse(url).getDocument();
Node imgNode;
try {
@@ -31,7 +31,7 @@ public class TurboImageHost extends Host {
@Override
protected void setNameAndUrl(final String url, final ImageFileData imageFileData) throws HostException {
Document doc = getDocument(url);
Document doc = getResponse(url).getDocument();
String title;
try {
@@ -84,7 +84,9 @@ public class ExecutionService {
data.forEach(e -> {
futures.get(e.getImage().getUrl()).cancel(true);
e.getImageFileData().getImageRequest().abort();
if(e.getImageFileData().getImageRequest() != null) {
e.getImageFileData().getImageRequest().abort();
}
});
}
@@ -32,6 +32,7 @@ public class AppSettingsService {
private final String V_USERNAME = "VUSERNAME";
private final String V_PASSWORD = "VPASSWORD";
private final String V_THANKS = "VTHANKS";
private final String DESKTOP_CLIPBOARD = "DESKTOP_CLIPBOARD";
private String downloadPath;
private int maxThreads;
@@ -40,6 +41,7 @@ public class AppSettingsService {
private String vUsername;
private String vPassword;
private boolean vThanks;
private boolean desktopClipboard;
public void setVPassword(String vPassword) {
if(vPassword.isEmpty()) {
@@ -52,12 +54,13 @@ public class AppSettingsService {
public void restore() {
downloadPath = prefs.get(DOWNLOAD_PATH, System.getProperty("user.dir"));
maxThreads = prefs.getInt(MAX_THREADS, 1);
autoStart = prefs.getBoolean(AUTO_START, false);
maxThreads = prefs.getInt(MAX_THREADS, 4);
autoStart = prefs.getBoolean(AUTO_START, true);
vLogin = prefs.getBoolean(V_LOGIN, false);
vUsername = prefs.get(V_USERNAME, "");
vPassword = prefs.get(V_PASSWORD, "");
vThanks = prefs.getBoolean(V_THANKS, false);
desktopClipboard = prefs.getBoolean(DESKTOP_CLIPBOARD, false);
}
public void save() {
@@ -69,6 +72,7 @@ public class AppSettingsService {
prefs.put(V_USERNAME, vUsername);
prefs.put(V_PASSWORD, vPassword);
prefs.putBoolean(V_THANKS, vThanks);
prefs.putBoolean(DESKTOP_CLIPBOARD, desktopClipboard);
try {
prefs.sync();
@@ -113,8 +117,10 @@ public class AppSettingsService {
private String vPassword;
@JsonProperty("vThanks")
private boolean vThanks;
@JsonProperty("desktopClipboard")
private boolean desktopClipboard;
public Settings(String downloadPath, int maxThreads, boolean autoStart, boolean vLogin, String vUsername, String vPassword, boolean vThanks) {
public Settings(String downloadPath, int maxThreads, boolean autoStart, boolean vLogin, String vUsername, String vPassword, boolean vThanks, boolean desktopClipboard) {
this.downloadPath = downloadPath;
this.maxThreads = maxThreads;
this.autoStart = autoStart;
@@ -122,6 +128,7 @@ public class AppSettingsService {
this.vUsername = vUsername;
this.vPassword = vPassword;
this.vThanks = vThanks;
this.desktopClipboard = desktopClipboard;
}
}
}
@@ -1,7 +1,6 @@
package tn.mnlr.vripper.services;
import io.reactivex.processors.PublishProcessor;
import io.reactivex.processors.ReplayProcessor;
import lombok.Getter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -10,10 +9,12 @@ import tn.mnlr.vripper.entities.Post;
import tn.mnlr.vripper.host.Host;
import tn.mnlr.vripper.q.DownloadJob;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@Service
@Getter
@@ -27,10 +28,6 @@ public class AppStateService {
private PublishProcessor<Image> liveImageUpdates = PublishProcessor.create();
// private ReplayProcessor<Image> allImageState = ReplayProcessor.create();
// private ReplayProcessor<Post> snapshotPostsState = ReplayProcessor.create();
private PublishProcessor<Post> livePostsState = PublishProcessor.create();
@Autowired
@@ -93,4 +90,39 @@ public class AppStateService {
runningPosts.put(key, new AtomicInteger(0));
}
}
public synchronized void remove(String postId) {
currentPosts.get(postId).setRemoved(true);
runningPosts.remove(postId);
currentPosts.remove(postId);
Iterator<Map.Entry<String, Image>> iterator = currentImages.entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry<String, Image> entry = iterator.next();
if(entry.getValue().getPostId().equals(postId)) {
iterator.remove();
}
}
persistenceService.getProcessor().onNext(currentPosts);
}
public synchronized List<String> clearAll() {
List<String> toRemove = this.currentPosts
.values()
.stream()
.filter(e -> e.getStatus().equals(Post.Status.COMPLETE) && e.getDone().get() >= e.getTotal())
.map(Post::getPostId)
.collect(Collectors.toList());
toRemove.forEach(this::remove);
return toRemove;
}
public synchronized List<String> removeAll() {
List<String> toRemove = this.currentPosts
.values()
.stream()
.map(Post::getPostId)
.collect(Collectors.toList());
toRemove.forEach(this::remove);
return toRemove;
}
}
@@ -1,6 +1,7 @@
package tn.mnlr.vripper.services;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.reactivex.disposables.Disposable;
import io.reactivex.processors.PublishProcessor;
import lombok.Getter;
import org.slf4j.Logger;
@@ -13,14 +14,18 @@ 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.PreDestroy;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@Service
public class PersistenceService {
@@ -32,14 +37,29 @@ public class PersistenceService {
private ObjectMapper om;
private Disposable subscription;
@Getter
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");
} 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);
processor
subscription = processor
.onBackpressureLatest()
.buffer(10, TimeUnit.SECONDS)
.filter(e -> !e.isEmpty())
@@ -48,8 +68,17 @@ public class PersistenceService {
.subscribe();
}
@PreDestroy
public void preDestroy() {
this.subscription.dispose();
logger.info(String.format("Destroying %s", PersistenceService.class.getSimpleName()));
logger.info("Persisting data before destroying");
this.persist(stateService.getCurrentPosts());
}
public void persist(Map<String, Post> currentPosts) {
try(PrintWriter out = new PrintWriter(VripperApplication.dataPath)) {
try (PrintWriter out = new PrintWriter(VripperApplication.dataPath, "UTF-8")) {
out.print(om.writeValueAsString(currentPosts));
} catch (IOException e) {
logger.error("Failed to persist app state", e);
@@ -71,7 +100,7 @@ public class PersistenceService {
String jsonContent;
try {
jsonContent = new String(Files.readAllBytes(Paths.get(VripperApplication.dataPath)));
jsonContent = Files.readAllLines(Paths.get(VripperApplication.dataPath), Charset.forName("UTF-8")).stream().collect(Collectors.joining());
} catch (Exception e) {
logger.warn("data file not found, previous state cannot be restored", e);
return;
@@ -8,9 +8,9 @@ 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.services.AppSettingsService;
import tn.mnlr.vripper.entities.Post;
import tn.mnlr.vripper.q.DownloadQ;
import tn.mnlr.vripper.services.AppSettingsService;
import tn.mnlr.vripper.services.AppStateService;
import tn.mnlr.vripper.services.PostParser;
import tn.mnlr.vripper.services.VipergirlsAuthService;
@@ -75,7 +75,13 @@ public class PostRestEndpoint {
logger.info("Auto start downloads option is disabled");
}
logger.info(String.format("Done processing thread: %s", url.url));
return new ResponseEntity(HttpStatus.OK);
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);
}
@PostMapping("/post/restart")
@@ -86,10 +92,30 @@ public class PostRestEndpoint {
@PostMapping("/post/stop")
@ResponseStatus(value = HttpStatus.OK)
public void stop(@RequestBody PostId postId) throws Exception {
public void stop(@RequestBody PostId postId) {
downloadQ.stop(postId.getPostId());
}
@PostMapping("/post/remove")
@ResponseStatus(value = HttpStatus.OK)
public ResponseEntity remove(@RequestBody PostId postId) {
downloadQ.stop(postId.getPostId());
appStateService.remove(postId.getPostId());
return ResponseEntity.ok(new RemoveResult(postId.getPostId()));
}
@PostMapping("/post/clear/all")
@ResponseStatus(value = HttpStatus.OK)
public ResponseEntity clearAll() {
return ResponseEntity.ok(new RemoveAllResult(appStateService.clearAll()));
}
@PostMapping("/post/remove/all")
@ResponseStatus(value = HttpStatus.OK)
public ResponseEntity removeAll() {
return ResponseEntity.ok(new RemoveAllResult(appStateService.removeAll()));
}
@Getter
@ToString
private static class ThreadUrl {
@@ -100,4 +126,32 @@ public class PostRestEndpoint {
private static class PostId {
private String postId;
}
@Getter
private static class ParseResult {
ParseResult(int parsed) {
this.parsed = parsed;
}
private int parsed;
}
@Getter
private static class RemoveAllResult {
private List<String> postIds;
private int removed;
RemoveAllResult(List<String> postIds) {
this.removed = postIds.size();
this.postIds = postIds;
}
}
@Getter
private static class RemoveResult {
private String postId;
RemoveResult(String postId) {
this.postId = postId;
}
}
}
@@ -56,11 +56,12 @@ public class SettingsRestEndpoint {
this.settings.setVPassword("");
this.settings.setVThanks(false);
}
this.settings.setDesktopClipboard(settings.isDesktopClipboard());
this.settings.save();
vipergirlsAuthService.authenticate();
return new ResponseEntity(HttpStatus.OK);
return ResponseEntity.ok(getSettings());
}
@GetMapping("/settings")
@@ -74,7 +75,8 @@ public class SettingsRestEndpoint {
settings.isVLogin(),
settings.getVUsername(),
settings.getVPassword(),
settings.isVThanks()
settings.isVThanks(),
settings.isDesktopClipboard()
);
}
@@ -1,32 +0,0 @@
package tn.mnlr.vripper.web.restendpoints;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import tn.mnlr.vripper.SpringContext;
@RestController
@CrossOrigin(value = "*")
public class ShutdownRestEndpoint {
private static final Logger logger = LoggerFactory.getLogger(ShutdownRestEndpoint.class);
@ExceptionHandler(Exception.class)
public ResponseEntity handleException(Exception e) {
logger.error("Error when process request", e);
return ResponseEntity
.status(HttpStatus.INTERNAL_SERVER_ERROR)
.body(e.getMessage());
}
@PostMapping("/shutdown")
@ResponseStatus(value = HttpStatus.OK)
public ResponseEntity shutdown() {
logger.info("Shutting down request received");
new Thread(SpringContext::close).start();
return new ResponseEntity(HttpStatus.OK);
}
}
@@ -91,15 +91,17 @@ public class WebSocketHandler extends TextWebSocketHandler {
logger.error("Unexpected error occurred", e);
}
postsSubscriptions.put(session.getId(), appStateService.getLivePostsState()
.onBackpressureBuffer()
.observeOn(Schedulers.io())
.buffer(2, TimeUnit.SECONDS)
.filter(e -> !e.isEmpty())
.map(e -> e.stream().distinct().collect(Collectors.toList()))
.map(om::writeValueAsString)
.map(TextMessage::new)
.subscribe(msg -> send(session, msg), e -> logger.error("Failed to send data to client", e))
postsSubscriptions.put(session.getId(),
appStateService.getLivePostsState()
.onBackpressureBuffer()
.observeOn(Schedulers.io())
.filter(e -> !e.isRemoved())
.buffer(500, TimeUnit.MILLISECONDS, 50)
.filter(e -> !e.isEmpty())
.map(e -> e.stream().distinct().collect(Collectors.toList()))
.map(om::writeValueAsString)
.map(TextMessage::new)
.subscribe(msg -> send(session, msg), e -> logger.error("Failed to send data to client", e))
);
}
@@ -126,7 +128,7 @@ public class WebSocketHandler extends TextWebSocketHandler {
.onBackpressureBuffer()
.observeOn(Schedulers.io())
.filter(e -> e.getPostId().equals(postId))
.buffer(2, TimeUnit.SECONDS)
.buffer(500, TimeUnit.MILLISECONDS, 50)
.filter(e -> !e.isEmpty())
.map(e -> e.stream().distinct().collect(Collectors.toList()))
.map(om::writeValueAsString)
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource=
"org/springframework/boot/logging/logback/defaults.xml" />
<include resource=
"org/springframework/boot/logging/logback/file-appender.xml" />
<include resource=
"org/springframework/boot/logging/logback/console-appender.xml" />
<root level="INFO">
<appender-ref ref="FILE" />
<appender-ref ref="CONSOLE" />
</root>
</configuration>
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

+272 -40
View File
@@ -1,6 +1,6 @@
{
"name": "vripper-ui",
"version": "0.0.0",
"version": "1.4.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -1751,8 +1751,7 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
"integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
"dev": true,
"optional": true
"dev": true
},
"array-flatten": {
"version": "2.1.2",
@@ -2528,15 +2527,13 @@
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
"dev": true,
"optional": true
"dev": true
},
"camelcase-keys": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
"dev": true,
"optional": true,
"requires": {
"camelcase": "^2.0.0",
"map-obj": "^1.0.0"
@@ -3179,7 +3176,6 @@
"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
"integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
"dev": true,
"optional": true,
"requires": {
"array-find-index": "^1.0.1"
}
@@ -3248,8 +3244,7 @@
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
"dev": true,
"optional": true
"dev": true
},
"default-gateway": {
"version": "2.7.2",
@@ -3522,6 +3517,65 @@
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
"dev": true
},
"electron": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/electron/-/electron-5.0.5.tgz",
"integrity": "sha512-GzVQhImBX3rSCFPyJ1u1KbxquoidAHzGeCH2FTs3lzAh1H8m4vd7xh6CNC111mT/I8pxFk5D8s3atJlJQLPAeg==",
"dev": true,
"requires": {
"@types/node": "^10.12.18",
"electron-download": "^4.1.0",
"extract-zip": "^1.0.3"
},
"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==",
"dev": true
}
}
},
"electron-download": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.1.tgz",
"integrity": "sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==",
"dev": true,
"requires": {
"debug": "^3.0.0",
"env-paths": "^1.0.0",
"fs-extra": "^4.0.1",
"minimist": "^1.2.0",
"nugget": "^2.0.1",
"path-exists": "^3.0.0",
"rc": "^1.2.1",
"semver": "^5.4.1",
"sumchecker": "^2.0.2"
},
"dependencies": {
"debug": {
"version": "3.2.6",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
"dev": true,
"requires": {
"ms": "^2.1.1"
}
},
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
}
}
},
"electron-to-chromium": {
"version": "1.3.137",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.137.tgz",
@@ -3658,6 +3712,12 @@
"integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
"dev": true
},
"env-paths": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz",
"integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=",
"dev": true
},
"err-code": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
@@ -4179,6 +4239,18 @@
}
}
},
"extract-zip": {
"version": "1.6.7",
"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
"integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
"dev": true,
"requires": {
"concat-stream": "1.6.2",
"debug": "2.6.9",
"mkdirp": "0.5.1",
"yauzl": "2.4.1"
}
},
"extsprintf": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -4212,6 +4284,15 @@
"websocket-driver": ">=0.5.1"
}
},
"fd-slicer": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
"integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
"dev": true,
"requires": {
"pend": "~1.2.0"
}
},
"figgy-pudding": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
@@ -4427,6 +4508,17 @@
"null-check": "^1.0.0"
}
},
"fs-extra": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
"dev": true,
"requires": {
"graceful-fs": "^4.1.2",
"jsonfile": "^4.0.0",
"universalify": "^0.1.0"
}
},
"fs-minipass": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
@@ -4521,8 +4613,7 @@
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
"dev": true,
"optional": true
"dev": true
},
"get-stream": {
"version": "3.0.0",
@@ -5053,7 +5144,6 @@
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
"dev": true,
"optional": true,
"requires": {
"repeating": "^2.0.0"
}
@@ -5417,8 +5507,7 @@
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
"dev": true,
"optional": true
"dev": true
},
"is-windows": {
"version": "1.0.2",
@@ -5905,6 +5994,15 @@
}
}
},
"jsonfile": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
"dev": true,
"requires": {
"graceful-fs": "^4.1.6"
}
},
"jsonparse": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
@@ -6152,7 +6250,6 @@
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"dev": true,
"optional": true,
"requires": {
"graceful-fs": "^4.1.2",
"parse-json": "^2.2.0",
@@ -6165,8 +6262,7 @@
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true,
"optional": true
"dev": true
}
}
},
@@ -6271,7 +6367,6 @@
"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
"integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
"dev": true,
"optional": true,
"requires": {
"currently-unhandled": "^0.4.1",
"signal-exit": "^3.0.0"
@@ -6429,8 +6524,7 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
"dev": true,
"optional": true
"dev": true
},
"map-visit": {
"version": "1.0.0",
@@ -6492,7 +6586,6 @@
"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
"dev": true,
"optional": true,
"requires": {
"camelcase-keys": "^2.0.0",
"decamelize": "^1.1.2",
@@ -6510,8 +6603,7 @@
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true,
"optional": true
"dev": true
}
}
},
@@ -6800,6 +6892,14 @@
"integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
"dev": true
},
"ngx-electron": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ngx-electron/-/ngx-electron-2.1.1.tgz",
"integrity": "sha512-XCr/tiVR9J1SLbxy8TB0LjVzwahwYZCsHhFmng7pjsKUByWVkzDcvxo1EE+rR2MlHjE5jKmP3JH5qeLONdSAtw==",
"requires": {
"tslib": "^1.9.0"
}
},
"nice-try": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -7118,6 +7218,29 @@
"set-blocking": "~2.0.0"
}
},
"nugget": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
"integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
"dev": true,
"requires": {
"debug": "^2.1.3",
"minimist": "^1.1.0",
"pretty-bytes": "^1.0.2",
"progress-stream": "^1.1.0",
"request": "^2.45.0",
"single-line-log": "^1.1.2",
"throttleit": "0.0.2"
},
"dependencies": {
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true
}
}
},
"null-check": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
@@ -7185,6 +7308,12 @@
}
}
},
"object-keys": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
"integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
"dev": true
},
"object-visit": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -7641,6 +7770,12 @@
"sha.js": "^2.4.8"
}
},
"pend": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
"dev": true
},
"performance-now": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -7761,6 +7896,16 @@
"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
"dev": true
},
"pretty-bytes": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
"integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
"dev": true,
"requires": {
"get-stdin": "^4.0.1",
"meow": "^3.1.0"
}
},
"process": {
"version": "0.11.10",
"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -7773,6 +7918,61 @@
"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
"dev": true
},
"progress-stream": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz",
"integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=",
"dev": true,
"requires": {
"speedometer": "~0.1.2",
"through2": "~0.2.3"
},
"dependencies": {
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
"dev": true
},
"readable-stream": {
"version": "1.1.14",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.1",
"isarray": "0.0.1",
"string_decoder": "~0.10.x"
}
},
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
"dev": true
},
"through2": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
"integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
"dev": true,
"requires": {
"readable-stream": "~1.1.9",
"xtend": "~2.1.1"
}
},
"xtend": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
"integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
"dev": true,
"requires": {
"object-keys": "~0.4.0"
}
}
}
},
"promise": {
"version": "7.3.1",
"resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
@@ -8101,7 +8301,6 @@
"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
"dev": true,
"optional": true,
"requires": {
"deep-extend": "^0.6.0",
"ini": "~1.3.0",
@@ -8113,8 +8312,7 @@
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true,
"optional": true
"dev": true
}
}
},
@@ -8140,7 +8338,6 @@
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
"dev": true,
"optional": true,
"requires": {
"load-json-file": "^1.0.0",
"normalize-package-data": "^2.3.2",
@@ -8152,7 +8349,6 @@
"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
"dev": true,
"optional": true,
"requires": {
"graceful-fs": "^4.1.2",
"pify": "^2.0.0",
@@ -8163,8 +8359,7 @@
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true,
"optional": true
"dev": true
}
}
},
@@ -8173,7 +8368,6 @@
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
"dev": true,
"optional": true,
"requires": {
"find-up": "^1.0.0",
"read-pkg": "^1.0.0"
@@ -8184,7 +8378,6 @@
"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
"dev": true,
"optional": true,
"requires": {
"path-exists": "^2.0.0",
"pinkie-promise": "^2.0.0"
@@ -8195,7 +8388,6 @@
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
"dev": true,
"optional": true,
"requires": {
"pinkie-promise": "^2.0.0"
}
@@ -8242,7 +8434,6 @@
"resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
"integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
"dev": true,
"optional": true,
"requires": {
"indent-string": "^2.1.0",
"strip-indent": "^1.0.1"
@@ -8854,6 +9045,15 @@
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
"dev": true
},
"single-line-log": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz",
"integrity": "sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=",
"dev": true,
"requires": {
"string-width": "^1.0.1"
}
},
"slash": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
@@ -9319,6 +9519,12 @@
"chalk": "^2.0.1"
}
},
"speedometer": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz",
"integrity": "sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0=",
"dev": true
},
"split-string": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -9508,7 +9714,6 @@
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
"dev": true,
"optional": true,
"requires": {
"is-utf8": "^0.2.0"
}
@@ -9524,7 +9729,6 @@
"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
"integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
"dev": true,
"optional": true,
"requires": {
"get-stdin": "^4.0.1"
}
@@ -9533,8 +9737,7 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
"dev": true,
"optional": true
"dev": true
},
"style-loader": {
"version": "0.23.1",
@@ -9602,6 +9805,15 @@
"when": "~3.6.x"
}
},
"sumchecker": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz",
"integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=",
"dev": true,
"requires": {
"debug": "^2.2.0"
}
},
"supports-color": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
@@ -9850,6 +10062,12 @@
}
}
},
"throttleit": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
"integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=",
"dev": true
},
"through": {
"version": "2.3.8",
"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -9984,8 +10202,7 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
"dev": true,
"optional": true
"dev": true
},
"trim-right": {
"version": "1.0.1",
@@ -10194,6 +10411,12 @@
"imurmurhash": "^0.1.4"
}
},
"universalify": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
"dev": true
},
"unpipe": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -11046,6 +11269,15 @@
}
}
},
"yauzl": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
"integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
"dev": true,
"requires": {
"fd-slicer": "~1.0.1"
}
},
"yeast": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
+4 -1
View File
@@ -1,10 +1,11 @@
{
"name": "vripper-ui",
"version": "0.0.0",
"version": "1.4.2",
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"build-electron": "ng build --base-href ./",
"prod": "ng build --prod",
"test": "ng test",
"lint": "ng lint",
@@ -27,6 +28,7 @@
"ag-grid-community": "^21.0.1",
"core-js": "^2.5.4",
"hammerjs": "^2.0.8",
"ngx-electron": "^2.1.1",
"rxjs": "~6.3.3",
"tslib": "^1.9.0",
"zone.js": "~0.8.26"
@@ -40,6 +42,7 @@
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"codelyzer": "~4.5.0",
"electron": "^5.0.5",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~3.1.1",
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>tn.mnlr</groupId>
<artifactId>vripper</artifactId>
<version>1.2.0</version>
<version>1.4.2</version>
</parent>
<artifactId>vripper-ui</artifactId>
<name>vripper-ui</name>
+11 -17
View File
@@ -1,24 +1,18 @@
<div *ngIf="state | async as _state">
<div fxLayout="column" *ngIf="connecting(_state)" class="overlay loading" fxLayoutAlign="center center">
<mat-spinner></mat-spinner>
<h2>Connecting</h2>
</div>
<div fxLayout="column" *ngIf="noConnectionState(_state)" class="overlay no-connection" fxLayoutAlign="center center">
<mat-icon class="overlay-icon">error</mat-icon>
<h2>Connection with the server is closed</h2>
</div>
<div fxLayout="column" *ngIf="connecting()" class="overlay loading" fxLayoutAlign="center center">
<mat-spinner></mat-spinner>
<h2>Connecting</h2>
</div>
<div id="app-container" fxLayout="column" fxLayoutGap="20px">
<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>
</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">
<span>Viper Ripper</span>
<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 id="shutdown">
<button (click)="shutdown()" mat-icon-button aria-label="Shutdow server">
<mat-icon>power_settings_new</mat-icon>
</button>
</div>
<div>
<button mat-icon-button [matMenuTriggerFor]="menu" aria-label="settings">
<mat-icon>more_vert</mat-icon>
+16
View File
@@ -1,3 +1,15 @@
#logo {
height: 48px;
margin-right: 10px;
background-image: url('../assets/logo.png');
background-repeat: no-repeat;
background-size: 48px 48px;
}
#title {
user-select: none
}
.overlay-icon {
font-size: 128px;
width: 128px;
@@ -7,3 +19,7 @@
.no-connection {
color: #eb6060;
}
.electron {
margin-top: 30px;
}
+21 -43
View File
@@ -1,12 +1,11 @@
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 { BreakpointObserver, BreakpointState, Breakpoints } from '@angular/cdk/layout';
import { Observable } from 'rxjs';
import { WsConnectionService, WSState } from './ws-connection.service';
import { ShutdownComponent } from './shutdown/shutdown.component';
import { HttpClient } from '@angular/common/http';
import { environment } from 'src/environments/environment';
@Component({
selector: 'app-root',
@@ -18,17 +17,21 @@ export class AppComponent implements OnInit {
public dialog: MatDialog,
private breakpointObserver: BreakpointObserver,
private ws: WsConnectionService,
private httpClient: HttpClient
) {
this.state = this.ws.state;
this.state.subscribe(e => {
if (e === WSState.CLOSE) {
this.dialog.closeAll();
}
});
}
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();
}
});
}
state: Observable<WSState>;
currentState: WSState;
isExtraSmall: Observable<BreakpointState> = this.breakpointObserver.observe(Breakpoints.XSmall);
@@ -53,39 +56,14 @@ export class AppComponent implements OnInit {
});
}
shutdown(): void {
const dialogRef = this.dialog.open(ShutdownComponent, {
width: '400px',
height: '200px',
maxWidth: '100vw',
maxHeight: '100vh'
});
const smallDialogSubscription = this.isExtraSmall.subscribe(result => {
if (result.matches) {
dialogRef.updateSize('100%', '100%');
} else {
dialogRef.updateSize('400px', '200px');
}
});
dialogRef.afterClosed().subscribe(result => {
switch (result) {
case 'yes':
this.httpClient.post(environment.localhost + '/shutdown', null).subscribe();
break;
}
smallDialogSubscription.unsubscribe();
});
noConnectionState(): boolean {
return this.currentState === WSState.CLOSE || this.currentState === WSState.ERROR;
}
noConnectionState(state: WSState): boolean {
return state === WSState.CLOSE;
connecting(): boolean {
return this.currentState === WSState.INIT || this.currentState === WSState.CONNECTING;
}
connecting(state: WSState): boolean {
return state === WSState.CONNECTING;
ngOnInit() {
}
ngOnInit() {}
}
+10 -5
View File
@@ -10,7 +10,7 @@ import { PostDetailComponent } from './post-detail/post-detail.component';
import { FlexLayoutModule } from '@angular/flex-layout';
import { AppRoutingModule } from './app-routing.module';
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
import { FormsModule } from '@angular/forms';
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';
@@ -19,7 +19,10 @@ import { LoginComponent } from './login/login.component';
import { XhrInterceptorService } from './xhr-interceptor.service';
import { HomeComponent } from './home/home.component';
import { SettingsComponent } from './settings/settings.component';
import { ShutdownComponent } from './shutdown/shutdown.component';
import { NgxElectronModule } from 'ngx-electron';
import { ServerService } from './server-service';
import { ConfirmDialogComponent } from './common/confirmation-component/confirmation-dialog';
@NgModule({
declarations: [
@@ -32,12 +35,12 @@ import { ShutdownComponent } from './shutdown/shutdown.component';
LoginComponent,
HomeComponent,
SettingsComponent,
ShutdownComponent
ConfirmDialogComponent
],
entryComponents: [
PostDetailComponent,
SettingsComponent,
ShutdownComponent
ConfirmDialogComponent
],
imports: [
BrowserAnimationsModule,
@@ -46,9 +49,11 @@ import { ShutdownComponent } from './shutdown/shutdown.component';
MaterialModule,
FlexLayoutModule,
AppRoutingModule,
NgxElectronModule,
ReactiveFormsModule,
AgGridModule.withComponents([PostProgressRendererComponent, MenuRendererComponent, PostDetailsProgressRendererComponent])
],
providers: [AppService, WsConnectionService, { provide: HTTP_INTERCEPTORS, useClass: XhrInterceptorService, multi: true }],
providers: [AppService, WsConnectionService, { provide: HTTP_INTERCEPTORS, useClass: XhrInterceptorService, multi: true }, ServerService],
bootstrap: [AppComponent]
})
export class AppModule { }
@@ -0,0 +1,12 @@
import { TestBed } from '@angular/core/testing';
import { ClipboardService } from './clipboard.service';
describe('ClipboardService', () => {
beforeEach(() => TestBed.configureTestingModule({}));
it('should be created', () => {
const service: ClipboardService = TestBed.get(ClipboardService);
expect(service).toBeTruthy();
});
});
+70
View File
@@ -0,0 +1,70 @@
import { Subject, Observable } from 'rxjs';
import { ElectronService } from 'ngx-electron';
import { Injectable, OnInit } from '@angular/core';
import { Clipboard } from 'electron';
import { HttpClient } from '@angular/common/http';
import { Settings } from './common/settings.model';
import { ServerService } from './server-service';
@Injectable({
providedIn: 'root'
})
export class ClipboardService {
private links$: Subject<string> = new Subject();
private interval: NodeJS.Timer;
constructor(
private electronService: ElectronService,
private serverService: ServerService,
private httpClient: HttpClient
) {}
init(settings?: Settings) {
if (!settings) {
this.httpClient.get<Settings>(this.serverService.baseUrl + '/settings').subscribe(
data => {
this._init(data);
},
error => {
console.error(error);
}
);
return;
} else {
this._init(settings);
}
}
_init(settings: Settings) {
if (!this.electronService.isElectronApp) {
console.log('Clipboard deactive, not an electron app');
return;
}
if (this.interval != null) {
clearInterval(this.interval);
}
if (!settings.desktopClipboard) {
return;
}
const clipboard: Clipboard = this.electronService.clipboard;
let lastText = '';
this.interval = setInterval(() => {
const text = clipboard.readText();
if (this.textHasDiff(text, lastText)) {
lastText = text;
if (text.indexOf('https://vipergirls.to/threads') !== -1) {
this.links$.next(text);
}
}
}, 500);
}
private textHasDiff(a, b) {
return a && b !== a;
}
get links(): Observable<string> {
return this.links$.asObservable();
}
}
@@ -0,0 +1,8 @@
<h1 mat-dialog-title>{{ data.header }}</h1>
<mat-dialog-content>
<p>{{ data.content }}</p>
</mat-dialog-content>
<mat-dialog-actions align="end">
<button cdkFocusInitial mat-dialog-close="no" mat-raised-button>No</button>
<button color="primary" mat-dialog-close="yes" mat-raised-button>Yes</button>
</mat-dialog-actions>
@@ -0,0 +1,15 @@
import { Component, Inject } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
export interface DialogConfirmation {
header: string;
content: string;
}
@Component({
selector: 'app-confirmation-dialog',
templateUrl: 'confirmation-dialog.html'
})
export class ConfirmDialogComponent {
constructor(public dialogRef: MatDialogRef<ConfirmDialogComponent>, @Inject(MAT_DIALOG_DATA) public data: DialogConfirmation) {}
}
@@ -0,0 +1,3 @@
export interface ParseResponse {
parsed: number;
}
@@ -0,0 +1,4 @@
export interface RemoveAllResponse {
removed: number;
postIds: string[];
}
@@ -0,0 +1,3 @@
export interface RemoveResponse {
postId: string;
}
@@ -0,0 +1,10 @@
export interface Settings {
downloadPath: string;
maxThreads: number;
autoStart: boolean;
vLogin: boolean;
vUsername: string;
vPassword: string;
vThanks: boolean;
desktopClipboard: boolean;
}
+25 -7
View File
@@ -1,18 +1,36 @@
<div *ngIf="loading" class="overlay loading" fxLayout="row" fxLayoutAlign="center center">
<mat-spinner></mat-spinner>
</div>
<div fxLayout="column" style="height: 100%">
<div fxLayout="column" fxLayoutGap="10px" style="height: 100%">
<div fxFlex="nogrow">
<form #f="ngForm" fxLayout="row" fxLayoutAlign="center center" fxLayoutGap="20px" autocomplete="off">
<form
#f="ngForm"
(ngSubmit)="submit(f)"
autocomplete="off"
fxLayout="row"
fxLayoutAlign="center center"
fxLayoutGap="20px"
>
<mat-form-field fxFlex="grow">
<input name="url" [(ngModel)]="input" matInput placeholder="Put a vipergirls.to link" required>
<input [(ngModel)]="input" matInput name="url" placeholder="Put a vipergirls.to link" required/>
</mat-form-field>
<div>
<button (click)="submit(f)" type="button" mat-raised-button color="primary" [disabled]="f.invalid">Grab</button>
<button type="submit" mat-raised-button color="primary" [disabled]="f.invalid">Grab</button>
</div>
</form>
</div>
<div fxLayout="column" fxFlex="grow">
<app-posts style="height: 100%; width: 100%;" fxFlex="nogrow"></app-posts>
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="10px">
<button (click)="clear()" aria-label="Clear completed" color="primary" mat-stroked-button title="Clear completed">
Clear completed
<mat-icon>clear_all</mat-icon>
</button>
<button (click)="remove()" aria-label="Remove All" color="primary" mat-stroked-button title="Remove All">
Remove All
<mat-icon>delete_forever</mat-icon>
</button>
</div>
</div>
<div fxLayout="column" fxFlex="grow">
<app-posts [ngStyle]="{'height': electronService.isElectronApp ? 'calc(100% - 27px)' : '100%'}" fxFlex="nogrow"
style="width: 100%; overflow-x: hidden"></app-posts>
</div>
</div>
+100 -21
View File
@@ -1,9 +1,15 @@
import { Component, OnInit, HostBinding } from '@angular/core';
import { ElectronService } from 'ngx-electron';
import { ClipboardService } from './../clipboard.service';
import { ParseResponse } from './../common/parse-response.model';
import { Component, OnInit, ViewChild, Inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { environment } from 'src/environments/environment';
import { finalize } from 'rxjs/operators';
import { MatSnackBar } from '@angular/material';
import { finalize, filter, flatMap } from 'rxjs/operators';
import { MatSnackBar, MatDialogRef, MAT_DIALOG_DATA, 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';
@Component({
selector: 'app-home',
@@ -11,33 +17,106 @@ import { NgForm } from '@angular/forms';
styleUrls: ['./home.component.scss']
})
export class HomeComponent implements OnInit {
constructor(
private httpClient: HttpClient,
private _snackBar: MatSnackBar
) { }
private _snackBar: MatSnackBar,
private serverService: ServerService,
private clipboardService: ClipboardService,
public dialog: MatDialog,
public electronService: ElectronService
) {
this.clipboardService.links.subscribe(e => {
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
});
}
);
});
}
@ViewChild(PostsComponent)
private postsComponent: PostsComponent;
loading = false;
input: string;
ngOnInit() {
}
ngOnInit() {}
submit(form: NgForm) {
this.loading = true;
this.httpClient
.post(environment.localhost + '/post', { url: this.input })
.pipe(finalize(() => {
this.loading = false;
this.input = null;
form.resetForm();
}))
.subscribe(data => {
}, error => {
this._snackBar.open(error.error, null, {
duration: 5000,
});
});
.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.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, {
duration: 5000
});
}
);
}
remove() {
this.dialog
.open(ConfirmDialogComponent, {
maxHeight: '100vh',
maxWidth: '100vw',
height: '200px',
width: '60%',
data: {header: 'Confirmation', content: 'Are you sure you want to remove all threads ?'}
})
.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
});
}
);
}
}
+4 -2
View File
@@ -13,7 +13,8 @@ import {
MatCardModule,
MatSlideToggleModule,
MatSnackBarModule,
MatSnackBar
MatSnackBar,
MatTabsModule
} from '@angular/material';
@NgModule({
@@ -30,7 +31,8 @@ import {
MatDialogModule,
MatCardModule,
MatSlideToggleModule,
MatSnackBarModule
MatSnackBarModule,
MatTabsModule
],
providers: [MatSnackBar]
})
@@ -1,6 +1,6 @@
import { PostDetailsProgressRendererComponent } from './post-details-progress.component';
import { WsConnectionService } from './../ws-connection.service';
import { Component, OnInit, ViewChild, Inject, OnDestroy } from '@angular/core';
import { Component, OnInit, ViewChild, Inject, OnDestroy, NgZone } from '@angular/core';
import { MatSort, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { PostDetailsDataSource } from './post-details.datasource';
import { PostState } from '../posts/post-state.model';
@@ -16,7 +16,8 @@ export class PostDetailComponent implements OnInit, OnDestroy {
constructor(
public dialogRef: MatDialogRef<PostDetailComponent>,
@Inject(MAT_DIALOG_DATA) public dialogData: PostState,
private wsConnection: WsConnectionService) {
private wsConnection: WsConnectionService,
private zone: NgZone) {
this.gridOptions = <GridOptions> {
columnDefs: [
@@ -39,7 +40,7 @@ export class PostDetailComponent implements OnInit, OnDestroy {
getRowNodeId: (data) => data['url'],
onGridReady: () => {
this.gridOptions.api.sizeColumnsToFit();
this.dataSource = new PostDetailsDataSource(this.wsConnection, this.gridOptions, this.dialogData.postId);
this.dataSource = new PostDetailsDataSource(this.wsConnection, this.gridOptions, this.dialogData.postId, this.zone);
this.dataSource.connect();
},
onGridSizeChanged: () => this.gridOptions.api.sizeColumnsToFit(),
@@ -1,8 +1,10 @@
import { WsConnectionService } from '../ws-connection.service';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { Component, OnInit, OnDestroy, NgZone } from '@angular/core';
import { AgRendererComponent } from 'ag-grid-angular';
import { Subscription } from 'rxjs';
import { PostDetails } from './post-details.model';
import { WsHandler } from '../ws-handler';
import { ICellRendererParams } from 'ag-grid-community';
@Component({
selector: 'app-progress-cell',
@@ -64,10 +66,16 @@ import { PostDetails } from './post-details.model';
]
})
export class PostDetailsProgressRendererComponent implements AgRendererComponent, OnInit, OnDestroy {
constructor(private wsConnectionService: WsConnectionService) {}
constructor(
private wsConnectionService: WsConnectionService,
private zone: NgZone
) {
this.websocketHandlerPromise = this.wsConnectionService.getConnection();
}
websocketHandlerPromise: Promise<WsHandler>;
subscription: Subscription;
params: any;
params: ICellRendererParams;
postDetails: PostDetails;
trunc(value: number): number {
@@ -75,11 +83,15 @@ export class PostDetailsProgressRendererComponent implements AgRendererComponent
}
ngOnInit(): void {
this.subscription = this.wsConnectionService.subscribeForPostDetails(e => {
e.forEach(v => {
if (this.postDetails.url === v.url) {
this.postDetails = v;
}
this.websocketHandlerPromise.then((handler: WsHandler) => {
this.subscription = handler.subscribeForPostDetails(e => {
this.zone.run(() => {
e.forEach(v => {
if (this.postDetails.url === v.url) {
this.postDetails = v;
}
});
});
});
});
}
@@ -88,12 +100,12 @@ export class PostDetailsProgressRendererComponent implements AgRendererComponent
this.subscription.unsubscribe();
}
agInit(params: any): void {
agInit(params: ICellRendererParams): void {
this.params = params;
this.postDetails = params.data;
}
refresh(params: any): boolean {
refresh(params: ICellRendererParams): boolean {
this.postDetails = params.data;
return true;
}
@@ -1,46 +1,54 @@
import { WsHandler } from './../ws-handler';
import { GridOptions } from 'ag-grid-community';
import { Subject, Subscription } from 'rxjs';
import { Subscription } from 'rxjs';
import { WsConnectionService, WSState } from '../ws-connection.service';
import { WSMessage } from '../common/ws-message.model';
import { CMD } from '../common/cmd.enum';
declare var SockJS;
import { NgZone } from '@angular/core';
export class PostDetailsDataSource {
constructor(
private wsConnectionService: WsConnectionService,
private gridOptions: GridOptions,
private postId: string,
private zone: NgZone
) {
this.websocketHandlerPromise = wsConnectionService.getConnection();
}
constructor(private websocketConnection: WsConnectionService, private gridOptions: GridOptions, private postId: string) {
this.websocket = websocketConnection.getConnection();
}
websocketHandlerPromise: Promise<WsHandler>;
websocket: Subject<any>;
subscriptions: Subscription[] = [];
subscriptions: Subscription[] = [];
connect() {
console.log('Connecting to post details datasource');
this.subscriptions.push(this.websocketConnection.subscribeForPostDetails(e => {
connect() {
console.log('Connecting to post details datasource');
this.websocketHandlerPromise.then((handler: WsHandler) => {
this.subscriptions.push(
handler.subscribeForPostDetails(e => {
this.zone.run(() => {
const toAdd = [];
const toUpdate = [];
e.forEach(v => {
if (this.gridOptions.api.getRowNode(v.url) == null) {
toAdd.push(v);
} else {
toUpdate.push(v);
}
if (this.gridOptions.api.getRowNode(v.url) == null) {
toAdd.push(v);
} else {
toUpdate.push(v);
}
});
this.gridOptions.api.updateRowData({ update: toUpdate, add: toAdd });
}));
});
})
);
this.subscriptions.push(this.websocketConnection.state.subscribe((e) => {
if (e === WSState.OPEN) {
this.websocket.next(new WSMessage(CMD.POST_DETAILS_SUB.toString(), this.postId));
}
}));
}
handler.send(new WSMessage(CMD.POST_DETAILS_SUB.toString(), this.postId));
});
}
disconnect() {
console.log('Disconnecting from post details datasource');
this.subscriptions.forEach(e => e.unsubscribe());
this.websocket.next(new WSMessage(CMD.POST_DETAILS_UNSUB.toString()));
}
disconnect() {
console.log('Disconnecting from post details datasource');
this.subscriptions.forEach(e => e.unsubscribe());
this.websocketHandlerPromise.then((handler: WsHandler) => {
handler.send(new WSMessage(CMD.POST_DETAILS_UNSUB.toString()));
});
}
}
@@ -1,13 +1,18 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
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 } from '@angular/material';
import { environment } from 'src/environments/environment';
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',
@@ -22,7 +27,7 @@ import { WsConnectionService } from '../ws-connection.service';
<button
*ngIf="
postData.status === 'PENDING' ||
postData.status === 'COMPLETE' ||
(postData.status === 'COMPLETE' && postData.progress !== 100) ||
postData.status === 'ERROR' ||
postData.status === 'STOPPED'
"
@@ -39,34 +44,49 @@ import { WsConnectionService } from '../ws-connection.service';
</ng-container>
</button>
<button (click)="seeDetails()" mat-menu-item>
<mat-icon>details</mat-icon>
<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: any;
params: ICellRendererParams;
postData: PostState;
subscription: Subscription;
constructor(
public dialog: MatDialog,
private httpClient: HttpClient,
private breakpointObserver: BreakpointObserver,
private wsConnectionService: WsConnectionService
) {}
websocketHandlerPromise: Promise<WsHandler>;
ngOnInit(): void {
this.subscription = this.wsConnectionService.subscribeForPosts(e => {
e.forEach(v => {
if (this.postData.postId === v.postId) {
this.postData = v;
}
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;
}
});
});
});
});
}
@@ -98,29 +118,70 @@ export class MenuRendererComponent implements OnInit, OnDestroy, AgRendererCompo
}
restart() {
this.httpClient.post(environment.localhost + '/post/restart', { postId: this.postData.postId }).subscribe(
data => {},
this.httpClient.post(this.serverService.baseUrl + '/post/restart', { postId: this.postData.postId }).subscribe(
() => {
this._snackBar.open('Thread 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 thread ?' }
})
.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(environment.localhost + '/post/stop', { postId: this.postData.postId }).subscribe(
data => {},
this.httpClient.post(this.serverService.baseUrl + '/post/stop', { postId: this.postData.postId }).subscribe(
() => {
this._snackBar.open('Thread stopped', null, {
duration: 5000
});
},
error => {
console.error(error);
}
);
}
agInit(params: any): void {
agInit(params: ICellRendererParams): void {
this.params = params;
this.postData = params.data;
}
refresh(params: any): boolean {
refresh(params: ICellRendererParams): boolean {
return false;
}
}
@@ -1,8 +1,10 @@
import { WsConnectionService } from '../ws-connection.service';
import { PostState } from './post-state.model';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { Component, OnInit, OnDestroy, NgZone } from '@angular/core';
import { AgRendererComponent } from 'ag-grid-angular';
import { Subscription } from 'rxjs';
import { WsHandler } from '../ws-handler';
import { ICellRendererParams } from 'ag-grid-community';
@Component({
selector: 'app-progress-cell',
@@ -65,22 +67,32 @@ import { Subscription } from 'rxjs';
]
})
export class PostProgressRendererComponent implements AgRendererComponent, OnInit, OnDestroy {
params: any;
constructor(
private wsConnectionService: WsConnectionService,
private zone: NgZone
) {
this.websocketHandlerPromise = this.wsConnectionService.getConnection();
}
websocketHandlerPromise: Promise<WsHandler>;
params: ICellRendererParams;
postState: PostState;
subscription: Subscription;
constructor(private wsConnectionService: WsConnectionService) {}
trunc(value: number): number {
return Math.trunc(value);
}
ngOnInit(): void {
this.subscription = this.wsConnectionService.subscribeForPosts(e => {
e.forEach(v => {
if (this.postState.postId === v.postId) {
this.postState = v;
}
this.websocketHandlerPromise.then((handler: WsHandler) => {
this.subscription = handler.subscribeForPosts(e => {
this.zone.run(() => {
e.forEach(v => {
if (this.postState.postId === v.postId) {
this.postState = v;
}
});
});
});
});
}
@@ -89,12 +101,12 @@ export class PostProgressRendererComponent implements AgRendererComponent, OnIni
this.subscription.unsubscribe();
}
agInit(params: any): void {
agInit(params: ICellRendererParams): void {
this.params = params;
this.postState = params.data;
}
refresh(params: any): boolean {
refresh(params: ICellRendererParams): boolean {
this.postState = params.data;
return true;
}
+8 -3
View File
@@ -1,5 +1,10 @@
export class PostState {
constructor(public postId: string, public title: string, public progress: number, public status: string) { }
constructor(
public type: string,
public postId: string,
public title: string,
public progress: number,
public status: string,
public removed: boolean
) {}
}
+42 -28
View File
@@ -1,46 +1,60 @@
import { PostState } from './post-state.model';
import { CMD } from './../common/cmd.enum';
import { WSMessage } from './../common/ws-message.model';
import { Subject, Subscription } from 'rxjs';
import { WsConnectionService, WSState } from '../ws-connection.service';
import { Subscription } from 'rxjs';
import { WsConnectionService } from '../ws-connection.service';
import { GridOptions } from 'ag-grid-community';
import { WsHandler } from '../ws-handler';
import { NgZone } from '@angular/core';
export class PostsDataSource {
constructor(private websocketConnection: WsConnectionService,
private gridOptions: GridOptions) {
this.websocket = websocketConnection.getConnection();
constructor(
private wsConnectionService: WsConnectionService,
private gridOptions: GridOptions,
private zone: NgZone
) {
this.websocketHandlerPromise = this.wsConnectionService.getConnection();
}
websocket: Subject<any>;
websocketHandlerPromise: Promise<WsHandler>;
subscriptions: Subscription[] = [];
connect() {
this.websocketHandlerPromise.then((handler: WsHandler) => {
console.log('Connecting to posts datasource');
this.subscriptions.push(
handler.subscribeForPosts((e: PostState[]) => {
this.zone.run(() => {
const toAdd = [];
const toUpdate = [];
const toRemove = [];
e.forEach(v => {
if (v.removed) {
if (this.gridOptions.api.getRowNode(v.postId) != null) {
toRemove.push(this.gridOptions.api.getRowNode(v.postId).data);
}
return;
}
console.log('Connecting to posts datasource');
this.subscriptions.push(this.websocketConnection.subscribeForPosts(e => {
const toAdd = [];
const toUpdate = [];
e.forEach(v => {
if (this.gridOptions.api.getRowNode(v.postId) == null) {
toAdd.push(v);
} else {
toUpdate.push(v);
}
});
this.gridOptions.api.updateRowData({ update: toUpdate, add: toAdd });
}));
this.subscriptions.push(this.websocketConnection.state.subscribe((e) => {
if (e === WSState.OPEN) {
this.websocket.next(new WSMessage(CMD.POSTS_SUB.toString()));
}
}));
if (this.gridOptions.api.getRowNode(v.postId) == null) {
toAdd.push(v);
} else {
toUpdate.push(v);
}
});
this.gridOptions.api.updateRowData({ update: toUpdate, add: toAdd, remove: toRemove });
});
})
);
handler.send(new WSMessage(CMD.POSTS_SUB.toString()));
});
}
disconnect() {
console.log('Disconnecting from posts datasource');
this.subscriptions.forEach(e => e.unsubscribe());
this.websocket.next(new WSMessage(CMD.POSTS_UNSUB.toString()));
this.websocketHandlerPromise.then((handler: WsHandler) => {
handler.send(new WSMessage(CMD.POSTS_UNSUB.toString()));
});
}
}
+22 -3
View File
@@ -1,4 +1,4 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
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';
@@ -13,7 +13,10 @@ import { Subject } from 'rxjs';
})
export class PostsComponent implements OnInit, OnDestroy {
constructor(private wsConnection: WsConnectionService) {
constructor(
private wsConnection: WsConnectionService,
private zone: NgZone
) {
this.gridOptions = <GridOptions> {
columnDefs: [
{
@@ -45,7 +48,7 @@ export class PostsComponent implements OnInit, OnDestroy {
getRowNodeId: (data) => data['postId'],
onGridReady: () => {
this.gridOptions.api.sizeColumnsToFit();
this.dataSource = new PostsDataSource(this.wsConnection, this.gridOptions);
this.dataSource = new PostsDataSource(this.wsConnection, this.gridOptions, this.zone);
this.dataSource.connect();
},
onGridSizeChanged: () => this.gridOptions.api.sizeColumnsToFit(),
@@ -57,6 +60,22 @@ export class PostsComponent implements OnInit, OnDestroy {
gridOptions: GridOptions;
dataSource: PostsDataSource;
removeRows(postIds: string[]): void {
if (postIds == null) {
return;
}
const toRemove = [];
postIds.forEach(p => {
const nodeToDelete = this.gridOptions.api.getRowNode(p);
if (nodeToDelete != null) {
toRemove.push(nodeToDelete.data);
}
});
this.gridOptions.api.updateRowData({ remove: toRemove });
}
ngOnInit() {
}
+17
View File
@@ -0,0 +1,17 @@
import { Injectable } from '@angular/core';
@Injectable()
export class ServerService {
private _baseUrl: string;
constructor() {}
set baseUrl(baseUrl: string) {
this._baseUrl = baseUrl;
}
get baseUrl(): string {
return this._baseUrl;
}
}
@@ -4,61 +4,85 @@
</div>
<mat-dialog-content fxFlex="grow">
<div class="container">
<form #f="ngForm" autocomplete="off">
<mat-form-field>
<input
[(ngModel)]="settings.downloadPath"
matInput
placeholder="Download Path"
name="downloadPath"
required
/>
</mat-form-field>
<mat-form-field>
<input
[(ngModel)]="settings.maxThreads"
type="number"
matInput
placeholder="Max concurrent downloads"
name="maxThreads"
min="1"
max="8"
required
/>
</mat-form-field>
<mat-checkbox color="primary" [(ngModel)]="settings.autoStart" name="autoStart">Auto start downloads</mat-checkbox>
<mat-slide-toggle color="primary" [(ngModel)]="settings.vLogin" name="vLogin">
ViperGirls Authentication
</mat-slide-toggle>
<section *ngIf="settings.vLogin">
<div>
<mat-form-field>
<input [(ngModel)]="settings.vUsername" matInput placeholder="ViperGirls Username" name="vUsername" />
</mat-form-field>
<mat-tab-group dynamicHeight="true">
<mat-tab label="General Settings">
<form [formGroup]="generalSettingsForm" autocomplete="off">
<div fxLayout="row" fxLayoutGap="20px" fxLayoutAlign="center center">
<mat-form-field fxFlex="grow">
<input
formControlName="downloadPath"
matInput
placeholder="Download Path"
name="downloadPath"
required
/>
</mat-form-field>
<button fxFlex="100px" (click)="browse()" mat-raised-button *ngIf="electronService.isElectronApp">
Browse
</button>
</div>
<mat-form-field>
<input
[(ngModel)]="settings.vPassword"
type="password"
formControlName="maxThreads"
type="number"
matInput
placeholder="ViperGirls Password"
name="vPassword"
placeholder="Max concurrent downloads"
name="maxThreads"
min="1"
max="8"
required
/>
</mat-form-field>
<mat-checkbox color="primary" [(ngModel)]="settings.vThanks" name="vThanks">Leave thanks</mat-checkbox>
</div>
</section>
</form>
<mat-checkbox color="primary" formControlName="autoStart" name="autoStart"
>Auto start downloads</mat-checkbox
>
<mat-slide-toggle color="primary" formControlName="vLogin" name="vLogin">
ViperGirls Authentication
</mat-slide-toggle>
<section *ngIf="generalSettingsForm.get('vLogin').value">
<div>
<mat-form-field>
<input formControlName="vUsername" matInput placeholder="ViperGirls Username" name="vUsername" />
</mat-form-field>
<mat-form-field>
<input
formControlName="vPassword"
type="password"
matInput
placeholder="ViperGirls Password"
name="vPassword"
/>
</mat-form-field>
<mat-checkbox color="primary" formControlName="vThanks" name="vThanks">Leave thanks</mat-checkbox>
</div>
</section>
</form>
</mat-tab>
<mat-tab label="Desktop Integration" *ngIf="electronService.isElectronApp">
<form [formGroup]="desktopSettingsForm" autocomplete="off">
<mat-checkbox color="primary" formControlName="desktopClipboard" name="desktopClipboard"
>Monitor Clipboard</mat-checkbox
>
</form>
</mat-tab>
</mat-tab-group>
</div>
</mat-dialog-content>
<mat-dialog-actions fxFlex="nogrow" align="end">
<button mat-raised-button cdkFocusInitial mat-dialog-close>Close</button>
<button mat-raised-button (click)="onSubmit(f)" color="primary" type="submit" [disabled]="f.pristine || f.invalid">
<button mat-raised-button mat-dialog-close>Close</button>
<button
mat-raised-button
(click)="onSubmit()"
color="primary"
type="submit"
[disabled]="(generalSettingsForm.pristine && desktopSettingsForm.pristine) || generalSettingsForm.invalid || desktopSettingsForm.invalid"
>
Apply
</button>
</mat-dialog-actions>
@@ -7,8 +7,8 @@
width: 100%;
}
.container form section {
padding: 10px;
.container form {
padding: 15px;
}
.container form section > * {
@@ -1,18 +1,11 @@
import { ClipboardService } from './../clipboard.service';
import { Component, OnInit } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { environment } from 'src/environments/environment';
import { NgForm } from '@angular/forms';
import { FormGroup, FormControl } from '@angular/forms';
import { MatSnackBar } from '@angular/material';
export interface Settings {
downloadPath: string;
maxThreads: number;
autoStart: boolean;
vLogin: boolean;
vUsername: string;
vPassword: string;
vThanks: boolean;
}
import { ServerService } from '../server-service';
import { ElectronService } from 'ngx-electron';
import { Settings } from '../common/settings.model';
@Component({
selector: 'app-settings',
@@ -20,40 +13,75 @@ export interface Settings {
styleUrls: ['./settings.component.scss']
})
export class SettingsComponent implements OnInit {
constructor(private httpClient: HttpClient, private _snackBar: MatSnackBar) {}
constructor(
private httpClient: HttpClient,
private _snackBar: MatSnackBar,
private serverService: ServerService,
public electronService: ElectronService,
private clipboardService: ClipboardService
) {}
settings: Settings = {
downloadPath: null,
maxThreads: null,
autoStart: false,
vLogin: false,
vUsername: null,
vPassword: null,
vThanks: false,
};
generalSettingsForm = new FormGroup({
downloadPath: new FormControl(''),
maxThreads: new FormControl(''),
autoStart: new FormControl(false),
vLogin: new FormControl(false),
vUsername: new FormControl(''),
vPassword: new FormControl(''),
vThanks: new FormControl(false)
});
desktopSettingsForm = new FormGroup({
desktopClipboard: new FormControl(false)
});
ngOnInit() {
this.httpClient
.get<Settings>(environment.localhost + '/settings')
.subscribe(data => {
this.settings = data;
}, error => {
this.httpClient.get<Settings>(this.serverService.baseUrl + '/settings').subscribe(
data => {
this.generalSettingsForm.reset(data);
this.desktopSettingsForm.reset(data);
},
error => {
console.error(error);
});
}
);
}
onSubmit(f: NgForm): void {
browse() {
const result: string[] | undefined = this.electronService.remote.dialog.showOpenDialog(
this.electronService.remote.getCurrentWindow(),
{
properties: ['openDirectory']
}
);
if (result !== undefined) {
this.generalSettingsForm.get('downloadPath').setValue(result[0]);
this.generalSettingsForm.get('downloadPath').markAsDirty();
this.generalSettingsForm.get('downloadPath').markAsTouched();
}
}
onSubmit(): void {
this.httpClient
.post(environment.localhost + '/settings', this.settings)
.subscribe(() => {
this._snackBar.open('Settings updated', null, {
duration: 5000,
});
f.resetForm(this.settings);
}, error => {
this._snackBar.open(error.error.message, null, {
duration: 5000,
});
});
.post<Settings>(this.serverService.baseUrl + '/settings', {
...this.generalSettingsForm.value,
...this.desktopSettingsForm.value
})
.subscribe(
data => {
this._snackBar.open('Settings updated', null, {
duration: 5000
});
this.generalSettingsForm.reset(data);
this.desktopSettingsForm.reset(data);
this.clipboardService.init(data);
},
error => {
this._snackBar.open(error.error.message, null, {
duration: 5000
});
}
);
}
}
@@ -1,15 +0,0 @@
<div fxLayout="column" class="dialog-container" style="height: 100%;">
<div fxFlex="nogrow">
<h2 class="no-wrap" mat-dialog-title>Confirmation</h2>
</div>
<mat-dialog-content fxFlex="grow">
<div class="container">
<p>Are you sure you want to shutdown the server</p>
</div>
</mat-dialog-content>
<mat-dialog-actions fxFlex="nogrow" align="end">
<button mat-raised-button mat-dialog-close="no">No</button>
<button mat-raised-button cdkFocusInitial mat-dialog-close="yes" color="primary">Yes</button>
</mat-dialog-actions>
</div>
@@ -1,25 +0,0 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ShutdownComponent } from './shutdown.component';
describe('ShutdownComponent', () => {
let component: ShutdownComponent;
let fixture: ComponentFixture<ShutdownComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ShutdownComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ShutdownComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -1,15 +0,0 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-shutdown',
templateUrl: './shutdown.component.html',
styleUrls: ['./shutdown.component.scss']
})
export class ShutdownComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
+76 -72
View File
@@ -1,44 +1,97 @@
import { Injectable } from '@angular/core';
import { Observer, Subject, BehaviorSubject, ConnectableObservable, Observable, Subscription } from 'rxjs';
import { environment } from 'src/environments/environment';
import { multicast, map, filter } from 'rxjs/operators';
import { PostState } from './posts/post-state.model';
import { PostDetails } from './post-detail/post-details.model';
import { multicast } from 'rxjs/operators';
import { ElectronService } from 'ngx-electron';
import { WsHandler } from './ws-handler';
import { ServerService } from './server-service';
declare var SockJS;
export enum WSState {
INIT, CONNECTING, ERROR, CLOSE, OPEN
INIT,
CONNECTING,
ERROR,
CLOSE,
OPEN
}
const maxAttemps = 5;
@Injectable()
export class WsConnectionService {
private websocket: Subject<any>;
private state$: BehaviorSubject<WSState> = new BehaviorSubject(WSState.INIT);
private sock;
private _state: WSState = WSState.INIT;
private wsHandlerPromise: Promise<WsHandler>;
private wsHandler: WsHandler;
constructor() {
this.tryConnect();
constructor(private electronService: ElectronService, private serverService: ServerService) {
this.wsHandlerPromise = new Promise((resolve, reject) => {
if (this.wsHandler != null) {
return this.wsHandler;
}
if (this.electronService.isElectronApp) {
this.electronService.ipcRenderer.send('get-port');
// wait for MainIPC
this.electronService.ipcRenderer.once('port', (event, port) => {
console.log('server running on port', port);
this.serverService.baseUrl = 'http://localhost:' + port;
this.tryConnect(resolve, reject);
});
} else {
this.serverService.baseUrl = environment.localhost;
this.tryConnect(resolve, reject);
}
});
}
public get state(): Observable<WSState> {
return this.state$.asObservable();
}
tryConnect() {
tryConnect(resolve, reject) {
let attempts = 0;
this.connect();
const subscription: Subscription = this.state$.subscribe(e => {
if (e === WSState.OPEN) {
this.wsHandler = new WsHandler(this.websocket);
resolve(this.wsHandler);
}
});
const interval = setInterval(() => {
if (this._state !== WSState.OPEN && attempts >= maxAttemps) {
clearInterval(interval);
this._state = WSState.ERROR;
this.state$.next(this._state);
reject('Failed to connect to server');
subscription.unsubscribe();
return;
} else if (this._state === WSState.OPEN) {
clearInterval(interval);
subscription.unsubscribe();
return;
}
this.connect();
attempts++;
}, 5000);
}
connect() {
this._state = WSState.CONNECTING;
this.state$.next(this._state);
this.sock = new SockJS(environment.localhost + '/endpoint');
this.sock = new SockJS(this.serverService.baseUrl + '/endpoint');
const observable = Observable.create((obs: Observer<string>) => {
this.sock.onmessage = (message) => obs.next(message.data);
this.sock.onerror = (error) => {
this.sock.onmessage = message => obs.next(message.data);
this.sock.onerror = error => {
console.log('Sockjs error', error);
obs.error(error);
this._state = WSState.ERROR;
this.state$.next(this._state);
};
this.sock.onclose = () => {
console.log('Sockjs disconnected');
obs.complete();
this._state = WSState.CLOSE;
this.state$.next(this._state);
@@ -47,71 +100,22 @@ export class WsConnectionService {
this.sock.onopen = () => {
console.log('Sockjs connection established');
const observer = {
next: (data: Object) => {
if (this.sock.readyState === WebSocket.OPEN) {
this.sock.send(JSON.stringify(data));
}
}
};
this.websocket = Subject.create(observer, observable).pipe(multicast(() => new Subject()));
(<ConnectableObservable<any>>(<unknown>this.websocket)).connect();
this._state = WSState.OPEN;
this.state$.next(this._state);
};
const observer = {
next: (data: Object) => {
if (this.sock.readyState === WebSocket.OPEN) {
this.sock.send(JSON.stringify(data));
}
},
};
this.websocket = Subject.create(observer, observable).pipe(multicast(() => new Subject()));
(<ConnectableObservable<any>><unknown>this.websocket).connect();
}
subscribeForPosts(callback: (stream: Array<PostState>) => void): Subscription {
return this.websocket
.pipe(
map(e => JSON.parse(e)),
filter(e => e.length > 0 && e[0].type === 'post'),
map(e => {
const values = [];
(<Array<any>>e).forEach(element => {
values.push(new PostState(
element.postId,
element.title,
element.done === 0 && element.total === 0 ? 0 : (element.done / element.total) * 100,
element.status)
);
});
return values;
})
)
.subscribe(e => {
callback(e);
});
}
subscribeForPostDetails(callback: (stream: Array<PostDetails>) => void): Subscription {
return this.websocket
.pipe(
map(e => JSON.parse(e)),
filter(e => e.length > 0 && e[0].type === 'img'),
map(e => {
const values = [];
(<Array<any>>e).forEach(element => {
values.push(new PostDetails(element.postId,
element.postName,
element.url,
element.current === 0 && element.total === 0 ? 0 : (element.current / element.total) * 100,
element.status));
});
return values;
})
)
.subscribe(e => callback(e));
}
getConnection() {
if (this.sock == null || this.sock.readyState === 3 || this.sock.readyState === 2) {
this.tryConnect();
}
return this.websocket;
getConnection(): Promise<WsHandler> {
return this.wsHandlerPromise;
}
disconnect() {
+64
View File
@@ -0,0 +1,64 @@
import { Subject, Subscription } from 'rxjs';
import { WSMessage } from './common/ws-message.model';
import { PostState } from './posts/post-state.model';
import { map, filter } from 'rxjs/operators';
import { PostDetails } from './post-detail/post-details.model';
export class WsHandler {
constructor(private websocket: Subject<any>) {}
subscribeForPosts(callback: (postStream: Array<PostState>) => void): Subscription {
return this.websocket
.pipe(
map(e => JSON.parse(e)),
filter(e => e.length > 0 && e.filter(v => v.type === 'post').length > 0),
map(e => {
const posts: Array<PostState> = [];
(<Array<any>>e).forEach(element => {
posts.push(
new PostState(
element.type,
element.postId,
element.title,
element.done === 0 && element.total === 0 ? 0 : (element.done / element.total) * 100,
element.status,
element.removed
)
);
});
return posts;
})
)
.subscribe(e => {
callback(e);
});
}
subscribeForPostDetails(callback: (stream: Array<PostDetails>) => void): Subscription {
return this.websocket
.pipe(
map(e => JSON.parse(e)),
filter(e => e.length > 0 && e[0].type === 'img'),
map(e => {
const values = [];
(<Array<any>>e).forEach(element => {
values.push(
new PostDetails(
element.postId,
element.postName,
element.url,
element.current === 0 && element.total === 0 ? 0 : (element.current / element.total) * 100,
element.status
)
);
});
return values;
})
)
.subscribe(e => callback(e));
}
send(wsMessage: WSMessage) {
this.websocket.next(wsMessage);
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

+14 -2
View File
@@ -2,12 +2,20 @@
@import "~@angular/material/prebuilt-themes/indigo-pink.css";
@import "~ag-grid-community/dist/styles/ag-grid.css";
@import "~ag-grid-community/dist/styles/ag-theme-material.css";
body {
margin: 0;
html {
border: 3px solid rgb(63, 81, 181);
box-sizing: border-box;
height: 100vh;
width: 100vw;
}
body {
& .window-title {
font-family: "Arial";
}
}
app-root {
height: 100%;
width: 100%;
@@ -56,4 +64,8 @@ div.ag-cell.no-padding {
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
.ag-body-viewport {
overflow: hidden !important;
}