Fixed CopyMods (unfinished FTP) & ModCreate UI

hyperbx · web-flow · commit 7145ea0bbcad · 2019-07-15T14:29:56.000+01:00
diff --git a/Sonic '06 Mod Manager/ModCreate.Designer.cs b/Sonic '06 Mod Manager/ModCreate.Designer.cs
diff --git a/Sonic '06 Mod Manager/ModCreate.cs b/Sonic '06 Mod Manager/ModCreate.cs
@@ -71,7 +71,7 @@ private void CreateButton_Click(object sender, EventArgs e)
                         if (modAuthor != "") { modINI.WriteLine("Author=\"" + modAuthor + "\""); }
                         modINI.WriteLine("Platform=\"" + combo_System.Text + "\"");
                         modINI.WriteLine("Merge=\"" + modMerge.ToString() + "\"");
-                        if (modCopy != "") { modINI.WriteLine("Copy=\"" + modCopy + "\""); }
+                        if (modCopy != "") { modINI.WriteLine("Read-only=\"" + modCopy + "\""); }
                         modINI.Close();
                     }
                 }
@@ -95,7 +95,7 @@ private void Check_Merge_CheckedChanged(object sender, EventArgs e)
                 modMerge = false;
                 lbl_Copy.Enabled = false;
                 modCopyBox.Enabled = false;
-                readonlyButtonHelp.Enabled = true;
+                readonlyButtonHelp.Enabled = false;
             }
         }
 
diff --git a/Sonic '06 Mod Manager/ModManager.cs b/Sonic '06 Mod Manager/ModManager.cs
@@ -1464,7 +1464,7 @@ private void CopyMods()
                         string entryValue;
                         while ((line = configFile.ReadLine()) != null)
                         {
-                            if (line.Contains("Copy=\""))
+                            if (line.Contains("Read-only=\""))
                             {
                                 entryValue = line.Substring(line.IndexOf("=") + 2);
                                 entryValue = entryValue.Remove(entryValue.Length - 1);
@@ -1496,33 +1496,16 @@ private void CopyMods()
                             {
                                 if (File.ReadAllLines($"{modsPath}\\{item}\\mod.ini").Contains("Merge=\"True\""))
                                 {
-                                    if (mod.EndsWith(".arc"))
+                                    if (Path.GetExtension(mod) == ".arc")
                                     {
-                                        if (combo_Priority.SelectedIndex == 0)
+                                        if (string.Join(" ", filesToCopyList.ToArray()).Contains(Path.GetFileName(mod)))
                                         {
-                                            foreach (var modFile in filesToCopyList)
-                                            {
-                                                if (modFile == Path.GetFileName(mod))
-                                                {
-                                                    Console.WriteLine("Copying " + mod);
-                                                    if (!File.Exists(targetArcPath)) File.Move(origArcPath, targetArcPath);
-                                                    File.Copy(mod, origArcPath, true);
-                                                }
-                                            }
-                                            Console.WriteLine("Merging " + mod);
-                                            MergeARCs(origArcPath, mod, origArcPath, false, string.Empty);
+                                            Console.WriteLine("Copying " + mod);
+                                            if (!File.Exists(targetArcPath)) File.Move(origArcPath, targetArcPath);
+                                            File.Copy(mod, origArcPath, true);
                                         }
-                                        else if (combo_Priority.SelectedIndex == 1)
+                                        else
                                         {
-                                            foreach (var modFile in filesToCopyList)
-                                            {
-                                                if (modFile == Path.GetFileName(mod))
-                                                {
-                                                    Console.WriteLine("Copying " + mod);
-                                                    if (!File.Exists(targetArcPath)) File.Move(origArcPath, targetArcPath);
-                                                    File.Copy(mod, origArcPath, true);
-                                                }
-                                            }
                                             Console.WriteLine("Merging " + mod);
                                             MergeARCs(origArcPath, mod, origArcPath, false, string.Empty);
                                         }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ private void CreateButton_Click(object sender, EventArgs e)`
`71`	`71`	`if (modAuthor != "") { modINI.WriteLine("Author=\"" + modAuthor + "\""); }`
`72`	`72`	`modINI.WriteLine("Platform=\"" + combo_System.Text + "\"");`
`73`	`73`	`modINI.WriteLine("Merge=\"" + modMerge.ToString() + "\"");`
`74`		`- if (modCopy != "") { modINI.WriteLine("Copy=\"" + modCopy + "\""); }`
	`74`	`+ if (modCopy != "") { modINI.WriteLine("Read-only=\"" + modCopy + "\""); }`
`75`	`75`	`modINI.Close();`
`76`	`76`	`}`
`77`	`77`	`}`
`@@ -95,7 +95,7 @@ private void Check_Merge_CheckedChanged(object sender, EventArgs e)`
`95`	`95`	`modMerge = false;`
`96`	`96`	`lbl_Copy.Enabled = false;`
`97`	`97`	`modCopyBox.Enabled = false;`
`98`		`- readonlyButtonHelp.Enabled = true;`
	`98`	`+ readonlyButtonHelp.Enabled = false;`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -1464,7 +1464,7 @@ private void CopyMods()`
`1464`	`1464`	`string entryValue;`
`1465`	`1465`	`while ((line = configFile.ReadLine()) != null)`
`1466`	`1466`	`{`
`1467`		`- if (line.Contains("Copy=\""))`
	`1467`	`+ if (line.Contains("Read-only=\""))`
`1468`	`1468`	`{`
`1469`	`1469`	`entryValue = line.Substring(line.IndexOf("=") + 2);`
`1470`	`1470`	`entryValue = entryValue.Remove(entryValue.Length - 1);`
`@@ -1496,33 +1496,16 @@ private void CopyMods()`
`1496`	`1496`	`{`
`1497`	`1497`	`if (File.ReadAllLines($"{modsPath}\\{item}\\mod.ini").Contains("Merge=\"True\""))`
`1498`	`1498`	`{`
`1499`		`- if (mod.EndsWith(".arc"))`
	`1499`	`+ if (Path.GetExtension(mod) == ".arc")`
`1500`	`1500`	`{`
`1501`		`- if (combo_Priority.SelectedIndex == 0)`
	`1501`	`+ if (string.Join(" ", filesToCopyList.ToArray()).Contains(Path.GetFileName(mod)))`
`1502`	`1502`	`{`
`1503`		`- foreach (var modFile in filesToCopyList)`
`1504`		`- {`
`1505`		`- if (modFile == Path.GetFileName(mod))`
`1506`		`- {`
`1507`		`- Console.WriteLine("Copying " + mod);`
`1508`		`- if (!File.Exists(targetArcPath)) File.Move(origArcPath, targetArcPath);`
`1509`		`- File.Copy(mod, origArcPath, true);`
`1510`		`- }`
`1511`		`- }`
`1512`		`- Console.WriteLine("Merging " + mod);`
`1513`		`- MergeARCs(origArcPath, mod, origArcPath, false, string.Empty);`
	`1503`	`+ Console.WriteLine("Copying " + mod);`
	`1504`	`+ if (!File.Exists(targetArcPath)) File.Move(origArcPath, targetArcPath);`
	`1505`	`+ File.Copy(mod, origArcPath, true);`
`1514`	`1506`	`}`
`1515`		`- else if (combo_Priority.SelectedIndex == 1)`
	`1507`	`+ else`
`1516`	`1508`	`{`
`1517`		`- foreach (var modFile in filesToCopyList)`
`1518`		`- {`
`1519`		`- if (modFile == Path.GetFileName(mod))`
`1520`		`- {`
`1521`		`- Console.WriteLine("Copying " + mod);`
`1522`		`- if (!File.Exists(targetArcPath)) File.Move(origArcPath, targetArcPath);`
`1523`		`- File.Copy(mod, origArcPath, true);`
`1524`		`- }`
`1525`		`- }`
`1526`	`1509`	`Console.WriteLine("Merging " + mod);`
`1527`	`1510`	`MergeARCs(origArcPath, mod, origArcPath, false, string.Empty);`
`1528`	`1511`	`}`