Merge pull request #731 from zanllp/feature/custom-tag-color

Add support for custom tag colors

javascript/index.js

@@ -13,7 +13,7 @@ Promise.resolve().then(async () => {
     <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Infinite Image Browsing</title>
-    <script type="module" crossorigin src="/infinite_image_browsing/fe-static/assets/index-a0a34372.js"></script>
+    <script type="module" crossorigin src="/infinite_image_browsing/fe-static/assets/index-ee40c384.js"></script>
     <link rel="stylesheet" href="/infinite_image_browsing/fe-static/assets/index-c05ac913.css">
   </head>
 

scripts/iib/api.py

@@ -939,6 +939,25 @@ async def get_img_selected_custom_tag(path: str):
     async def get_img_tags(req: PathsReq):
         conn = DataBase.get_conn()
         return ImageTag.batch_get_tags_by_path(conn, req.paths)
+
+
+    # update tag
+    class UpdateTagReq(BaseModel):
+        id: int
+        color: str
+
+    @app.post(
+        db_api_base + "/update_tag",
+        dependencies=[Depends(verify_secret), Depends(write_permission_required)],
+    )
+    async def update_tag(req: UpdateTagReq):
+        conn = DataBase.get_conn()
+        tag = Tag.get(conn, req.id)
+        if tag:
+            tag.color = req.color
+            tag.save(conn)
+        conn.commit()
+
 
     class ToggleCustomTagToImgReq(BaseModel):
         img_path: str

scripts/iib/db/datamodel.py

@@ -257,19 +257,20 @@ def find_by_substring(
 
 
 class Tag:
-    def __init__(self, name: str, score: int, type: str, count=0):
+    def __init__(self, name: str, score: int, type: str, count=0, color = ""):
         self.name = name
         self.score = score
         self.type = type
         self.count = count
         self.id = None
+        self.color = color
         self.display_name = tags_translate.get(name)
 
     def save(self, conn):
         with closing(conn.cursor()) as cur:
             cur.execute(
-                "INSERT OR REPLACE INTO tag (id, name, score, type, count) VALUES (?, ?, ?, ?, ?)",
-                (self.id, self.name, self.score, self.type, self.count),
+                "INSERT OR REPLACE INTO tag (id, name, score, type, count, color) VALUES (?, ?, ?, ?, ?, ?)",
+                (self.id, self.name, self.score, self.type, self.count, self.color),
             )
             self.id = cur.lastrowid
 
@@ -326,7 +327,7 @@ def get_or_create(cls, conn: Connection, name: str, type: str):
 
     @classmethod
     def from_row(cls, row: tuple):
-        tag = cls(name=row[1], score=row[2], type=row[3], count=row[4])
+        tag = cls(name=row[1], score=row[2], type=row[3], count=row[4], color=row[5])
         tag.id = row[0]
         return tag
 
@@ -350,6 +351,13 @@ def create_table(cls, conn):
                 VALUES ("like", 0, "custom", 0);
                 """
             )
+            try:
+                cur.execute(
+                    """ALTER TABLE tag
+                    ADD COLUMN color TEXT DEFAULT ''"""
+                )
+            except sqlite3.OperationalError as e:
+                pass
 
 
 class ImageTag: