Ver 1.1 main updates

Updates major code files to 1.1

Author: wangruoyuyuyu

__init__.py

@@ -4,7 +4,7 @@
 
 
 class AboutWindow(ui_aboutWindow.Ui_Dialog, QtWidgets.QDialog):
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
 
     def __init__(self, parent=None):
         super().__init__(parent=parent)

aboutWindow.py

@@ -1,6 +1,23 @@
 import requests
 import _thread
-import parser
+import sys,importlib.util
+if sys.version_info.minor==9:
+    try:
+        from . import parser
+    except (ImportError,ModuleNotFoundError):
+        parser=None
+else:
+    import parser
+
+def import_from_file(module_name, file_path):
+    spec = importlib.util.spec_from_file_location(module_name, file_path)
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+    return module
+
+if not parser:
+    parser=import_from_file("parser","./parser.py")
+
 import re
 import chardet  # 导入chardet库用于编码检测
 from urllib.parse import quote, unquote

api.py

@@ -1,9 +1,12 @@
 from uip import ui_assetWindow
 from PySide6 import QtWidgets, QtCore, QtGui
 import _thread, api, browseWindow, pyperclip, downloader, typing, os, path_saver
+from INSLogger import Logger
 
 
 class AssetWindow(ui_assetWindow.Ui_Dialog, QtWidgets.QDialog):
+    logger = Logger("AssetWindow")
+
     def __init__(self, parent=None):
         super().__init__(parent=parent)
         self.setupUi(self)
@@ -44,16 +47,16 @@ def __init__(self, parent=None):
     def init_progress_bar(self):
         """初始化进度条交互功能"""
         # 设置进度条范围
-        self.horizontalSlider_playprogress.setRange(0, 100)
+        # self.horizontalSlider_playprogress.setRange(0, 100) #Not needed in the new version
 
-        # 连接滑块信号
-        self.horizontalSlider_playprogress.sliderPressed.connect(self.on_slider_pressed)
-        self.horizontalSlider_playprogress.sliderReleased.connect(
-            self.on_slider_released
-        )
-        self.horizontalSlider_playprogress.valueChanged.connect(
-            self.on_slider_value_changed
-        )
+        # # 连接滑块信号
+        # self.horizontalSlider_playprogress.sliderPressed.connect(self.on_slider_pressed)
+        # self.horizontalSlider_playprogress.sliderReleased.connect(
+        #     self.on_slider_released
+        # )
+        # self.horizontalSlider_playprogress.valueChanged.connect(
+        #     self.on_slider_value_changed
+        # )
 
     def on_slider_pressed(self):
         """进度条开始拖动时调用"""
@@ -154,10 +157,10 @@ def _on_font_page_loaded(self, success):
                 self.js_code, self._on_font_js_executed
             )
         else:
-            print("字体预览页面加载失败")
+            self.logger.log("字体预览页面加载失败")
 
     def _on_font_js_executed(self, result):
-        print("JS执行完成，结果:", result)
+        self.logger.log("JS执行完成，结果:", result)
 
     def setData(self, data: dict):
         if "H1" in data.keys():
@@ -174,6 +177,7 @@ def setData(self, data: dict):
                 if url.startswith("/"):
                     url = f"http://localhost:{self.parent().parent().port}" + url
                 self.widget_image.loader.load_image(url)
+                self.pushButton_saveimage.clicked.connect(self.save_img)
             else:
                 self.tabWidget.setTabEnabled(2, False)
         else:
@@ -182,9 +186,9 @@ def setData(self, data: dict):
             self.tabWidget.setTabEnabled(6, True)
             full_link = f"http://localhost:{self.parent().parent().port}{data['Video']}"
             self.widget_video_play.load_video(full_link)
-            self.video_check_interval = QtCore.QTimer()
-            self.video_check_interval.timeout.connect(self.update_vdo_proc)
-            self.video_check_interval.start(1000)  # 1秒更新一次
+            # self.video_check_interval = QtCore.QTimer()
+            # self.video_check_interval.timeout.connect(self.update_vdo_proc)
+            # self.video_check_interval.start(1000)  # 1秒更新一次
             self.pushButton_savevdo.clicked.connect(self.save_vdo)
         else:
             self.pushButton_savevdo.clicked.connect(self.empty)
@@ -245,7 +249,7 @@ def save_audio(self):
         self.setEnabled(True)
 
         save_name: str = self.audio_name
-        filters = f"{save_name.split(".")[1]} File (*.{save_name.split(".")[1]})"
+        filters = f"{save_name.split('.')[1]} File (*.{save_name.split('.')[1]})"
         save_path = QtWidgets.QFileDialog.getSaveFileName(
             self,
             "Save File...",
@@ -258,7 +262,7 @@ def save_audio(self):
         self.saving_dialogs.append(downloader.Downloader(self))
         self.saving_dialogs[-1].show()
         full_url = (
-            f"http://localhost:{self.parent().parent().port}{self._data["Audio"]}"
+            f"http://localhost:{self.parent().parent().port}{self._data['Audio']}"
         )
         self.saving_dialogs[-1].file_download(full_url, save_path)
 
@@ -284,7 +288,7 @@ def save_vdo(self):
         self.setEnabled(True)
 
         save_name: str = self.vdo_name
-        filters = f"{save_name.split(".")[1]} File (*.{save_name.split(".")[1]})"
+        filters = f"{save_name.split('.')[1]} File (*.{save_name.split('.')[1]})"
         save_path = QtWidgets.QFileDialog.getSaveFileName(
             self,
             "Save File...",
@@ -297,7 +301,7 @@ def save_vdo(self):
         self.saving_dialogs.append(downloader.Downloader(self))
         self.saving_dialogs[-1].show()
         full_url = (
-            f"http://localhost:{self.parent().parent().port}{self._data["Video"]}"
+            f"http://localhost:{self.parent().parent().port}{self._data['Video']}"
         )
         self.saving_dialogs[-1].file_download(full_url, save_path)
 
@@ -307,6 +311,31 @@ def _get_file_name(self):
         )
         self.vdo_name_got = True
 
+    def save_img(self):
+        if not self._data["Image"]:
+            return
+        save_name: str = list(self._data["Image"].keys())[0]
+        ext = self._get_img_ext(list(self._data["Image"].values())[0])
+        self.logger.debug("savename:", save_name, "ext:", ext)
+        filters = f"{ext} File(*.{ext})"
+        save_path = QtWidgets.QFileDialog.getSaveFileName(
+            self,
+            "Save File...",
+            dir=os.path.join(path_saver.get_last_export_path(), save_name),
+            filter=filters,
+        )[0]
+        if not save_path:
+            return
+        path_saver.save_last_export_path(path_saver.get_file_dir(save_path))
+        self.saving_dialogs.append(downloader.Downloader(self))
+        self.saving_dialogs[-1].show()
+        full_url = f"http://localhost:{self.parent().parent().port}{list(self._data['Image'].values())[0]}"
+        self.saving_dialogs[-1].file_download(full_url, save_path)
+
+    _get_img_ext = staticmethod(
+        lambda lnk: str(lnk).lower().split("extension=")[-1].split("&")[0]
+    )
+
     def save_yaml(self):
         if not self._data["Yaml"]:
             return
@@ -323,7 +352,7 @@ def save_yaml(self):
         path_saver.save_last_export_path(path_saver.get_file_dir(save_path))
         self.saving_dialogs.append(downloader.Downloader(self))
         self.saving_dialogs[-1].show()
-        full_url = f"http://localhost:{self.parent().parent().port}{list(self._data["Yaml"].values())[0]}"
+        full_url = f"http://localhost:{self.parent().parent().port}{list(self._data['Yaml'].values())[0]}"
         self.saving_dialogs[-1].file_download(full_url, save_path)
 
     def save_json(self):
@@ -342,14 +371,14 @@ def save_json(self):
         path_saver.save_last_export_path(path_saver.get_file_dir(save_path))
         self.saving_dialogs.append(downloader.Downloader(self))
         self.saving_dialogs[-1].show()
-        full_url = f"http://localhost:{self.parent().parent().port}{list(self._data["Json"].values())[0]}"
+        full_url = f"http://localhost:{self.parent().parent().port}{list(self._data['Json'].values())[0]}"
         self.saving_dialogs[-1].file_download(full_url, save_path)
 
     def save_text(self):
         if not self._data["Text"]:
             return  # 没有
         save_name: str = list(self._data["Text"].keys())[0]
-        filters = f"{save_name.split(".")[1]} File (*.{save_name.split(".")[1]});;Text File (*.txt);;All Files(*.*)"
+        filters = f"{save_name.split('.')[1]} File (*.{save_name.split('.')[1]});;Text File (*.txt);;All Files(*.*)"
         save_path = QtWidgets.QFileDialog.getSaveFileName(
             self,
             "Save File...",
@@ -360,7 +389,7 @@ def save_text(self):
             return  # 取消了
         path_saver.save_last_export_path(path_saver.get_file_dir(save_path))
         self.saving_dialogs.append(downloader.Downloader(self))
-        full_url = f"http://localhost:{self.parent().parent().port}{list(self._data["Text"].values())[0]}"
+        full_url = f"http://localhost:{self.parent().parent().port}{list(self._data['Text'].values())[0]}"
         self.saving_dialogs[-1].show()
         self.saving_dialogs[-1].file_download(full_url, save_path)
 
@@ -517,6 +546,9 @@ def dependencies_context_menu(self):
 
     def open_content(self, table: QtWidgets.QTableWidget, selection_text: str):
         link = self._data[f"{selection_text}_links"][table.selectedItems()[0].row()]
+        if not link:
+            # 没有就退出
+            return
         if "Assets" in link:
             self.is_data_loaded = False
             self.loaded_data = None
@@ -548,7 +580,7 @@ def _open_assets(self, link):
         self.loaded_data = api.get_loaded_assets(
             self.parent().parent().port, from_url=True, url=link
         )
-        # print(self.loaded_data)
+        # self.logger.log(self.loaded_data)
         self.is_data_loaded = True
 
     def closeEvent(self, arg__1):

assetWindow.py

@@ -0,0 +1,138 @@
+from PySide6 import QtCore, QtWidgets
+from INSLogger import Logger
+
+
+class TreeSearcher(QtCore.QObject):
+    logger = Logger("Searcher")
+
+    def __init__(self, search_bar: QtWidgets.QLineEdit):
+        super().__init__(parent=search_bar)
+        self._orig_dic = dict()
+        self._treeWidget = None
+        self._last_text = str()
+        self._last_dict = None
+
+        self.parent().textChanged.connect(self.search)
+
+    def search(self):
+        txt = self.parent().text()
+        # self.logger.debug(self._last_text,self._last_dict)
+        if self._last_text in txt and self._last_dict:
+            data = self.searchedDict(self._last_dict, txt)
+            self.setData(data)
+            self._last_dict = data
+            self.logger.log("finished fast search")
+        else:
+            data = self.searchedDict(self._orig_dic, txt)
+            self.setData(data)
+            self._last_dict = data
+            self.logger.log("finished normal search")
+        self._last_text = txt
+
+    @staticmethod
+    def searchedDict(orig: dict, text: str) -> dict:
+        out = dict()
+        for k, v in orig.items():
+            if not type(v) == dict:
+                continue
+            out[k] = dict()
+            for i, j in v.items():
+                if text in i:
+                    out[k][i] = j
+        return out
+
+    def origDict(self) -> dict:
+        return self._orig_dic
+
+    def setOrigDict(self, dic: dict):
+        self._orig_dic = dic
+
+    def __bool__(self):
+        return bool(self._orig_dic) and bool()
+
+    def treeWidget(self) -> QtWidgets.QTreeWidget:
+        return self._treeWidget
+
+    def setTreeWidget(self, widget: QtWidgets.QTreeWidget):
+        self._treeWidget = widget
+
+    def setData(self, data: dict):
+        # self.logger.log(data)
+        self._treeWidget.clear()
+        self._treeWidget.setHeaderLabel("items")
+        tvs = list()
+        for k, v in data.items():
+            trans = QtCore.QCoreApplication.translate("Dialog", k)
+            qte = QtWidgets.QTreeWidgetItem([trans])
+            if type(v) != dict:
+                continue
+            for l in v.keys():
+                c = QtWidgets.QTreeWidgetItem([l])
+                qte.addChild(c)
+            tvs += [qte]
+        self._treeWidget.insertTopLevelItems(0, tvs)
+        self._treeWidget.expandAll()
+
+
+class TableSearcher(QtCore.QObject):  # TODO:横竖反了，想紫砂了
+    def __init__(self, search_bar: QtWidgets.QLineEdit):
+        super().__init__(parent=search_bar)
+        self._orig_list = list()
+        self._tableWidget = None
+        self.parent().textChanged.connect(self.search)
+
+    def setOrigList(self, lis: list):
+        self._orig_list = lis
+
+    def origList(self) -> list:
+        return self._orig_list
+
+    def setTableWidget(self, tab: QtWidgets.QListWidget):
+        self._tableWidget = tab
+
+    def tableWidget(self) -> QtWidgets.QTableWidget:
+        return self._tableWidget
+
+    @staticmethod
+    def searchedList(orig: list, text: str):
+        out = list()
+        set_index = list()
+        set_index.append(0)
+        for i in range(len(orig)):
+            for j in range(len(orig[i])):
+                if text in orig[i][j]:
+                    set_index.append(j)
+        _j2l = list()
+        for i2 in range(len(orig)):
+            _j2l = list()
+            for j2 in range(len(orig[i2])):
+                if j2 in set_index:
+                    _j2l.append(orig[i2][j2])
+            if not _j2l:
+                continue
+            out.append(_j2l)
+        return out
+
+    def search(self):
+        self.setData(self.searchedList(self._orig_list, self.parent().text()))
+
+    def setData(self, data):
+        assets_data: list = data
+        self._tableWidget.clear()
+        self._tableWidget.setColumnCount(len(assets_data))
+        if assets_data[0]:
+            self._tableWidget.setRowCount(len(assets_data[0]) - 1)
+        vlabel = list()
+        index = 0
+        for i in assets_data:
+            for j in range(len(i)):
+                if not j:
+                    vlabel.append(i[j])
+                    continue
+                item = QtWidgets.QTableWidgetItem(i[j])
+                self._tableWidget.setItem(j - 1, index, item)
+            index += 1
+        self._tableWidget.setHorizontalHeaderLabels(vlabel)
+        self._tableWidget.horizontalHeader().setSectionResizeMode(
+            QtWidgets.QHeaderView.Stretch
+        )