Added args and fixed id bug

Author: EmeraldLoc

sm_osx/DataStore.xcdatamodeld/DataStore.xcdatamodel/contents

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="20086" systemVersion="21E230" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="LauncherRepos" representedClassName="LauncherRepos" syncable="YES" codeGenerationType="class">
+        <attribute name="args" optional="YES" attributeType="String"/>
+        <attribute name="id" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
         <attribute name="isEditing" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
         <attribute name="path" optional="YES" attributeType="String"/>
         <attribute name="title" optional="YES" attributeType="String"/>
     </entity>
     <elements>
-        <element name="LauncherRepos" positionX="-63" positionY="-18" width="128" height="74"/>
+        <element name="LauncherRepos" positionX="-63" positionY="-18" width="128" height="104"/>
     </elements>
 </model>

sm_osx/LauncherView.swift

@@ -16,9 +16,10 @@ struct LauncherView: View {
     @FetchRequest(sortDescriptors:[SortDescriptor(\.title)]) var launcherRepos: FetchedResults<LauncherRepos>
     @State var existingRepo = URL(string: "")
     @State var repoTitle = ""
-    @State var currentVersion = "v1.1.0\n"
+    @State var currentVersion = "v1.1.2\n"
     @State var updateAlert = false
     @State var latestVersion = ""
+    @State var repoArgs = ""
     @AppStorage("firstLaunch") var firstLaunch = true
     let sm64: UTType = .init(filenameExtension: "f3dex2e")!
 
@@ -50,19 +51,33 @@ struct LauncherView: View {
 
                                 Button(action: {
 
-                                    for i in 0...launcherRepos.count - 1 {
-                                        launcherRepos[i].isEditing = false
+                                    for iEdit in 0...launcherRepos.count - 1 {
+                                        launcherRepos[iEdit].isEditing = false
                                     }
 
                                     launcherRepos[i].isEditing = true
                                 }) {
                                     Image(systemName: "pencil")
                                 }.popover(isPresented: Binding.constant(launcherRepos[i].isEditing)) {
 
-                                    HStack {
+                                    VStack {
                                         TextField("Name of Repo", text: $repoTitle)
+                                            .lineLimit(nil)
+                                            .scaledToFill()
                                             .onChange(of: repoTitle) { _ in
                                                 launcherRepos[i].title = repoTitle
+                                                do {
+                                                    try moc.save()
+                                                }
+                                                catch {
+                                                    print("Its broken \(error)")
+                                                }
+                                            }
+                                        TextField("Arguments", text: $repoArgs)
+                                            .lineLimit(nil)
+                                            .scaledToFill()
+                                            .onChange(of: repoArgs) { _ in
+                                                launcherRepos[i].args = repoArgs
 
                                                 do {
                                                     try moc.save()
@@ -71,7 +86,10 @@ struct LauncherView: View {
                                                     print("Its broken \(error)")
                                                 }
                                             }
-                                    }.onAppear {repoTitle = launcherRepos[i].title ?? ""}
+                                    }.onAppear {
+                                        repoTitle = launcherRepos[i].title ?? ""
+                                        repoArgs = launcherRepos[i].args ?? ""
+                                    }
                                 }
 
                                 Button(action: {
@@ -91,7 +109,7 @@ struct LauncherView: View {
                                 }
 
                                 Button(action: {
-                                    try? print(shell.shell("\(LauncherRepo.path ?? "its broken")"))
+                                    try? print(shell.shell("\(LauncherRepo.path ?? "its broken") \(LauncherRepo.args ?? "")"))
 
                                     print(LauncherRepo.path ?? "")
                                 }) {
@@ -131,6 +149,8 @@ struct LauncherView: View {
 
                         repo.title = "Repo \(launcherRepos.count)"
                         repo.path = existingRepo?.path
+                        repo.args = ""
+                        repo.id = UUID()
 
                         do {
                             try moc.save()
@@ -161,7 +181,7 @@ struct LauncherView: View {
             }
 
             if firstLaunch {
-                try? shell.shell("cd ~/ && mkdir SM64Repos")
+                try? print(shell.shell("cd ~/ && mkdir SM64Repos"))
             }
 
             if launcherRepos.isEmpty {return}

sm_osx/RomView.swift

@@ -133,6 +133,8 @@ struct RomView: View {
                         launcherRepo.title = "sm64ex-coop"
                         launcherRepo.isEditing = false
                         launcherRepo.path = "~/SM64Repos/sm64ex-coop-build/sm64.us.f3dex2e"
+                        launcherRepo.args = ""
+                        launcherRepo.id = UUID()
 
                         do {
                             try moc.save()
@@ -316,6 +318,8 @@ struct RomView: View {
                             launcherRepo.title = "\(repo)"
                             launcherRepo.isEditing = false
                             launcherRepo.path = "~/SM64Repos/\(repo)-build/moon64.us.f3dex2e"
+                            launcherRepo.args = ""
+                            launcherRepo.id = UUID()
 
                             do {
                                 try moc.save()
@@ -330,6 +334,8 @@ struct RomView: View {
                             launcherRepo.title = "\(repo)"
                             launcherRepo.isEditing = false
                             launcherRepo.path = "~/SM64Repos/\(repo)-build/sm64.us.f3dex2e"
+                            launcherRepo.args = ""
+                            launcherRepo.id = UUID()
 
                             do {
                                 try moc.save()
@@ -422,6 +428,8 @@ struct RomView: View {
                         launcherRepo.title = "sm64port"
                         launcherRepo.isEditing = false
                         launcherRepo.path = "~/SM64Repos/sm64port-build/sm64.us.f3dex2e"
+                        launcherRepo.args = ""
+                        launcherRepo.id = UUID()
 
                         do {
                             try moc.save()