Merge pull request #32 from Dragon-0609/dev

Dragon-0609 · web-flow · commit 026a97f2ca77 · 2022-03-04T19:31:09.000+05:00
Fix errors caused by old/new theme 2
diff --git a/Yuki Theme.Core/CLI.cs b/Yuki Theme.Core/CLI.cs
@@ -91,6 +91,11 @@ public static void load_schemes (Func <string> ifZero = null)
 		/// <returns></returns>
 		public static bool add (string copyFrom, string name)
 		{
+			if (name.Length < 2)
+			{
+				if (CLI_Actions.showError != null) CLI_Actions.showError ("The name is too short. At least it must be 2", "Too short");
+				return true;
+			}
 			string sto = Helper.ConvertNameToPath (name);
 			string patsh = Path.Combine (currentPath,
 			                             $"Themes/{sto}" + (oldThemeList [copyFrom] ? Helper.FILE_EXTENSTION_OLD : Helper.FILE_EXTENSTION_NEW));
@@ -325,6 +330,10 @@ public static void import (string path, Func <string, string, bool> exist)
 		/// <param name="to">To</param>
 		public static void rename (string from, string to)
 		{
+			if (to.Length < 2)
+			{
+				if (CLI_Actions.showError != null) CLI_Actions.showError ("The name is too short. At least it must be 2", "Too short");
+			}
 			if (!isDefaultTheme [from])
 			{
 				string frm = Helper.ConvertNameToPath (from);
@@ -772,7 +781,7 @@ private static void ReGenerateFromOld (string path, string oldPath, string name,
 				File.WriteAllText (path, json);
 			else
 			{
-				Helper.UpdateZip (path, json, null, true, null, true);
+				Helper.UpdateZip (path, json, null, true, null, true, "", false);
 			}
 		}
 
diff --git a/Yuki Theme.Core/Forms/ThemeManager.cs b/Yuki Theme.Core/Forms/ThemeManager.cs
@@ -75,6 +75,8 @@ public void onRename (string from, string to)
 			ListViewItem res = scheme.Items.Find (from, true) [0];
 			ReItem reit = (ReItem)res;
 			reit.SetName (to);
+			form.schemes.Items [form.schemes.Items.IndexOf (from)] = to;
+			scheme.Invalidate();
 			form.schemes.Invalidate();
 		}
 
diff --git a/Yuki Theme.Core/Helper.cs b/Yuki Theme.Core/Helper.cs
@@ -272,16 +272,16 @@ private static bool IsZip (ZipArchive zipFile, string themefile)
 		}
 
 		public static void UpdateZip (string path, string content, Image img, bool wantToKeepImage = false, Image sticker = null,
-		                              bool   wantToKeepSticker = false, string themeName = "")
+		                              bool   wantToKeepSticker = false, string themeName = "", bool asOld = true)
 		{
 			if (!wantToKeepImage && !wantToKeepSticker && img == null && sticker == null)
 			{
-				SaveToFile (path, content);
+				SaveToFile (path, content, asOld);
 			} else
 			{
 				using (var archive = ZipFile.Open (path, ZipArchiveMode.Update))
 				{
-					if (themeName.Length == 0) themeName = GetThemeSaveName ();
+					if (themeName.Length == 0) themeName = GetThemeSaveName (asOld);
 					ZipArchiveEntry entry = archive.GetEntry (themeName);
 
 					entry?.Delete ();
@@ -316,10 +316,10 @@ public static void UpdateZip (string path, string content, Image img, bool wantT
 			}
 		}
 
-		private static void SaveToFile (string path, string content)
+		private static void SaveToFile (string path, string content, bool asOld)
 		{
 			if (File.Exists (path)) File.Delete (path);
-			if (Settings.saveAsOld)
+			if (asOld)
 				SaveToFileOld (path, content);
 			else
 				SaveToFileNew (path, content);
@@ -376,18 +376,18 @@ private static void ExtractFile (ZipArchive archive, string filename, string des
 			}
 		}
 
-		public static void Zip (string path, string content, Image img, Image sticker = null, string themeName = "")
+		public static void Zip (string path, string content, Image img, Image sticker = null, string themeName = "", bool asOld = true)
 		{
 			if (img == null && sticker == null)
 			{
-				SaveToFile (path, content);
+				SaveToFile (path, content, asOld);
 			} else
 			{
 				using (var fileStream = new FileStream (path, FileMode.Create))
 				{
 					using (var archive = new ZipArchive (fileStream, ZipArchiveMode.Create))
 					{
-						if (themeName.Length == 0) themeName = GetThemeSaveName ();
+						if (themeName.Length == 0) themeName = GetThemeSaveName (asOld);
 						ZipArchiveEntry entry = archive.CreateEntry (themeName, CompressionLevel.Optimal);
 
 
@@ -443,14 +443,14 @@ public static Color ChangeColorBrightness (Color color, float correctionFactor)
 			return Color.FromArgb (color.A, (int) red, (int) green, (int) blue);
 		}
 
-		public static string GetThemeSaveName ()
+		public static string GetThemeSaveName (bool asOld)
 		{
-			return "theme." + GetSaveFormat ();
+			return "theme." + GetSaveFormat (asOld);
 		}
 
-		public static string GetSaveFormat ()
+		public static string GetSaveFormat (bool asOld)
 		{
-			return Settings.saveAsOld ? "xshd" : "json";
+			return asOld ? "xshd" : "json";
 		}
 
 		public static bool IsDark (Color clr)
diff --git a/Yuki Theme.Core/NewThemeFormat.cs b/Yuki Theme.Core/NewThemeFormat.cs
@@ -45,10 +45,10 @@ public static void saveList (Image img2 = null, Image img3 = null, bool wantToKe
 			{
 				if (iszip)
 				{
-					Helper.UpdateZip (CLI.currentTheme.fullPath, json, img2, wantToKeep, img3, wantToKeep);
+					Helper.UpdateZip (CLI.currentTheme.fullPath, json, img2, wantToKeep, img3, wantToKeep, "", false);
 				} else
 				{
-					Helper.Zip (CLI.currentTheme.fullPath, json, img2, img3);
+					Helper.Zip (CLI.currentTheme.fullPath, json, img2, img3, "", false);
 				}
 			}
 		}
@@ -232,7 +232,7 @@ public static void WriteName (string path, string name)
 				File.WriteAllText (CLI.pathToFileNew, json);
 			else
 			{
-				Helper.UpdateZip (path, json, null, true, null, true);
+				Helper.UpdateZip (path, json, null, true, null, true, "", false);
 			}
 		}
 
diff --git a/Yuki Theme.Core/OldThemeFormat.cs b/Yuki Theme.Core/OldThemeFormat.cs
@@ -262,10 +262,10 @@ public static void SaveXML (Image img2, Image img3, bool wantToKeep, bool iszip,
 				string txml = doc.OuterXml;
 				if (iszip)
 				{
-					Helper.UpdateZip (themePath, txml, img2, wantToKeep, img3, wantToKeep, "theme.xshd");
+					Helper.UpdateZip (themePath, txml, img2, wantToKeep, img3, wantToKeep, "theme.xshd", true);
 				} else
 				{
-					Helper.Zip (themePath, txml, img2, img3, "theme.xshd");
+					Helper.Zip (themePath, txml, img2, img3, "theme.xshd", true);
 				}
 			}
 		}
diff --git a/Yuki Theme.Core/Parsers/DokiThemeParser.cs b/Yuki Theme.Core/Parsers/DokiThemeParser.cs
@@ -629,7 +629,7 @@ public override void finishParsing (string path)
 					node.AppendChild (doc.CreateComment ("hasSticker:" + stick.Item1.ToString ()));
 				}
 
-				Helper.Zip (outname, doc.OuterXml, wallp.Item2, stick.Item2);
+				Helper.Zip (outname, doc.OuterXml, wallp.Item2, stick.Item2, "", true);
 			}
 		}
 
diff --git a/Yuki Theme.Core/Parsers/MainParser.cs b/Yuki Theme.Core/Parsers/MainParser.cs
@@ -90,7 +90,7 @@ public static void Parse (string path, MForm form = null, bool ask = true, bool
 							Image sticker = null;
 							if (isWallpaperExist) wallpaper = Image.FromFile (Path.Combine (directory, "background.png"));
 							if (isStickerExist) sticker = Image.FromFile (Path.Combine (directory, "sticker.png"));
-							Helper.Zip (pathef, content, wallpaper, sticker, "theme.xshd");
+							Helper.Zip (pathef, content, wallpaper, sticker, "theme.xshd", true);
 						} else
 						{
 							File.Copy (path, pathef, true);							

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,11 @@ public static void load_schemes (Func <string> ifZero = null)`
`91`	`91`	`/// <returns></returns>`
`92`	`92`	`public static bool add (string copyFrom, string name)`
`93`	`93`	`{`
	`94`	`+ if (name.Length < 2)`
	`95`	`+ {`
	`96`	`+ if (CLI_Actions.showError != null) CLI_Actions.showError ("The name is too short. At least it must be 2", "Too short");`
	`97`	`+ return true;`
	`98`	`+ }`
`94`	`99`	`string sto = Helper.ConvertNameToPath (name);`
`95`	`100`	`string patsh = Path.Combine (currentPath,`
`96`	`101`	`$"Themes/{sto}" + (oldThemeList [copyFrom] ? Helper.FILE_EXTENSTION_OLD : Helper.FILE_EXTENSTION_NEW));`
`@@ -325,6 +330,10 @@ public static void import (string path, Func <string, string, bool> exist)`
`325`	`330`	`/// <param name="to">To</param>`
`326`	`331`	`public static void rename (string from, string to)`
`327`	`332`	`{`
	`333`	`+ if (to.Length < 2)`
	`334`	`+ {`
	`335`	`+ if (CLI_Actions.showError != null) CLI_Actions.showError ("The name is too short. At least it must be 2", "Too short");`
	`336`	`+ }`
`328`	`337`	`if (!isDefaultTheme [from])`
`329`	`338`	`{`
`330`	`339`	`string frm = Helper.ConvertNameToPath (from);`
`@@ -772,7 +781,7 @@ private static void ReGenerateFromOld (string path, string oldPath, string name,`
`772`	`781`	`File.WriteAllText (path, json);`
`773`	`782`	`else`
`774`	`783`	`{`
`775`		`- Helper.UpdateZip (path, json, null, true, null, true);`
	`784`	`+ Helper.UpdateZip (path, json, null, true, null, true, "", false);`
`776`	`785`	`}`
`777`	`786`	`}`
`778`	`787`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,8 @@ public void onRename (string from, string to)`
`75`	`75`	`ListViewItem res = scheme.Items.Find (from, true) [0];`
`76`	`76`	`ReItem reit = (ReItem)res;`
`77`	`77`	`reit.SetName (to);`
	`78`	`+ form.schemes.Items [form.schemes.Items.IndexOf (from)] = to;`
	`79`	`+ scheme.Invalidate();`
`78`	`80`	`form.schemes.Invalidate();`
`79`	`81`	`}`
`80`	`82`
Original file line number	Diff line number	Diff line change
`@@ -272,16 +272,16 @@ private static bool IsZip (ZipArchive zipFile, string themefile)`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`public static void UpdateZip (string path, string content, Image img, bool wantToKeepImage = false, Image sticker = null,`
`275`		`- bool wantToKeepSticker = false, string themeName = "")`
	`275`	`+ bool wantToKeepSticker = false, string themeName = "", bool asOld = true)`
`276`	`276`	`{`
`277`	`277`	`if (!wantToKeepImage && !wantToKeepSticker && img == null && sticker == null)`
`278`	`278`	`{`
`279`		`- SaveToFile (path, content);`
	`279`	`+ SaveToFile (path, content, asOld);`
`280`	`280`	`} else`
`281`	`281`	`{`
`282`	`282`	`using (var archive = ZipFile.Open (path, ZipArchiveMode.Update))`
`283`	`283`	`{`
`284`		`- if (themeName.Length == 0) themeName = GetThemeSaveName ();`
	`284`	`+ if (themeName.Length == 0) themeName = GetThemeSaveName (asOld);`
`285`	`285`	`ZipArchiveEntry entry = archive.GetEntry (themeName);`
`286`	`286`
`287`	`287`	`entry?.Delete ();`
`@@ -316,10 +316,10 @@ public static void UpdateZip (string path, string content, Image img, bool wantT`
`316`	`316`	`}`
`317`	`317`	`}`
`318`	`318`
`319`		`- private static void SaveToFile (string path, string content)`
	`319`	`+ private static void SaveToFile (string path, string content, bool asOld)`
`320`	`320`	`{`
`321`	`321`	`if (File.Exists (path)) File.Delete (path);`
`322`		`- if (Settings.saveAsOld)`
	`322`	`+ if (asOld)`
`323`	`323`	`SaveToFileOld (path, content);`
`324`	`324`	`else`
`325`	`325`	`SaveToFileNew (path, content);`
`@@ -376,18 +376,18 @@ private static void ExtractFile (ZipArchive archive, string filename, string des`
`376`	`376`	`}`
`377`	`377`	`}`
`378`	`378`
`379`		`- public static void Zip (string path, string content, Image img, Image sticker = null, string themeName = "")`
	`379`	`+ public static void Zip (string path, string content, Image img, Image sticker = null, string themeName = "", bool asOld = true)`
`380`	`380`	`{`
`381`	`381`	`if (img == null && sticker == null)`
`382`	`382`	`{`
`383`		`- SaveToFile (path, content);`
	`383`	`+ SaveToFile (path, content, asOld);`
`384`	`384`	`} else`
`385`	`385`	`{`
`386`	`386`	`using (var fileStream = new FileStream (path, FileMode.Create))`
`387`	`387`	`{`
`388`	`388`	`using (var archive = new ZipArchive (fileStream, ZipArchiveMode.Create))`
`389`	`389`	`{`
`390`		`- if (themeName.Length == 0) themeName = GetThemeSaveName ();`
	`390`	`+ if (themeName.Length == 0) themeName = GetThemeSaveName (asOld);`
`391`	`391`	`ZipArchiveEntry entry = archive.CreateEntry (themeName, CompressionLevel.Optimal);`
`392`	`392`
`393`	`393`
`@@ -443,14 +443,14 @@ public static Color ChangeColorBrightness (Color color, float correctionFactor)`
`443`	`443`	`return Color.FromArgb (color.A, (int) red, (int) green, (int) blue);`
`444`	`444`	`}`
`445`	`445`
`446`		`- public static string GetThemeSaveName ()`
	`446`	`+ public static string GetThemeSaveName (bool asOld)`
`447`	`447`	`{`
`448`		`- return "theme." + GetSaveFormat ();`
	`448`	`+ return "theme." + GetSaveFormat (asOld);`
`449`	`449`	`}`
`450`	`450`
`451`		`- public static string GetSaveFormat ()`
	`451`	`+ public static string GetSaveFormat (bool asOld)`
`452`	`452`	`{`
`453`		`- return Settings.saveAsOld ? "xshd" : "json";`
	`453`	`+ return asOld ? "xshd" : "json";`
`454`	`454`	`}`
`455`	`455`
`456`	`456`	`public static bool IsDark (Color clr)`
Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,10 @@ public static void saveList (Image img2 = null, Image img3 = null, bool wantToKe`
`45`	`45`	`{`
`46`	`46`	`if (iszip)`
`47`	`47`	`{`
`48`		`- Helper.UpdateZip (CLI.currentTheme.fullPath, json, img2, wantToKeep, img3, wantToKeep);`
	`48`	`+ Helper.UpdateZip (CLI.currentTheme.fullPath, json, img2, wantToKeep, img3, wantToKeep, "", false);`
`49`	`49`	`} else`
`50`	`50`	`{`
`51`		`- Helper.Zip (CLI.currentTheme.fullPath, json, img2, img3);`
	`51`	`+ Helper.Zip (CLI.currentTheme.fullPath, json, img2, img3, "", false);`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`}`
`@@ -232,7 +232,7 @@ public static void WriteName (string path, string name)`
`232`	`232`	`File.WriteAllText (CLI.pathToFileNew, json);`
`233`	`233`	`else`
`234`	`234`	`{`
`235`		`- Helper.UpdateZip (path, json, null, true, null, true);`
	`235`	`+ Helper.UpdateZip (path, json, null, true, null, true, "", false);`
`236`	`236`	`}`
`237`	`237`	`}`
`238`	`238`
Original file line number	Diff line number	Diff line change
`@@ -262,10 +262,10 @@ public static void SaveXML (Image img2, Image img3, bool wantToKeep, bool iszip,`
`262`	`262`	`string txml = doc.OuterXml;`
`263`	`263`	`if (iszip)`
`264`	`264`	`{`
`265`		`- Helper.UpdateZip (themePath, txml, img2, wantToKeep, img3, wantToKeep, "theme.xshd");`
	`265`	`+ Helper.UpdateZip (themePath, txml, img2, wantToKeep, img3, wantToKeep, "theme.xshd", true);`
`266`	`266`	`} else`
`267`	`267`	`{`
`268`		`- Helper.Zip (themePath, txml, img2, img3, "theme.xshd");`
	`268`	`+ Helper.Zip (themePath, txml, img2, img3, "theme.xshd", true);`
`269`	`269`	`}`
`270`	`270`	`}`
`271`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -629,7 +629,7 @@ public override void finishParsing (string path)`
`629`	`629`	`node.AppendChild (doc.CreateComment ("hasSticker:" + stick.Item1.ToString ()));`
`630`	`630`	`}`
`631`	`631`
`632`		`- Helper.Zip (outname, doc.OuterXml, wallp.Item2, stick.Item2);`
	`632`	`+ Helper.Zip (outname, doc.OuterXml, wallp.Item2, stick.Item2, "", true);`
`633`	`633`	`}`
`634`	`634`	`}`
`635`	`635`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public static void Parse (string path, MForm form = null, bool ask = true, bool`
`90`	`90`	`Image sticker = null;`
`91`	`91`	`if (isWallpaperExist) wallpaper = Image.FromFile (Path.Combine (directory, "background.png"));`
`92`	`92`	`if (isStickerExist) sticker = Image.FromFile (Path.Combine (directory, "sticker.png"));`
`93`		`- Helper.Zip (pathef, content, wallpaper, sticker, "theme.xshd");`
	`93`	`+ Helper.Zip (pathef, content, wallpaper, sticker, "theme.xshd", true);`
`94`	`94`	`} else`
`95`	`95`	`{`
`96`	`96`	`File.Copy (path, pathef, true);`