v3.4.2

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## [3.4.1] - 2021-05-09
+## [3.4.2] - 2021-05-10
 
 ### Changed
 
@@ -8,6 +8,7 @@
 - Enhance download queue logic
 - Code source enhancements
 - Fix app icons
+- Fix race condition bug
 
 ## [3.3.8] - 2021-05-05
 

pom.xml

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

vripper-electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vripper-electron",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "description": "A ripper for vipergirls.to built using web technolgies",
   "main": "main.js",
   "author": "death-claw <53543762+death-claw@users.noreply.github.com>",

vripper-electron/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>tn.mnlr</groupId>
         <artifactId>vripper</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.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>3.4.1</version>
+        <version>3.4.2</version>
     </parent>
     <artifactId>vripper-server</artifactId>
     <name>vripper-server</name>

vripper-server/src/main/java/tn/mnlr/vripper/download/DownloadService.java

@@ -31,7 +31,7 @@ public class DownloadService {
 
   private final ConcurrentHashMap<Host, AtomicInteger> threadCount = new ConcurrentHashMap<>();
   private final ExecutorService executor = Executors.newFixedThreadPool(MAX_POOL_SIZE);
-  private final List<DownloadJob> running = Collections.synchronizedList(new ArrayList<>());
+  private final List<DownloadJob> running = new ArrayList<>();
   private final List<DownloadJob> pending = new ArrayList<>();
 
   private final SettingsService settingsService;
@@ -75,7 +75,7 @@ public class DownloadService {
     executor.awaitTermination(5, TimeUnit.SECONDS);
   }
 
-  private void stopRunning(@NonNull String postId) {
+  private synchronized void stopRunning(@NonNull String postId) {
     List<DownloadJob> stopping = new ArrayList<>();
     Iterator<DownloadJob> iterator = running.iterator();
     while (iterator.hasNext()) {
@@ -129,15 +129,15 @@ public class DownloadService {
     enqueue(post, images);
   }
 
-  private boolean isPending(String postId) {
+  private synchronized boolean isPending(String postId) {
     return pending.stream().anyMatch(p -> p.getPost().getPostId().equals(postId));
   }
 
-  private boolean isRunning(String postId) {
+  private synchronized boolean isRunning(String postId) {
     return running.stream().anyMatch(p -> p.getPost().getPostId().equals(postId));
   }
 
-  private void stop(String postId) {
+  private synchronized void stop(String postId) {
     try {
       pauseQ = true;
       final Post post = dataService.findPostByPostId(postId).orElseThrow();
@@ -245,7 +245,7 @@ public class DownloadService {
     }
   }
 
-  private void push(DownloadJob downloadJob) {
+  private synchronized void push(DownloadJob downloadJob) {
     log.debug(String.format("Scheduling a job for %s", downloadJob.getImage().getUrl()));
     executor.execute(new DownloadJobWrapper(downloadJob));
     running.add(downloadJob);

vripper-ui/package.json

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

vripper-ui/pom.xml

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

vripper-ui/src/environments/environment.prod.ts

@@ -2,5 +2,5 @@ export const environment = {
   production: true,
   localhost: `${window.location.protocol}//${window.location.host}`,
   ws: `${window.location.protocol === 'http:' ? 'ws:' : 'wss:'}//${window.location.host}`,
-  version: '3.4.1'
+  version: '3.4.2'
 };

vripper-ui/src/environments/environment.ts

@@ -6,7 +6,7 @@ export const environment = {
   production: false,
   localhost: 'http://localhost:8080',
   ws: 'ws://localhost:8080',
-  version: '3.4.1'
+  version: '3.4.2'
 };
 
 /*