🐛 fix the problem of adding duplicate data

Author: InnoFang

code_counter/conf/config.json

@@ -1,55 +1,55 @@
 {
     "suffix": [
-        "c",
-        "cc",
-        "clj",
-        "cpp",
-        "cs",
-        "cu",
-        "cuh",
-        "dart",
-        "go",
-        "h",
-        "hpp",
-        "java",
-        "jl",
-        "js",
-        "kt",
         "lisp",
-        "lua",
-        "pde",
-        "m",
-        "php",
         "py",
-        "R",
+        "clj",
+        "vb",
+        "hpp",
+        "ts",
+        "cc",
         "rb",
+        "dart",
+        "pde",
+        "cu",
+        "sh",
+        "swift",
+        "cs",
+        "js",
         "rs",
+        "php",
+        "c",
         "rust",
-        "sh",
+        "lua",
+        "jl",
+        "java",
+        "cuh",
+        "R",
+        "go",
         "scala",
-        "swift",
-        "ts",
-        "vb"
+        "m",
+        "cpp",
+        "h",
+        "kt"
     ],
     "comment": [
-        "#",
-        "//",
-        "/*",
         "*",
-        "*/",
         ":",
+        "*/",
+        "\"\"\"\"",
         ";",
-        "\"\"\"\""
+        "/*",
+        "//",
+        "#"
     ],
     "ignore": [
-        "out",
-        "venv",
         ".git",
-        ".idea",
-        "build",
         "target",
-        "node_modules",
+        "dist",
+        "build",
         ".vscode",
-        "dist"
+        "node_modules",
+        "out",
+        ".idea",
+        "venv"
     ]
 }

code_counter/conf/config.py

@@ -4,15 +4,20 @@
 import json
 import pkg_resources
 
+class SetEncoder(json.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, set):
+            return list(obj)
+        return json.JSONEncoder.default(self, obj)
 
 class Config:
 
     def __init__(self):
         conf = self.__load()
 
-        self.suffix = conf['suffix']
-        self.comment = conf['comment']
-        self.ignore = conf['ignore']
+        self.suffix = set(conf['suffix'])
+        self.comment = set(conf['comment'])
+        self.ignore = set(conf['ignore'])
 
     def invoke(self, args):
         if args.restore:
@@ -26,7 +31,7 @@ def invoke(self, args):
             self.show()
 
     def show(self):
-        print(json.dumps(self.__dict__, indent=4))
+        print(json.dumps(self.__dict__, indent=4, cls=SetEncoder))
 
     def __confirm(self, tips):
         check = input(tips)
@@ -35,26 +40,26 @@ def __confirm(self, tips):
     def __append_config(self, suffix_add, comment_add, ignore_add):
         if suffix_add:
             if self.__confirm("'suffix' will be appended with {} (y/n)".format(suffix_add)):
-                self.suffix.extend(suffix_add)
+                self.suffix.update(suffix_add)
         if comment_add:
             if self.__confirm("'comment' will be appended with {} (y/n)".format(comment_add)):
-                self.comment.extend(comment_add)
+                self.comment.update(comment_add)
         if ignore_add:
             if self.__confirm("'ignore' will be appended with {} (y/n)".format(ignore_add)):
-                self.ignore.extend(ignore_add)
+                self.ignore.update(ignore_add)
 
         self.__update()
 
     def __reset_config(self, suffix_reset, comment_reset, ignore_reset):
         if suffix_reset:
             if self.__confirm("'suffix' will be replaced with {} (y/n)".format(suffix_reset)):
-                self.suffix = suffix_reset
+                self.suffix = set(suffix_reset)
         if comment_reset:
             if self.__confirm("'comment' will be replaced with {} (y/n)".format(comment_reset)):
-                self.comment = comment_reset
+                self.comment = set(comment_reset)
         if ignore_reset:
             if self.__confirm("'ignore' will be replaced with {} (y/n)".format(ignore_reset)):
-                self.ignore = ignore_reset
+                self.ignore = set(ignore_reset)
 
         self.__update()
 
@@ -67,14 +72,14 @@ def __load(self):
     def __update(self):
         filename = pkg_resources.resource_filename(__name__, 'config.json')
         with open(filename, 'w') as config:
-            json.dump(self.__dict__, config, indent=4)
+            json.dump(self.__dict__, config, indent=4, cls=SetEncoder)
 
     def restore(self):
-        self.suffix = ["c", "cc", "clj", "cpp", "cs", "cu", "cuh", "dart", "go", "h",
-                       "hpp", "java", "jl", "js", "kt", "lisp", "lua", "pde", "m", "php",
-                       "py", "R", "rb", "rs", "rust", "sh", "scala", "swift", "ts", "vb"]
-        self.comment = ["#", "//", "/*", "*", "*/", ":", ";", '""""']
-        self.ignore = ["out", "venv", ".git", ".idea", "build", "target", "node_modules", ".vscode", "dist"]
+        self.suffix = {"c", "cc", "clj", "cpp", "cs", "cu", "cuh", "dart", "go", "h", "hpp", "java", "jl", "js", "kt",
+                       "lisp", "lua", "pde", "m", "php", "py", "R", "rb", "rs", "rust", "sh", "scala", "swift", "ts",
+                       "vb"}
+        self.comment = {"#", "//", "/*", "*", "*/", ":", ";", '""""'}
+        self.ignore = {"out", "venv", ".git", ".idea", "build", "target", "node_modules", ".vscode", "dist"}
 
-        if self.__confirm('Default configuration will be restored (y/n)?'):
+        if self.__confirm('The default configuration will be restored (y/n)?'):
             self.__update()