ChaoticByte/xxSherly
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed race condition by using ConcurrentHashMap instead of HashMap

Browse source
This commit is contained in:
Julian Müller (ChaoticByte) 2023-05-07 18:50:06 +02:00
parent 37d7b5bd06
commit 752f3393b5
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/net/chaoticbyte/xxsherly/App.java
View file

@ -5,8 +5,8 @@ import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLine;
@ -19,8 +19,6 @@ public class App {
public static final String usageHelp = "xxSherly.jar [options] folder1 folder2 ..."; public static final String usageHelp = "xxSherly.jar [options] folder1 folder2 ...";
public static HashMap<String, List<File>> fileMap = new HashMap<>();
public static boolean doTheColorThingy = false; public static boolean doTheColorThingy = false;
public static boolean verbose = false; public static boolean verbose = false;
@ -98,6 +96,8 @@ public class App {
// Calculate Hashes // Calculate Hashes
ConcurrentHashMap<String, List<File>> fileMap = new ConcurrentHashMap<>();
files.parallelStream().forEach(file -> { files.parallelStream().forEach(file -> {
List<File> fileArray = new ArrayList<>(); List<File> fileArray = new ArrayList<>();
@ -107,11 +107,11 @@ public class App {
// Generate Checksum // Generate Checksum
try { try {
String checksum = FileChecksum.getChecksum(file); String checksum = FileChecksum.getChecksum(file);
if (App.fileMap.containsKey(checksum)) { if (fileMap.containsKey(checksum)) {
fileArray.addAll(App.fileMap.get(checksum)); fileArray.addAll(fileMap.get(checksum));
App.fileMap.put(checksum, fileArray); fileMap.put(checksum, fileArray);
} else { } else {
App.fileMap.put(checksum, fileArray); fileMap.put(checksum, fileArray);
} }
} }
catch (IOException e) { catch (IOException e) {
@ -122,7 +122,7 @@ public class App {
ArrayList<String> toRemove = new ArrayList<String>(); ArrayList<String> toRemove = new ArrayList<String>();
for (String checksum: fileMap.keySet()) { for (String checksum: fileMap.keySet()) {
if (App.fileMap.get(checksum).size() == 1) { if (fileMap.get(checksum).size() == 1) {
toRemove.add(checksum); toRemove.add(checksum);
} }
} }
@ -149,8 +149,8 @@ public class App {
int toBeDeleted = 0; int toBeDeleted = 0;
long bytes = 0; long bytes = 0;
for (String checksum: fileMap.keySet()) { for (String checksum: fileMap.keySet()) {
App.fileMap.get(checksum).remove(0); fileMap.get(checksum).remove(0);
for (File file: App.fileMap.get(checksum)) { for (File file: fileMap.get(checksum)) {
if (file != null) bytes += file.length(); if (file != null) bytes += file.length();
} }
toBeDeleted++; toBeDeleted++;
@ -158,7 +158,7 @@ public class App {
if (doTheColorThingy) { if (doTheColorThingy) {
String color = ConsoleColors.RED_BOLD; String color = ConsoleColors.RED_BOLD;
if (fileMap.size() < 1) color = ConsoleColors.GREEN_BOLD; if (toBeDeleted < 1) color = ConsoleColors.GREEN_BOLD;
System.out.println(color + (bytes / 1000000.0) + " redundant MB in " + toBeDeleted + " file(s) found." + ConsoleColors.RESET); System.out.println(color + (bytes / 1000000.0) + " redundant MB in " + toBeDeleted + " file(s) found." + ConsoleColors.RESET);
} else System.out.println((bytes / 1000000.0) + " redundant MB in " + toBeDeleted + " file(s) found."); } else System.out.println((bytes / 1000000.0) + " redundant MB in " + toBeDeleted + " file(s) found.");
} }