v1.3.2

Author: Greenest-Guy

iniparser.py

@@ -327,10 +327,11 @@ def getAnimations(file_path):
     # adds a tag to the top of file_path "//Skins merged using github.com/Greenest-Guy/osu-mania-Skin-Merger\n"
     @staticmethod
     def addTag(file_path):
+        tag = "//Skins merged using github.com/Greenest-Guy/osu-mania-Skin-Merger\n"
         with open(file_path, 'r', encoding="utf-8") as f:
             original_content = f.read()
 
-        with open(file_path, 'w', encoding="utf-8") as file:
-            file.write(
-                "//Skins merged using github.com/Greenest-Guy/osu-mania-Skin-Merger\n")
-            file.write(original_content)
+        if tag not in original_content:
+            with open(file_path, 'w', encoding="utf-8") as file:
+                file.write(tag)
+                file.write(original_content)

logic.py

@@ -208,14 +208,21 @@ def mergeNewSkin(self):
                                   base_filename)
 
         # Update Author
-        IniParser.editValue(skin_file_path, "Author",
-                            f"{IniParser.getValue(IniParser.findSkinini(self.base_skin_path), "Author")} + {IniParser.getValue(IniParser.findSkinini(self.merge_skin_path), "Author")}")
+        base_skin_author = IniParser.getValue(
+            IniParser.findSkinini(self.base_skin_path), "Author")
 
-        self.finishMerge(len(missing_files))
+        merge_skin_author = IniParser.getValue(
+            IniParser.findSkinini(self.merge_skin_path), "Author")
+
+        if merge_skin_author not in base_skin_author:
+            IniParser.editValue(skin_file_path, "Author",
+                                f"{base_skin_author} + {merge_skin_author}")
 
         # Adds Tag to top (Skins merged using github.com/Greenest-Guy/osu-mania-Skin-Merger)
         IniParser.addTag(skin_file_path)
 
+        self.finishMerge(len(missing_files))
+
     def overwriteSkin(self):
         keycount = int(self.app.key_select.get().strip('k'))
         mania_sections = IniParser.dictKeySections(
@@ -303,8 +310,16 @@ def overwriteSkin(self):
         # Update Author
         base_skin_author = IniParser.getValue(
             IniParser.findSkinini(self.base_skin_path), "Author")
-        IniParser.editValue(skin_file_path, "Author",
-                            f"{base_skin_author} + {IniParser.getValue(IniParser.findSkinini(self.merge_skin_path), "Author")}")
+
+        merge_skin_author = IniParser.getValue(
+            IniParser.findSkinini(self.merge_skin_path), "Author")
+
+        if merge_skin_author not in base_skin_author:
+            IniParser.editValue(skin_file_path, "Author",
+                                f"{base_skin_author} + {merge_skin_author}")
+
+        # Adds Tag to top (Skins merged using github.com/Greenest-Guy/osu-mania-Skin-Merger)
+        IniParser.addTag(skin_file_path)
 
         self.finishMerge(len(missing_files))
 

version.py

@@ -1 +1 @@
-__version__ = "1.3.1"
+__version__ = "1.3.2"