colin/mirror-komikku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Servers] Refine df555ae7

Browse Source
This commit is contained in:
Valéry Febvre
2022-10-13 14:01:45 +02:00
parent 558c133142
commit 1674e619c8
5 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -14,7 +14,7 @@ __Komikku__ is licensed under the [GPLv3+](https://www.gnu.org/licenses/gpl-3.0.
* Online reading from dozens of servers
* Offline reading of downloaded comics
* Categories to organize your library
* Reading of local comics in CBZ or CBR formats
* RTL, LTR, Vertical and Webtoon reading modes
* Several types of navigation:
* Keyboard arrow keys
@@ -22,6 +22,7 @@ __Komikku__ is licensed under the [GPLv3+](https://www.gnu.org/licenses/gpl-3.0.
* Mouse wheel
* 2-fingers swipe gesture (touchpad)
* Swipe gesture (touch screen)
* Categories to organize your library
* Automatic update of comics
* Automatic download of new chapters
* Reading history

3
data/info.febvre.Komikku.appdata.xml.in.in
View File

@@ -15,9 +15,10 @@
<ul>
<li>Online reading from dozens of servers</li>
<li>Offline reading of downloaded comics</li>
<li>Categories to organize your library</li>
<li>Reading of local comics in CBZ or CBR formats</li>
<li>RTL, LTR, Vertical and Webtoon reading modes</li>
<li>Support several types of navigation: keyboard arrow keys, right and left navigation layout via mouse click or tapping (touchpad/touch screen), mouse wheel, 2-fingers swipe gesture (touchpad), swipe gesture (touch screen)</li>
<li>Categories to organize your library</li>
<li>Automatic update of comics</li>
<li>Automatic download of new chapters</li>
<li>Reading history</li>

1
data/info.febvre.Komikku.desktop.in
View File

@@ -10,5 +10,6 @@ StartupNotify=true
Categories=Office;Viewer;GTK;GNOME;
# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
Keywords=manga;reader;viewer;comic;manhwa;manhua;bd;webtoon;webcomic;scan;offline;
X-GNOME-UsesNotifications=true
# Translators: Do NOT translate or transliterate this text (these are enum types)!
X-Purism-FormFactor=Workstation;Mobile;

16
komikku/explorer.py
View File

@@ -190,19 +190,15 @@ class Explorer(Gtk.Stack):
button.set_icon_name('help-about-symbolic')
popover = Gtk.Popover()
label = Gtk.Label()
label.set_markup("""A specific folder structure is required
for local comics to be properly processed.
label.set_wrap(True)
label.set_max_width_chars(32)
label.set_markup(_("""A specific folder structure is required for local comics to be properly processed.
Each comic must have its own folder which
must contain the chapters as archive files
in CBZ or CBR formats.
Each comic must have its own folder which must contain the chapters/volumes as archive files in CBZ or CBR formats.
The folder's name will be used as name
for the comic.
The folder's name will be used as name for the comic.
The 'unrar' utility is required for
CBR format archives.
""")
NOTE: The 'unrar' command-line tool is required for CBR archives."""))
popover.set_child(label)
button.set_popover(popover)
box.append(button)

10
komikku/reader/pager/page.py
View File

@@ -37,7 +37,7 @@ class Page(Gtk.Overlay):
self.picture = None
self._status = None # rendering, rendered, offlimit, cleaned
self.error = None # connection error, server error, archive error or corrupt file error
self.error = None # connection error, server error, corrupt file error
self.loadable = False # loadable from disk or downloadable from server (chapter pages are known)
self.scrolledwindow = Gtk.ScrolledWindow()
@@ -108,7 +108,7 @@ class Page(Gtk.Overlay):
def complete(error_code, error_message):
self.activity_indicator.stop()
if error_code in ('archive', 'connection', 'server'):
if error_code in ('connection', 'server'):
on_error(error_code, error_message)
elif error_code == 'offlimit':
self.status = 'offlimit'
@@ -163,7 +163,7 @@ class Page(Gtk.Overlay):
return load_chapter(prior_chapter)
def on_error(kind, message=None):
assert kind in ('archive', 'connection', 'server', ), 'Invalid error kind'
assert kind in ('connection', 'server', ), 'Invalid error kind'
if message is not None:
self.window.show_notification(message, 2)
@@ -180,7 +180,7 @@ class Page(Gtk.Overlay):
self.loadable = True
if self.chapter.manga.server_id != 'local':
if self.server.manga.server_id != 'local':
page_path = self.chapter.get_page_path(self.index)
if page_path is None:
try:
@@ -197,7 +197,7 @@ class Page(Gtk.Overlay):
try:
self.data = self.chapter.get_page_data(self.index)
except Exception as e:
error_code, error_message = 'archive', log_error_traceback(e)
error_code, error_message = 'server', log_error_traceback(e)
GLib.idle_add(complete, error_code, error_message)