0.1.1.10

Author: LordKBX

common/MIME.py

@@ -533,7 +533,7 @@ def insert_book(database: bdd.BDD, file_name_template: str, file_name_separator:
         elif ext in ['.cbz', '.cbr']:  # section for CBZ and CBR files
             tmp_guid = uid()  # assign random guid for CBZ and CBR books
             ret = inflate(file, tmpdir)
-            tmp_cover = create_thumbnail(listDir(tmpdir)[0])  # get path of the first image into temp dir
+            tmp_cover = create_thumbnail(list_directory(tmpdir)[0])  # get path of the first image into temp dir
 
         else:
             print('Invalid file format')

common/books.py

@@ -3,6 +3,7 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
 from common.vars import *
+from common.MIME import *
 
 
 def get_file_size(file_name: str, human_readable: bool = True):
@@ -26,65 +27,86 @@ def get_file_size(file_name: str, human_readable: bool = True):
         return '{} bytes'.format(size)
 
 
-def listDir(dirName: str, ext: str = None):
+def get_file_type(file_path: str) -> str:
+    file_path = file_path.replace('/', os.sep)
+    file_tab = file_path.split(os.sep)
+    ext = file_tab[len(file_tab) - 1]
+    file_type = ""
+    end = False
+    while end is False:
+        if ext in EXT_TO_TYPE:
+            file_type = EXT_TO_TYPE[ext][0]
+            end = True
+        else:
+            try:
+                point_pos = ext.index('.', 1)
+                ext = ext[point_pos:]
+            except Exception:
+                end = True
+                file_type = "application/octet-stream"
+
+    return file_type
+
+
+def list_directory(directory_path: str, expected_extension: str = None):
     """
     Recursive function for listing files in a folder and his sub folders
 
-    :param dirName: path of the parsed dir
-    :param ext: list of extention separated by |
+    :param directory_path: path of the parsed dir
+    :param expected_extension: list of extension separated by |
     :return: list(str)
     """
-    allFiles = list()
-    for root, directories, files in os.walk(dirName, topdown=False):
+    file_list = list()
+    for root, directories, files in os.walk(directory_path, topdown=False):
         for name in files:
-            fullPath = os.path.join(root, name)
-            if ext is not None:
-                if re.search("\\.({})$".format(ext), name) is None: continue
-            allFiles.append(fullPath)
-        if ext is None:
+            full_path = os.path.join(root, name)
+            if expected_extension is not None:
+                if re.search("\\.({})$".format(expected_extension), name) is None: continue
+            file_list.append(full_path)
+        if expected_extension is None:
             for name in directories:
-                allFiles.append(os.path.join(root, name))
-    return allFiles
+                file_list.append(os.path.join(root, name))
+    return file_list
 
 
-def listOnlyDir(path: str, level: int = 1, startDirs: list = [], excludeDirs: list = []):
+def listing_of_directory(path: str, level: int = 1, list_base_content: list = [], list_excluded_directory: list = []):
     some_dir = path.rstrip(os.path.sep)
-    listDir = startDirs
+    list_of_dir = list_base_content
     if os.path.isdir(some_dir):
         num_sep = some_dir.count(os.path.sep)
         for root, dirs, files in os.walk(some_dir):
             num_sep_this = root.count(os.path.sep)
             for name in dirs:
-                if name in excludeDirs: continue
+                if name in list_excluded_directory: continue
                 if num_sep + level > num_sep_this:
-                    listDir.append(name)
-    return listDir
+                    list_of_dir.append(name)
+    return list_of_dir
 
 
-def listDirTree(dirName: str, ext: str = None):
-    listOfFile = listDir(dirName, ext)
-    listOfFile.sort()
+def list_directory_tree(base_directory: str, ext: str = None):
+    list_of_file = list_directory(base_directory, ext)
+    list_of_file.sort()
     # print(listOfFile)
 
-    treeFiles = dict()
-    for file in listOfFile:
-        recurListDirTree(file, dirName + os.sep, treeFiles)
-    return treeFiles
+    tree_files = dict()
+    for file in list_of_file:
+        __list_directory_tree_recursive(file, base_directory + os.sep, tree_files)
+    return tree_files
 
 
-def recurListDirTree(file: str, path: str, treeFiles: dict):
-    tmpl = file.replace(path, '')
-    tmpp = tmpl.split(os.sep)
+def __list_directory_tree_recursive(file: str, path: str, parent_file_tree: dict):
+    sub_path = file.replace(path, '')
+    sub_path_tab = sub_path.split(os.sep)
 
-    if isinstance(tmpp, list):
-        if len(tmpp) > 1:
-            if tmpp[0] not in treeFiles:
-                treeFiles[tmpp[0]] = dict()
-            if isinstance(treeFiles[tmpp[0]], dict):
-                recurListDirTree(file, path + tmpp[0] + os.sep, treeFiles[tmpp[0]])
+    if isinstance(sub_path_tab, list):
+        if len(sub_path_tab) > 1:
+            if sub_path_tab[0] not in parent_file_tree:
+                parent_file_tree[sub_path_tab[0]] = dict()
+            if isinstance(parent_file_tree[sub_path_tab[0]], dict):
+                __list_directory_tree_recursive(file, path + sub_path_tab[0] + os.sep, parent_file_tree[sub_path_tab[0]])
         else:
-            if os.path.isfile(file): treeFiles[tmpl] = file
-            else: treeFiles[tmpl] = dict()
+            if os.path.isfile(file): parent_file_tree[sub_path] = file
+            else: parent_file_tree[sub_path] = dict()
 
 
 def clean_dir(src_dir: str):

common/files.py

@@ -12,18 +12,22 @@ class QtQIconEnum(enum.Enum):
     unlock = env_vars['styles']['Dark']['icons']['unlock']
 
 
-def setQTreeItemIcon(item: QtWidgets.QTreeWidgetItem, icon_ref: QtQIconEnum = QtQIconEnum.folder):
+def setQTreeItemIcon(item: QtWidgets.QTreeWidgetItem, icon_ref: str = QtQIconEnum.folder.value):
     icon = QtGui.QIcon()
     image = QtGui.QPixmap()
-    image.load(icon_ref.value)
+    image.load(icon_ref)
     icon.addPixmap(image, QtGui.QIcon.Normal, QtGui.QIcon.Off)
     item.setIcon(0, icon)
 
 
-def setQTreeItemFolderIcon(item: QtWidgets.QTreeWidgetItem):
-    setQTreeItemIcon(item, QtQIconEnum.folder)
+def setQTreeItemFileIcon(item: QtWidgets.QTreeWidgetItem, style='Dark'):
+    setQTreeItemIcon(item, get_style_var(style, 'icons/file'))
 
 
-def setQTreeItemLockIcon(item: QtWidgets.QTreeWidgetItem):
-    setQTreeItemIcon(item, QtQIconEnum.lock)
+def setQTreeItemFolderIcon(item: QtWidgets.QTreeWidgetItem, style='Dark'):
+    setQTreeItemIcon(item, get_style_var(style, 'icons/folder'))
+
+
+def setQTreeItemLockIcon(item: QtWidgets.QTreeWidgetItem, style='Dark'):
+    setQTreeItemIcon(item, get_style_var(style, 'icons/lock'))
 

common/qt.py

@@ -15,18 +15,28 @@ def __init__(self, parent, folder: str):
         super(CheckpointWindow, self).__init__(parent, QtCore.Qt.WindowTitleHint | QtCore.Qt.WindowCloseButtonHint)
         PyQt5.uic.loadUi(os.path.dirname(os.path.realpath(__file__)) + os.sep + 'checkpoint.ui'.replace('/', os.sep), self)  # Load the .ui file
         lng = lang.Lang()
+        self.BDD = parent.BDD
+        style = self.BDD.get_param('style')
         self.setWindowTitle(lng['Editor']['LinkWindow']['WindowTitle'])
+        self.setStyleSheet(env_vars['styles'][style]['QDialog'])
+
         self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(lng['Editor']['LinkWindow']['btnOk'])
         self.buttonBox.button(QtWidgets.QDialogButtonBox.Cancel).setText(lng['Editor']['LinkWindow']['btnCancel'])
-        self.fileTree.setStyleSheet(env_vars['styles']['Dark']['fullTreeView'])
+        self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setStyleSheet(env_vars['styles'][style]['defaultButton'])
+        self.buttonBox.button(QtWidgets.QDialogButtonBox.Cancel).setStyleSheet(env_vars['styles'][style]['defaultButton'])
+        cursor = QtGui.QCursor(QtCore.Qt.PointingHandCursor)
+        self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setCursor(cursor)
+        self.buttonBox.button(QtWidgets.QDialogButtonBox.Cancel).setCursor(cursor)
+
+        self.fileTree.setStyleSheet(env_vars['styles'][style]['fullTreeView'])
         self.fileTree.headerItem().setText(0, lng['Editor']['FileTableHeader'])
         self.fileTree.itemClicked.connect(self.itemClick)
         self.folder = folder
         self.selectedCheckpoint = ''
 
     def openExec(self):
         self.fileTree.clear()
-        liste = common.files.listOnlyDir(path=self.folder, level=1, startDirs=['original'], excludeDirs=['original', 'current'])
+        liste = common.files.listing_of_directory(path=self.folder, level=1, list_base_content=['original'], list_excluded_directory=['original', 'current'])
         print(liste)
         for fold in liste:
             item = QtWidgets.QTreeWidgetItem(self.fileTree)

editor/checkpoint.py

@@ -78,15 +78,15 @@ def open_exec(self, text: str = None, url: str = None):
         self.list_content.clear()
         self.addindex_combobox.clear()
 
-        self.files = common.files.listDirTree(self.folder, 'html|xhtml')
-        files = common.files.listDir(self.folder, 'html|xhtml')
+        self.files = common.files.list_directory_tree(self.folder, 'html|xhtml')
+        files = common.files.list_directory(self.folder, 'html|xhtml')
         self.addindex_combobox.addItem("")
 
         print(self.files)
         for file in files:
             self.addindex_combobox.addItem(file.replace(self.folder, ""))
 
-        li = common.files.listDir(self.folder, "opf")
+        li = common.files.list_directory(self.folder, "opf")
         data = ''
         with open(li[0]) as myfile:
             data = myfile.read()

editor/content_table_editor.py

@@ -114,7 +114,7 @@ def reload_contents(self):
         except Exception:
             ''
 
-    def create_pane(self, title: str, path: str, tmpcss: str = None):
+    def create_pane(self, title: str, icon: str, path: str, tmpcss: str = None):
         if tmpcss is not None:
             self.tmpcss = tmpcss
         data = None
@@ -245,7 +245,7 @@ def create_pane(self, title: str, path: str, tmpcss: str = None):
             block.setUrl(QtCore.QUrl(page))
             vertical_layout.addWidget(block)
 
-        self.addTab(tab, QtGui.QIcon(), title)
+        self.addTab(tab, QtGui.QIcon(QtGui.QPixmap(icon)), title)
         self.setTabsClosable(True)
         self.setCurrentIndex(self.count() - 1)
 

editor/editing_pane.py

@@ -16,14 +16,19 @@ class FilesNameWindow(QDialog):
     def __init__(self, parent):
         super(FilesNameWindow, self).__init__(parent, QtCore.Qt.WindowTitleHint | QtCore.Qt.WindowCloseButtonHint)
         PyQt5.uic.loadUi(os.path.dirname(os.path.realpath(__file__)) + os.sep + 'files_name.ui'.replace('/', os.sep), self)  # Load the .ui file
-        lng = lang.Lang()
-        self.lang = lng
+        lng = parent.lng
+        self.BDD = parent.BDD
+        style = self.BDD.get_param('style')
+        self.setStyleSheet(env_vars['styles'][style]['QDialog'])
         self.setWindowTitle(lng['Editor']['FilesWindow']['FileNameWindowTitle'])
         self.label.setText(lng['Editor']['FilesWindow']['FileNameWindowLabel'])
         self.button_box.button(QtWidgets.QDialogButtonBox.Ok).setText(lng['Editor']['FilesWindow']['btnOk'])
         self.button_box.button(QtWidgets.QDialogButtonBox.Cancel).setText(lng['Editor']['FilesWindow']['btnCancel'])
-        self.button_box.button(QtWidgets.QDialogButtonBox.Ok).setStyleSheet(env_vars['styles']['Dark']['fullAltButton'])
-        self.button_box.button(QtWidgets.QDialogButtonBox.Cancel).setStyleSheet(env_vars['styles']['Dark']['fullAltButton'])
+        self.button_box.button(QtWidgets.QDialogButtonBox.Ok).setStyleSheet(env_vars['styles'][style]['defaultButton'])
+        self.button_box.button(QtWidgets.QDialogButtonBox.Cancel).setStyleSheet(env_vars['styles'][style]['defaultButton'])
+        cursor = QtGui.QCursor(QtCore.Qt.PointingHandCursor)
+        self.button_box.button(QtWidgets.QDialogButtonBox.Ok).setCursor(cursor)
+        self.button_box.button(QtWidgets.QDialogButtonBox.Cancel).setCursor(cursor)
 
     def open_exec(self, text: str = None):
         if text is not None:
@@ -41,14 +46,19 @@ def __init__(self, parent, folder: str):
         super(FilesWindow, self).__init__(parent, QtCore.Qt.WindowTitleHint | QtCore.Qt.WindowCloseButtonHint)
         PyQt5.uic.loadUi(os.path.dirname(os.path.realpath(__file__)) + os.sep + 'files.ui'.replace('/', os.sep), self)  # Load the .ui file
         lng = lang.Lang()
-        self.lang = lng
+        self.BDD = parent.BDD
+        self.style = self.BDD.get_param('style')
+        self.lng = lng
         self.setWindowTitle(lng['Editor']['FilesWindow']['WindowTitle'])
-        self.setStyleSheet(env_vars['styles']['Dark']['fullButton'])
+        self.setStyleSheet(env_vars['styles'][self.style]['QDialog'] + env_vars['styles'][self.style]['EditorFileDialogAdditional'])
         self.button_box.button(QtWidgets.QDialogButtonBox.Ok).setText(lng['Editor']['FilesWindow']['btnOk'])
         self.button_box.button(QtWidgets.QDialogButtonBox.Cancel).setText(lng['Editor']['FilesWindow']['btnCancel'])
-        self.button_box.button(QtWidgets.QDialogButtonBox.Ok).setStyleSheet(env_vars['styles']['Dark']['fullAltButton'])
-        self.button_box.button(QtWidgets.QDialogButtonBox.Cancel).setStyleSheet(env_vars['styles']['Dark']['fullAltButton'])
-        self.file_tree.setStyleSheet(env_vars['styles']['Dark']['fullTreeView'])
+        self.button_box.button(QtWidgets.QDialogButtonBox.Ok).setStyleSheet(env_vars['styles'][self.style]['defaultButton'])
+        self.button_box.button(QtWidgets.QDialogButtonBox.Cancel).setStyleSheet(env_vars['styles'][self.style]['defaultButton'])
+        cursor = QtGui.QCursor(QtCore.Qt.PointingHandCursor)
+        self.button_box.button(QtWidgets.QDialogButtonBox.Ok).setCursor(cursor)
+        self.button_box.button(QtWidgets.QDialogButtonBox.Cancel).setCursor(cursor)
+        self.file_tree.setStyleSheet(env_vars['styles'][self.style]['fullTreeView'])
         self.file_tree.headerItem().setText(0, lng['Editor']['FileTableHeader'])
         self.file_tree.itemClicked.connect(self.item_click)
         self.file_tree.header().setSectionsClickable(True)
@@ -67,14 +77,14 @@ def __init__(self, parent, folder: str):
 
     def open_exec(self, text: str = None, url: str = None):
         self.file_tree.clear()
-        tree = common.files.listDirTree(self.folder)
+        tree = common.files.list_directory_tree(self.folder)
         # for index in tree:
         #     item = QtWidgets.QTreeWidgetItem(self.fileTree)
         #     item.setText(0, index)
         #     if isinstance(tree[index], dict):
         #         item.setData(0, 100, ':dir:')
         #         item.setData(0, 99, index)
-        #         common.qt.setQTreeItemFolderIcon(item)
+        #         common.qt.setQTreeItemFolderIcon(item, self.style)
         #
         #         item = self.recur_file_table_insert(item, tree[index], index)
         #     else:
@@ -102,7 +112,7 @@ def recur_file_table_insert(self, base_item: Union[QtWidgets.QTreeWidgetItem, Qt
             if isinstance(tree[indexr], dict):
                 itemr.setData(0, 100, ':dir:')
                 itemr.setData(0, 99, previous_dir + os.sep + indexr)
-                common.qt.setQTreeItemFolderIcon(itemr)
+                common.qt.setQTreeItemFolderIcon(itemr, self.style)
 
                 itemr = self.recur_file_table_insert(itemr, tree[indexr], previous_dir + os.sep + indexr)
             else:
@@ -111,7 +121,7 @@ def recur_file_table_insert(self, base_item: Union[QtWidgets.QTreeWidgetItem, Qt
             print(previous_dir + os.sep + indexr)
             if previous_dir + os.sep + indexr in self.lock_list or re.search('\\.opf$', indexr) is not None:
                 itemr.setData(0, 98, True)
-                common.qt.setQTreeItemLockIcon(itemr)
+                common.qt.setQTreeItemLockIcon(itemr, self.style)
             if isinstance(base_item, QtWidgets.QTreeWidget):
                 self.file_tree.insertTopLevelItem(0, itemr)
             else:
@@ -167,7 +177,7 @@ def importer(self):
             options |= QFileDialog.DontUseNativeDialog
             files, _ = QFileDialog.getOpenFileNames(
                 self,
-                self.lang['Editor']['FilesWindow']['ImportWindowTitle'],
+                self.lng['Editor']['FilesWindow']['ImportWindowTitle'],
                 "",
                 "All Files (*.*)", options=options
             )
@@ -187,7 +197,7 @@ def importer(self):
                 else:
                     itemr = QtWidgets.QTreeWidgetItem(item)
                 itemr.setText(0, tb[len(tb)-1])
-                itemr.setForeground(0, QtGui.QColor(env_vars['styles']['Dark']['partialTreeViewItemColorNew']))
+                itemr.setForeground(0, QtGui.QColor(env_vars['styles'][self.style]['partialTreeViewItemColorNew']))
 
                 if isinstance(item, QtWidgets.QTreeWidget): self.file_tree.insertTopLevelItem(0, itemr)
                 else: item.addChild(itemr)
@@ -209,15 +219,15 @@ def new_file(self, is_file: bool = True):
                 if self.selected_folder != '':
                     prepath = os.sep + self.selected_folder
 
-                itemr.setForeground(0, QtGui.QColor(env_vars['styles']['Dark']['partialTreeViewItemColorNew']))
+                itemr.setForeground(0, QtGui.QColor(env_vars['styles'][self.style]['partialTreeViewItemColorNew']))
                 itemr.setText(0, file)
                 if is_file is True:
                     itemr.setData(0, 100, ':file:')
                     self.list_new[prepath + os.sep + file] = {'innerPath': prepath + os.sep + file, 'type': 'new_file'}
                 else:
                     itemr.setData(0, 100, ':dir:')
                     self.list_new[prepath + os.sep + file] = {'innerPath': prepath + os.sep + file, 'type': 'new_folder'}
-                    common.qt.setQTreeItemFolderIcon(itemr)
+                    common.qt.setQTreeItemFolderIcon(itemr, self.style)
                 itemr.setData(0, 99, prepath + os.sep + file)
 
                 if isinstance(item, QtWidgets.QTreeWidget):
@@ -264,7 +274,7 @@ def rename(self):
                             'newPath': self.selected_folder + os.sep + file, 'type': 'renameFile',
                             'original': prepath + os.sep + pre_file}
                 item.setText(0, file)
-                item.setForeground(0, QtGui.QColor(env_vars['styles']['Dark']['partialTreeViewItemColorMod']))
+                item.setForeground(0, QtGui.QColor(env_vars['styles'][self.style]['partialTreeViewItemColorMod']))
         except Exception:
             traceback.print_exc()
 
@@ -307,7 +317,7 @@ def delete(self):
                         ret2 = self.remove_from_dict(self.list_rename, file, parent)
                         item.setText(tbo[len(tbo)-1])
 
-                    item.setForeground(0, QtGui.QColor(env_vars['styles']['Dark']['partialTreeViewItemColorDel']))
+                    item.setForeground(0, QtGui.QColor(env_vars['styles'][self.style]['partialTreeViewItemColorDel']))
         except Exception:
             traceback.print_exc()