v2.0.2

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.0.2] - 2019-09-23
+### Changed
+- Add portable mode
+
+## [2.0.1] - 2019-09-22
+### Changed
+- Change app name
+
 ## [2.0.0] - 2019-09-22
 ### Added
 - Add sub folder option

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>tn.mnlr</groupId>
     <artifactId>vripper</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.2</version>
     <packaging>pom</packaging>
     <parent>
         <groupId>org.springframework.boot</groupId>

vripper-electron/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "vripper-electron",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

vripper-electron/package.json

@@ -1,13 +1,14 @@
 {
   "name": "vripper-electron",
-  "version": "2.0.0",
-  "description": "A ripper for vipergirls.to",
+  "version": "2.0.2",
+  "description": "A ripper for vipergirls.to built using web technolgies",
   "main": "main.js",
   "author": "death-claw <53543762+death-claw@users.noreply.github.com>",
   "homepage": "https://github.com/death-claw/vripper-project",
   "license": "ISC",
   "build": {
     "appId": "tn.mnlr.vripper",
+    "productName": "V Ripper",
     "files": [
       "**/*",
       "!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme}",
@@ -38,8 +39,13 @@
         "nsis"
       ]
     },
+    "nsis": {
+      "createDesktopShortcut": "always",
+      "oneClick": false,
+      "perMachine": false
+    },
     "linux": {
-      "synopsis": "A ripper for vipergirls.to",
+      "synopsis": "vipergirls.to ripper",
       "category": "Utility",
       "packageCategory": "Utility",
       "icon": "icons",

vripper-electron/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>tn.mnlr</groupId>
     <artifactId>vripper</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.2</version>
   </parent>
   <artifactId>vripper-electron</artifactId>
   <name>vripper-electron</name>

vripper-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>tn.mnlr</groupId>
         <artifactId>vripper</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
     <artifactId>vripper-server</artifactId>
     <name>vripper-server</name>

vripper-server/src/main/java/tn/mnlr/vripper/VripperApplication.java

@@ -1,8 +1,10 @@
 package tn.mnlr.vripper;
 
+import lombok.Getter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -12,6 +14,7 @@ import tn.mnlr.vripper.services.AppSettingsService;
 import tn.mnlr.vripper.services.PersistenceService;
 import tn.mnlr.vripper.services.VipergirlsAuthService;
 
+import javax.annotation.PostConstruct;
 import java.io.File;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -21,7 +24,7 @@ public class VripperApplication {
 
     private static final Logger logger = LoggerFactory.getLogger(VripperApplication.class);
 
-    public static final String dataPath = System.getProperty("user.home", ".") + File.separator + ".vripper" + File.separator + "data.json";
+//    public static final String dataPath = System.getProperty("user.home", ".") + File.separator + ".vripper" + File.separator + "data.json";
 
     public static final ExecutorService commonExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
 
@@ -46,6 +49,17 @@ public class VripperApplication {
         @Autowired
         private AppSettingsService appSettingsService;
 
+        @Value("${base.dir}")
+        private String baseDir;
+
+        @Getter
+        private String dataPath;
+
+        @PostConstruct
+        public void init() {
+            dataPath = baseDir + File.separator + ".vripper" + File.separator + "data.json";
+        }
+
         @Override
         public void run(String... args) {
 

vripper-server/src/main/java/tn/mnlr/vripper/services/PersistenceService.java

@@ -39,6 +39,9 @@ public class PersistenceService {
     @Autowired
     private AppStateService stateService;
 
+    @Autowired
+    private VripperApplication.AppCommandRunner appCommandRunner;
+
     private ObjectMapper om;
 
     private Disposable subscription;
@@ -61,7 +64,7 @@ public class PersistenceService {
 
     @PostConstruct
     public void init() {
-        File dataFile = new File(VripperApplication.dataPath);
+        File dataFile = new File(appCommandRunner.getDataPath());
         if (!dataFile.exists()) {
             try {
                 dataFile.getParentFile().mkdirs();
@@ -95,7 +98,7 @@ public class PersistenceService {
 
     public void persist(Map<String, Post> currentPosts) {
 
-        try (PrintWriter out = new PrintWriter(VripperApplication.dataPath, "UTF-8")) {
+        try (PrintWriter out = new PrintWriter(appCommandRunner.getDataPath(), "UTF-8")) {
             out.print(om.writeValueAsString(currentPosts));
         } catch (IOException e) {
             logger.error("Failed to persist app state", e);
@@ -109,11 +112,11 @@ public class PersistenceService {
         } catch (IOException e) {
             logger.error("Failed to read app state", e);
             long timestamp = new Date().getTime();
-            logger.warn(String.format("trying to rename old data file from %s to %s", VripperApplication.dataPath, VripperApplication.dataPath + "." + timestamp + ".old"));
+            logger.warn(String.format("trying to rename old data file from %s to %s", appCommandRunner.getDataPath(), appCommandRunner.getDataPath() + "." + timestamp + ".old"));
             try {
-                Files.move(new File(VripperApplication.dataPath).toPath(), new File(VripperApplication.dataPath + "." + timestamp + ".old").toPath());
+                Files.move(new File(appCommandRunner.getDataPath()).toPath(), new File(appCommandRunner.getDataPath() + "." + timestamp + ".old").toPath());
             } catch (IOException ex) {
-                logger.error(String.format("Failed to rename %s to %s", VripperApplication.dataPath, VripperApplication.dataPath + ".old"));
+                logger.error(String.format("Failed to rename %s to %s", appCommandRunner.getDataPath(), appCommandRunner.getDataPath() + ".old"));
                 SpringContext.close();
             }
         }
@@ -125,7 +128,7 @@ public class PersistenceService {
 
         String jsonContent = null;
         try {
-            jsonContent = Files.readAllLines(Paths.get(VripperApplication.dataPath), StandardCharsets.UTF_8).stream().collect(Collectors.joining());
+            jsonContent = Files.readAllLines(Paths.get(appCommandRunner.getDataPath()), StandardCharsets.UTF_8).stream().collect(Collectors.joining());
         } catch (Exception e) {
             logger.error("data file cannot be read, previous state cannot be restored", e);
             SpringContext.close();

vripper-server/src/main/resources/application-installer.properties

@@ -0,0 +1 @@
+base.dir=${user.home}

vripper-server/src/main/resources/application-portable.properties

@@ -0,0 +1 @@
+base.dir=${user.dir}

vripper-server/src/main/resources/application.properties

@@ -1,8 +1,9 @@
 logging.level.org.springframework.web=INFO
 logging.level.root=INFO
 logging.level.org.apache.http=INFO
-logging.file=${user.home}/.vripper/vripper.log
+logging.file=${base.dir}/.vripper/vripper.log
 server.port=${vripper.server.port:8080}
 management.endpoints.web.exposure.include=shutdown
 management.endpoint.shutdown.enabled=true
-endpoints.shutdown.enabled=true
+endpoints.shutdown.enabled=true
+spring.profiles.active=portable

vripper-ui/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "vripper-ui",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

vripper-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vripper-ui",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

vripper-ui/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>tn.mnlr</groupId>
     <artifactId>vripper</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.2</version>
   </parent>
   <artifactId>vripper-ui</artifactId>
   <name>vripper-ui</name>

vripper-ui/src/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>VripperUi</title>
+  <title>V Ripper</title>
   <base href="/">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">