add fix_non_seq menu, support non sequential page number by default #41

Author: chroming

src/config.py

@@ -19,7 +19,7 @@
 
 class Config(object):
     APP_NAME = 'PDFDir'
-    VERSION = 'v0.3.0-beta26'
+    VERSION = 'v0.3.0-beta28'
     WINDOW_ICON = 'pdf.ico'
     HOME_PAGE_URL = 'https://github.com/chroming/pdfdir'
     HELP_PAGE_URL = 'https://github.com/chroming/pdfdir/blob/master/readme.md'

src/convert.py

@@ -101,7 +101,8 @@ def _convert_dir_text(dir_text,
                       level4=None,
                       level5=None,
                       other=0,
-                      level_by_space=False):
+                      level_by_space=False,
+                      fix_non_seq=False):
     l0, l1, pagenum, index_dict = 0, 0, -float("inf"), {}
     l2, l3, l4 = 0, 0, 0
     dir_list = text_to_list(dir_text)
@@ -111,7 +112,7 @@ def _convert_dir_text(dir_text,
     for di in dir_list:
         di = di.rstrip()
         title, num = split_page_num(di)
-        if num > pagenum:
+        if num > pagenum or not fix_non_seq:
             pagenum = num
         index_dict[i] = {'title': title, 'real_num': pagenum + offset, 'num': pagenum}
         level = check_level(title, level0, level1, level2, level3, level4, level5, other=other)
@@ -145,7 +146,8 @@ def convert_dir_text(dir_text,
                      level4=None,
                      level5=None,
                      other=0,
-                     level_by_space=False):
+                     level_by_space=False,
+                     fix_non_seq=False):
     """
     convert directory text to dict.
 
@@ -162,4 +164,6 @@ def convert_dir_text(dir_text,
     :return: the dict of directory, like {0:{'title':'A', 'pagenum':1}, 1:{'title':'B', pagenum:2, parent: 0} ......}
 
     """
-    return _convert_dir_text(dir_text, offset, level0, level1, level2, level3, level4, level5, other=other, level_by_space=level_by_space)
+    return _convert_dir_text(dir_text, offset, level0, level1, level2, level3, level4, level5, other=other,
+                             level_by_space=level_by_space,
+                             fix_non_seq=fix_non_seq)

src/gui/main.py

@@ -79,7 +79,8 @@ def _set_connect(self):
                     self.level4_edit.textChanged,
                     self.level5_edit.textChanged,
                     self.unknown_level_box.currentIndexChanged,
-                    self.space_level_box.stateChanged
+                    self.space_level_box.stateChanged,
+                    self.fix_non_seq_action.changed,
                     ):
             act.connect(self.make_dir_tree)
 
@@ -213,6 +214,10 @@ def other_level_index(self):
     def level_by_space(self):
         return self.space_level_box.isChecked()
 
+    @property
+    def fix_non_seq(self):
+        return self.fix_non_seq_action.isChecked()
+
     def open_file_dialog(self):
         filename, _ = QtWidgets.QFileDialog.getOpenFileName(self, u'select PDF', filter="PDF (*.pdf)")
         self.pdf_path_edit.setText(filename)
@@ -235,7 +240,8 @@ def make_dir_tree(self):
                                       self.level4_text,
                                       self.level5_text,
                                       other=self.other_level_index,
-                                      level_by_space=self.level_by_space)
+                                      level_by_space=self.level_by_space,
+                                      fix_non_seq=self.fix_non_seq)
         top_idx = 0
         inserted_items = {}
         children = {}

src/gui/main_ui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file './src/gui/main_ui.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.9
+# Created by: PyQt5 UI code generator 5.15.10
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
@@ -201,8 +201,10 @@ def setupUi(self, PDFdir):
         self.menuBar.setObjectName("menuBar")
         self.help_menu = QtWidgets.QMenu(self.menuBar)
         self.help_menu.setObjectName("help_menu")
-        self.menu = QtWidgets.QMenu(self.menuBar)
-        self.menu.setObjectName("menu")
+        self.language_menu = QtWidgets.QMenu(self.menuBar)
+        self.language_menu.setObjectName("language_menu")
+        self.options_menu = QtWidgets.QMenu(self.menuBar)
+        self.options_menu.setObjectName("options_menu")
         PDFdir.setMenuBar(self.menuBar)
         self.home_page_action = QtWidgets.QAction(PDFdir)
         self.home_page_action.setObjectName("home_page_action")
@@ -214,13 +216,18 @@ def setupUi(self, PDFdir):
         self.english_action.setObjectName("english_action")
         self.chinese_action = QtWidgets.QAction(PDFdir)
         self.chinese_action.setObjectName("chinese_action")
+        self.fix_non_seq_action = QtWidgets.QAction(PDFdir)
+        self.fix_non_seq_action.setCheckable(True)
+        self.fix_non_seq_action.setObjectName("fix_non_seq_action")
         self.help_menu.addAction(self.home_page_action)
         self.help_menu.addAction(self.help_action)
         self.help_menu.addAction(self.update_action)
-        self.menu.addAction(self.english_action)
-        self.menu.addAction(self.chinese_action)
+        self.language_menu.addAction(self.english_action)
+        self.language_menu.addAction(self.chinese_action)
+        self.options_menu.addAction(self.fix_non_seq_action)
+        self.menuBar.addAction(self.options_menu.menuAction())
         self.menuBar.addAction(self.help_menu.menuAction())
-        self.menuBar.addAction(self.menu.menuAction())
+        self.menuBar.addAction(self.language_menu.menuAction())
 
         self.retranslateUi(PDFdir)
         QtCore.QMetaObject.connectSlotsByName(PDFdir)
@@ -266,9 +273,12 @@ def retranslateUi(self, PDFdir):
         self.dir_tree_widget.headerItem().setText(2, _translate("PDFdir", "实际页数"))
         self.export_button.setText(_translate("PDFdir", "写入"))
         self.help_menu.setTitle(_translate("PDFdir", "帮助"))
-        self.menu.setTitle(_translate("PDFdir", "语言"))
+        self.language_menu.setTitle(_translate("PDFdir", "语言"))
+        self.options_menu.setTitle(_translate("PDFdir", "选项"))
         self.home_page_action.setText(_translate("PDFdir", "主页"))
         self.help_action.setText(_translate("PDFdir", "帮助手册"))
         self.update_action.setText(_translate("PDFdir", "检查更新"))
         self.english_action.setText(_translate("PDFdir", "English"))
         self.chinese_action.setText(_translate("PDFdir", "中文"))
+        self.fix_non_seq_action.setText(_translate("PDFdir", "修复乱序页码"))
+        self.fix_non_seq_action.setIconText(_translate("PDFdir", "修复乱序页码"))

src/gui/main_ui.ui

@@ -490,15 +490,22 @@ p, li { white-space: pre-wrap; }
     <addaction name="help_action"/>
     <addaction name="update_action"/>
    </widget>
-   <widget class="QMenu" name="menu">
+   <widget class="QMenu" name="language_menu">
     <property name="title">
      <string>语言</string>
     </property>
     <addaction name="english_action"/>
     <addaction name="chinese_action"/>
    </widget>
+   <widget class="QMenu" name="options_menu">
+    <property name="title">
+     <string>选项</string>
+    </property>
+    <addaction name="fix_non_seq_action"/>
+   </widget>
+   <addaction name="options_menu"/>
    <addaction name="help_menu"/>
-   <addaction name="menu"/>
+   <addaction name="language_menu"/>
   </widget>
   <action name="home_page_action">
    <property name="text">
@@ -525,6 +532,17 @@ p, li { white-space: pre-wrap; }
     <string>中文</string>
    </property>
   </action>
+  <action name="fix_non_seq_action">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>修复乱序页码</string>
+   </property>
+   <property name="iconText">
+    <string>修复乱序页码</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>