diff --git a/src/main/java/com/robertvokac/bitbackup/commands/CheckCommand.java b/src/main/java/com/robertvokac/bitbackup/commands/CheckCommand.java index 7ca49a6..1be5059 100644 --- a/src/main/java/com/robertvokac/bitbackup/commands/CheckCommand.java +++ b/src/main/java/com/robertvokac/bitbackup/commands/CheckCommand.java @@ -185,7 +185,7 @@ public class CheckCommand implements Command { LOG.error("Part {}: KO. Failed.", CheckCommandPart.MIGRATE_DB_SCHEMA_IF_NEEDED.number); throw new RuntimeException("Part " + CheckCommandPart.MIGRATE_DB_SCHEMA_IF_NEEDED.number + ": KO. Failed."); } - } catch (Exception e) { + } catch (RuntimeException e) { LOG.error("Part {}: KO. {}", CheckCommandPart.MIGRATE_DB_SCHEMA_IF_NEEDED.number, e.getMessage()); return false; } @@ -212,7 +212,7 @@ public class CheckCommand implements Command { List filesAlreadyFound = new ArrayList<>(); List filesInDirList = foundFilesInCurrentDir(bitBackupFiles.getWorkingDir(), filesAlreadyFound, bitBackupFiles); - Utils.writeTextToFile(bitbackupindex.toString(), new File("bitbackupindex")); + Utils.writeTextToFile(bitbackupindexSB.toString(), bitBackupFiles.getBitbackupindex()); ListSet listSet = new ListSet<>(filesInDirList, f -> loadPathButOnlyTheNeededPart(bitBackupFiles.getWorkingDir(), f)); LOG.info("Part {}: Found {} files.", CheckCommandPart.FOUND_FILES_IN_FILESYSTEM.number, listSet.size()); @@ -225,7 +225,7 @@ public class CheckCommand implements Command { private String loadPathButOnlyTheNeededPart(File currentDir, File file) { return file.getAbsolutePath().substring(currentDir.getAbsolutePath().length() + 1); } - private StringBuilder bitbackupindex = new StringBuilder(); + private final StringBuilder bitbackupindexSB = new StringBuilder(); static int iii = 0; private int foundFiles; @@ -238,13 +238,13 @@ public class CheckCommand implements Command { boolean isBitBackupIgnore = f.getName().equals(bitBackupFiles.getBitBackupIgnore().getName()); - if (isBitBackupIgnore && !f.getAbsolutePath().equals(bitBackupFiles.getBitBackupIgnore().getAbsoluteFile())) { + if (isBitBackupIgnore && !f.getAbsolutePath().equals(bitBackupFiles.getBitBackupIgnore().getAbsolutePath())) { bitBackupFiles.getBitBackupIgnoreRegex().addBitBackupIgnoreFile(f, bitBackupFiles.getWorkingDir()); } if (f.isDirectory()) { ++foundDirs; try { - bitbackupindex.append(new FileEntry(f).toCsvLine()).append("\n"); + bitbackupindexSB.append(new FileEntry(f).toCsvLine()).append("\n"); } catch (IOException ex) { java.util.logging.Logger.getLogger(CheckCommand.class.getName()).log(Level.SEVERE, null, ex); } @@ -264,7 +264,7 @@ public class CheckCommand implements Command { continue; } try { - bitbackupindex.append(new FileEntry(f).toCsvLine()).append("\n"); + bitbackupindexSB.append(new FileEntry(f).toCsvLine()).append("\n"); } catch (IOException ex) { java.util.logging.Logger.getLogger(CheckCommand.class.getName()).log(Level.SEVERE, null, ex); } diff --git a/src/main/java/com/robertvokac/bitbackup/commands/HelpCommand.java b/src/main/java/com/robertvokac/bitbackup/commands/HelpCommand.java index 0c3a032..92f8e03 100644 --- a/src/main/java/com/robertvokac/bitbackup/commands/HelpCommand.java +++ b/src/main/java/com/robertvokac/bitbackup/commands/HelpCommand.java @@ -39,7 +39,7 @@ public class HelpCommand implements Command { } @Override - public String run(BitBackupArgs bitInspectorArgs) { + public String run(BitBackupArgs bitBackupArgs) { String str = """ NAME bitbackup - " Bit Backup" diff --git a/src/main/java/com/robertvokac/bitbackup/commands/VersionCommand.java b/src/main/java/com/robertvokac/bitbackup/commands/VersionCommand.java index e6429a3..69bc407 100644 --- a/src/main/java/com/robertvokac/bitbackup/commands/VersionCommand.java +++ b/src/main/java/com/robertvokac/bitbackup/commands/VersionCommand.java @@ -42,7 +42,7 @@ private static final Logger LOG = LogManager.getLogger(VersionCommand.class); } @Override - public String run(BitBackupArgs bitInspectorArgs) { + public String run(BitBackupArgs bitBackupArgs) { String result = "Bit Backup 0.0.0-SNAPSHOT"; LOG.info(result); return result; diff --git a/src/main/java/com/robertvokac/bitbackup/core/BitInspector.java b/src/main/java/com/robertvokac/bitbackup/core/BitBackup.java similarity index 94% rename from src/main/java/com/robertvokac/bitbackup/core/BitInspector.java rename to src/main/java/com/robertvokac/bitbackup/core/BitBackup.java index f4adfc4..6d06989 100644 --- a/src/main/java/com/robertvokac/bitbackup/core/BitInspector.java +++ b/src/main/java/com/robertvokac/bitbackup/core/BitBackup.java @@ -32,12 +32,12 @@ import com.robertvokac.bitbackup.commands.VersionCommand; * * @author Robert Vokac */ -public class BitInspector { +public class BitBackup { - private static final Logger LOG = LogManager.getLogger(BitInspector.class); + private static final Logger LOG = LogManager.getLogger(BitBackup.class); private final Set commandImplementations; - public BitInspector() { + public BitBackup() { commandImplementations = new HashSet<>(); commandImplementations.add(new CheckCommand()); commandImplementations.add(new HelpCommand()); diff --git a/src/main/java/com/robertvokac/bitbackup/core/BitBackupArgs.java b/src/main/java/com/robertvokac/bitbackup/core/BitBackupArgs.java index 69442d6..85a7a07 100644 --- a/src/main/java/com/robertvokac/bitbackup/core/BitBackupArgs.java +++ b/src/main/java/com/robertvokac/bitbackup/core/BitBackupArgs.java @@ -43,7 +43,7 @@ public class BitBackupArgs { return array; } - public BitBackupArgs(BitInspectorCommand command, Map map) { + public BitBackupArgs(BitBackupCommand command, Map map) { this(convertToStringArray(command.name().toLowerCase(), map)); } diff --git a/src/main/java/com/robertvokac/bitbackup/core/BitInspectorCommand.java b/src/main/java/com/robertvokac/bitbackup/core/BitBackupCommand.java similarity index 97% rename from src/main/java/com/robertvokac/bitbackup/core/BitInspectorCommand.java rename to src/main/java/com/robertvokac/bitbackup/core/BitBackupCommand.java index e7027f4..5e7a420 100644 --- a/src/main/java/com/robertvokac/bitbackup/core/BitInspectorCommand.java +++ b/src/main/java/com/robertvokac/bitbackup/core/BitBackupCommand.java @@ -24,6 +24,6 @@ package com.robertvokac.bitbackup.core; * * @author Robert Vokac */ -public enum BitInspectorCommand { +public enum BitBackupCommand { CHECK, HELP, VERSION; } diff --git a/src/main/java/com/robertvokac/bitbackup/core/BitBackupContext.java b/src/main/java/com/robertvokac/bitbackup/core/BitBackupContext.java index 98d1bea..5c8a8f2 100644 --- a/src/main/java/com/robertvokac/bitbackup/core/BitBackupContext.java +++ b/src/main/java/com/robertvokac/bitbackup/core/BitBackupContext.java @@ -36,9 +36,9 @@ public class BitBackupContext { private final String directoryWhereSqliteFileIs; private ConnectionFactory connectionFactory; @Getter - private SystemItemRepository systemItemRepository; + private final SystemItemRepository systemItemRepository; @Getter - private FileRepository fileRepository; + private final FileRepository fileRepository; public BitBackupContext(String directoryWhereSqliteFileIs) { this.directoryWhereSqliteFileIs = directoryWhereSqliteFileIs; diff --git a/src/main/java/com/robertvokac/bitbackup/core/BitBackupFiles.java b/src/main/java/com/robertvokac/bitbackup/core/BitBackupFiles.java index f1956ff..5c4c7d7 100644 --- a/src/main/java/com/robertvokac/bitbackup/core/BitBackupFiles.java +++ b/src/main/java/com/robertvokac/bitbackup/core/BitBackupFiles.java @@ -39,10 +39,8 @@ public class BitBackupFiles { private final File bitBackupIgnore; private final BitBackupIgnoreRegex bitBackupIgnoreRegex; private final File bitBackupReportCsv; + private final File bitbackupindex; - - - public BitBackupFiles(BitBackupArgs bitInspectorArgs) { workingDir = new File(bitInspectorArgs.hasArgument("dir") ? bitInspectorArgs.getArgument("dir") : "."); workingDirAbsolutePath = workingDir.getAbsolutePath(); @@ -51,5 +49,6 @@ public class BitBackupFiles { bitBackupIgnore = new File(workingDirAbsolutePath + "/.bitbackupignore"); bitBackupIgnoreRegex = new BitBackupIgnoreRegex(bitBackupIgnore); bitBackupReportCsv = new File(workingDirAbsolutePath + "/.bitbackupreport.csv"); + bitbackupindex = new File(workingDirAbsolutePath + "/.bitbackupindex.csv"); } } diff --git a/src/main/java/com/robertvokac/bitbackup/core/Main.java b/src/main/java/com/robertvokac/bitbackup/core/Main.java index 7ef7904..f4509d7 100755 --- a/src/main/java/com/robertvokac/bitbackup/core/Main.java +++ b/src/main/java/com/robertvokac/bitbackup/core/Main.java @@ -28,8 +28,8 @@ public class Main { public static void main(String[] args) { System.out.println("Bir - Detects bit rotten files in the given directory to keep your files forever.\n"); - BitInspector bitInspector = new BitInspector(); - bitInspector.run(args); + BitBackup bitBackup = new BitBackup(); + bitBackup.run(args); } diff --git a/src/main/java/com/robertvokac/bitbackup/persistence/impl/sqlite/SqliteDatabaseMigration.java b/src/main/java/com/robertvokac/bitbackup/persistence/impl/sqlite/SqliteDatabaseMigration.java index 4b69bbd..4f057c0 100644 --- a/src/main/java/com/robertvokac/bitbackup/persistence/impl/sqlite/SqliteDatabaseMigration.java +++ b/src/main/java/com/robertvokac/bitbackup/persistence/impl/sqlite/SqliteDatabaseMigration.java @@ -19,12 +19,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////// package com.robertvokac.bitbackup.persistence.impl.sqlite; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.logging.Level; -import java.util.logging.Logger; -import com.robertvokac.bitbackup.core.Constants; import com.robertvokac.bitbackup.core.Utils; import com.robertvokac.dbmigration.core.main.DBMigration; import com.robertvokac.dbmigration.core.main.MigrationResult;