rpms/cozy
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

merge into: rpms:rawhide
Branches Tags
rpms:rawhide
rpms:main
rpms:f43
rpms:f42
rpms:f41
rpms:f40
rpms:f39
rpms:f38
rpms:f36
rpms:f37
rpms:f35
rpms:f34
rpms:f33
rpms:f32
...
pull from: rpms:f36
Branches Tags
rpms:main
rpms:rawhide
rpms:f43
rpms:f42
rpms:f41
rpms:f40
rpms:f39
rpms:f38
rpms:f36
rpms:f37
rpms:f35
rpms:f34
rpms:f33
rpms:f32
Sign in to create a new pull request.

2 commits
rawhide ... f36

Author SHA1 Message Date
Artur Frenszek-Iwicki
3f9db590ab Fix crash at startup and file conflicts 2023-03-28 08:30:54 +02:00
Artur Frenszek-Iwicki
698a6b60ca Update to v1.2.1 2022-08-21 21:05:06 +02:00
6 changed files with 235 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -17,3 +17,4 @@
/cozy-1.1.2.tar.gz
/cozy-1.1.3.tar.gz
/cozy-1.2.0.tar.gz
/cozy-1.2.1.tar.gz

332
0000--unbundle-inject.patch
View file

@ -1,6 +1,6 @@
diff -rU4 cozy-1.0.1--orig/cozy/app_controller.py cozy-1.0.1--patched/cozy/app_controller.py
--- cozy-1.0.1--orig/cozy/app_controller.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/app_controller.py 2021-05-30 11:14:55.904892273 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/app_controller.py cozy-1.2.1--patched/cozy/app_controller.py
--- cozy-1.2.1--orig/cozy/app_controller.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/app_controller.py 2022-08-21 20:24:05.025489593 +0200
@@ -1,7 +1,7 @@
from gi.repository import Gio
@ -10,9 +10,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/app_controller.py cozy-1.0.1--patched/cozy/app_c
from cozy.control.offline_cache import OfflineCache
from cozy.media.files import Files
diff -rU4 cozy-1.0.1--orig/cozy/application_settings.py cozy-1.0.1--patched/cozy/application_settings.py
--- cozy-1.0.1--orig/cozy/application_settings.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/application_settings.py 2021-05-30 11:14:55.889892270 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/application_settings.py cozy-1.2.1--patched/cozy/application_settings.py
--- cozy-1.2.1--orig/cozy/application_settings.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/application_settings.py 2022-08-21 20:24:05.026489599 +0200
@@ -1,8 +1,8 @@
from gi.repository import Gio
@ -23,9 +23,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/application_settings.py cozy-1.0.1--patched/cozy
class ApplicationSettings(EventSender):
_settings: Gio.Settings = inject.attr(Gio.Settings)
diff -rU4 cozy-1.0.1--orig/cozy/control/artwork_cache.py cozy-1.0.1--patched/cozy/control/artwork_cache.py
--- cozy-1.0.1--orig/cozy/control/artwork_cache.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/control/artwork_cache.py 2021-05-30 11:14:55.784892252 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/control/artwork_cache.py cozy-1.2.1--patched/cozy/control/artwork_cache.py
--- cozy-1.2.1--orig/cozy/control/artwork_cache.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/control/artwork_cache.py 2022-08-21 20:24:05.026489599 +0200
@@ -6,9 +6,9 @@
from cozy.application_settings import ApplicationSettings
@ -37,9 +37,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/control/artwork_cache.py cozy-1.0.1--patched/coz
from cozy.report import reporter
log = logging.getLogger("artwork_cache")
diff -rU4 cozy-1.0.1--orig/cozy/control/filesystem_monitor.py cozy-1.0.1--patched/cozy/control/filesystem_monitor.py
--- cozy-1.0.1--orig/cozy/control/filesystem_monitor.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/control/filesystem_monitor.py 2021-05-30 11:14:55.780892251 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/control/filesystem_monitor.py cozy-1.2.1--patched/cozy/control/filesystem_monitor.py
--- cozy-1.2.1--orig/cozy/control/filesystem_monitor.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/control/filesystem_monitor.py 2022-08-21 20:24:05.026489599 +0200
@@ -1,8 +1,8 @@
import logging
from typing import List
@ -50,9 +50,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/control/filesystem_monitor.py cozy-1.0.1--patche
from cozy.architecture.event_sender import EventSender
from cozy.model.book import Book
diff -rU4 cozy-1.0.1--orig/cozy/control/mpris.py cozy-1.0.1--patched/cozy/control/mpris.py
--- cozy-1.0.1--orig/cozy/control/mpris.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/control/mpris.py 2021-05-30 11:14:55.789892253 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/control/mpris.py cozy-1.2.1--patched/cozy/control/mpris.py
--- cozy-1.2.1--orig/cozy/control/mpris.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/control/mpris.py 2022-08-21 20:24:05.026489599 +0200
@@ -22,9 +22,9 @@
import cozy.ui
@ -64,9 +64,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/control/mpris.py cozy-1.0.1--patched/cozy/contro
from cozy.model.book import Book
from cozy.report import reporter
diff -rU4 cozy-1.2.0--orig/cozy/control/offline_cache.py cozy-1.2.0--patched/cozy/control/offline_cache.py
--- cozy-1.2.0--orig/cozy/control/offline_cache.py 2022-01-08 18:02:56.000000000 +0100
+++ cozy-1.2.0--patched/cozy/control/offline_cache.py 2022-01-08 23:55:05.338643169 +0100
diff -U4 -r cozy-1.2.1--orig/cozy/control/offline_cache.py cozy-1.2.1--patched/cozy/control/offline_cache.py
--- cozy-1.2.1--orig/cozy/control/offline_cache.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/control/offline_cache.py 2022-08-21 20:24:05.027489605 +0200
@@ -12,9 +12,9 @@
from cozy.db.file import File
@ -78,8 +78,9 @@ diff -rU4 cozy-1.2.0--orig/cozy/control/offline_cache.py cozy-1.2.0--patched/coz
from cozy.model.chapter import Chapter
from cozy.report import reporter
from cozy.view_model.settings_view_model import SettingsViewModel
--- cozy-1.0.3--orig/cozy/media/files.py 2021-06-04 19:08:29.000000000 +0200
+++ cozy-1.0.3--patched/cozy/media/files.py 2021-06-14 13:48:39.526393674 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/media/files.py cozy-1.2.1--patched/cozy/media/files.py
--- cozy-1.2.1--orig/cozy/media/files.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/media/files.py 2022-08-21 20:24:05.027489605 +0200
@@ -5,9 +5,9 @@
from gi.repository import Gio
@ -91,10 +92,10 @@ diff -rU4 cozy-1.2.0--orig/cozy/control/offline_cache.py cozy-1.2.0--patched/coz
from cozy.model.settings import Settings
from cozy.report import reporter
from cozy.ui.info_banner import InfoBanner
diff -rU4 cozy-1.0.1--orig/cozy/media/importer.py cozy-1.0.1--patched/cozy/media/importer.py
--- cozy-1.0.1--orig/cozy/media/importer.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/media/importer.py 2021-05-30 11:14:55.810892256 +0200
@@ -9,9 +9,9 @@
diff -U4 -r cozy-1.2.1--orig/cozy/media/importer.py cozy-1.2.1--patched/cozy/media/importer.py
--- cozy-1.2.1--orig/cozy/media/importer.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/media/importer.py 2022-08-21 20:24:05.027489605 +0200
@@ -10,9 +10,9 @@
from cozy.architecture.event_sender import EventSender
from cozy.architecture.profiler import timing
@ -105,10 +106,10 @@ diff -rU4 cozy-1.0.1--orig/cozy/media/importer.py cozy-1.0.1--patched/cozy/media
from cozy.media.media_file import MediaFile
from cozy.model.database_importer import DatabaseImporter
from cozy.model.library import Library
diff -rU4 cozy-1.0.1--orig/cozy/media/player.py cozy-1.0.1--patched/cozy/media/player.py
--- cozy-1.0.1--orig/cozy/media/player.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/media/player.py 2021-05-30 11:14:55.802892255 +0200
@@ -6,9 +6,9 @@
diff -U4 -r cozy-1.2.1--orig/cozy/media/player.py cozy-1.2.1--patched/cozy/media/player.py
--- cozy-1.2.1--orig/cozy/media/player.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/media/player.py 2022-08-21 20:24:05.027489605 +0200
@@ -9,9 +9,9 @@
from cozy.application_settings import ApplicationSettings
from cozy.architecture.event_sender import EventSender
@ -119,11 +120,11 @@ diff -rU4 cozy-1.0.1--orig/cozy/media/player.py cozy-1.0.1--patched/cozy/media/p
from cozy.model.book import Book
from cozy.model.chapter import Chapter
from cozy.model.library import Library
diff -rU4 cozy-1.0.1--orig/cozy/model/book.py cozy-1.0.1--patched/cozy/model/book.py
--- cozy-1.0.1--orig/cozy/model/book.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/model/book.py 2021-05-30 11:14:55.901892272 +0200
@@ -7,9 +7,9 @@
from cozy.architecture.observable import Observable
diff -U4 -r cozy-1.2.1--orig/cozy/model/book.py cozy-1.2.1--patched/cozy/model/book.py
--- cozy-1.2.1--orig/cozy/model/book.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/model/book.py 2022-08-21 20:24:38.465691342 +0200
@@ -10,9 +10,9 @@
from cozy.db.collation import collate_natural
from cozy.db.book import Book as BookModel
from cozy.db.track import Track as TrackModel
from cozy.db.track_to_file import TrackToFile
@ -133,9 +134,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/model/book.py cozy-1.0.1--patched/cozy/model/boo
from cozy.model.settings import Settings
from cozy.model.track import Track, TrackInconsistentData
diff -rU4 cozy-1.0.1--orig/cozy/model/database_importer.py cozy-1.0.1--patched/cozy/model/database_importer.py
--- cozy-1.0.1--orig/cozy/model/database_importer.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/model/database_importer.py 2021-05-30 11:14:55.897892271 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/model/database_importer.py cozy-1.2.1--patched/cozy/model/database_importer.py
--- cozy-1.2.1--orig/cozy/model/database_importer.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/model/database_importer.py 2022-08-21 20:24:05.028489611 +0200
@@ -6,9 +6,9 @@
from cozy.db.book import Book as BookModel
from cozy.db.file import File
@ -147,10 +148,10 @@ diff -rU4 cozy-1.0.1--orig/cozy/model/database_importer.py cozy-1.0.1--patched/c
from cozy.media.media_file import MediaFile
from cozy.model.book import Book, BookIsEmpty
diff -rU4 cozy-1.0.1--orig/cozy/model/library.py cozy-1.0.1--patched/cozy/model/library.py
--- cozy-1.0.1--orig/cozy/model/library.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/model/library.py 2021-05-30 11:14:55.893892271 +0200
@@ -5,9 +5,9 @@
diff -U4 -r cozy-1.2.1--orig/cozy/model/library.py cozy-1.2.1--patched/cozy/model/library.py
--- cozy-1.2.1--orig/cozy/model/library.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/model/library.py 2022-08-21 20:24:05.028489611 +0200
@@ -6,9 +6,9 @@
from cozy.architecture.event_sender import EventSender
from cozy.architecture.profiler import timing
from cozy.db.book import Book as BookModel
@ -161,9 +162,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/model/library.py cozy-1.0.1--patched/cozy/model/
from cozy.model.book import Book, BookIsEmpty
from cozy.model.chapter import Chapter
from cozy.model.settings import Settings
diff -rU4 cozy-1.0.1--orig/cozy/model/settings.py cozy-1.0.1--patched/cozy/model/settings.py
--- cozy-1.0.1--orig/cozy/model/settings.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/model/settings.py 2021-05-30 11:14:55.890892270 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/model/settings.py cozy-1.2.1--patched/cozy/model/settings.py
--- cozy-1.2.1--orig/cozy/model/settings.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/model/settings.py 2022-08-21 20:24:05.028489611 +0200
@@ -2,9 +2,9 @@
from typing import List, Optional
@ -175,9 +176,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/model/settings.py cozy-1.0.1--patched/cozy/model
from cozy.db.book import Book
from cozy.db.settings import Settings as SettingsModel
diff -rU4 cozy-1.0.1--orig/cozy/power_manager.py cozy-1.0.1--patched/cozy/power_manager.py
--- cozy-1.0.1--orig/cozy/power_manager.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/power_manager.py 2021-05-30 11:14:55.795892254 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/power_manager.py cozy-1.2.1--patched/cozy/power_manager.py
--- cozy-1.2.1--orig/cozy/power_manager.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/power_manager.py 2022-08-21 20:24:05.028489611 +0200
@@ -1,9 +1,9 @@
import logging
@ -189,9 +190,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/power_manager.py cozy-1.0.1--patched/cozy/power_
log = logging.getLogger("power_mgr")
diff -rU4 cozy-1.0.1--orig/cozy/report/report_to_loki.py cozy-1.0.1--patched/cozy/report/report_to_loki.py
--- cozy-1.0.1--orig/cozy/report/report_to_loki.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/report/report_to_loki.py 2021-05-30 11:14:55.915892274 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/report/report_to_loki.py cozy-1.2.1--patched/cozy/report/report_to_loki.py
--- cozy-1.2.1--orig/cozy/report/report_to_loki.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/report/report_to_loki.py 2022-08-21 20:24:05.029489617 +0200
@@ -6,9 +6,9 @@
import distro
import platform
@ -203,9 +204,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/report/report_to_loki.py cozy-1.0.1--patched/coz
from cozy.version import __version__ as CozyVersion
from peewee import __version__ as PeeweeVersion
from mutagen import version_string as MutagenVersion
diff -rU4 cozy-1.1.0--orig/cozy/ui/app_view.py cozy-1.1.0--patched/cozy/ui/app_view.py
--- cozy-1.1.0--orig/cozy/ui/app_view.py 2021-08-07 09:44:45.000000000 +0200
+++ cozy-1.1.0--patched/cozy/ui/app_view.py 2021-08-09 11:51:55.741980422 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/ui/app_view.py cozy-1.2.1--patched/cozy/ui/app_view.py
--- cozy-1.2.1--orig/cozy/ui/app_view.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/app_view.py 2022-08-21 20:24:05.029489617 +0200
@@ -1,7 +1,7 @@
from gi.repository import Gtk, Handy
@ -215,9 +216,9 @@ diff -rU4 cozy-1.1.0--orig/cozy/ui/app_view.py cozy-1.1.0--patched/cozy/ui/app_v
from cozy.view import View
LIBRARY = "main"
diff -rU4 cozy-1.1.0--orig/cozy/ui/book_detail_view.py cozy-1.1.0--patched/cozy/ui/book_detail_view.py
--- cozy-1.1.0--orig/cozy/ui/book_detail_view.py 2021-08-07 09:44:45.000000000 +0200
+++ cozy-1.1.0--patched/cozy/ui/book_detail_view.py 2021-08-09 11:45:43.895311019 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/ui/book_detail_view.py cozy-1.2.1--patched/cozy/ui/book_detail_view.py
--- cozy-1.2.1--orig/cozy/ui/book_detail_view.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/book_detail_view.py 2022-08-21 20:24:05.029489617 +0200
@@ -5,9 +5,9 @@
import gi
@ -229,9 +230,9 @@ diff -rU4 cozy-1.1.0--orig/cozy/ui/book_detail_view.py cozy-1.1.0--patched/cozy/
from cozy.model.chapter import Chapter
from cozy.report import reporter
from cozy.ui.chapter_element import ChapterElement
diff -rU4 cozy-1.0.1--orig/cozy/ui/db_migration_failed_view.py cozy-1.0.1--patched/cozy/ui/db_migration_failed_view.py
--- cozy-1.0.1--orig/cozy/ui/db_migration_failed_view.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/db_migration_failed_view.py 2021-05-30 11:14:55.820892258 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/ui/db_migration_failed_view.py cozy-1.2.1--patched/cozy/ui/db_migration_failed_view.py
--- cozy-1.2.1--orig/cozy/ui/db_migration_failed_view.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/db_migration_failed_view.py 2022-08-21 20:24:05.029489617 +0200
@@ -1,9 +1,9 @@
import webbrowser
@ -243,9 +244,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/db_migration_failed_view.py cozy-1.0.1--patch
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
diff -rU4 cozy-1.0.1--orig/cozy/ui/delete_book_view.py cozy-1.0.1--patched/cozy/ui/delete_book_view.py
--- cozy-1.0.1--orig/cozy/ui/delete_book_view.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/delete_book_view.py 2021-05-30 11:14:55.815892257 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/ui/delete_book_view.py cozy-1.2.1--patched/cozy/ui/delete_book_view.py
--- cozy-1.2.1--orig/cozy/ui/delete_book_view.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/delete_book_view.py 2022-08-21 20:24:05.029489617 +0200
@@ -1,7 +1,7 @@
import gi
@ -255,9 +256,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/delete_book_view.py cozy-1.0.1--patched/cozy/
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
diff -rU4 cozy-1.0.1--orig/cozy/ui/file_not_found_dialog.py cozy-1.0.1--patched/cozy/ui/file_not_found_dialog.py
--- cozy-1.0.1--orig/cozy/ui/file_not_found_dialog.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/file_not_found_dialog.py 2021-05-30 11:14:55.818892258 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/ui/file_not_found_dialog.py cozy-1.2.1--patched/cozy/ui/file_not_found_dialog.py
--- cozy-1.2.1--orig/cozy/ui/file_not_found_dialog.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/file_not_found_dialog.py 2022-08-21 20:24:05.030489623 +0200
@@ -2,9 +2,9 @@
from gi.repository import Gtk
@ -269,10 +270,10 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/file_not_found_dialog.py cozy-1.0.1--patched/
from cozy.model.chapter import Chapter
from cozy.model.library import Library
diff -rU4 cozy-1.0.1--orig/cozy/ui/headerbar.py cozy-1.0.1--patched/cozy/ui/headerbar.py
--- cozy-1.0.1--orig/cozy/ui/headerbar.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/headerbar.py 2021-05-30 11:14:55.816892257 +0200
@@ -3,9 +3,9 @@
diff -U4 -r cozy-1.2.1--orig/cozy/ui/headerbar.py cozy-1.2.1--patched/cozy/ui/headerbar.py
--- cozy-1.2.1--orig/cozy/ui/headerbar.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/headerbar.py 2022-08-21 20:24:05.030489623 +0200
@@ -1,9 +1,9 @@
import logging
import gi
@ -283,12 +284,13 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/headerbar.py cozy-1.0.1--patched/cozy/ui/head
from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState
gi.require_version('Gtk', '3.0')
--- cozy-1.0.3--orig/cozy/ui/info_banner.py 2021-06-04 19:08:29.000000000 +0200
+++ cozy-1.0.3--patched/cozy/ui/info_banner.py 2021-06-14 13:50:16.042218527 +0200
@@ -3,9 +3,9 @@
gi.require_version('Granite', '1.0')
diff -U4 -r cozy-1.2.1--orig/cozy/ui/info_banner.py cozy-1.2.1--patched/cozy/ui/info_banner.py
--- cozy-1.2.1--orig/cozy/ui/info_banner.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/info_banner.py 2022-08-21 20:24:50.973766801 +0200
@@ -1,9 +1,9 @@
import gi
from gi.repository import Gtk, Granite
from gi.repository import Gtk
-from cozy.ext import inject
+import inject
@ -296,9 +298,17 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/headerbar.py cozy-1.0.1--patched/cozy/ui/head
class InfoBanner:
_builder: Gtk.Builder = inject.attr("MainWindowBuilder")
diff -rU4 cozy-1.1.0--orig/cozy/ui/library_view.py cozy-1.1.0--patched/cozy/ui/library_view.py
--- cozy-1.1.0--orig/cozy/ui/library_view.py 2021-08-07 09:44:45.000000000 +0200
+++ cozy-1.1.0--patched/cozy/ui/library_view.py 2021-08-09 11:44:00.084565772 +0200
@@ -19,5 +19,5 @@
self._label.set_text(message)
self._toast.set_revealed(True)
def _on_response(self, _, __):
- self._toast.set_revealed(False)
\ No newline at end of file
+ self._toast.set_revealed(False)
diff -U4 -r cozy-1.2.1--orig/cozy/ui/library_view.py cozy-1.2.1--patched/cozy/ui/library_view.py
--- cozy-1.2.1--orig/cozy/ui/library_view.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/library_view.py 2022-08-21 20:24:05.030489623 +0200
@@ -2,9 +2,9 @@
from gi.repository import Gtk, Handy
@ -310,9 +320,9 @@ diff -rU4 cozy-1.1.0--orig/cozy/ui/library_view.py cozy-1.1.0--patched/cozy/ui/l
from cozy.ui.delete_book_view import DeleteBookView
from cozy.ui.widgets.filter_list_box import FilterListBox
from cozy.view_model.library_view_model import LibraryViewModel, LibraryViewMode, LibraryPage
diff -rU4 cozy-1.1.1--orig/cozy/ui/main_view.py cozy-1.1.1--patched/cozy/ui/main_view.py
--- cozy-1.1.1--orig/cozy/ui/main_view.py 2021-08-20 12:43:14.000000000 +0200
+++ cozy-1.1.1--patched/cozy/ui/main_view.py 2021-08-20 13:03:43.707422125 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/ui/main_view.py cozy-1.2.1--patched/cozy/ui/main_view.py
--- cozy-1.2.1--orig/cozy/ui/main_view.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/main_view.py 2022-08-21 20:24:05.031489629 +0200
@@ -5,9 +5,9 @@
from gi.repository import Gtk, Gio, Gdk, GLib
@ -324,9 +334,9 @@ diff -rU4 cozy-1.1.1--orig/cozy/ui/main_view.py cozy-1.1.1--patched/cozy/ui/main
from cozy.application_settings import ApplicationSettings
from cozy.architecture.event_sender import EventSender
from cozy.architecture.singleton import Singleton
diff -rU4 cozy-1.1.0--orig/cozy/ui/media_controller_big.py cozy-1.1.0--patched/cozy/ui/media_controller_big.py
--- cozy-1.1.0--orig/cozy/ui/media_controller_big.py 2021-08-07 09:44:45.000000000 +0200
+++ cozy-1.1.0--patched/cozy/ui/media_controller_big.py 2021-08-09 11:53:21.875598752 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/ui/media_controller_big.py cozy-1.2.1--patched/cozy/ui/media_controller_big.py
--- cozy-1.2.1--orig/cozy/ui/media_controller_big.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/media_controller_big.py 2022-08-21 20:24:05.031489629 +0200
@@ -3,9 +3,9 @@
import gi
@ -338,9 +348,9 @@ diff -rU4 cozy-1.1.0--orig/cozy/ui/media_controller_big.py cozy-1.1.0--patched/c
from cozy.ui.widgets.seek_bar import SeekBar
from cozy.ui.widgets.sleep_timer import SleepTimer
from cozy.view_model.playback_control_view_model import PlaybackControlViewModel
diff -rU4 cozy-1.1.0--orig/cozy/ui/media_controller_small.py cozy-1.1.0--patched/cozy/ui/media_controller_small.py
--- cozy-1.1.0--orig/cozy/ui/media_controller_small.py 2021-08-07 09:44:45.000000000 +0200
+++ cozy-1.1.0--patched/cozy/ui/media_controller_small.py 2021-08-09 11:54:54.115260921 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/ui/media_controller_small.py cozy-1.2.1--patched/cozy/ui/media_controller_small.py
--- cozy-1.2.1--orig/cozy/ui/media_controller_small.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/media_controller_small.py 2022-08-21 20:24:05.031489629 +0200
@@ -3,9 +3,9 @@
import gi
@ -352,9 +362,9 @@ diff -rU4 cozy-1.1.0--orig/cozy/ui/media_controller_small.py cozy-1.1.0--patched
from cozy.view_model.playback_control_view_model import PlaybackControlViewModel
gi.require_version('Gtk', '3.0')
diff -rU4 cozy-1.2.0--orig/cozy/ui/preferences_view.py cozy-1.2.0--patched/cozy/ui/preferences_view.py
--- cozy-1.2.0--orig/cozy/ui/preferences_view.py 2022-01-08 18:02:56.000000000 +0100
+++ cozy-1.2.0--patched/cozy/ui/preferences_view.py 2022-01-08 23:57:30.067592062 +0100
diff -U4 -r cozy-1.2.1--orig/cozy/ui/preferences_view.py cozy-1.2.1--patched/cozy/ui/preferences_view.py
--- cozy-1.2.1--orig/cozy/ui/preferences_view.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/preferences_view.py 2022-08-21 20:24:05.031489629 +0200
@@ -2,9 +2,9 @@
from cozy.view_model.settings_view_model import SettingsViewModel
import gi
@ -366,9 +376,9 @@ diff -rU4 cozy-1.2.0--orig/cozy/ui/preferences_view.py cozy-1.2.0--patched/cozy/
from cozy.ui.widgets.storage_list_box_row import StorageListBoxRow
gi.require_version('Gtk', '3.0')
diff -rU4 cozy-1.0.1--orig/cozy/ui/search_view.py cozy-1.0.1--patched/cozy/ui/search_view.py
--- cozy-1.0.1--orig/cozy/ui/search_view.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/search_view.py 2021-05-30 11:14:55.827892259 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/ui/search_view.py cozy-1.2.1--patched/cozy/ui/search_view.py
--- cozy-1.2.1--orig/cozy/ui/search_view.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/search_view.py 2022-08-21 20:24:05.031489629 +0200
@@ -1,8 +1,8 @@
import threading
from threading import Thread
@ -379,9 +389,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/search_view.py cozy-1.0.1--patched/cozy/ui/se
import gi
diff -rU4 cozy-1.0.1--orig/cozy/ui/warnings.py cozy-1.0.1--patched/cozy/ui/warnings.py
--- cozy-1.0.1--orig/cozy/ui/warnings.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/warnings.py 2021-05-30 11:14:55.819892258 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/ui/warnings.py cozy-1.2.1--patched/cozy/ui/warnings.py
--- cozy-1.2.1--orig/cozy/ui/warnings.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/warnings.py 2022-08-21 20:24:05.032489635 +0200
@@ -1,8 +1,8 @@
from gettext import gettext
@ -392,9 +402,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/warnings.py cozy-1.0.1--patched/cozy/ui/warni
from cozy.control.filesystem_monitor import FilesystemMonitor
gi.require_version('Gtk', '3.0')
diff -rU4 cozy-1.1.0--orig/cozy/ui/widgets/album_element.py cozy-1.1.0--patched/cozy/ui/widgets/album_element.py
--- cozy-1.1.0--orig/cozy/ui/widgets/album_element.py 2021-08-07 09:44:45.000000000 +0200
+++ cozy-1.1.0--patched/cozy/ui/widgets/album_element.py 2021-08-09 11:49:54.163107640 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/album_element.py cozy-1.2.1--patched/cozy/ui/widgets/album_element.py
--- cozy-1.2.1--orig/cozy/ui/widgets/album_element.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/widgets/album_element.py 2022-08-21 20:24:05.032489635 +0200
@@ -5,9 +5,9 @@
from cozy.control.artwork_cache import ArtworkCache
@ -406,9 +416,9 @@ diff -rU4 cozy-1.1.0--orig/cozy/ui/widgets/album_element.py cozy-1.1.0--patched/
from gi.repository import Gtk, GObject, Gdk
ALBUM_ART_SIZE = 200
diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/error_reporting.py cozy-1.0.1--patched/cozy/ui/widgets/error_reporting.py
--- cozy-1.0.1--orig/cozy/ui/widgets/error_reporting.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/widgets/error_reporting.py 2021-05-30 11:14:55.851892263 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/error_reporting.py cozy-1.2.1--patched/cozy/ui/widgets/error_reporting.py
--- cozy-1.2.1--orig/cozy/ui/widgets/error_reporting.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/widgets/error_reporting.py 2022-08-21 20:24:05.032489635 +0200
@@ -2,9 +2,9 @@
import gi
@ -420,9 +430,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/error_reporting.py cozy-1.0.1--patche
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-1.0.1--patched/cozy/ui/widgets/playback_speed_popover.py
--- cozy-1.0.1--orig/cozy/ui/widgets/playback_speed_popover.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/widgets/playback_speed_popover.py 2021-05-30 11:14:55.842892262 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-1.2.1--patched/cozy/ui/widgets/playback_speed_popover.py
--- cozy-1.2.1--orig/cozy/ui/widgets/playback_speed_popover.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/widgets/playback_speed_popover.py 2022-08-21 20:24:05.032489635 +0200
@@ -1,7 +1,7 @@
import gi
@ -432,9 +442,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-1.0.1-
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/search_results.py cozy-1.0.1--patched/cozy/ui/widgets/search_results.py
--- cozy-1.0.1--orig/cozy/ui/widgets/search_results.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/widgets/search_results.py 2021-05-30 11:14:55.839892261 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/search_results.py cozy-1.2.1--patched/cozy/ui/widgets/search_results.py
--- cozy-1.2.1--orig/cozy/ui/widgets/search_results.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/widgets/search_results.py 2022-08-21 20:24:05.033489641 +0200
@@ -1,8 +1,8 @@
from gi.repository import Gtk, Gdk
import cozy.tools as tools
@ -445,9 +455,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/search_results.py cozy-1.0.1--patched
MAX_BOOK_LENGTH = 80
BOOK_ICON_SIZE = 40
diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/sleep_timer.py cozy-1.0.1--patched/cozy/ui/widgets/sleep_timer.py
--- cozy-1.0.1--orig/cozy/ui/widgets/sleep_timer.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/widgets/sleep_timer.py 2021-05-30 11:14:55.849892263 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/sleep_timer.py cozy-1.2.1--patched/cozy/ui/widgets/sleep_timer.py
--- cozy-1.2.1--orig/cozy/ui/widgets/sleep_timer.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/widgets/sleep_timer.py 2022-08-21 20:24:05.033489641 +0200
@@ -1,7 +1,7 @@
import gi
@ -457,9 +467,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/sleep_timer.py cozy-1.0.1--patched/co
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
diff -rU4 cozy-1.2.0--orig/cozy/ui/widgets/storage_list_box_row.py cozy-1.2.0--patched/cozy/ui/widgets/storage_list_box_row.py
--- cozy-1.2.0--orig/cozy/ui/widgets/storage_list_box_row.py 2022-01-08 18:02:56.000000000 +0100
+++ cozy-1.2.0--patched/cozy/ui/widgets/storage_list_box_row.py 2022-01-08 23:49:52.216924531 +0100
diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-1.2.1--patched/cozy/ui/widgets/storage_list_box_row.py
--- cozy-1.2.1--orig/cozy/ui/widgets/storage_list_box_row.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/widgets/storage_list_box_row.py 2022-08-21 20:24:05.033489641 +0200
@@ -2,9 +2,9 @@
from threading import Thread
@ -471,9 +481,9 @@ diff -rU4 cozy-1.2.0--orig/cozy/ui/widgets/storage_list_box_row.py cozy-1.2.0--p
from cozy.model.settings import Settings
from gi.repository import Gtk, GObject
diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/whats_new_window.py cozy-1.0.1--patched/cozy/ui/widgets/whats_new_window.py
--- cozy-1.0.1--orig/cozy/ui/widgets/whats_new_window.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/widgets/whats_new_window.py 2021-05-30 11:14:55.855892264 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/whats_new_window.py cozy-1.2.1--patched/cozy/ui/widgets/whats_new_window.py
--- cozy-1.2.1--orig/cozy/ui/widgets/whats_new_window.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/widgets/whats_new_window.py 2022-08-21 20:24:05.033489641 +0200
@@ -3,9 +3,9 @@
import gi
@ -485,9 +495,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/whats_new_window.py cozy-1.0.1--patch
from cozy.version import __version__ as CozyVersion
gi.require_version('Gtk', '3.0')
diff -rU4 cozy-1.0.1--orig/cozy/view_model/book_detail_view_model.py cozy-1.0.1--patched/cozy/view_model/book_detail_view_model.py
--- cozy-1.0.1--orig/cozy/view_model/book_detail_view_model.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/view_model/book_detail_view_model.py 2021-05-30 11:14:55.867892266 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/view_model/book_detail_view_model.py cozy-1.2.1--patched/cozy/view_model/book_detail_view_model.py
--- cozy-1.2.1--orig/cozy/view_model/book_detail_view_model.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/view_model/book_detail_view_model.py 2022-08-21 20:24:05.034489647 +0200
@@ -5,9 +5,9 @@
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
@ -499,9 +509,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/book_detail_view_model.py cozy-1.0.1-
from cozy.model.book import Book
from cozy.model.chapter import Chapter
from cozy.model.library import Library
diff -rU4 cozy-1.0.1--orig/cozy/view_model/headerbar_view_model.py cozy-1.0.1--patched/cozy/view_model/headerbar_view_model.py
--- cozy-1.0.1--orig/cozy/view_model/headerbar_view_model.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/view_model/headerbar_view_model.py 2021-05-30 11:14:55.864892266 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/view_model/headerbar_view_model.py cozy-1.2.1--patched/cozy/view_model/headerbar_view_model.py
--- cozy-1.2.1--orig/cozy/view_model/headerbar_view_model.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/view_model/headerbar_view_model.py 2022-08-21 20:24:05.034489647 +0200
@@ -2,9 +2,9 @@
from cozy.architecture.event_sender import EventSender
@ -513,10 +523,10 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/headerbar_view_model.py cozy-1.0.1--p
from cozy.media.importer import Importer, ScanStatus
from cozy.model.library import Library
from cozy.open_view import OpenView
diff -rU4 cozy-1.0.1--orig/cozy/view_model/library_view_model.py cozy-1.0.1--patched/cozy/view_model/library_view_model.py
--- cozy-1.0.1--orig/cozy/view_model/library_view_model.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/view_model/library_view_model.py 2021-05-30 11:14:55.868892266 +0200
@@ -2,9 +2,9 @@
diff -U4 -r cozy-1.2.1--orig/cozy/view_model/library_view_model.py cozy-1.2.1--patched/cozy/view_model/library_view_model.py
--- cozy-1.2.1--orig/cozy/view_model/library_view_model.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/view_model/library_view_model.py 2022-08-21 20:24:05.034489647 +0200
@@ -4,9 +4,9 @@
from typing import Optional
from gi.repository import Gtk
@ -527,9 +537,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/library_view_model.py cozy-1.0.1--pat
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
from cozy.control.filesystem_monitor import FilesystemMonitor
diff -rU4 cozy-1.0.1--orig/cozy/view_model/playback_control_view_model.py cozy-1.0.1--patched/cozy/view_model/playback_control_view_model.py
--- cozy-1.0.1--orig/cozy/view_model/playback_control_view_model.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/view_model/playback_control_view_model.py 2021-05-30 11:14:55.863892265 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/view_model/playback_control_view_model.py cozy-1.2.1--patched/cozy/view_model/playback_control_view_model.py
--- cozy-1.2.1--orig/cozy/view_model/playback_control_view_model.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/view_model/playback_control_view_model.py 2022-08-21 20:24:05.034489647 +0200
@@ -1,9 +1,9 @@
from typing import Optional
@ -541,9 +551,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/playback_control_view_model.py cozy-1
from cozy.model.book import Book
from cozy.open_view import OpenView
diff -rU4 cozy-1.0.1--orig/cozy/view_model/playback_speed_view_model.py cozy-1.0.1--patched/cozy/view_model/playback_speed_view_model.py
--- cozy-1.0.1--orig/cozy/view_model/playback_speed_view_model.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/view_model/playback_speed_view_model.py 2021-05-30 11:14:55.859892265 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/view_model/playback_speed_view_model.py cozy-1.2.1--patched/cozy/view_model/playback_speed_view_model.py
--- cozy-1.2.1--orig/cozy/view_model/playback_speed_view_model.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/view_model/playback_speed_view_model.py 2022-08-21 20:24:05.034489647 +0200
@@ -1,8 +1,8 @@
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
@ -554,9 +564,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/playback_speed_view_model.py cozy-1.0
class PlaybackSpeedViewModel(Observable, EventSender):
diff -rU4 cozy-1.0.1--orig/cozy/view_model/search_view_model.py cozy-1.0.1--patched/cozy/view_model/search_view_model.py
--- cozy-1.0.1--orig/cozy/view_model/search_view_model.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/view_model/search_view_model.py 2021-05-30 11:14:55.862892265 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/view_model/search_view_model.py cozy-1.2.1--patched/cozy/view_model/search_view_model.py
--- cozy-1.2.1--orig/cozy/view_model/search_view_model.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/view_model/search_view_model.py 2022-08-21 20:24:05.035489653 +0200
@@ -1,5 +1,5 @@
-import cozy.ext.inject as inject
+import inject
@ -564,9 +574,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/search_view_model.py cozy-1.0.1--patc
from cozy.extensions.set import split_strings_to_set
from cozy.open_view import OpenView
from cozy.application_settings import ApplicationSettings
diff -rU4 cozy-1.2.0--orig/cozy/view_model/settings_view_model.py cozy-1.2.0--patched/cozy/view_model/settings_view_model.py
--- cozy-1.2.0--orig/cozy/view_model/settings_view_model.py 2022-01-08 18:02:56.000000000 +0100
+++ cozy-1.2.0--patched/cozy/view_model/settings_view_model.py 2022-01-08 23:51:44.333502875 +0100
diff -U4 -r cozy-1.2.1--orig/cozy/view_model/settings_view_model.py cozy-1.2.1--patched/cozy/view_model/settings_view_model.py
--- cozy-1.2.1--orig/cozy/view_model/settings_view_model.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/view_model/settings_view_model.py 2022-08-21 20:24:05.035489653 +0200
@@ -8,9 +8,9 @@
from cozy.architecture.observable import Observable
from cozy.control.filesystem_monitor import FilesystemMonitor
@ -578,9 +588,9 @@ diff -rU4 cozy-1.2.0--orig/cozy/view_model/settings_view_model.py cozy-1.2.0--pa
from cozy.model.settings import Settings
from cozy.report import reporter
from gi.repository import Gtk
diff -rU4 cozy-1.0.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-1.0.1--patched/cozy/view_model/sleep_timer_view_model.py
--- cozy-1.0.1--orig/cozy/view_model/sleep_timer_view_model.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/view_model/sleep_timer_view_model.py 2021-05-30 11:14:55.858892265 +0200
diff -U4 -r cozy-1.2.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-1.2.1--patched/cozy/view_model/sleep_timer_view_model.py
--- cozy-1.2.1--orig/cozy/view_model/sleep_timer_view_model.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/view_model/sleep_timer_view_model.py 2022-08-21 20:24:05.035489653 +0200
@@ -5,9 +5,9 @@
from cozy import tools
@ -592,9 +602,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-1.0.1-
from cozy.tools import IntervalTimer
log = logging.getLogger("sleep_timer_view_model")
diff -rU4 cozy-1.0.1--orig/test/cozy/media/test_importer.py cozy-1.0.1--patched/test/cozy/media/test_importer.py
--- cozy-1.0.1--orig/test/cozy/media/test_importer.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/test/cozy/media/test_importer.py 2021-05-30 11:14:55.922892276 +0200
diff -U4 -r cozy-1.2.1--orig/test/cozy/media/test_importer.py cozy-1.2.1--patched/test/cozy/media/test_importer.py
--- cozy-1.2.1--orig/test/cozy/media/test_importer.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/test/cozy/media/test_importer.py 2022-08-21 20:24:05.035489653 +0200
@@ -2,9 +2,9 @@
import pytest
@ -606,9 +616,9 @@ diff -rU4 cozy-1.0.1--orig/test/cozy/media/test_importer.py cozy-1.0.1--patched/
from cozy.model.library import Library
diff -rU4 cozy-1.0.1--orig/test/cozy/media/test_player.py cozy-1.0.1--patched/test/cozy/media/test_player.py
--- cozy-1.0.1--orig/test/cozy/media/test_player.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/test/cozy/media/test_player.py 2021-05-30 11:14:55.926892276 +0200
diff -U4 -r cozy-1.2.1--orig/test/cozy/media/test_player.py cozy-1.2.1--patched/test/cozy/media/test_player.py
--- cozy-1.2.1--orig/test/cozy/media/test_player.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/test/cozy/media/test_player.py 2022-08-21 20:24:05.036489659 +0200
@@ -3,9 +3,9 @@
import pytest
from peewee import SqliteDatabase
@ -620,9 +630,9 @@ diff -rU4 cozy-1.0.1--orig/test/cozy/media/test_player.py cozy-1.0.1--patched/te
from cozy.model.library import Library
from cozy.model.settings import Settings
diff -rU4 cozy-1.0.1--orig/test/cozy/model/storage_block_list.py cozy-1.0.1--patched/test/cozy/model/storage_block_list.py
--- cozy-1.0.1--orig/test/cozy/model/storage_block_list.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/test/cozy/model/storage_block_list.py 2021-05-30 11:14:55.940892279 +0200
diff -U4 -r cozy-1.2.1--orig/test/cozy/model/storage_block_list.py cozy-1.2.1--patched/test/cozy/model/storage_block_list.py
--- cozy-1.2.1--orig/test/cozy/model/storage_block_list.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/test/cozy/model/storage_block_list.py 2022-08-21 20:24:05.036489659 +0200
@@ -1,8 +1,8 @@
import pytest
from peewee import SqliteDatabase
@ -633,9 +643,9 @@ diff -rU4 cozy-1.0.1--orig/test/cozy/model/storage_block_list.py cozy-1.0.1--pat
@pytest.fixture(autouse=True)
def setup_inject(peewee_database_storage):
diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_book.py cozy-1.0.1--patched/test/cozy/model/test_book.py
--- cozy-1.0.1--orig/test/cozy/model/test_book.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/test/cozy/model/test_book.py 2021-05-30 11:14:55.942892280 +0200
diff -U4 -r cozy-1.2.1--orig/test/cozy/model/test_book.py cozy-1.2.1--patched/test/cozy/model/test_book.py
--- cozy-1.2.1--orig/test/cozy/model/test_book.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/test/cozy/model/test_book.py 2022-08-21 20:24:05.036489659 +0200
@@ -1,9 +1,9 @@
import pytest
from peewee import SqliteDatabase
@ -647,9 +657,9 @@ diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_book.py cozy-1.0.1--patched/test
@pytest.fixture(autouse=True)
diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_database_importer.py cozy-1.0.1--patched/test/cozy/model/test_database_importer.py
--- cozy-1.0.1--orig/test/cozy/model/test_database_importer.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/test/cozy/model/test_database_importer.py 2021-05-30 11:14:55.934892278 +0200
diff -U4 -r cozy-1.2.1--orig/test/cozy/model/test_database_importer.py cozy-1.2.1--patched/test/cozy/model/test_database_importer.py
--- cozy-1.2.1--orig/test/cozy/model/test_database_importer.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/test/cozy/model/test_database_importer.py 2022-08-21 20:24:05.036489659 +0200
@@ -1,8 +1,8 @@
import pytest
from peewee import SqliteDatabase
@ -660,9 +670,9 @@ diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_database_importer.py cozy-1.0.1-
@pytest.fixture(autouse=True)
def setup_inject(peewee_database):
diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_library.py cozy-1.0.1--patched/test/cozy/model/test_library.py
--- cozy-1.0.1--orig/test/cozy/model/test_library.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/test/cozy/model/test_library.py 2021-05-30 11:14:55.939892279 +0200
diff -U4 -r cozy-1.2.1--orig/test/cozy/model/test_library.py cozy-1.2.1--patched/test/cozy/model/test_library.py
--- cozy-1.2.1--orig/test/cozy/model/test_library.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/test/cozy/model/test_library.py 2022-08-21 20:24:05.036489659 +0200
@@ -1,9 +1,9 @@
import pytest
from peewee import SqliteDatabase
@ -674,9 +684,9 @@ diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_library.py cozy-1.0.1--patched/t
from cozy.model.settings import Settings
from test.cozy.mocks import ApplicationSettingsMock
diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_settings.py cozy-1.0.1--patched/test/cozy/model/test_settings.py
--- cozy-1.0.1--orig/test/cozy/model/test_settings.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/test/cozy/model/test_settings.py 2021-05-30 11:14:55.936892278 +0200
diff -U4 -r cozy-1.2.1--orig/test/cozy/model/test_settings.py cozy-1.2.1--patched/test/cozy/model/test_settings.py
--- cozy-1.2.1--orig/test/cozy/model/test_settings.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/test/cozy/model/test_settings.py 2022-08-21 20:24:05.037489665 +0200
@@ -1,7 +1,7 @@
import pytest

12
0001-fix-appdata-file.patch Normal file
View file

@ -0,0 +1,12 @@
--- cozy-1.2.1--orig/data/com.github.geigi.cozy.appdata.xml 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/data/com.github.geigi.cozy.appdata.xml 2022-08-21 20:29:02.793386230 +0200
@@ -54,8 +54,9 @@
</custom>
<releases>
<release version="1.2.1" timestamp="1661086733">
<description>
+ <p>This minor release includes various assorted fixes.</p>
<ul>
<li>Support for GTK style manager (thanks A6GibKm)</li>
<li>Use natural sorting for chapter titles</li>
<li>As always, updated translations thanks to all the translators!</li>

23
0002-fix-invalid-version-none.patch Normal file
View file

@ -0,0 +1,23 @@
--- cozy-1.2.1--orig/cozy/ui/widgets/whats_new_window.py 2022-08-21 14:59:13.000000000 +0200
+++ cozy-1.2.1--patched/cozy/ui/widgets/whats_new_window.py 2023-03-28 07:46:50.407285724 +0200
@@ -50,14 +50,16 @@
def _fill_window(self):
self.children = []
- last_launched_version = version.parse(self.app_settings.last_launched_version)
-
- if type(last_launched_version) is version.LegacyVersion:
+ if (self.app_settings.last_launched_version is None) or (self.app_settings.last_launched_version == "None"):
self._fill_welcome()
else:
- self._fill_whats_new(last_launched_version)
+ last_launched_version = version.parse(self.app_settings.last_launched_version)
+ if type(last_launched_version) is version.LegacyVersion:
+ self._fill_welcome()
+ else:
+ self._fill_whats_new(last_launched_version)
def _fill_welcome(self):
from cozy.ui.widgets.welcome import Welcome
from cozy.ui.widgets.error_reporting import ErrorReporting

29
cozy.spec
View file

@ -4,7 +4,7 @@ Name: cozy
Summary: Modern audiobook player
License: GPLv3+
Version: 1.2.0
Version: 1.2.1
Release: 2%{?dist}
URL: https://cozy.geigi.de
@ -15,6 +15,14 @@ Source99: find-unpatched-imports.sh
# Unbundle python-inject
Patch0: 0000--unbundle-inject.patch
# The appdata XML file does not pass validation
Patch1: 0001-fix-appdata-file.patch
# Fix crash at startup
# See: https://bugzilla.redhat.com/show_bug.cgi?id=2182220
# https://github.com/geigi/cozy/issues/756
Patch2: 0002-fix-invalid-version-none.patch
BuildArch: noarch
%global req_dazzle 3.34.0
@ -103,6 +111,10 @@ rm -rf cozy/ext/inject
# Run the "find unpatched imports" script
"%{SOURCE99}" "$(pwd)"
# Apply other patches
%patch1 -p1
%patch2 -p1
%build
%meson
@ -115,6 +127,13 @@ rm -rf cozy/ext/inject
%meson_install
%find_lang %{rtld_name}
# Move "actions" icons out of /usr/share/icons/ to avoid conflicts with other packages
# See: https://bugzilla.redhat.com/show_bug.cgi?id=2120689
# https://github.com/geigi/cozy/issues/710
COZY_ICON_DIR="%{buildroot}%{_datadir}/%{rtld_name}/icons/hicolor/scalable"
install -m 755 -d "${COZY_ICON_DIR}"
mv %{buildroot}%{_datadir}/icons/hicolor/scalable/actions "${COZY_ICON_DIR}/actions"
# Remove the "devel" icon
rm %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{rtld_name}.Devel.svg
@ -136,13 +155,19 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop
%{_datadir}/applications/%{rtld_name}.desktop
%{_datadir}/glib-2.0/schemas/%{rtld_name}.gschema.xml
%{_datadir}/icons/hicolor/*/apps/%{rtld_name}.svg
%{_datadir}/icons/hicolor/scalable/actions/*-symbolic.svg
%{_datadir}/icons/hicolor/symbolic/apps/%{rtld_name}-symbolic.svg
%{_metainfodir}/%{rtld_name}.appdata.xml
%{python3_sitelib}/%{name}/
%changelog
* Tue Mar 28 2023 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.2.1-2
- Move "actions" icons out of /usr/share/icons to avoid conflicts with other packages
- Add a patch to fix crash at startup
* Sun Aug 21 2022 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.2.1-1
- Update to v1.2.1
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

2
sources
View file

@ -1 +1 @@
SHA512 (cozy-1.2.0.tar.gz) = d3eb8063be4f7d966072fb48be23bbf71ea068a6614be55ef2ce70181c8c78e6200168a1cddc41d23406a8686c1be2e7ec9197470e9e94e6c287df45990b8056
SHA512 (cozy-1.2.1.tar.gz) = db6c4a5ed47e139d87ca8a0d3c1d2681305ee565322209240e52acc1ac41c9669fb3ae06ca517d668e5f7a86319861089772b0d7b8f1aa22cfb5462913a9d3f5