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

Compare commits

base: 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
..
compare: rpms:f37
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

1 commit
rawhide ... f37

Author SHA1 Message Date
Artur Frenszek-Iwicki
67faeb1c39 Fix crash at startup and file conflicts 2023-03-28 08:18:19 +02:00
6 changed files with 349 additions and 333 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -18,4 +18,3 @@
/cozy-1.1.3.tar.gz
/cozy-1.2.0.tar.gz
/cozy-1.2.1.tar.gz
/cozy-1.3.0.tar.gz

539
0000--unbundle-inject.patch
View file

@ -1,6 +1,6 @@
diff -r -U4 cozy-1.3.0--orig/cozy/app_controller.py cozy-1.3.0--patched/cozy/app_controller.py
--- cozy-1.3.0--orig/cozy/app_controller.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/app_controller.py 2024-03-03 11:51:34.062151406 +0100
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 -r -U4 cozy-1.3.0--orig/cozy/app_controller.py cozy-1.3.0--patched/cozy/app
from cozy.control.offline_cache import OfflineCache
from cozy.media.files import Files
diff -r -U4 cozy-1.3.0--orig/cozy/application_settings.py cozy-1.3.0--patched/cozy/application_settings.py
--- cozy-1.3.0--orig/cozy/application_settings.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/application_settings.py 2024-03-03 11:52:23.623579214 +0100
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 -r -U4 cozy-1.3.0--orig/cozy/application_settings.py cozy-1.3.0--patched/co
class ApplicationSettings(EventSender):
_settings: Gio.Settings = inject.attr(Gio.Settings)
diff -r -U4 cozy-1.3.0--orig/cozy/control/artwork_cache.py cozy-1.3.0--patched/cozy/control/artwork_cache.py
--- cozy-1.3.0--orig/cozy/control/artwork_cache.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/control/artwork_cache.py 2024-03-03 11:52:23.625579231 +0100
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 -r -U4 cozy-1.3.0--orig/cozy/control/artwork_cache.py cozy-1.3.0--patched/c
from cozy.report import reporter
log = logging.getLogger("artwork_cache")
diff -r -U4 cozy-1.3.0--orig/cozy/control/filesystem_monitor.py cozy-1.3.0--patched/cozy/control/filesystem_monitor.py
--- cozy-1.3.0--orig/cozy/control/filesystem_monitor.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/control/filesystem_monitor.py 2024-03-03 11:51:34.062151406 +0100
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,23 +50,23 @@ diff -r -U4 cozy-1.3.0--orig/cozy/control/filesystem_monitor.py cozy-1.3.0--patc
from cozy.architecture.event_sender import EventSender
from cozy.model.book import Book
diff -r -U4 cozy-1.3.0--orig/cozy/control/mpris.py cozy-1.3.0--patched/cozy/control/mpris.py
--- cozy-1.3.0--orig/cozy/control/mpris.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/control/mpris.py 2024-03-03 11:52:23.625579231 +0100
@@ -15,9 +15,9 @@
from gi.repository import Gio, GLib
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
from cozy.application_settings import ApplicationSettings
from cozy.control.artwork_cache import ArtworkCache
-from cozy.ext import inject
+import inject
from cozy.media.player import NS_TO_SEC, US_TO_SEC, Player
from cozy.media.player import Player
from cozy.model.book import Book
from cozy.report import reporter
diff -r -U4 cozy-1.3.0--orig/cozy/control/offline_cache.py cozy-1.3.0--patched/cozy/control/offline_cache.py
--- cozy-1.3.0--orig/cozy/control/offline_cache.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/control/offline_cache.py 2024-03-03 11:52:23.624579222 +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,9 +78,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/control/offline_cache.py cozy-1.3.0--patched/c
from cozy.model.chapter import Chapter
from cozy.report import reporter
from cozy.view_model.settings_view_model import SettingsViewModel
diff -r -U4 cozy-1.3.0--orig/cozy/media/files.py cozy-1.3.0--patched/cozy/media/files.py
--- cozy-1.3.0--orig/cozy/media/files.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/media/files.py 2024-03-03 11:52:23.626579240 +0100
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,11 +91,11 @@ diff -r -U4 cozy-1.3.0--orig/cozy/media/files.py cozy-1.3.0--patched/cozy/media/
from cozy.media.importer import Importer
from cozy.model.settings import Settings
from cozy.report import reporter
from cozy.ui.toaster import ToastNotifier
diff -r -U4 cozy-1.3.0--orig/cozy/media/importer.py cozy-1.3.0--patched/cozy/media/importer.py
--- cozy-1.3.0--orig/cozy/media/importer.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/media/importer.py 2024-03-03 11:52:23.626579240 +0100
@@ -9,9 +9,9 @@
from cozy.ui.info_banner import InfoBanner
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
@ -106,9 +106,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/media/importer.py cozy-1.3.0--patched/cozy/med
from cozy.media.media_file import MediaFile
from cozy.model.database_importer import DatabaseImporter
from cozy.model.library import Library
diff -r -U4 cozy-1.3.0--orig/cozy/media/player.py cozy-1.3.0--patched/cozy/media/player.py
--- cozy-1.3.0--orig/cozy/media/player.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/media/player.py 2024-03-03 11:52:23.626579240 +0100
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
@ -120,9 +120,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/media/player.py cozy-1.3.0--patched/cozy/media
from cozy.model.book import Book
from cozy.model.chapter import Chapter
from cozy.model.library import Library
diff -r -U4 cozy-1.3.0--orig/cozy/model/book.py cozy-1.3.0--patched/cozy/model/book.py
--- cozy-1.3.0--orig/cozy/model/book.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/model/book.py 2024-03-03 11:52:23.624579222 +0100
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
@ -134,9 +134,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/model/book.py cozy-1.3.0--patched/cozy/model/b
from cozy.model.settings import Settings
from cozy.model.track import Track, TrackInconsistentData
diff -r -U4 cozy-1.3.0--orig/cozy/model/database_importer.py cozy-1.3.0--patched/cozy/model/database_importer.py
--- cozy-1.3.0--orig/cozy/model/database_importer.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/model/database_importer.py 2024-03-03 11:52:23.624579222 +0100
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
@ -148,9 +148,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/model/database_importer.py cozy-1.3.0--patched
from cozy.media.media_file import MediaFile
from cozy.model.book import Book, BookIsEmpty
diff -r -U4 cozy-1.3.0--orig/cozy/model/library.py cozy-1.3.0--patched/cozy/model/library.py
--- cozy-1.3.0--orig/cozy/model/library.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/model/library.py 2024-03-03 11:52:23.624579222 +0100
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
@ -162,23 +162,23 @@ diff -r -U4 cozy-1.3.0--orig/cozy/model/library.py cozy-1.3.0--patched/cozy/mode
from cozy.model.book import Book, BookIsEmpty
from cozy.model.chapter import Chapter
from cozy.model.settings import Settings
diff -r -U4 cozy-1.3.0--orig/cozy/model/settings.py cozy-1.3.0--patched/cozy/model/settings.py
--- cozy-1.3.0--orig/cozy/model/settings.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/model/settings.py 2024-03-03 11:51:34.061151397 +0100
@@ -3,9 +3,9 @@
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
import peewee
from peewee import SqliteDatabase
-import cozy.ext.inject as inject
+import inject
from peewee import SqliteDatabase
from cozy.db.book import Book
from cozy.db.settings import Settings as SettingsModel
from cozy.db.storage import Storage as StorageModel
from cozy.model.storage import InvalidPath, Storage
diff -r -U4 cozy-1.3.0--orig/cozy/power_manager.py cozy-1.3.0--patched/cozy/power_manager.py
--- cozy-1.3.0--orig/cozy/power_manager.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/power_manager.py 2024-03-03 11:52:23.627579248 +0100
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
@ -190,9 +190,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/power_manager.py cozy-1.3.0--patched/cozy/powe
log = logging.getLogger("power_mgr")
diff -r -U4 cozy-1.3.0--orig/cozy/report/report_to_loki.py cozy-1.3.0--patched/cozy/report/report_to_loki.py
--- cozy-1.3.0--orig/cozy/report/report_to_loki.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/report/report_to_loki.py 2024-03-03 11:52:23.625579231 +0100
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
@ -204,11 +204,11 @@ diff -r -U4 cozy-1.3.0--orig/cozy/report/report_to_loki.py cozy-1.3.0--patched/c
from cozy.version import __version__ as CozyVersion
from peewee import __version__ as PeeweeVersion
from mutagen import version_string as MutagenVersion
diff -r -U4 cozy-1.3.0--orig/cozy/ui/app_view.py cozy-1.3.0--patched/cozy/ui/app_view.py
--- cozy-1.3.0--orig/cozy/ui/app_view.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/app_view.py 2024-03-03 11:52:23.629579266 +0100
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, Adw
from gi.repository import Gtk, Handy
-from cozy.ext import inject
+import inject
@ -216,9 +216,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/ui/app_view.py cozy-1.3.0--patched/cozy/ui/app
from cozy.view import View
LIBRARY = "main"
diff -r -U4 cozy-1.3.0--orig/cozy/ui/book_detail_view.py cozy-1.3.0--patched/cozy/ui/book_detail_view.py
--- cozy-1.3.0--orig/cozy/ui/book_detail_view.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/book_detail_view.py 2024-03-03 11:52:23.630579274 +0100
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
@ -230,36 +230,50 @@ diff -r -U4 cozy-1.3.0--orig/cozy/ui/book_detail_view.py cozy-1.3.0--patched/coz
from cozy.model.chapter import Chapter
from cozy.report import reporter
from cozy.ui.chapter_element import ChapterElement
diff -r -U4 cozy-1.3.0--orig/cozy/ui/delete_book_view.py cozy-1.3.0--patched/cozy/ui/delete_book_view.py
--- cozy-1.3.0--orig/cozy/ui/delete_book_view.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/delete_book_view.py 2024-03-03 11:52:23.629579266 +0100
@@ -1,7 +1,7 @@
from gi.repository import Adw, Gtk
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
import gi
-from cozy.ext import inject
+import inject
from cozy.model.book import Book
from cozy.ui.widgets.book_row import BookRow
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
diff -r -U4 cozy-1.3.0--orig/cozy/ui/file_not_found_dialog.py cozy-1.3.0--patched/cozy/ui/file_not_found_dialog.py
--- cozy-1.3.0--orig/cozy/ui/file_not_found_dialog.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/file_not_found_dialog.py 2024-03-03 11:52:23.627579248 +0100
@@ -1,9 +1,9 @@
from pathlib import Path
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
from gi.repository import Adw, Gio, GLib, Gtk
-from cozy.ext import inject
+import inject
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
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
import cozy.ui
-from cozy.ext import inject
+import inject
from cozy.media.importer import Importer
from cozy.model.chapter import Chapter
from cozy.model.library import Library
diff -r -U4 cozy-1.3.0--orig/cozy/ui/headerbar.py cozy-1.3.0--patched/cozy/ui/headerbar.py
--- cozy-1.3.0--orig/cozy/ui/headerbar.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/headerbar.py 2024-03-03 11:52:23.631579283 +0100
@@ -1,15 +1,15 @@
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
@ -269,48 +283,49 @@ diff -r -U4 cozy-1.3.0--orig/cozy/ui/headerbar.py cozy-1.3.0--patched/cozy/ui/he
from cozy.ui.widgets.progress_popover import ProgressPopover
from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState
from gi.repository import Adw, Gtk, GObject
-from cozy.ext import inject
+import inject
from cozy.ui.widgets.progress_popover import ProgressPopover
from cozy.view_model.headerbar_view_model import HeaderBarState, HeaderbarViewModel
log = logging.getLogger("Headerbar")
diff -r -U4 cozy-1.3.0--orig/cozy/ui/import_failed_dialog.py cozy-1.3.0--patched/cozy/ui/import_failed_dialog.py
--- cozy-1.3.0--orig/cozy/ui/import_failed_dialog.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/import_failed_dialog.py 2024-03-03 11:52:23.630579274 +0100
gi.require_version('Gtk', '3.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 @@
from gettext import gettext as _
import gi
from gi.repository import Adw, Gtk
from gi.repository import Gtk
-from cozy.ext import inject
+import inject
HEADER = _("This can have multiple reasons:")
POSSIBILITIES = "\n • ".join(( # yes, it is a hack, because \t would be too wide
diff -r -U4 cozy-1.3.0--orig/cozy/ui/library_view.py cozy-1.3.0--patched/cozy/ui/library_view.py
--- cozy-1.3.0--orig/cozy/ui/library_view.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/library_view.py 2024-03-03 11:52:23.629579266 +0100
@@ -2,9 +2,9 @@
from typing import Optional
class InfoBanner:
_builder: Gtk.Builder = inject.attr("MainWindowBuilder")
@@ -19,5 +19,5 @@
self._label.set_text(message)
self._toast.set_revealed(True)
from gi.repository import Adw, Gtk
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
from gi.repository.Gtk import Builder
-from cozy.ext import inject
+import inject
from cozy.ui.widgets.book_element import BookElement
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
diff -r -U4 cozy-1.3.0--orig/cozy/ui/main_view.py cozy-1.3.0--patched/cozy/ui/main_view.py
--- cozy-1.3.0--orig/cozy/ui/main_view.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/main_view.py 2024-03-03 11:51:34.062151406 +0100
@@ -6,9 +6,9 @@
from cozy.view_model.library_view_model import LibraryViewModel, LibraryViewMode, LibraryPage
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 Adw, Gdk, Gio, GLib, Gtk
from gi.repository import Gtk, Gio, Gdk, GLib
import cozy.control.filesystem_monitor as fs_monitor
-import cozy.ext.inject as inject
@ -319,9 +334,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/ui/main_view.py cozy-1.3.0--patched/cozy/ui/ma
from cozy.application_settings import ApplicationSettings
from cozy.architecture.event_sender import EventSender
from cozy.architecture.singleton import Singleton
diff -r -U4 cozy-1.3.0--orig/cozy/ui/media_controller.py cozy-1.3.0--patched/cozy/ui/media_controller.py
--- cozy-1.3.0--orig/cozy/ui/media_controller.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/media_controller.py 2024-03-03 11:52:23.631579283 +0100
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
@ -333,52 +348,67 @@ diff -r -U4 cozy-1.3.0--orig/cozy/ui/media_controller.py cozy-1.3.0--patched/coz
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 -r -U4 cozy-1.3.0--orig/cozy/ui/preferences_view.py cozy-1.3.0--patched/cozy/ui/preferences_view.py
--- cozy-1.3.0--orig/cozy/ui/preferences_view.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/preferences_view.py 2024-03-03 11:52:23.630579274 +0100
@@ -1,8 +1,8 @@
from typing import Any
from gi.repository import Adw, Gio, Gtk
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
from cozy.control.artwork_cache import ArtworkCache
from cozy.db.book import Book
-from cozy.ext import inject
+import inject
from cozy.ui.widgets.playback_speed_popover import PlaybackSpeedPopover
from cozy.view_model.playback_control_view_model import PlaybackControlViewModel
gi.require_version('Gtk', '3.0')
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
from gi.repository import Handy, Gio
-from cozy.ext import inject
+import inject
from cozy.ui.widgets.error_reporting import ErrorReporting
from cozy.ui.widgets.storage_list_box_row import StorageListBoxRow
from cozy.ui.widgets.storages import StorageLocations
from cozy.view_model.settings_view_model import SettingsViewModel
diff -r -U4 cozy-1.3.0--orig/cozy/ui/search_view.py cozy-1.3.0--patched/cozy/ui/search_view.py
--- cozy-1.3.0--orig/cozy/ui/search_view.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/search_view.py 2024-03-03 11:52:23.631579283 +0100
@@ -2,9 +2,9 @@
from typing import Callable, Sequence
from gi.repository import Adw, Gtk
gi.require_version('Gtk', '3.0')
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
-from cozy.ext import inject
+import inject
from cozy.model.book import Book
from cozy.ui.headerbar import Headerbar
from cozy.ui.widgets.book_row import BookRow
from cozy.ui.widgets.search_results import ArtistResultRow
diff -r -U4 cozy-1.3.0--orig/cozy/ui/toaster.py cozy-1.3.0--patched/cozy/ui/toaster.py
--- cozy-1.3.0--orig/cozy/ui/toaster.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/toaster.py 2024-03-03 11:52:23.631579283 +0100
@@ -1,7 +1,7 @@
from gi.repository import Adw, Gtk
from cozy.ui.widgets.search_results import BookSearchResult, ArtistSearchResult
-from cozy.ext import inject
import gi
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
import gi
-import cozy.ext.inject as inject
+import inject
from cozy.control.filesystem_monitor import FilesystemMonitor
class ToastNotifier:
_builder: Gtk.Builder = inject.attr("MainWindowBuilder")
diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/album_element.py cozy-1.3.0--patched/cozy/ui/widgets/album_element.py
--- cozy-1.3.0--orig/cozy/ui/widgets/album_element.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/widgets/album_element.py 2024-03-03 11:52:23.627579248 +0100
@@ -4,9 +4,9 @@
import cairo
gi.require_version('Gtk', '3.0')
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
from cozy.extensions.gtk_widget import set_hand_cursor, reset_cursor
from cozy.model.book import Book
-from cozy.ext import inject
+import inject
@ -386,23 +416,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/album_element.py cozy-1.3.0--patche
from gi.repository import Gtk, GObject, Gdk
ALBUM_ART_SIZE = 200
diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/book_row.py cozy-1.3.0--patched/cozy/ui/widgets/book_row.py
--- cozy-1.3.0--orig/cozy/ui/widgets/book_row.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/widgets/book_row.py 2024-03-03 11:52:23.628579257 +0100
@@ -2,9 +2,9 @@
from gi.repository import Adw, Gtk
from cozy.control.artwork_cache import ArtworkCache
-from cozy.ext import inject
+import inject
from cozy.model.book import Book
BOOK_ICON_SIZE = 52
diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/error_reporting.py cozy-1.3.0--patched/cozy/ui/widgets/error_reporting.py
--- cozy-1.3.0--orig/cozy/ui/widgets/error_reporting.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/widgets/error_reporting.py 2024-03-03 11:52:23.628579257 +0100
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
@ -411,47 +427,78 @@ diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/error_reporting.py cozy-1.3.0--patc
-from cozy.ext import inject
+import inject
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
LEVELS = [
diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/playback_speed_popover.py cozy-1.3.0--patched/cozy/ui/widgets/playback_speed_popover.py
--- cozy-1.3.0--orig/cozy/ui/widgets/playback_speed_popover.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/widgets/playback_speed_popover.py 2024-03-03 11:52:23.628579257 +0100
@@ -1,5 +1,5 @@
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
-from cozy.ext import inject
+import inject
from cozy.view_model.playback_speed_view_model import PlaybackSpeedViewModel
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
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
from cozy.control.artwork_cache import ArtworkCache
-from cozy.ext import inject
+import inject
from cozy.model.book import Book
MAX_BOOK_LENGTH = 80
BOOK_ICON_SIZE = 40
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
diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/sleep_timer.py cozy-1.3.0--patched/cozy/ui/widgets/sleep_timer.py
--- cozy-1.3.0--orig/cozy/ui/widgets/sleep_timer.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/widgets/sleep_timer.py 2024-03-03 11:52:23.627579248 +0100
@@ -1,5 +1,5 @@
-from cozy.ext import inject
+import inject
from cozy.view_model.sleep_timer_view_model import SleepTimerViewModel, SystemPowerControl
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
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
diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/storages.py cozy-1.3.0--patched/cozy/ui/widgets/storages.py
--- cozy-1.3.0--orig/cozy/ui/widgets/storages.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/ui/widgets/storages.py 2024-03-03 11:52:23.628579257 +0100
@@ -1,9 +1,9 @@
from typing import Callable
from gi.repository import Adw, Gio, GLib, GObject, Gtk
from cozy.control.filesystem_monitor import FilesystemMonitor
from cozy.model.storage import Storage
-from cozy.ext import inject
+import inject
from cozy.model.storage import Storage
from cozy.view_model.storages_view_model import StoragesViewModel
from cozy.model.library import Library
from cozy.model.settings import Settings
from gi.repository import Gtk, GObject
diff -r -U4 cozy-1.3.0--orig/cozy/view_model/book_detail_view_model.py cozy-1.3.0--patched/cozy/view_model/book_detail_view_model.py
--- cozy-1.3.0--orig/cozy/view_model/book_detail_view_model.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/view_model/book_detail_view_model.py 2024-03-03 11:52:23.623579214 +0100
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
from cozy.application_settings import ApplicationSettings
-from cozy.ext import inject
+import inject
from cozy.ui.main_view import CozyUI
from cozy.version import __version__ as CozyVersion
gi.require_version('Gtk', '3.0')
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
from cozy.control.filesystem_monitor import FilesystemMonitor
@ -462,9 +509,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/view_model/book_detail_view_model.py cozy-1.3.
from cozy.model.book import Book
from cozy.model.chapter import Chapter
from cozy.model.library import Library
diff -r -U4 cozy-1.3.0--orig/cozy/view_model/headerbar_view_model.py cozy-1.3.0--patched/cozy/view_model/headerbar_view_model.py
--- cozy-1.3.0--orig/cozy/view_model/headerbar_view_model.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/view_model/headerbar_view_model.py 2024-03-03 11:52:23.623579214 +0100
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
@ -476,24 +523,26 @@ diff -r -U4 cozy-1.3.0--orig/cozy/view_model/headerbar_view_model.py cozy-1.3.0-
from cozy.media.importer import Importer, ScanStatus
from cozy.model.library import Library
from cozy.open_view import OpenView
diff -r -U4 cozy-1.3.0--orig/cozy/view_model/library_view_model.py cozy-1.3.0--patched/cozy/view_model/library_view_model.py
--- cozy-1.3.0--orig/cozy/view_model/library_view_model.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/view_model/library_view_model.py 2024-03-03 11:51:34.061151397 +0100
@@ -2,9 +2,9 @@
import os
from enum import Enum, auto
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
-import cozy.ext.inject as inject
+import inject
from cozy.application_settings import ApplicationSettings
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
from cozy.control.filesystem_monitor import FilesystemMonitor
diff -r -U4 cozy-1.3.0--orig/cozy/view_model/playback_control_view_model.py cozy-1.3.0--patched/cozy/view_model/playback_control_view_model.py
--- cozy-1.3.0--orig/cozy/view_model/playback_control_view_model.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/view_model/playback_control_view_model.py 2024-03-03 11:52:23.622579205 +0100
@@ -1,7 +1,7 @@
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
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
-from cozy.ext import inject
@ -502,9 +551,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/view_model/playback_control_view_model.py cozy
from cozy.model.book import Book
from cozy.open_view import OpenView
diff -r -U4 cozy-1.3.0--orig/cozy/view_model/playback_speed_view_model.py cozy-1.3.0--patched/cozy/view_model/playback_speed_view_model.py
--- cozy-1.3.0--orig/cozy/view_model/playback_speed_view_model.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/view_model/playback_speed_view_model.py 2024-03-03 11:52:23.622579205 +0100
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
@ -515,37 +564,33 @@ diff -r -U4 cozy-1.3.0--orig/cozy/view_model/playback_speed_view_model.py cozy-1
class PlaybackSpeedViewModel(Observable, EventSender):
diff -r -U4 cozy-1.3.0--orig/cozy/view_model/search_view_model.py cozy-1.3.0--patched/cozy/view_model/search_view_model.py
--- cozy-1.3.0--orig/cozy/view_model/search_view_model.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/view_model/search_view_model.py 2024-03-03 11:51:34.061151397 +0100
@@ -1,9 +1,9 @@
from typing import Callable
from gi.repository import GLib
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
from cozy.extensions.set import split_strings_to_set
from cozy.open_view import OpenView
from cozy.application_settings import ApplicationSettings
from cozy.architecture.event_sender import EventSender
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
diff -r -U4 cozy-1.3.0--orig/cozy/view_model/settings_view_model.py cozy-1.3.0--patched/cozy/view_model/settings_view_model.py
--- cozy-1.3.0--orig/cozy/view_model/settings_view_model.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/view_model/settings_view_model.py 2024-03-03 11:52:23.621579196 +0100
@@ -4,9 +4,9 @@
from cozy.application_settings import ApplicationSettings
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
from cozy.model.library import Library
from cozy.model.storage import Storage
-from cozy.ext import inject
+import inject
from cozy.media.importer import Importer
from cozy.model.settings import Settings
log = logging.getLogger("settings_view_model")
diff -r -U4 cozy-1.3.0--orig/cozy/view_model/sleep_timer_view_model.py cozy-1.3.0--patched/cozy/view_model/sleep_timer_view_model.py
--- cozy-1.3.0--orig/cozy/view_model/sleep_timer_view_model.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/view_model/sleep_timer_view_model.py 2024-03-03 11:52:23.622579205 +0100
from cozy.report import reporter
from gi.repository import Gtk
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
@ -557,23 +602,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/view_model/sleep_timer_view_model.py cozy-1.3.
from cozy.tools import IntervalTimer
log = logging.getLogger("sleep_timer_view_model")
diff -r -U4 cozy-1.3.0--orig/cozy/view_model/storages_view_model.py cozy-1.3.0--patched/cozy/view_model/storages_view_model.py
--- cozy-1.3.0--orig/cozy/view_model/storages_view_model.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/cozy/view_model/storages_view_model.py 2024-03-03 11:52:23.621579196 +0100
@@ -6,9 +6,9 @@
from cozy.application_settings import ApplicationSettings
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
from cozy.control.filesystem_monitor import FilesystemMonitor
-from cozy.ext import inject
+import inject
from cozy.media.importer import Importer
from cozy.model.library import Library
from cozy.model.settings import Settings
from cozy.model.storage import Storage
diff -r -U4 cozy-1.3.0--orig/test/cozy/media/test_importer.py cozy-1.3.0--patched/test/cozy/media/test_importer.py
--- cozy-1.3.0--orig/test/cozy/media/test_importer.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/test/cozy/media/test_importer.py 2024-03-03 11:52:23.633579300 +0100
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
@ -585,9 +616,9 @@ diff -r -U4 cozy-1.3.0--orig/test/cozy/media/test_importer.py cozy-1.3.0--patche
from cozy.model.library import Library
diff -r -U4 cozy-1.3.0--orig/test/cozy/media/test_player.py cozy-1.3.0--patched/test/cozy/media/test_player.py
--- cozy-1.3.0--orig/test/cozy/media/test_player.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/test/cozy/media/test_player.py 2024-03-03 11:52:23.633579300 +0100
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
@ -599,9 +630,9 @@ diff -r -U4 cozy-1.3.0--orig/test/cozy/media/test_player.py cozy-1.3.0--patched/
from cozy.model.library import Library
from cozy.model.settings import Settings
diff -r -U4 cozy-1.3.0--orig/test/cozy/model/storage_block_list.py cozy-1.3.0--patched/test/cozy/model/storage_block_list.py
--- cozy-1.3.0--orig/test/cozy/model/storage_block_list.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/test/cozy/model/storage_block_list.py 2024-03-03 11:52:23.632579291 +0100
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
@ -612,9 +643,9 @@ diff -r -U4 cozy-1.3.0--orig/test/cozy/model/storage_block_list.py cozy-1.3.0--p
@pytest.fixture(autouse=True)
def setup_inject(peewee_database_storage):
diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_book.py cozy-1.3.0--patched/test/cozy/model/test_book.py
--- cozy-1.3.0--orig/test/cozy/model/test_book.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/test/cozy/model/test_book.py 2024-03-03 11:52:23.633579300 +0100
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
@ -626,9 +657,9 @@ diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_book.py cozy-1.3.0--patched/te
@pytest.fixture(autouse=True)
diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_database_importer.py cozy-1.3.0--patched/test/cozy/model/test_database_importer.py
--- cozy-1.3.0--orig/test/cozy/model/test_database_importer.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/test/cozy/model/test_database_importer.py 2024-03-03 11:52:23.632579291 +0100
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
@ -639,9 +670,9 @@ diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_database_importer.py cozy-1.3.
@pytest.fixture(autouse=True)
def setup_inject(peewee_database):
diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_library.py cozy-1.3.0--patched/test/cozy/model/test_library.py
--- cozy-1.3.0--orig/test/cozy/model/test_library.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/test/cozy/model/test_library.py 2024-03-03 11:52:23.632579291 +0100
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
@ -653,9 +684,9 @@ diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_library.py cozy-1.3.0--patched
from cozy.model.settings import Settings
from test.cozy.mocks import ApplicationSettingsMock
diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_settings.py cozy-1.3.0--patched/test/cozy/model/test_settings.py
--- cozy-1.3.0--orig/test/cozy/model/test_settings.py 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/test/cozy/model/test_settings.py 2024-03-03 11:51:34.063151414 +0100
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

16
0001-fix-appdata-file.patch
View file

@ -1,11 +1,11 @@
--- cozy-1.3.0--orig/data/com.github.geigi.cozy.appdata.xml 2024-03-01 15:44:03.000000000 +0100
+++ cozy-1.3.0--patched/data/com.github.geigi.cozy.appdata.xml 2024-03-03 11:55:41.260289799 +0100
@@ -67,8 +67,9 @@
</description>
</release>
<release version="1.2.1" date="2022-08-21">
<description translatable="no">
+ <p>This minor release includes various assorted fixes.</p>
--- 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>

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

101
cozy.spec
View file

@ -2,10 +2,10 @@ Name: cozy
%global rtld_name com.github.geigi.cozy
Summary: Modern audiobook player
License: GPL-3.0-or-later
License: GPLv3+
Version: 1.3.0
Release: 11%{?dist}
Version: 1.2.1
Release: 2%{?dist}
URL: https://cozy.geigi.de
Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
@ -18,17 +18,26 @@ 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_adwaita 1.4.0
%global req_py_inject 4.3.1
%global req_py_peewee 3.9.6
%global req_dazzle 3.34.0
%global req_granite 5.3.0
%global req_gtk3 3.22
%global req_handy 1.0.0
%global req_meson 0.4.0
BuildRequires: desktop-file-utils
BuildRequires: glib2-devel
BuildRequires: granite-devel >= %{req_granite}
BuildRequires: gtk3-devel >= %{req_gtk3}
BuildRequires: libappstream-glib
BuildRequires: libadwaita-devel >= %{req_adwaita}
BuildRequires: meson >= 0.59.0
BuildRequires: libhandy1-devel >= %{req_handy}
BuildRequires: meson >= %{req_meson}
BuildRequires: python3-devel
%global with_tests 1
@ -37,10 +46,12 @@ BuildRequires: python3-devel
BuildRequires: gstreamer1-plugins-base
BuildRequires: python3dist(distro)
BuildRequires: python3dist(inject) >= %{req_py_inject}
BuildRequires: python3dist(inject) >= 4.3.1
BuildRequires: python3dist(mutagen)
BuildRequires: python3dist(peewee) >= %{req_py_peewee}
BuildRequires: python3dist(packaging)
BuildRequires: python3dist(peewee) >= 3.9.6
BuildRequires: python3dist(pygobject)
BuildRequires: python3dist(pytest-runner)
BuildRequires: python3dist(pytest-mock)
BuildRequires: python3dist(pytz)
BuildRequires: python3dist(requests)
@ -48,17 +59,21 @@ BuildRequires: python3dist(requests)
Requires: file
Requires: glib2
Requires: libadwaita >= %{req_adwaita}
Requires: granite >= %{req_granite}
Requires: libdazzle >= %{req_dazzle}
Requires: libhandy >= %{req_handy}
Requires: gstreamer1-plugins-bad-free
Requires: gstreamer1-plugins-good
Requires: gstreamer1-plugins-ugly-free
Requires: hicolor-icon-theme
# For whatever reason, the Python dependency generator doesn't seem to work
# for this RPM, so we'll just copy-paste the BuildRequires list
Requires: python3dist(distro)
Requires: python3dist(inject) >= %{req_py_inject}
Requires: python3dist(inject) >= 4.3.1
Requires: python3dist(mutagen)
Requires: python3dist(peewee) >= %{req_py_peewee}
Requires: python3dist(packaging)
Requires: python3dist(peewee) >= 3.9.6
Requires: python3dist(pygobject)
Requires: python3dist(pytz)
Requires: python3dist(requests)
@ -90,14 +105,15 @@ Here are some of the current features:
%setup -q
# Unbundle inject
%patch 0 -p1
%patch0 -p1
rm -rf cozy/ext/inject
# Run the "find unpatched imports" script
"%{SOURCE99}" "$(pwd)"
# Apply other patches
%patch 1 -p1
%patch1 -p1
%patch2 -p1
%build
@ -145,62 +161,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop
%changelog
* Fri Dec 12 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 1.3.0-11
- Drop gstreamer1-plugins-ugly-free dependency
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 1.3.0-10
- Rebuilt for Python 3.14.0rc3 bytecode
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 1.3.0-9
- Rebuilt for Python 3.14.0rc2 bytecode
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue Jun 17 2025 Python Maint <python-maint@redhat.com> - 1.3.0-7
- Rebuilt for Python 3.14
* Wed Mar 12 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.3.0-6
- gstreamer1-plugins-bad-free rebuild
* Wed Feb 12 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 1.3.0-5
- Remove spurious BuildRequires on python-pytest-runner
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 1.3.0-2
- Rebuilt for Python 3.13
* Sun Mar 03 2024 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.3.0-1
- Update to v1.3.0
- Drop Patch2 (fix crash at startup - merged upstream)
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jul 06 2023 Python Maint <python-maint@redhat.com> - 1.2.1-5
- Rebuilt for Python 3.12
* Sun May 28 2023 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.2.1-4
- Modify Patch2 to fix yet another crash at startup
* Tue Mar 28 2023 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.2.1-3
* 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
- Convert License tag to SPDX
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sun Aug 21 2022 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.2.1-1
- Update to v1.2.1

2
sources
View file

@ -1 +1 @@
SHA512 (cozy-1.3.0.tar.gz) = 2e7ca481bb3ed3813814640e2685ef666063d9614cf2cfb6db9ca2f0db61f0883c8415506c3cb84b88b20e7dbf768b4cc587b5c69ea15c9db0b3411c4ea83f2d
SHA512 (cozy-1.2.1.tar.gz) = db6c4a5ed47e139d87ca8a0d3c1d2681305ee565322209240e52acc1ac41c9669fb3ae06ca517d668e5f7a86319861089772b0d7b8f1aa22cfb5462913a9d3f5