Cleanup

Author: consuelita

AdversaryLabSwift/Base.lproj/Main.storyboard

@@ -38,7 +38,7 @@ class FileController
         guard let appDirectory = prepareDirectory(groupName: groupName)
             else
         {
-            print("Failed to save the classifier, could not find the application document directory.")
+            print("Failed to save the model, could not prepare the \(groupName) directory.")
             return
         }
 
@@ -97,7 +97,7 @@ class FileController
         guard let appDirectory = prepareDirectory(groupName: groupName)
         else
         {
-            print("Failed to save the classifier, could not find the application document directory.")
+            print("Failed to save the classifier, could not prepare the \(groupName) directory.")
             return
         }
 
@@ -206,6 +206,17 @@ class FileController
 
         let directoryURL = appDirectory.appendingPathComponent(groupName)
         let bundleURL = directoryURL.appendingPathExtension("adversary")
+        
+        if fileManager.fileExists(atPath: bundleURL.path)
+        {
+            do{
+                try fileManager.removeItem(at: bundleURL)
+            }
+            catch let removeFileError
+            {
+                print("Error trying to remove file at \(bundleURL.path): \(removeFileError)")
+            }
+        }
 
         do
         {
@@ -282,17 +293,21 @@ class FileController
         guard let appDirectory = getAdversarySupportDirectory()
             else
         {
-            print("Failed to save the file, could not find the application document directory.")
+            print("Failed to save the file, could not find the application support directory.")
             return nil
         }
 
         let groupURL = appDirectory.appendingPathComponent(groupName)
 
-        guard fileManager.fileExists(atPath: groupURL.path)
-        else
+        if !fileManager.fileExists(atPath: groupURL.path)
         {
-            print("Group directory does not exist.")
-            return nil
+            do {
+                try fileManager.createDirectory(at: groupURL, withIntermediateDirectories: true, attributes: nil)
+            } catch let createDirError {
+                print("Failed to prepare the \(groupName) directory.")
+                print("Received a directory creation error: \(createDirError)")
+                return nil
+            }
         }
 
         do

AdversaryLabSwift/Controllers/FileController.swift

@@ -258,6 +258,7 @@ class RedisServerController: NSObject
     func runLaunchRedisScript(completion:@escaping (_ completion:Bool) -> Void)
     {
         let bundle = Bundle.main
+        let workingDir = FileManager.default.currentDirectoryPath
 
         guard let path = bundle.path(forResource: "LaunchRedisServerScript", ofType: "sh")
             else
@@ -270,15 +271,23 @@ class RedisServerController: NSObject
         guard let redisConfigPath = bundle.path(forResource: "redis", ofType: "conf")
             else
         {
-            print("Unable to launch Redis server: could not find terraform executable.")
+            print("Unable to launch Redis server: could not find redis executable.")
             completion(false)
             return
         }
 
         guard let redisPath = bundle.path(forResource: "redis-server", ofType: nil)
             else
         {
-            print("Unable to launch Redis server: could not find terraform executable.")
+            print("Unable to launch Redis server: could not find redis-server.")
+            completion(false)
+            return
+        }
+        
+        guard let redisCliPath = bundle.path(forResource: "redis-cli", ofType: nil)
+            else
+        {
+            print("Unable to launch Redis server: could not find redis-cli.")
             completion(false)
             return
         }
@@ -296,9 +305,10 @@ class RedisServerController: NSObject
         {
             print("🚀🚀🚀🚀🚀🚀🚀")
             print("Redis config path: \(redisConfigPath)")
+            print("Working directory: \(workingDir)")
             self.redisProcess = Process()
             self.redisProcess.launchPath = path
-            self.redisProcess.arguments = [redisPath, redisConfigPath, redisModulePath]
+            self.redisProcess.arguments = [redisPath, redisConfigPath, redisModulePath, redisCliPath, workingDir]
             self.redisProcess.launch()
 
             sleep(1)

AdversaryLabSwift/Controllers/RedisServerController.swift

@@ -33,7 +33,6 @@ class SymphonyController
         symphony = Symphony(root: songDirectory)
 
         // Get the list of transports in the Symphony DB
-        
         do
         {
             let tables = try FileManager().contentsOfDirectory(at: songDirectory, includingPropertiesForKeys: nil, options: .skipsHiddenFiles)
@@ -103,18 +102,23 @@ class SymphonyController
     /// File management
     func unzipSong(sourceURL: URL) -> URL?
     {
-        let fileManager = FileManager()
-        let currentWorkingURL = URL(fileURLWithPath: fileManager.currentDirectoryPath)
-        let destinationURL = currentWorkingURL.appendingPathComponent("adversary_data")
+        guard let applicationSupportDir = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first
+        else {
+            print("Unable to unzip the Song data because we could not find the application support directory.")
+            return nil
+        }
+        
+        let destinationURL = applicationSupportDir.appendingPathComponent("adversary_data")
         do
         {
             // Overwrite any old data at this directory
-            if fileManager.fileExists(atPath: destinationURL.path)
+            if FileManager.default.fileExists(atPath: destinationURL.path)
             {
-                try fileManager.removeItem(at: destinationURL)
+                try FileManager.default.removeItem(at: destinationURL)
             }
 
-            try fileManager.unzipItem(at: sourceURL, to: currentWorkingURL)
+            try FileManager.default.unzipItem(at: sourceURL, to: applicationSupportDir)
+            
             return destinationURL
         }
         catch