Compare commits

...
Sign in to create a new pull request.

20 commits

Author SHA1 Message Date
Yaakov Selkowitz
f3eec8b9f6 Drop gstreamer1-plugins-ugly-free dependency
This made sense long ago, as that is where the MP3 decoder elements were
first made available in Fedora. Since then, they have moved to -good,
and not much is left in -ugly-free that would make it mandatory.
2025-12-11 23:48:52 -05:00
Python Maint
d4895992c4 Rebuilt for Python 3.14.0rc3 bytecode 2025-09-19 12:12:30 +02:00
Python Maint
55e1a90fe8 Rebuilt for Python 3.14.0rc2 bytecode 2025-08-15 12:43:07 +02:00
Fedora Release Engineering
61c3d2002d Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 18:44:15 +00:00
Python Maint
d84606a2b7 Rebuilt for Python 3.14 2025-06-17 21:48:51 +02:00
Gwyn Ciesla
c52ed82d02 gstreamer1-plugins-bad-free rebuild 2025-03-12 10:03:25 -05:00
Benjamin A. Beasley
4ae24022e1 Remove spurious BuildRequires on python-pytest-runner 2025-02-12 15:39:52 -05:00
Fedora Release Engineering
29fb9b34e4 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 14:40:22 +00:00
Fedora Release Engineering
7721fa40ea Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 20:03:41 +00:00
Python Maint
59985656cf Rebuilt for Python 3.13 2024-06-08 11:35:14 +02:00
Artur Frenszek-Iwicki
9ae0d057fe Update to v1.3.0 (rhbz#2252866) 2024-03-03 12:10:49 +01:00
Fedora Release Engineering
3201112dc1 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 08:11:23 +00:00
Fedora Release Engineering
29b4c2c9d0 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 16:14:21 +00:00
Fedora Release Engineering
456944d542 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 16:26:52 +00:00
Python Maint
9babfc26d7 Rebuilt for Python 3.12 2023-07-06 09:43:05 +02:00
Artur Frenszek-Iwicki
a9fb01a27c Patch yet another crash at startup 2023-05-28 12:21:23 +02:00
Artur Frenszek-Iwicki
c1f8e34311 Fix crash at startup and file conflicts 2023-03-28 07:51:56 +02:00
Fedora Release Engineering
d20a3c3c4f Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 00:33:20 +00:00
Artur Frenszek-Iwicki
82f42210c6 Update to v1.2.1 2022-08-21 20:32:32 +02:00
Fedora Release Engineering
4d1d9df76b Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-20 23:38:00 +00:00
5 changed files with 369 additions and 311 deletions

2
.gitignore vendored
View file

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

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 -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
@@ -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 -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
@@ -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 -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
@@ -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 -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
@@ -1,8 +1,8 @@
import logging
from typing import List
@ -50,23 +50,23 @@ 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
@@ -22,9 +22,9 @@
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
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 Player
from cozy.media.player import NS_TO_SEC, US_TO_SEC, Player
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 -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
@@ -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 -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
@@ -5,9 +5,9 @@
from gi.repository import Gio
@ -90,10 +91,10 @@ diff -rU4 cozy-1.2.0--orig/cozy/control/offline_cache.py cozy-1.2.0--patched/coz
from cozy.media.importer import Importer
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
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.architecture.event_sender import EventSender
@ -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 -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
@@ -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 -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
@@ -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 -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
@@ -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 -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
@@ -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,23 +162,23 @@ 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
@@ -2,9 +2,9 @@
from typing import List, Optional
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 @@
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
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
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
@@ -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 -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
@@ -6,9 +6,9 @@
import distro
import platform
@ -203,11 +204,11 @@ 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 -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
@@ -1,7 +1,7 @@
from gi.repository import Gtk, Handy
from gi.repository import Gtk, Adw
-from cozy.ext import inject
+import inject
@ -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 -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
@@ -5,9 +5,9 @@
import gi
@ -229,50 +230,36 @@ 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
@@ -1,9 +1,9 @@
import webbrowser
import gi
-from cozy.ext import inject
+import inject
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 -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 @@
import gi
from gi.repository import Adw, Gtk
-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 -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
@@ -2,9 +2,9 @@
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
from gi.repository import Gtk
from gi.repository import Adw, Gio, GLib, 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 -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 -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 @@
import logging
import gi
@ -282,40 +269,48 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/headerbar.py cozy-1.0.1--patched/cozy/ui/head
from cozy.ui.widgets.progress_popover import ProgressPopover
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')
from gi.repository import Adw, Gtk, GObject
from gi.repository import Gtk, Granite
-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
@@ -1,9 +1,9 @@
from gettext import gettext as _
from gi.repository import Adw, Gtk
-from cozy.ext import inject
+import inject
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
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
from gi.repository import Gtk, Handy
from gi.repository.Gtk import Builder
from gi.repository import Adw, Gtk
-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, 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
@@ -5,9 +5,9 @@
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 gi.repository import Gtk, Gio, Gdk, GLib
from gi.repository import Adw, Gdk, Gio, GLib, Gtk
import cozy.control.filesystem_monitor as fs_monitor
-import cozy.ext.inject as inject
@ -324,9 +319,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 -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
@@ -3,9 +3,9 @@
import gi
@ -338,67 +333,52 @@ 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
@@ -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 -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
@@ -2,9 +2,9 @@
from cozy.view_model.settings_view_model import SettingsViewModel
import gi
from gi.repository import Handy, Gio
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
-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
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
@@ -1,8 +1,8 @@
import threading
from threading import Thread
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
-from cozy.ext import inject
+import inject
from cozy.ui.widgets.search_results import BookSearchResult, ArtistSearchResult
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
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
@@ -1,8 +1,8 @@
from gettext import gettext
import gi
-import cozy.ext.inject as inject
-from cozy.ext import inject
+import inject
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
@@ -5,9 +5,9 @@
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
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
@ -406,89 +386,72 @@ 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 -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 @@
import gi
from gi.repository import Adw, Gtk
from cozy.application_settings import ApplicationSettings
-from cozy.ext import inject
+import inject
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
@@ -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 -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
@@ -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 -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
@@ -1,7 +1,7 @@
import gi
BOOK_ICON_SIZE = 52
-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 -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 -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
@@ -2,9 +2,9 @@
from threading import Thread
from cozy.control.filesystem_monitor import FilesystemMonitor
from cozy.model.storage import Storage
-from cozy.ext import inject
+import inject
from cozy.model.library import Library
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
@@ -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 -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
@@ -5,9 +5,9 @@
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 @@
-from cozy.ext import inject
+import inject
from cozy.view_model.playback_speed_view_model import PlaybackSpeedViewModel
from gi.repository import Gtk
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
from gi.repository import Gtk
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.ext import inject
+import inject
from cozy.model.storage import Storage
from cozy.view_model.storages_view_model import StoragesViewModel
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
@@ -3,9 +3,9 @@
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
from cozy.control.filesystem_monitor import FilesystemMonitor
@ -499,9 +462,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 -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
@@ -2,9 +2,9 @@
from cozy.architecture.event_sender import EventSender
@ -513,26 +476,24 @@ 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
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
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 -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
@@ -1,9 +1,9 @@
from typing import Optional
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 @@
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
-from cozy.ext import inject
@ -541,9 +502,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 -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
@@ -1,8 +1,8 @@
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
@ -554,33 +515,37 @@ 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
@@ -1,5 +1,5 @@
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
-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
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
@@ -8,9 +8,9 @@
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
from cozy.control.filesystem_monitor import FilesystemMonitor
from cozy.model.library import Library
from cozy.model.storage import Storage
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.ext import inject
+import inject
from cozy.media.importer import Importer
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
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
@@ -5,9 +5,9 @@
from cozy import tools
@ -592,9 +557,23 @@ 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 -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
@@ -2,9 +2,9 @@
import pytest
@ -606,9 +585,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 -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
@@ -3,9 +3,9 @@
import pytest
from peewee import SqliteDatabase
@ -620,9 +599,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 -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
@@ -1,8 +1,8 @@
import pytest
from peewee import SqliteDatabase
@ -633,9 +612,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 -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
@@ -1,9 +1,9 @@
import pytest
from peewee import SqliteDatabase
@ -647,9 +626,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 -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
@@ -1,8 +1,8 @@
import pytest
from peewee import SqliteDatabase
@ -660,9 +639,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 -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
@@ -1,9 +1,9 @@
import pytest
from peewee import SqliteDatabase
@ -674,9 +653,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 -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
@@ -1,7 +1,7 @@
import pytest

View file

@ -0,0 +1,12 @@
--- 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>
<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>

115
cozy.spec
View file

@ -2,10 +2,10 @@ Name: cozy
%global rtld_name com.github.geigi.cozy
Summary: Modern audiobook player
License: GPLv3+
License: GPL-3.0-or-later
Version: 1.2.0
Release: 2%{?dist}
Version: 1.3.0
Release: 11%{?dist}
URL: https://cozy.geigi.de
Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
@ -15,21 +15,20 @@ 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
BuildArch: noarch
%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
%global req_adwaita 1.4.0
%global req_py_inject 4.3.1
%global req_py_peewee 3.9.6
BuildRequires: desktop-file-utils
BuildRequires: glib2-devel
BuildRequires: granite-devel >= %{req_granite}
BuildRequires: gtk3-devel >= %{req_gtk3}
BuildRequires: libappstream-glib
BuildRequires: libhandy1-devel >= %{req_handy}
BuildRequires: meson >= %{req_meson}
BuildRequires: libadwaita-devel >= %{req_adwaita}
BuildRequires: meson >= 0.59.0
BuildRequires: python3-devel
%global with_tests 1
@ -38,12 +37,10 @@ BuildRequires: python3-devel
BuildRequires: gstreamer1-plugins-base
BuildRequires: python3dist(distro)
BuildRequires: python3dist(inject) >= 4.3.1
BuildRequires: python3dist(inject) >= %{req_py_inject}
BuildRequires: python3dist(mutagen)
BuildRequires: python3dist(packaging)
BuildRequires: python3dist(peewee) >= 3.9.6
BuildRequires: python3dist(peewee) >= %{req_py_peewee}
BuildRequires: python3dist(pygobject)
BuildRequires: python3dist(pytest-runner)
BuildRequires: python3dist(pytest-mock)
BuildRequires: python3dist(pytz)
BuildRequires: python3dist(requests)
@ -51,21 +48,17 @@ BuildRequires: python3dist(requests)
Requires: file
Requires: glib2
Requires: granite >= %{req_granite}
Requires: libdazzle >= %{req_dazzle}
Requires: libhandy >= %{req_handy}
Requires: libadwaita >= %{req_adwaita}
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) >= 4.3.1
Requires: python3dist(inject) >= %{req_py_inject}
Requires: python3dist(mutagen)
Requires: python3dist(packaging)
Requires: python3dist(peewee) >= 3.9.6
Requires: python3dist(peewee) >= %{req_py_peewee}
Requires: python3dist(pygobject)
Requires: python3dist(pytz)
Requires: python3dist(requests)
@ -97,12 +90,15 @@ Here are some of the current features:
%setup -q
# Unbundle inject
%patch0 -p1
%patch 0 -p1
rm -rf cozy/ext/inject
# Run the "find unpatched imports" script
"%{SOURCE99}" "$(pwd)"
# Apply other patches
%patch 1 -p1
%build
%meson
@ -115,6 +111,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 +139,75 @@ 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
* 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
- 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
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

View file

@ -1 +1 @@
SHA512 (cozy-1.2.0.tar.gz) = d3eb8063be4f7d966072fb48be23bbf71ea068a6614be55ef2ce70181c8c78e6200168a1cddc41d23406a8686c1be2e7ec9197470e9e94e6c287df45990b8056
SHA512 (cozy-1.3.0.tar.gz) = 2e7ca481bb3ed3813814640e2685ef666063d9614cf2cfb6db9ca2f0db61f0883c8415506c3cb84b88b20e7dbf768b4cc587b5c69ea15c9db0b3411c4ea83f2d