Reworking Result View

Author: Jessica9-star

CanaryiOS/CanaryiOS/Assets.xcassets/AppIcon.appiconset/.DS_Store

@@ -18,5 +18,7 @@ class CanaryController
         let logger = Logger(label: "CanaryLibraryiOSExample")
         let canary = Canary(configDirectoryURL: configDirectory, savePath: savePath, logger: logger, timesToRun: numberOfTimesToRun)
         canary.runTest()//runAsync: true)
+        print("***********CONFIG DIR**********")
+        print(configDirectory)
     }
 }

CanaryiOS/CanaryiOS/CanaryController.swift

@@ -10,40 +10,6 @@ import UniformTypeIdentifiers
 import Foundation
 import TabularData
 
-
-//wip for multi-select of configs.
-//struct configSelectionView:View
-//{
-//    var results: String
-//    var body: some View{
-//        VStack(alignment:.center)
-//        {
-//            HStack(alignment:.center){
-//                //return home button
-//                //share button
-//                //view other result button
-//            }
-//            let configNameList: [ConfigIdentifier] = [ConfigIdentifier(name: "test1"), ConfigIdentifier(name: "test2")]
-//            List {
-//                ForEach(configNameList) {name in
-//                    ConfigCardView(configName: "test")
-//                }
-//            }
-//        }
-//    }
-//}
-
-//wip for multi-select of Configs
-//struct ConfigCardView: View{
-//    let configName: String
-//    var body: some View {
-//        let buttontext = "test"
-//        Button(buttontext){
-//            //go to results view
-//        }
-//    }
-//}
-
 struct BlueButton: ButtonStyle {
     func makeBody(configuration: Configuration) -> some View {
         configuration.label
@@ -81,32 +47,57 @@ struct ResultsCardView: View {
 }
 
 struct SelectAnotherDayView:View{
+    @Binding var canaryResults: [CanaryResult]
+    
     var body: some View{
         VStack{
-            let resultsNames = getContentsOfResults()
-            ForEach(resultsNames, id: \.self){result in
-                Button(result){
-                    viewingResult = result
-                    let removeCSV = result.replacingOccurrences(of: ".csv", with: "")
-                    resultDate = removeCSV.replacingOccurrences(of: "CanaryResults", with: "")
-                }
-                .buttonStyle(BlueButton())
-                .padding()
+            Text("Results")
+            canaryResults = getContentsOfResultsDirectory()
+            List(canaryResults)
+            {
+                
+                   result in
+                    
+                //viewingResult = result.name
+                Text(result.name)
+                
             }
+            
+//            ForEach(canaryResults, id: \.self){result in
+//                Button(result){
+//                    viewingResult = result
+//                    let removeCSV = result.replacingOccurrences(of: resultExtension, with: "")
+//                    resultDate = removeCSV.replacingOccurrences(of: resultFileName, with: "")
+//                }
+//                .buttonStyle(BlueButton())
+//                .padding()
+//            }
         }
     }
 
-    func getContentsOfResults() -> [String]{
+    func getContentsOfResultsDirectory() -> [CanaryResult]{
         let appHomeDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0]
-        let resultsDirectory = appHomeDirectory.appendingPathComponent("results")
+        let resultsDirectory = appHomeDirectory.appendingPathComponent(resultDirectoryName)
 
-        do{
+        do
+        {
             let results = try FileManager.default.contentsOfDirectory(atPath: resultsDirectory.path)
-            return results
-        } catch {
-            print("yikes")
+            var canaryResults = [CanaryResult]()
+            
+            for result in results {
+                let name = result.replacingOccurrences(of: resultExtension, with: "")
+                let canaryResult = CanaryResult(name: name, filename: result)
+                canaryResults.append(canaryResult)
+            }
+            
+            return canaryResults
+        }
+        catch
+        {
+            print("Failed to get the contents of \(resultsDirectory.path)")
+            print("Error: \(error)")
+            return []
         }
-        return []
     }
 
     func getDate() ->String{
@@ -220,23 +211,26 @@ struct ResultsView:View {
 
     //function which pulls the result of whatever day the global resultDate is pointed at. 
     func getResultsURL() -> URL{
-        let fileName = "CanaryResults" + resultDate + ".csv"
+        let fileName = resultFileName + resultDate + resultExtension
         let appHomeDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0]
-        let resultsDirectory = appHomeDirectory.appendingPathComponent("results")
+        let resultsDirectory = appHomeDirectory.appendingPathComponent(resultDirectoryName)
         let resultsFile = resultsDirectory.appendingPathComponent(fileName)
         return resultsFile
     }
 }
 
 struct ContentView: View
 {
+    @State private var isValidConfigPath = false
+    @State private var configPath = UserDefaults.standard.string(forKey: configPathKey) ?? "Config Directory Needed"
+    
     //Display Strings
     let configTitle: String = "Transport config directory:"
     let configSearchPrompt = "Please select the directory where your config files are located."
     let browseButtonTitle = "Select Config Directory"
     let numberOfRunsPrompt = "How many times do you want to run the test?"
     let runButtonTitle = "Run Test"
-    let logTitle = "Run Log test"
+    let logTitle = "Run Log"
     let runTimes = " Time(s)"
     let createSampleButtonTitle = "Create Sample Config"
     let step = 1
@@ -247,7 +241,7 @@ struct ContentView: View
     @State private var runLogs = ""
     @State private var insideResultsView = false
     @State var appHomeDirectory: URL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0]
-    @State var configDirectory: URL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0].appendingPathComponent("CanaryConfigs")
+    @State var configDirectory: URL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0].appendingPathComponent(configDirectoryName)
     @State var showDirectoryPicker = false
     var justShared: some Scene{
         WindowGroup{
@@ -281,35 +275,6 @@ struct ContentView: View
                                 DirectoryPickerView(directoryURL: $configDirectory)
                             }
                     }
-                    
-                    //create sample config button
-//                   Button(createSampleButtonTitle)
-//                    {
-//                        do {
-//                            //make URLs
-//                            let AppDirectory = getDocumentsDirectory()
-//                            let hotConfigDirectory = AppDirectory.appendingPathComponent("configsToUseInTest")
-//
-//                            //check to see if anything at configDirectory exists, if not, make the directory
-//                            if !FileManager.default.fileExists(atPath: hotConfigDirectory.absoluteString){
-//                                try! FileManager.default.createDirectory(at: hotConfigDirectory, withIntermediateDirectories: true, attributes: nil)
-//                            }
-//                            //save sample config
-//                            let sampleConfigReference = hotConfigDirectory.appendingPathComponent("sampleShadowSocksConfig.json")
-//                            let sampleConfigContents = ##" {"serverIP":"PII","port":PII,"password":"PII","cipherName":"DarkStar","cipherMode":"DarkStar"}"##
-//
-//
-//
-//                            try sampleConfigContents.write(to: sampleConfigReference, atomically: true, encoding: .utf8)
-//                            //let checkWork = try String(contentsOf: sampleConfigReference)
-//                            //print(checkWork)
-//                            }
-//                            catch{
-//                            print("sampleConfig failed to write")
-//                            print(error)
-//                            }
-//
-//                }
                 .padding(10)
                 Divider()
                 Spacer()
@@ -329,23 +294,28 @@ struct ContentView: View
                                 let canaryController = CanaryController()
                                 //make paths
                                 let AppDirectory = getDocumentsDirectory()
-                                let resultsDirectory = AppDirectory.appendingPathComponent("results")
-                            //check to see if resultsDirectory exists, if not, make one.
-                                if !FileManager.default.fileExists(atPath: resultsDirectory.absoluteString){
-                                    try! FileManager.default.createDirectory(at: resultsDirectory, withIntermediateDirectories: true, attributes: nil)
+                                let resultsDirectory = AppDirectory.appendingPathComponent(resultDirectoryName)
+                                
+                                //check to see if resultsDirectory exists, if not, make one.
+                                if !FileManager.default.fileExists(atPath: resultsDirectory.absoluteString)
+                                {
+                                    try FileManager.default.createDirectory(at: resultsDirectory, withIntermediateDirectories: true, attributes: nil)
                                 }
+                                
                                 //get today's date for the name of the results document
-                                if !FileManager.default.fileExists(atPath: resultsDirectory.path){
-                                    try! FileManager.default.createFile(atPath: resultsDirectory.path, contents: nil, attributes: nil)
+                                if !FileManager.default.fileExists(atPath: resultsDirectory.path)
+                                {
+                                    FileManager.default.createFile(atPath: resultsDirectory.path, contents: nil, attributes: nil)
                                 }
-                                print("run button pressed")
-                                viewingResult = "CanaryResults" + getDate() + ".csv"
+                                
+                                viewingResult = resultFileName + getDate() + resultExtension
                                 canaryController.runCanary(configDirectory: configDirectory, resultsDirectory: resultsDirectory,  numberOfTimesToRun: numberOfRuns)
                             }
-                            
-                            NavigationLink(destination: Text("secondView"), isActive: $insideResultsView) {EmptyView()}
-                            self.insideResultsView = true
-                        }//Button(runButtonTitle)
+                            catch
+                            {
+                                print("Error preparing directories: \(error)")
+                            }
+                        }
                         .buttonStyle(BlueButton())
 
                         NavigationLink(destination: ResultsView())
@@ -354,42 +324,48 @@ struct ContentView: View
                         }
                         .buttonStyle(BlueButton())
                         .padding(10)
-                    }//HStack
-                }//VStack
+                    }
+                }
 
                 Divider()
                 Spacer()
 
                 VStack(alignment: .center) // Logs UI
-                {
-                    Text(logTitle)
-                    
-                    ScrollViewReader // Test Log with automatic scrolling
                     {
-                        sp in
+                        Text(logTitle)
 
-                        ScrollView
+                        ScrollViewReader // Test Log with automatic scrolling
                         {
-                            // TODO: add .textSelection(.enabled) when appropriate to discontinue support of macOS 11 (only available on macOS 12+)
-                            Text(runningLog.logString)
-                                .id(0)
-                                .onChange(of: runningLog.logString)
+                            sp in
+                            
+                            ScrollView
                             {
-                                Value in
-                                sp.scrollTo(0, anchor: .bottom)
+                                // TODO: add .textSelection(.enabled) when appropriate to discontinue support of macOS 11 (only available on macOS 12+)
+                                Text(runningLog.logString)
+                                    .id(0)
+                                    .onChange(of: runningLog.logString)
+                                {
+                                    Value in
+                                    sp.scrollTo(0, anchor: .bottom)
+                                }
                             }
+                            .frame(maxHeight: 150)
                         }
-                        .frame(maxHeight: 150)
-                    }
-                    ScrollView
-                    {
-                       VStack
+                        .onAppear()
                         {
-                            Text(runLogs)
-                                .lineLimit(nil)
+                            isValidConfigPath = validate(configURL: URL(string: configPath))
                         }
-                        .frame(maxWidth: .infinity)
-                    }
+                        .padding(.vertical)
+                    
+//                    ScrollView
+//                    {
+//                       VStack
+//                        {
+//                            Text(runLogs)
+//                                .lineLimit(nil)
+//                        }
+//                        .frame(maxWidth: .infinity)
+//                    }
                 }
                 .padding()
 
@@ -398,6 +374,17 @@ struct ContentView: View
         }//NavigationView
     }//body
 
+    func validate(configURL: URL?) -> Bool
+    {
+        guard let isaURL = configURL
+        else { return false }
+        
+        var isDirectory = ObjCBool(true)
+        let exists = FileManager.default.fileExists(atPath: isaURL.path, isDirectory: &isDirectory)
+        
+        return exists && isDirectory.boolValue
+    }
+    
     func getDate() ->String{
         let date = Date()
         let dateFormatter = DateFormatter()
@@ -500,4 +487,11 @@ struct ContentView_Previews: PreviewProvider {
         ContentView(configDirectory: FileManager.default.temporaryDirectory)
     }
 }
+
+struct CanaryResult: Identifiable {
+    let id = UUID()
+    let name: String
+    let filename: String
+    
+}
 

CanaryiOS/CanaryiOS/ContentView.swift

@@ -22,3 +22,9 @@ class RunningLog: ObservableObject
 var configFileName: String = "blank"
 var resultDate = "today"
 var viewingResult = ""
+
+let resultDirectoryName = "results"
+let resultFileName = "CanaryResults"
+let resultExtension = ".csv"
+
+let configDirectoryName = "CanaryConfigs"