Merge pull request 'Fix checkForNewerStuffTest' (#5) from fix/checkForNewerStuffTest into dev

Reviewed-on: #5

src/Pacserver.Tests/checkForNewerStuffTest.cs

@@ -7,9 +7,11 @@ public class checkForNewerStuffTest {
     public void checkForNewerPackages_throwsExceptionIfNoFilesExist() {
         // Arrange
         PacserverUtils utils = new PacserverUtils();
+        File.Delete("/tmp/packages_before.txt");
+        File.Delete("/tmp/packages_after.txt");
 
         // Act
-        Action act = () => utils.diff("/tmp/before_update.txt", "/tmp/after_update.txt");
+        Action act = () => utils.diff("/tmp/packages_before.txt", "/tmp/packages_after.txt");
 
         // Assert
         act.Should().Throw<FileNotFoundException>().WithMessage("Necessary files could not be found");
@@ -22,12 +24,12 @@ public class checkForNewerStuffTest {
         utils.readPacmanConfig();
 
         // Act
-        utils.getEveryPackageNameAndVersionViaFolderName("/tmp/before_update.txt");
+        utils.getEveryPackageNameAndVersion("before", "/tmp/packages_before.txt");
-        utils.getEveryPackageNameAndVersionViaFolderName("/tmp/after_update.txt");
+        utils.getEveryPackageNameAndVersion("after", "/tmp/packages_after.txt");
 
         // Assert
-        File.Exists("/tmp/before_update.txt").Should().BeTrue();
+        File.Exists("/tmp/packages_before.txt").Should().BeTrue();
-        File.Exists("/tmp/after_update.txt").Should().BeTrue();
+        File.Exists("/tmp/packages_before.txt").Should().BeTrue();
     }
 
     [Fact]
@@ -35,7 +37,7 @@ public class checkForNewerStuffTest {
         // Arrange
         PacserverUtils utils = new PacserverUtils();
         utils.readPacmanConfig();
-        utils.getEveryPackageNameAndVersionViaFolderName("/tmp/before_update.txt");
+        utils.getEveryPackageNameAndVersion("before", "/tmp/packages_before.txt");
 
         // Act
         List<String> packageList = utils.packageNamesAndVersion;
@@ -45,16 +47,14 @@ public class checkForNewerStuffTest {
     }
 
     [Fact]
-    public void getEveryPackageNameAndVersionViaFolderName_throwsExceptionIfListIsEmpty() {
+    public void getEveryPackageNameAndVersionViaFolderName_throwsExceptionIfModeIsNotValid() {
         // Arrange
         PacserverUtils utils = new PacserverUtils();
-        Directory.CreateDirectory("/tmp/local");
-        utils.pacmanDatabaseDirectory = "/tmp/";
 
         // Act
-        Action act = () => utils.getEveryPackageNameAndVersionViaFolderName("/tmp/before_update.txt");
+        Action act = () => utils.getEveryPackageNameAndVersion("test", "/tmp/test.txt");
 
         // Assert
-        act.Should().Throw<Exception>().WithMessage("How did you execute this without any packages?");
+        act.Should().Throw<ArgumentException>().WithMessage("No valid mode was given. Valid modes are before and after");
     }
 }

src/Pacserver.Tests/checkIfDatabasesWereModifiedTest.cs

@@ -0,0 +1,31 @@
+using Pacserver.Utils;
+
+namespace Pacserver.Tests;
+
+public class checkIfDatabasesWereModifiedTest {
+    [Fact]
+    public void checkIfDatabasesWereModified_throwsExceptionIfNoValidModeIsGiven() {
+        // Arrange
+        PacserverUtils utils = new PacserverUtils();
+        utils.readPacmanConfig();
+
+        // Act
+        Action act = () => utils.checkIfDatabasesWereModified("test", "/tmp/test.txt");
+
+        // Assert
+        act.Should().Throw<ArgumentException>().WithMessage("No valid mode was given. Valid modes are before and after");
+    }
+
+    [Fact]
+    public void checkIfDatabasesWereModified_throwsNoExceptionIfValidModeIsGiven() {
+        // Arrange
+        PacserverUtils utils = new PacserverUtils();
+        utils.readPacmanConfig();
+
+        // Act
+        Action act = () => utils.checkIfDatabasesWereModified("before", "/tmp/test.txt");
+
+        // Assert
+        act.Should().NotThrow();
+    }
+}

src/Pacserver/Pacserver.cs

@@ -37,16 +37,42 @@ public class PacserverUtils {
     }
 
     public List<String> packageNamesAndVersion = new List<String>();
-    public void getEveryPackageNameAndVersionViaFolderName(string filePath) {
+    public void getEveryPackageNameAndVersion(string mode, string filePath) {
-        string[] directories = Directory.GetDirectories(pacmanDatabaseDirectory + "local/");
+        Regex regex = new Regex(@".+\.pkg\.tar\.zst$");
-        foreach (string directory in directories) {
+
-            packageNamesAndVersion.Add(new DirectoryInfo(directory).Name);
+        if (Directory.Exists(pacmanCacheDirectory)) {
+            if (Directory.GetFiles(pacmanCacheDirectory) is not null) {
+                packageNamesAndVersion = Directory.GetFiles(pacmanCacheDirectory).Where(file => regex.IsMatch(file)).ToList();
+            } else {
+                Console.WriteLine("No packages found in pacman cache");
+            }
+        } else {
+            Console.WriteLine("No pacman cache directory found");
         }
 
-        if (packageNamesAndVersion.Capacity > 0) {
+        switch (mode) {
-            File.WriteAllLines(filePath, packageNamesAndVersion);
+            case "before":
-        } else {
+                writePackageNamesAndVersionToFile(filePath);
-            throw new Exception("How did you execute this without any packages?");
+                break;
+            case "after":
+                writePackageNamesAndVersionToFile(filePath);
+                break;
+            default:
+                throw new ArgumentException("No valid mode was given. Valid modes are before and after");
+        }
+    }
+
+    public void writePackageNamesAndVersionToFile(string filePath) {
+        if (File.Exists(filePath)) {
+            File.Delete(filePath);
+        }
+        
+        using (File.Open(filePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite)) {
+            using (StreamWriter sw = new StreamWriter(filePath)) {
+                foreach (string package in packageNamesAndVersion) {
+                    sw.WriteLine(package);
+                }
+            }
         }
     }
 
@@ -63,50 +89,39 @@ public class PacserverUtils {
     public void checkIfDatabasesWereModified(string mode, string filePath) {
         string[] databases = Directory.GetFiles(pacmanDatabaseDirectory + "sync/");
 
-        // if (mode == "nuke") {
-        //     using (File.Open(filePath, FileMode.Truncate, FileAccess.ReadWrite, FileShare.Delete)) {
-        //         File.Delete(filePath);
-        //     }
-        // }
-
         foreach (string database in databases) {
             switch (mode) {
                 case "before":
-                    if (!File.Exists(filePath)) {
+                    writeDatabaseAccessTimeToFile(filePath, database);
-                        using (File.Open(filePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite)) {
-                            using (StreamWriter sw = new StreamWriter(filePath)) {
-                                sw.WriteLine(database + " " + File.GetLastAccessTime(database));
-                            }
-                        }
-                    } else if (File.Exists(filePath)) {
-                        using (File.Open(filePath, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite)) {
-                            using (var sw = new StreamWriter(filePath, true)) {
-                                sw.WriteLine(database + " " + File.GetLastAccessTime(database));
-                            }
-                        }
-                    }
                     break;
                 case "after":
-                    if (!File.Exists(filePath)) {
+                    writeDatabaseAccessTimeToFile(filePath, database);
-                        using (File.Open(filePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite)) {
-                            using (StreamWriter sw = new StreamWriter(filePath)) {
-                                sw.WriteLine(database + " " + File.GetLastAccessTime(database));
-                            }
-                        }
-                    } else if (File.Exists(filePath)) {
-                        using (File.Open(filePath, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite)) {
-                            using (var sw = new StreamWriter(filePath, true)) {
-                                sw.WriteLine(database + " " + File.GetLastAccessTime(database));
-                            }
-                        }
-                    }
                     break;
                 default:
-                    throw new ArgumentException("No valid mode was selected");
+                    throw new ArgumentException("No valid mode was given. Valid modes are before and after");
             }
         }
     }
 
+    public void writeDatabaseAccessTimeToFile(string filePath, string database) {
+        if (File.Exists(filePath)) {
+            File.Delete(filePath);
+        }
+
+        using (File.Open(filePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite)) {
+            using (StreamWriter sw = new StreamWriter(filePath)) {
+                sw.WriteLine(database + " " + File.GetLastAccessTime(database));
+            }
+        }
+    }
+
+    public List<String> databasesToTransfer = new List<String>();
+    public void filterDiffOutputForDatabases() {
+        foreach (string database in diffOfPackagesOrDatabases) {
+            databasesToTransfer.Add(Regex.Match(database, @"\/(?:[\w.-]+\/)*[\w.-]+(?:\.\w+)*\/*db").Value); // https://regex101.com/r/Wm5M0P/1
+        }
+    }
+
     private static List<String> newerPackagesAndDatabases = new List<String>();
     public async void transferPacmanCache() {
         HttpClient client = new HttpClient();

src/Pacserver/Program.cs

@@ -6,7 +6,7 @@ public class Program {
             Console.ForegroundColor = ConsoleColor.Red;
             Console.WriteLine("Please specify an option.");
             Console.ResetColor();
-            Console.WriteLine("Possible options are: determinePacmanCacheDirectory, packagesBefore, packagesAfter, diffPackages, databasesBefore, databasesAfter, diffDatabases");
+            Console.WriteLine("Possible options are: determinePacmanCacheDirectory, packagesBefore, packagesAfter, diffPackages, databasesBefore, databasesAfter, diffDatabases, filter");
             return;
         }
 
@@ -19,15 +19,15 @@ public class Program {
                 break;
             case "packagesBefore":
                 utils.readPacmanConfig();
-                utils.getEveryPackageNameAndVersionViaFolderName("/tmp/before_update.txt");
+                utils.getEveryPackageNameAndVersion("before", "/tmp/packages_before.txt");
                 break;
             case "packagesAfter":
                 utils.readPacmanConfig();
-                utils.getEveryPackageNameAndVersionViaFolderName("/tmp/after_update.txt");
+                utils.getEveryPackageNameAndVersion("after", "/tmp/packages_after.txt");
                 break;
             case "diffPackages":
-                utils.diff("/tmp/before_update.txt", "/tmp/after_update.txt");
+                utils.diff("/tmp/packages_before.txt", "/tmp/packages_after.txt");
-                string packages = string.Join(",", utils.diffOfPackagesOrDatabases);
+                string packages = string.Join("\n", utils.diffOfPackagesOrDatabases);
                 Console.WriteLine(packages);
                 break;
             case "databasesBefore":
@@ -40,14 +40,26 @@ public class Program {
                 break;
             case "diffDatabases":
                 utils.diff("/tmp/databases_before.txt", "/tmp/databases_after.txt");
-                string databases = string.Join(",", utils.diffOfPackagesOrDatabases);
+                string databases = string.Join("\n", utils.diffOfPackagesOrDatabases);
                 Console.WriteLine(databases);
                 break;
+            case "filter":
+                utils.diff("/tmp/databases_before.txt", "/tmp/databases_after.txt");
+                utils.filterDiffOutputForDatabases();
+                string filteredDatabases = string.Join("\n", utils.databasesToTransfer);
+                Console.WriteLine(filteredDatabases);
+                break;
+            case "getEveryPackageInCache":
+                utils.readPacmanConfig();
+                utils.getEveryPackageNameAndVersion("before", "/tmp/packages_before.txt");
+                string allPackages = string.Join("\n", utils.packageNamesAndVersion);
+                Console.WriteLine(allPackages);
+                break;
             default:
                 Console.ForegroundColor = ConsoleColor.Red;
                 Console.WriteLine(args[0] + " is not a recognized option.");
                 Console.ResetColor();
-                Console.WriteLine("Possible options are: determinePacmanCacheDirectory");
+                Console.WriteLine("Possible options are: determinePacmanCacheDirectory, packagesBefore, packagesAfter, diffPackages, databasesBefore, databasesAfter, diffDatabases, filter");
                 break;
         }
     }