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

Compare commits

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

32 commits
f34 ... rawhide

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
Fedora Release Engineering
50c2411628 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild 
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
 2022-01-19 23:53:14 +00:00
Artur Frenszek-Iwicki
7453be3468 Update to v1.2.0 2022-01-09 00:02:00 +01:00
Artur Frenszek-Iwicki
de0b4ac31c Update to v1.1.3 2021-12-31 13:45:00 +01:00
Neal Gompa
57f5ca812d Add missing dependencies to fix launching the app 
Resolves: #2013040, #2013041, #2013042
 2021-10-11 19:56:21 -04:00
Artur Frenszek-Iwicki
455e496f08 Update to v1.1.2 2021-08-20 14:41:11 +02:00
Artur Frenszek-Iwicki
4abcc93867 Update to v1.1.1 2021-08-20 13:08:45 +02:00
Artur Frenszek-Iwicki
94829d944d Update to v1.1.0 2021-08-09 12:01:27 +02:00
Artur Frenszek-Iwicki
15e5719468 Update to v1.0.4 2021-07-29 10:26:16 +02:00
Fedora Release Engineering
f3ea7a84f0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild 
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
 2021-07-21 20:03:05 +00:00
Fedora Release Engineering
769eaccef1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild 
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
 2021-07-21 15:07:18 +00:00
Artur Frenszek-Iwicki
0a5812e6fe Update to v1.0.3 2021-06-17 02:09:53 +02:00
Python Maint
a394b15cbd Rebuilt for Python 3.10 2021-06-04 20:02:14 +02:00
6 changed files with 818 additions and 699 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.gitignore vendored
View file

@ -10,3 +10,12 @@
/cozy-0.9.4.tar.gz
/cozy-0.9.5.tar.gz
/cozy-1.0.1.tar.gz
/cozy-1.0.3.tar.gz
/cozy-1.0.4.tar.gz
/cozy-1.1.0.tar.gz
/cozy-1.1.1.tar.gz
/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

667
0000--unbundle-inject.patch Normal file
View file

@ -0,0 +1,667 @@
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
-import cozy.ext.inject as inject
+import inject
from peewee import SqliteDatabase
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
@@ -1,8 +1,8 @@
from gi.repository import Gio
from cozy.architecture.event_sender import EventSender
-from cozy.ext import inject
+import inject
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
@@ -6,9 +6,9 @@
from cozy.application_settings import ApplicationSettings
from cozy.control.application_directories import get_cache_dir
from cozy.db.artwork_cache import ArtworkCache as ArtworkCacheModel
-from cozy.ext import inject
+import inject
from cozy.media.importer import Importer, ScanStatus
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
@@ -1,8 +1,8 @@
import logging
from typing import List
-import cozy.ext.inject as inject
+import inject
from gi.repository import Gio
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
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.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
@@ -12,9 +12,9 @@
from cozy.db.file import File
from cozy.db.offline_cache import OfflineCache as OfflineCacheModel
from cozy.db.track_to_file import TrackToFile
-from cozy.ext import inject
+import inject
from cozy.model.book import Book
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
@@ -5,9 +5,9 @@
from gi.repository import Gio
from cozy.architecture.event_sender import EventSender
-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 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
from cozy.architecture.profiler import timing
from cozy.control.filesystem_monitor import FilesystemMonitor, StorageNotFound
-from cozy.ext import inject
+import inject
from cozy.media.media_detector import MediaDetector, NotAnAudioFile, AudioFileCouldNotBeDiscovered
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
@@ -9,9 +9,9 @@
from cozy.application_settings import ApplicationSettings
from cozy.architecture.event_sender import EventSender
from cozy.control.offline_cache import OfflineCache
-from cozy.ext import inject
+import inject
from cozy.media.gst_player import GstPlayer, GstPlayerState
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
@@ -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
-from cozy.ext import inject
+import inject
from cozy.model.chapter import Chapter
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
@@ -6,9 +6,9 @@
from cozy.db.book import Book as BookModel
from cozy.db.file import File
from cozy.db.track import Track
from cozy.db.track_to_file import TrackToFile
-from cozy.ext import inject
+import inject
from cozy.extensions.is_same_book import is_same_book
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
@@ -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
from cozy.db.file import File
-from cozy.ext import inject
+import inject
from cozy.extensions.set import split_strings_to_set
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 @@
import peewee
from peewee import SqliteDatabase
-import cozy.ext.inject as inject
+import inject
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
@@ -1,9 +1,9 @@
import logging
from gi.repository import Gtk
-from cozy.ext import inject
+import inject
from cozy.media.player import Player
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
@@ -6,9 +6,9 @@
import distro
import platform
from cozy.application_settings import ApplicationSettings
-from cozy.ext import inject
+import inject
from cozy.report.log_level import LogLevel
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
@@ -1,7 +1,7 @@
from gi.repository import Gtk, Adw
-from cozy.ext import inject
+import inject
from cozy.view_model.app_view_model import AppViewModel
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
@@ -5,9 +5,9 @@
import gi
from cozy.control.artwork_cache import ArtworkCache
-from cozy.ext import inject
+import inject
from cozy.model.book import Book
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
-from cozy.ext import inject
+import inject
from cozy.model.book import Book
from cozy.ui.widgets.book_row import BookRow
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 Adw, Gio, GLib, Gtk
-from cozy.ext import inject
+import inject
from cozy.media.importer import Importer
from cozy.model.chapter import Chapter
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
-from cozy.ext import inject
+import inject
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
@@ -1,9 +1,9 @@
from gettext import gettext as _
from gi.repository import Adw, 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
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
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 Adw, Gdk, Gio, GLib, Gtk
import cozy.control.filesystem_monitor as fs_monitor
-import cozy.ext.inject as inject
+import inject
import cozy.report.reporter as report
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
@@ -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.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
-from cozy.ext import inject
+import inject
from cozy.ui.widgets.error_reporting import ErrorReporting
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.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.ext import inject
+import inject
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.model.book import Book
-from cozy.ext import inject
+import inject
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
@@ -2,9 +2,9 @@
import gi
from cozy.application_settings import ApplicationSettings
-from cozy.ext import inject
+import inject
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
from cozy.control.offline_cache import OfflineCache
-from cozy.ext import inject
+import inject
from cozy.media.player import Player
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
@@ -2,9 +2,9 @@
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
from cozy.control.offline_cache import OfflineCache
-from cozy.ext import inject
+import inject
from cozy.media.files import Files
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
from typing import Optional
-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 @@
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
-from cozy.ext import inject
+import inject
from cozy.media.player import Player
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
@@ -1,8 +1,8 @@
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
from cozy.db.book import Book
-from cozy.ext import inject
+import inject
from cozy.media.player import Player
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
-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/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
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
from cozy.application_settings import ApplicationSettings
from cozy.architecture.observable import Observable
-from cozy.ext import inject
+import inject
from cozy.media.player import Player
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
@@ -2,9 +2,9 @@
import pytest
from peewee import SqliteDatabase
-from cozy.ext import inject
+import inject
from cozy.media.media_file import MediaFile
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
@@ -3,9 +3,9 @@
import pytest
from peewee import SqliteDatabase
from cozy.application_settings import ApplicationSettings
-from cozy.ext import inject
+import inject
from cozy.media.gst_player import GstPlayer
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
@@ -1,8 +1,8 @@
import pytest
from peewee import SqliteDatabase
-from cozy.ext import inject
+import inject
@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
@@ -1,9 +1,9 @@
import pytest
from peewee import SqliteDatabase
from cozy.application_settings import ApplicationSettings
-from cozy.ext import inject
+import inject
from test.cozy.mocks import ApplicationSettingsMock
@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
@@ -1,8 +1,8 @@
import pytest
from peewee import SqliteDatabase
-from cozy.ext import inject
+import inject
@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
@@ -1,9 +1,9 @@
import pytest
from peewee import SqliteDatabase
from cozy.application_settings import ApplicationSettings
-from cozy.ext import inject
+import inject
from cozy.extensions.set import split_strings_to_set
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
@@ -1,7 +1,7 @@
import pytest
-import cozy.ext.inject as inject
+import inject
from peewee import SqliteDatabase
@pytest.fixture(autouse=True)

12
0001-fix-appdata-file.patch Normal file
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>

672
cozy--unbundle-inject.patch
View file

@ -1,672 +0,0 @@
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
@@ -1,7 +1,7 @@
from gi.repository import Gio
-import cozy.ext.inject as inject
+import inject
from peewee import SqliteDatabase
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
@@ -1,8 +1,8 @@
from gi.repository import Gio
from cozy.architecture.event_sender import EventSender
-from cozy.ext import inject
+import inject
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
@@ -6,9 +6,9 @@
from cozy.application_settings import ApplicationSettings
from cozy.control.application_directories import get_cache_dir
from cozy.db.artwork_cache import ArtworkCache as ArtworkCacheModel
-from cozy.ext import inject
+import inject
from cozy.media.importer import Importer, ScanStatus
from cozy.report import reporter
log = logging.getLogger("artwork_cache")
diff -rU4 cozy-1.0.1--orig/cozy/control/db.py cozy-1.0.1--patched/cozy/control/db.py
--- cozy-1.0.1--orig/cozy/control/db.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/control/db.py 2021-05-30 11:14:55.786892252 +0200
@@ -1,9 +1,9 @@
import logging
import os
import time
-import cozy.ext.inject as inject
+import inject
from cozy.control.db_updater import update_db
from cozy.db.artwork_cache import ArtworkCache
from cozy.db.book import Book
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
@@ -1,8 +1,8 @@
import logging
from typing import List
-import cozy.ext.inject as inject
+import inject
from gi.repository import Gio
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 @@
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.model.book import Book
from cozy.report import reporter
diff -rU4 cozy-1.0.1--orig/cozy/control/offline_cache.py cozy-1.0.1--patched/cozy/control/offline_cache.py
--- cozy-1.0.1--orig/cozy/control/offline_cache.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/control/offline_cache.py 2021-05-30 11:14:55.793892253 +0200
@@ -12,9 +12,9 @@
from cozy.db.file import File
from cozy.db.offline_cache import OfflineCache as OfflineCacheModel
from cozy.db.track_to_file import TrackToFile
-from cozy.ext import inject
+import inject
from cozy.model.book import Book
from cozy.model.chapter import Chapter
from cozy.report import reporter
diff -rU4 cozy-1.0.1--orig/cozy/media/files.py cozy-1.0.1--patched/cozy/media/files.py
--- cozy-1.0.1--orig/cozy/media/files.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/media/files.py 2021-05-30 11:14:55.798892254 +0200
@@ -5,9 +5,9 @@
from gi.repository import Gio
from cozy.architecture.event_sender import EventSender
-from cozy.ext import inject
+import inject
from cozy.media.importer import Importer
from cozy.model.settings import Settings
from cozy.report import reporter
diff -rU4 cozy-1.0.1--orig/cozy/media/importer.py cozy-1.0.1--patched/cozy/media/importer.py
--- cozy-1.0.1--orig/cozy/media/importer.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/media/importer.py 2021-05-30 11:14:55.810892256 +0200
@@ -9,9 +9,9 @@
from cozy.architecture.event_sender import EventSender
from cozy.architecture.profiler import timing
from cozy.control.filesystem_monitor import FilesystemMonitor, StorageNotFound
-from cozy.ext import inject
+import inject
from cozy.media.media_detector import MediaDetector, NotAnAudioFile, AudioFileCouldNotBeDiscovered
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 @@
from cozy.application_settings import ApplicationSettings
from cozy.architecture.event_sender import EventSender
from cozy.control.offline_cache import OfflineCache
-from cozy.ext import inject
+import inject
from cozy.media.gst_player import GstPlayer, GstPlayerState
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
from cozy.db.book import Book as BookModel
from cozy.db.track import Track as TrackModel
from cozy.db.track_to_file import TrackToFile
-from cozy.ext import inject
+import inject
from cozy.model.chapter import Chapter
from cozy.model.settings import Settings
from cozy.model.track import Track
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
@@ -6,9 +6,9 @@
from cozy.db.book import Book as BookModel
from cozy.db.file import File
from cozy.db.track import Track
from cozy.db.track_to_file import TrackToFile
-from cozy.ext import inject
+import inject
from cozy.extensions.is_same_book import is_same_book
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 @@
from cozy.architecture.event_sender import EventSender
from cozy.architecture.profiler import timing
from cozy.db.book import Book as BookModel
-from cozy.ext import inject
+import inject
from cozy.extensions.set import split_strings_to_set
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
import peewee
-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/model/storage_block_list.py cozy-1.0.1--patched/cozy/model/storage_block_list.py
--- cozy-1.0.1--orig/cozy/model/storage_block_list.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/model/storage_block_list.py 2021-05-30 11:14:55.902892272 +0200
@@ -1,9 +1,9 @@
from peewee import SqliteDatabase
from cozy.db.storage_blacklist import StorageBlackList
from cozy.db.track import Track as TrackModel
-from cozy.ext import inject
+import inject
from cozy.model.book import Book
class StorageBlockList:
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
@@ -1,9 +1,9 @@
import logging
from gi.repository import Gtk
-from cozy.ext import inject
+import inject
from cozy.media.player import Player
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
@@ -6,9 +6,9 @@
import distro
import platform
from cozy.application_settings import ApplicationSettings
-from cozy.ext import inject
+import inject
from cozy.report.log_level import LogLevel
from cozy.version import __version__ as CozyVersion
from peewee import __version__ as PeeweeVersion
from mutagen import version_string as MutagenVersion
diff -rU4 cozy-1.0.1--orig/cozy/ui/album_element.py cozy-1.0.1--patched/cozy/ui/album_element.py
--- cozy-1.0.1--orig/cozy/ui/album_element.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/album_element.py 2021-05-30 11:14:55.823892259 +0200
@@ -2,9 +2,9 @@
from gi.repository import Gtk, Gdk, GdkPixbuf, GObject
from cozy.control.artwork_cache import ArtworkCache
-from cozy.ext import inject
+import inject
from cozy.model.book import Book
log = logging.getLogger("album_element")
diff -rU4 cozy-1.0.1--orig/cozy/ui/book_detail_view.py cozy-1.0.1--patched/cozy/ui/book_detail_view.py
--- cozy-1.0.1--orig/cozy/ui/book_detail_view.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/book_detail_view.py 2021-05-30 11:14:55.831892260 +0200
@@ -3,9 +3,9 @@
import gi
from cozy.control.artwork_cache import ArtworkCache
-from cozy.ext import inject
+import inject
from cozy.model.book import Book
from cozy.model.chapter import Chapter
from cozy.report import reporter
from cozy.ui.disk_element import DiskElement
diff -rU4 cozy-1.0.1--orig/cozy/ui/book_element.py cozy-1.0.1--patched/cozy/ui/book_element.py
--- cozy-1.0.1--orig/cozy/ui/book_element.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/book_element.py 2021-05-30 11:14:55.813892257 +0200
@@ -1,8 +1,8 @@
import os
import subprocess
-import cozy.ext.inject as inject
+import inject
from gi.repository import Gtk, Gdk, Pango, GObject
import cozy.tools as tools
import cozy.ui
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
@@ -1,7 +1,7 @@
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/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 @@
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 -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 @@
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.ui.widgets.seek_bar import SeekBar
from cozy.ui.widgets.sleep_timer import SleepTimer
from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState
diff -rU4 cozy-1.0.1--orig/cozy/ui/library_view.py cozy-1.0.1--patched/cozy/ui/library_view.py
--- cozy-1.0.1--orig/cozy/ui/library_view.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/library_view.py 2021-05-30 11:14:55.826892259 +0200
@@ -2,9 +2,9 @@
from gi.repository import Gtk
from gi.repository.Gtk import Builder
-from cozy.ext import inject
+import inject
from cozy.model.book import Book
from cozy.ui.book_element import BookElement
from cozy.ui.delete_book_view import DeleteBookView
from cozy.ui.widgets.filter_list_box import FilterListBox
diff -rU4 cozy-1.0.1--orig/cozy/ui/main_view.py cozy-1.0.1--patched/cozy/ui/main_view.py
--- cozy-1.0.1--orig/cozy/ui/main_view.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/main_view.py 2021-05-30 11:14:55.835892261 +0200
@@ -1,7 +1,7 @@
import webbrowser
-import cozy.ext.inject as inject
+import inject
from cozy.application_settings import ApplicationSettings
from cozy.architecture.event_sender import EventSender
from cozy.control.db import books, close_db
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.ext import inject
+import inject
from cozy.ui.widgets.search_results import BookSearchResult, ArtistSearchResult
import gi
diff -rU4 cozy-1.0.1--orig/cozy/ui/settings.py cozy-1.0.1--patched/cozy/ui/settings.py
--- cozy-1.0.1--orig/cozy/ui/settings.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/settings.py 2021-05-30 11:14:55.812892257 +0200
@@ -4,9 +4,9 @@
from cozy.control.db import remove_tracks_with_path
from cozy.db.storage import Storage
from cozy.db.storage_blacklist import StorageBlackList
-from cozy.ext import inject
+import inject
from cozy.model.library import Library
from cozy.ui.widgets.ScrollWrapper import ScrollWrapper
from cozy.ui.widgets.storage_list_box_row import StorageListBoxRow
from cozy.view_model.settings_view_model import SettingsViewModel
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
+import inject
from cozy.control.filesystem_monitor import FilesystemMonitor
gi.require_version('Gtk', '3.0')
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
@@ -2,9 +2,9 @@
import gi
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
-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.0.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-1.0.1--patched/cozy/ui/widgets/storage_list_box_row.py
--- cozy-1.0.1--orig/cozy/ui/widgets/storage_list_box_row.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/ui/widgets/storage_list_box_row.py 2021-05-30 11:14:55.843892262 +0200
@@ -6,9 +6,9 @@
import cozy.ui
from cozy.control.filesystem_monitor import FilesystemMonitor
from cozy.db.storage import Storage
from cozy.model.settings import Settings
-from cozy.ext import inject
+import inject
from cozy.model.library import Library
from cozy.model.storage_block_list import StorageBlockList
log = logging.getLogger("settings")
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 cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
from cozy.control.filesystem_monitor import FilesystemMonitor
from cozy.control.offline_cache import OfflineCache
-from cozy.ext import inject
+import inject
from cozy.media.player import Player
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
@@ -2,9 +2,9 @@
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
from cozy.control.offline_cache import OfflineCache
-from cozy.ext import inject
+import inject
from cozy.media.files import Files
from cozy.media.importer import Importer, ScanStatus
from cozy.model.library import Library
diff -rU4 cozy-1.0.1--orig/cozy/view_model/library_view_model.py cozy-1.0.1--patched/cozy/view_model/library_view_model.py
--- cozy-1.0.1--orig/cozy/view_model/library_view_model.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/view_model/library_view_model.py 2021-05-30 11:14:55.868892266 +0200
@@ -2,9 +2,9 @@
import os
from enum import Enum, auto
from typing import Optional
-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
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
-from cozy.ext import inject
+import inject
from cozy.media.player import Player
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
@@ -1,8 +1,8 @@
from cozy.architecture.event_sender import EventSender
from cozy.architecture.observable import Observable
from cozy.db.book import Book
-from cozy.ext import inject
+import inject
from cozy.media.player import Player
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 @@
-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.0.1--orig/cozy/view_model/settings_view_model.py cozy-1.0.1--patched/cozy/view_model/settings_view_model.py
--- cozy-1.0.1--orig/cozy/view_model/settings_view_model.py 2021-05-30 10:34:51.000000000 +0200
+++ cozy-1.0.1--patched/cozy/view_model/settings_view_model.py 2021-05-30 11:14:55.860892265 +0200
@@ -1,6 +1,6 @@
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
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
@@ -5,9 +5,9 @@
from cozy import tools
from cozy.application_settings import ApplicationSettings
from cozy.architecture.observable import Observable
-from cozy.ext import inject
+import inject
from cozy.media.player import Player
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
@@ -2,9 +2,9 @@
import pytest
from peewee import SqliteDatabase
-from cozy.ext import inject
+import inject
from cozy.media.media_file import MediaFile
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
@@ -3,9 +3,9 @@
import pytest
from peewee import SqliteDatabase
from cozy.application_settings import ApplicationSettings
-from cozy.ext import inject
+import inject
from cozy.media.gst_player import GstPlayer
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
@@ -1,8 +1,8 @@
import pytest
from peewee import SqliteDatabase
-from cozy.ext import inject
+import inject
@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
@@ -1,9 +1,9 @@
import pytest
from peewee import SqliteDatabase
from cozy.application_settings import ApplicationSettings
-from cozy.ext import inject
+import inject
from test.cozy.mocks import ApplicationSettingsMock
@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
@@ -1,8 +1,8 @@
import pytest
from peewee import SqliteDatabase
-from cozy.ext import inject
+import inject
@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
@@ -1,9 +1,9 @@
import pytest
from peewee import SqliteDatabase
from cozy.application_settings import ApplicationSettings
-from cozy.ext import inject
+import inject
from cozy.extensions.set import split_strings_to_set
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
@@ -1,7 +1,7 @@
import pytest
-import cozy.ext.inject as inject
+import inject
from peewee import SqliteDatabase
@pytest.fixture(autouse=True)

155
cozy.spec
View file

@ -2,28 +2,34 @@ Name: cozy
%global rtld_name com.github.geigi.cozy
Summary: Modern audiobook player
License: GPLv3+
License: GPL-3.0-or-later
Version: 1.0.1
Release: 1%{?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
Source99: find-unpatched-imports.sh
Patch0: %{name}--unbundle-inject.patch
# 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_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: gtk3-devel >= 3.22
BuildRequires: libappstream-glib
BuildRequires: libhandy1-devel >= 1.0.0
BuildRequires: meson >= 0.40.0
BuildRequires: libadwaita-devel >= %{req_adwaita}
BuildRequires: meson >= 0.59.0
BuildRequires: python3-devel
BuildRequires: xmlstarlet
%global with_tests 1
@ -31,12 +37,10 @@ BuildRequires: xmlstarlet
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)
@ -44,18 +48,17 @@ BuildRequires: python3dist(requests)
Requires: file
Requires: glib2
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)
@ -87,19 +90,14 @@ 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)
"%{SOURCE99}" "$(pwd)"
# Add a nonsensical <p> tag at the beginning of <description> for every
# <release> in the appdata XML - needed to pass validation
xmlstarlet ed \
--insert component/releases/release/description/ul \
--type elem -n p -v 'List of changes:' \
< "data/%{rtld_name}.appdata.xml" > appdata.patched
mv ./appdata.patched "data/%{rtld_name}.appdata.xml"
# Apply other patches
%patch 1 -p1
%build
@ -113,6 +111,13 @@ mv ./appdata.patched "data/%{rtld_name}.appdata.xml"
%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
@ -134,13 +139,111 @@ 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
* Sun Jan 09 2022 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.2.0-1
- Update to v1.2.0
* Fri Dec 31 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.1.3-1
- Update to v1.1.3
* Mon Oct 11 2021 Neal Gompa <ngompa@fedoraproject.org> - 1.1.2-2
- Add missing dependencies to fix launching the app
Resolves: #2013040, #2013041, #2013042
* Fri Aug 20 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.1.2-1
- Update to v1.1.2
* Fri Aug 20 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.1.1-1
- Update to v1.1.1
- Drop Patch1 (POTFILES references non-existent file - fixed upsteam)
- Don't modify the appdata file in %%prep - no longer needed to pass validation
* Mon Aug 09 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.1.0-1
- Update to v1.1.0
* Thu Jul 29 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.0.4-1
- Update to v1.0.4
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Jun 17 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.0.3-1
- Update to v1.0.3
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.0.1-2
- Rebuilt for Python 3.10
* Sun May 30 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.0.1-1
- Update to v1.0.1

2
sources
View file

@ -1 +1 @@
SHA512 (cozy-1.0.1.tar.gz) = 6c95735172c52531bf2cd5fdfc24dab69e93a7438a08ca2e7c29d9abac904b45bfc2aa75bedfed26cc87c68fda7977ccf6c126f50a772bfb7b6ff08c289bcec5
SHA512 (cozy-1.3.0.tar.gz) = 2e7ca481bb3ed3813814640e2685ef666063d9614cf2cfb6db9ca2f0db61f0883c8415506c3cb84b88b20e7dbf768b4cc587b5c69ea15c9db0b3411c4ea83f2d