Disable torchlib

MangaManagerORG · Jan 9, 2024 · 9b38295 · 9b38295
1 parent 73b447f
commit 9b38295
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 36 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -23,7 +23,7 @@ RUN apt-get update && \
     xubuntu-default-settings \
     xubuntu-icon-theme \
     unrar\
-    git\
+#    git\
     # Python \
     idle-python3.11 \
     python3-tk \

diff --git a/MangaManager/src/MetadataManager/CoverManager/CoverManager.py b/MangaManager/src/MetadataManager/CoverManager/CoverManager.py
@@ -12,7 +12,7 @@
 
 from src.Common import ResourceLoader
 from src.Common.LoadedComicInfo.LoadedComicInfo import CoverActions, LoadedComicInfo
-from src.MetadataManager.CoverManager import torchlib
+
 from src.MetadataManager.GUI.MessageBox import MessageBoxWidgetFactory as mb
 from src.MetadataManager.GUI.scrolledframe import ScrolledFrame
 from src.MetadataManager.GUI.widgets import ButtonWidget
@@ -423,6 +423,9 @@ def select_similar(self):
         Selects files that match.
         :return:
         """
+
+        # from src.MetadataManager.CoverManager import torchlib
+
         assert len(self.selected_frames) == 1
         frame, pos = self.selected_frames[0]
         if pos == "front":
@@ -436,33 +439,33 @@ def select_similar(self):
         # Compare all covers:
         delta = float(self.delta_entry.get())
 
-        for comicframe in self.scrolled_widget.winfo_children():
-            comicframe: ComicFrame
-            lcinfo: LoadedComicInfo = comicframe.loaded_cinfo
-            try:
-                if self.scan_covers.get():
-                    photo_image = lcinfo.get_cover_cache()
-                    if photo_image is None:
-                        logger.error(f"Failed to compare front cover image. File is not loaded. File '{lcinfo.file_name}'")
-
-                    else:
-                        score = round(torchlib.generateScore(torchlib.convert_PIL(selected_image),torchlib.convert_PIL(ImageTk.getimage(photo_image))), 2)
-                        if score > delta:
-                            self.select_frame(None, frame=comicframe, pos="front")
-
-                if self.scan_backcovers.get():
-                    photo_image = lcinfo.get_cover_cache(True)
-                    if photo_image is None:
-                        logger.error(f"Failed to compare back cover image. File is not loaded. File '{lcinfo.file_name}'")
-                    else:
-                        score = round(torchlib.generateScore(torchlib.convert_PIL(selected_image),
-                                                torchlib.convert_PIL(
-                                                    ImageTk.getimage(photo_image))
-                                                ),2)
-                        if score > delta:
-                            self.select_frame(None, frame=comicframe, pos="back")
-            except Exception:
-                logger.exception(f"Failed to compare images for file {comicframe.loaded_cinfo.file_name}")
+        # for comicframe in self.scrolled_widget.winfo_children():
+        #     comicframe: ComicFrame
+        #     lcinfo: LoadedComicInfo = comicframe.loaded_cinfo
+        #     try:
+        #         if self.scan_covers.get():
+        #             photo_image = lcinfo.get_cover_cache()
+        #             if photo_image is None:
+        #                 logger.error(f"Failed to compare front cover image. File is not loaded. File '{lcinfo.file_name}'")
+        #
+        #             else:
+        #                 score = round(torchlib.generateScore(torchlib.convert_PIL(selected_image),torchlib.convert_PIL(ImageTk.getimage(photo_image))), 2)
+        #                 if score > delta:
+        #                     self.select_frame(None, frame=comicframe, pos="front")
+        #
+        #         if self.scan_backcovers.get():
+        #             photo_image = lcinfo.get_cover_cache(True)
+        #             if photo_image is None:
+        #                 logger.error(f"Failed to compare back cover image. File is not loaded. File '{lcinfo.file_name}'")
+        #             else:
+        #                 score = round(torchlib.generateScore(torchlib.convert_PIL(selected_image),
+        #                                         torchlib.convert_PIL(
+        #                                             ImageTk.getimage(photo_image))
+        #                                         ),2)
+        #                 if score > delta:
+        #                     self.select_frame(None, frame=comicframe, pos="back")
+        #     except Exception:
+        #         logger.exception(f"Failed to compare images for file {comicframe.loaded_cinfo.file_name}")
 
     def _scan_images(self, x, lcinfo:LoadedComicInfo, comicframe, is_backcover=False):
         """
@@ -483,8 +486,8 @@ def _scan_images(self, x, lcinfo:LoadedComicInfo, comicframe, is_backcover=False
     def _compare_images(self, x, compared_image, comicframe, pos):
 
         y = np.array(compared_image.histogram())
-        if self.compare_image(x, y, delta=delta):
-            self.select_frame(None, frame=comicframe, pos=pos)
+        # if self.compare_image(x, y, delta=delta):
+        #     self.select_frame(None, frame=comicframe, pos=pos)
 
     @staticmethod
     def compare_image(x, y, delta:float):

diff --git a/MangaManager/src/MetadataManager/CoverManager/torchlib.py b/MangaManager/src/MetadataManager/CoverManager/torchlib.py
@@ -1,3 +1,10 @@
+print("Importing torchlib")
+# pip requirements:
+# OpenCV-Python
+# sentence_transformers
+# open_clip_torch
+# requests
+# git+https://github.com/openai/CLIP.git
 import PIL
 import torch
 import open_clip

diff --git a/requirements.txt b/requirements.txt
@@ -10,8 +10,4 @@ numpy~=1.24.2
 rarfile
 tkinterdnd2
 sv-ttk
-OpenCV-Python
-sentence_transformers
-open_clip_torch
-requests
-git+https://github.com/openai/CLIP.git
+