Skip to content

Commit c71985f

Browse files
committed
Minor fixes
1 parent c8fe0ba commit c71985f

File tree

4 files changed

+28
-17
lines changed

4 files changed

+28
-17
lines changed

lector/__main__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ def add_books(self):
476476
ebooks_string = self._translate('Main_UI', 'eBooks')
477477
opened_files = QtWidgets.QFileDialog.getOpenFileNames(
478478
self, dialog_prompt, self.settings['last_open_path'],
479-
f'{ebooks_string} ({self.available_parsers})')
479+
f'{ebooks_string}({self.available_parsers})')
480480

481481
if not opened_files[0]:
482482
return
@@ -742,7 +742,7 @@ def show_settings(self, stacked_widget_index):
742742
else:
743743
self.settingsDialog.hide()
744744

745-
#____________________________________________
745+
#==================================================================
746746
# The contentView modification functions are in the guifunctions
747747
# module. self.profile_functions is the reference here.
748748

@@ -763,7 +763,7 @@ def modify_comic_view(self, key_pressed=None):
763763
self.profile_functions.modify_comic_view(
764764
signal_sender, key_pressed)
765765

766-
#____________________________________________
766+
#=================================================================
767767

768768
def change_page_view(self, key_pressed=False):
769769
# Set zoom mode to best fit to

lector/library.py

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,7 @@ def generate_model(self, mode, parsed_books=None, is_database_ready=True):
101101
position = i[5]
102102
if position:
103103
position = pickle.loads(position)
104-
if position['is_read']:
105-
position_perc = 1
106-
else:
107-
try:
108-
position_perc = (
109-
position['current_block'] / position['total_blocks'])
110-
except (KeyError, ZeroDivisionError):
111-
try:
112-
position_perc = (
113-
position['current_chapter'] / position['total_chapters'])
114-
except KeyError:
115-
position_perc = None
104+
position_perc = generate_position_percentage(position)
116105

117106
try:
118107
file_exists = os.path.exists(path)
@@ -339,3 +328,23 @@ def prune_models(self, valid_paths):
339328
# Remove invalid paths from the database as well
340329
database.DatabaseFunctions(
341330
self.main_window.database_path).delete_from_database('Path', invalid_paths)
331+
332+
333+
def generate_position_percentage(position):
334+
if not position:
335+
return None
336+
337+
if position['is_read']:
338+
position_perc = 1
339+
else:
340+
try:
341+
position_perc = (
342+
position['current_block'] / position['total_blocks'])
343+
except (KeyError, ZeroDivisionError):
344+
try:
345+
position_perc = (
346+
position['current_chapter'] / position['total_chapters'])
347+
except KeyError:
348+
position_perc = None
349+
350+
return position_perc

lector/logger.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1616

17-
VERSION = '0.5.0'
17+
VERSION = '0.5.1'
1818

1919
import os
2020
import logging

lector/sorter.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,9 @@ def read_book(self, filename):
201201
break
202202

203203
if not valid_extension:
204-
logger.error('Unsupported extension: ' + filename)
204+
this_error = 'Unsupported extension: ' + filename
205+
self.errors.append(this_error)
206+
logger.error(this_error)
205207
return
206208

207209
book_ref = sorter[file_extension](filename, self.temp_dir, file_md5)

0 commit comments

Comments
 (0)