Minor fixes
This commit is contained in:
@@ -476,7 +476,7 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
|
|||||||
ebooks_string = self._translate('Main_UI', 'eBooks')
|
ebooks_string = self._translate('Main_UI', 'eBooks')
|
||||||
opened_files = QtWidgets.QFileDialog.getOpenFileNames(
|
opened_files = QtWidgets.QFileDialog.getOpenFileNames(
|
||||||
self, dialog_prompt, self.settings['last_open_path'],
|
self, dialog_prompt, self.settings['last_open_path'],
|
||||||
f'{ebooks_string} ({self.available_parsers})')
|
f'{ebooks_string}({self.available_parsers})')
|
||||||
|
|
||||||
if not opened_files[0]:
|
if not opened_files[0]:
|
||||||
return
|
return
|
||||||
@@ -742,7 +742,7 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
|
|||||||
else:
|
else:
|
||||||
self.settingsDialog.hide()
|
self.settingsDialog.hide()
|
||||||
|
|
||||||
#____________________________________________
|
#==================================================================
|
||||||
# The contentView modification functions are in the guifunctions
|
# The contentView modification functions are in the guifunctions
|
||||||
# module. self.profile_functions is the reference here.
|
# module. self.profile_functions is the reference here.
|
||||||
|
|
||||||
@@ -763,7 +763,7 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
|
|||||||
self.profile_functions.modify_comic_view(
|
self.profile_functions.modify_comic_view(
|
||||||
signal_sender, key_pressed)
|
signal_sender, key_pressed)
|
||||||
|
|
||||||
#____________________________________________
|
#=================================================================
|
||||||
|
|
||||||
def change_page_view(self, key_pressed=False):
|
def change_page_view(self, key_pressed=False):
|
||||||
# Set zoom mode to best fit to
|
# Set zoom mode to best fit to
|
||||||
|
@@ -101,18 +101,7 @@ class Library:
|
|||||||
position = i[5]
|
position = i[5]
|
||||||
if position:
|
if position:
|
||||||
position = pickle.loads(position)
|
position = pickle.loads(position)
|
||||||
if position['is_read']:
|
position_perc = generate_position_percentage(position)
|
||||||
position_perc = 1
|
|
||||||
else:
|
|
||||||
try:
|
|
||||||
position_perc = (
|
|
||||||
position['current_block'] / position['total_blocks'])
|
|
||||||
except (KeyError, ZeroDivisionError):
|
|
||||||
try:
|
|
||||||
position_perc = (
|
|
||||||
position['current_chapter'] / position['total_chapters'])
|
|
||||||
except KeyError:
|
|
||||||
position_perc = None
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
file_exists = os.path.exists(path)
|
file_exists = os.path.exists(path)
|
||||||
@@ -339,3 +328,23 @@ class Library:
|
|||||||
# Remove invalid paths from the database as well
|
# Remove invalid paths from the database as well
|
||||||
database.DatabaseFunctions(
|
database.DatabaseFunctions(
|
||||||
self.main_window.database_path).delete_from_database('Path', invalid_paths)
|
self.main_window.database_path).delete_from_database('Path', invalid_paths)
|
||||||
|
|
||||||
|
|
||||||
|
def generate_position_percentage(position):
|
||||||
|
if not position:
|
||||||
|
return None
|
||||||
|
|
||||||
|
if position['is_read']:
|
||||||
|
position_perc = 1
|
||||||
|
else:
|
||||||
|
try:
|
||||||
|
position_perc = (
|
||||||
|
position['current_block'] / position['total_blocks'])
|
||||||
|
except (KeyError, ZeroDivisionError):
|
||||||
|
try:
|
||||||
|
position_perc = (
|
||||||
|
position['current_chapter'] / position['total_chapters'])
|
||||||
|
except KeyError:
|
||||||
|
position_perc = None
|
||||||
|
|
||||||
|
return position_perc
|
||||||
|
@@ -14,7 +14,7 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
VERSION = '0.5.0'
|
VERSION = '0.5.1'
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import logging
|
import logging
|
||||||
|
@@ -201,7 +201,9 @@ class BookSorter:
|
|||||||
break
|
break
|
||||||
|
|
||||||
if not valid_extension:
|
if not valid_extension:
|
||||||
logger.error('Unsupported extension: ' + filename)
|
this_error = 'Unsupported extension: ' + filename
|
||||||
|
self.errors.append(this_error)
|
||||||
|
logger.error(this_error)
|
||||||
return
|
return
|
||||||
|
|
||||||
book_ref = sorter[file_extension](filename, self.temp_dir, file_md5)
|
book_ref = sorter[file_extension](filename, self.temp_dir, file_md5)
|
||||||
|
Reference in New Issue
Block a user