diff --git a/LICENSE b/LICENSE index 20c8d1a..8df729b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ BSD 2-Clause License Copyright (c) 2023, Lia Brüggemann +Copyright (c) 2023, Julian Müller (ChaoticByte) Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 79a432c..f24b409 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ Usage: sherly -f inputfolder1 inputfolder2 inputfolder3 [options]... -t / -threads override default Thread number (default is usually number of cores * 2) -p / -progress enable progress indicator -d / -delete delete all dups except one without asking first + -n / -noinput skip all user input -debug debug stuff ``` diff --git a/pom.xml b/pom.xml index bfb2be6..dd38800 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.blydoescoding.sherly + net.chaoticbyte.xxsherly xxSherly 1.0 @@ -55,7 +55,7 @@ - com.blydoescoding.sherly.App + net.chaoticbyte.xxsherly.App diff --git a/src/main/java/com/blydoescoding/sherly/App.java b/src/main/java/net/chaoticbyte/xxsherly/App.java similarity index 96% rename from src/main/java/com/blydoescoding/sherly/App.java rename to src/main/java/net/chaoticbyte/xxsherly/App.java index 63a1a94..a3e0912 100644 --- a/src/main/java/com/blydoescoding/sherly/App.java +++ b/src/main/java/net/chaoticbyte/xxsherly/App.java @@ -1,4 +1,4 @@ -package com.blydoescoding.sherly; +package net.chaoticbyte.xxsherly; import java.io.IOException; import java.nio.file.Files; @@ -26,6 +26,7 @@ public class App { boolean recordThreads = false; int saidThreads = 0; boolean showDebug = false; + boolean noInput = false; boolean help = false; List paths = new ArrayList<>(); @@ -45,6 +46,7 @@ public class App { if (i.equalsIgnoreCase("-f") || i.equalsIgnoreCase("-folder")) { recordFolder = true;} if (i.equalsIgnoreCase("-t") || i.equalsIgnoreCase("-threads")) { recordThreads = true;} if (i.equalsIgnoreCase("-d") || i.equalsIgnoreCase("-delete")) { deleteDups = true;} + if (i.equalsIgnoreCase("-n") || i.equalsIgnoreCase("-noinput")) { noInput = true; } if (i.equalsIgnoreCase("-h") || i.equalsIgnoreCase("-help")) { help = true;} if (i.equalsIgnoreCase("-debug")) { showDebug = true;} @@ -59,6 +61,7 @@ public class App { System.out.println(" -t / -threads override default Thread number (default is usually number of cores * 2)"); System.out.println(" -p / -progress enable progress indicator"); System.out.println(" -d / -delete delete all dups except one without asking first"); + System.out.println(" -n / -noinput skip all user input"); System.out.println(" -debug debug stuff"); return; } @@ -172,7 +175,7 @@ public class App { if (deleteDups) { delete(allTheFilesWillBeDeleted); - } else { + } else if (!noInput) { ask(doTheColorThingy, bytes, allTheFilesWillBeDeleted); } diff --git a/src/main/java/com/blydoescoding/sherly/ConsoleColors.java b/src/main/java/net/chaoticbyte/xxsherly/ConsoleColors.java similarity index 92% rename from src/main/java/com/blydoescoding/sherly/ConsoleColors.java rename to src/main/java/net/chaoticbyte/xxsherly/ConsoleColors.java index cfd4c9a..3c414d1 100644 --- a/src/main/java/com/blydoescoding/sherly/ConsoleColors.java +++ b/src/main/java/net/chaoticbyte/xxsherly/ConsoleColors.java @@ -1,4 +1,4 @@ -package com.blydoescoding.sherly; +package net.chaoticbyte.xxsherly; // Just regular Colors to make it a bit prettier diff --git a/src/main/java/com/blydoescoding/sherly/ThreadedCompare.java b/src/main/java/net/chaoticbyte/xxsherly/ThreadedCompare.java similarity index 98% rename from src/main/java/com/blydoescoding/sherly/ThreadedCompare.java rename to src/main/java/net/chaoticbyte/xxsherly/ThreadedCompare.java index 89fc090..60aef15 100644 --- a/src/main/java/com/blydoescoding/sherly/ThreadedCompare.java +++ b/src/main/java/net/chaoticbyte/xxsherly/ThreadedCompare.java @@ -1,4 +1,4 @@ -package com.blydoescoding.sherly; +package net.chaoticbyte.xxsherly; import java.io.*; import java.nio.file.Path;