Merge pull request #828 from zanllp/feature/media-type-filter

feat: Add media type filter support for search functionality

Author: zanllp

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-a454705d.js"></script>
+    <script type="module" crossorigin src="/infinite_image_browsing/fe-static/assets/index-56203bfb.js"></script>
     <link rel="stylesheet" href="/infinite_image_browsing/fe-static/assets/index-d06b4bd6.css">
   </head>
 

scripts/iib/api.py

@@ -887,6 +887,7 @@ class SearchBySubstrReq(BaseModel):
         folder_paths: List[str] = None
         size: Optional[int] = 200
         path_only: Optional[bool] = False
+        media_type: Optional[str] = None  # "all", "image", "video"
 
     @app.post(db_api_base + "/search_by_substr", dependencies=[Depends(verify_secret)])
     async def search_by_substr(req: SearchBySubstrReq):
@@ -903,7 +904,8 @@ async def search_by_substr(req: SearchBySubstrReq):
             limit=req.size,
             regexp=req.regexp,
             folder_paths=folder_paths,
-            path_only=req.path_only
+            path_only=req.path_only,
+            media_type=req.media_type
         )
         return {
             "files": filter_allowed_files([x.to_file_info() for x in imgs]),

scripts/iib/db/datamodel.py

@@ -212,7 +212,7 @@ def safe_batch_remove(cls, conn: Connection, image_ids: List[int]) -> None:
     @classmethod
     def find_by_substring(
         cls, conn: Connection, substring: str, limit: int = 500, cursor="", regexp="", path_only=False,
-        folder_paths: List[str] = []
+        folder_paths: List[str] = [], media_type: str = None
     ) -> tuple[List["Image"], Cursor]:
         api_cur = Cursor()
         with closing(conn.cursor()) as cur:
@@ -241,7 +241,20 @@ def find_by_substring(
                     folder_clauses.append("(image.path LIKE ?)")
                     params.append(os.path.join(folder_path, "%"))
                 where_clauses.append("(" + " OR ".join(folder_clauses) + ")")
-            sql = "SELECT * FROM image"
+            
+            # 构建SQL查询
+            if media_type and media_type.lower() != "all":
+                # 需要JOIN到image_tag和tag表来过滤媒体类型
+                sql = """SELECT DISTINCT image.* FROM image 
+                        INNER JOIN image_tag ON image.id = image_tag.image_id 
+                        INNER JOIN tag ON image_tag.tag_id = tag.id"""
+                # 添加媒体类型过滤条件
+                media_type_name = "Image" if media_type.lower() == "image" else "Video"
+                where_clauses.append("(tag.type = 'Media Type' AND tag.name = ?)")
+                params.append(media_type_name)
+            else:
+                sql = "SELECT * FROM image"
+            
             if where_clauses:
                 sql += " WHERE "
                 sql += " AND ".join(where_clauses)

vue/components.d.ts

@@ -34,6 +34,7 @@ declare module '@vue/runtime-core' {
     ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup']
     ARow: typeof import('ant-design-vue/es')['Row']
     ASelect: typeof import('ant-design-vue/es')['Select']
+    ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
     ASkeleton: typeof import('ant-design-vue/es')['Skeleton']
     ASlider: typeof import('ant-design-vue/es')['Slider']
     ASpin: typeof import('ant-design-vue/es')['Spin']