diff --git a/.gitignore b/.gitignore index f9b5528..8cb8f06 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,15 @@ /cozy-0.7.5.tar.gz /cozy-0.7.7.tar.gz /cozy-0.7.8.tar.gz +/cozy-0.8.1.tar.gz +/cozy-0.9.1.tar.gz +/cozy-0.9.2.tar.gz +/cozy-0.9.3.tar.gz +/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 diff --git a/0000--unbundle-inject.patch b/0000--unbundle-inject.patch new file mode 100644 index 0000000..1ee8c36 --- /dev/null +++ b/0000--unbundle-inject.patch @@ -0,0 +1,699 @@ +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/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 + +--- 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 +@@ -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.info_banner import InfoBanner +diff -rU4 cozy-1.0.1--orig/cozy/media/importer.py cozy-1.0.1--patched/cozy/media/importer.py +--- cozy-1.0.1--orig/cozy/media/importer.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/media/importer.py 2021-05-30 11:14:55.810892256 +0200 +@@ -9,9 +9,9 @@ + + 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, 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 +@@ -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.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 -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.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 +@@ -1,7 +1,7 @@ + from gi.repository import Gtk, Handy + +-from cozy.ext import inject ++import inject + from cozy.view_model.app_view_model import AppViewModel + 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 +@@ -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 -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 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 + + 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 Gtk, Granite + +-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 +@@ -2,9 +2,9 @@ + + from gi.repository import Gtk, Handy + from gi.repository.Gtk import Builder + +-from cozy.ext import inject ++import inject + from cozy.ui.widgets.book_element import BookElement + from cozy.ui.delete_book_view import DeleteBookView + from cozy.ui.widgets.filter_list_box import FilterListBox + from cozy.view_model.library_view_model import LibraryViewModel, LibraryViewMode, 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 gi.repository import Gtk, Gio, Gdk, GLib + + 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 -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 +@@ -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 -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.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 +@@ -2,9 +2,9 @@ + import gi + + 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.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 @@ + + 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 + + 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 +@@ -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 + from cozy.open_view import OpenView +diff -rU4 cozy-1.0.1--orig/cozy/view_model/library_view_model.py cozy-1.0.1--patched/cozy/view_model/library_view_model.py +--- cozy-1.0.1--orig/cozy/view_model/library_view_model.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/view_model/library_view_model.py 2021-05-30 11:14:55.868892266 +0200 +@@ -2,9 +2,9 @@ + 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 + + 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) diff --git a/cozy--unbundle-inject.patch b/cozy--unbundle-inject.patch deleted file mode 100644 index 17fe046..0000000 --- a/cozy--unbundle-inject.patch +++ /dev/null @@ -1,546 +0,0 @@ -diff -r -U4 cozy-0.7.7--orig/cozy/app_controller.py cozy-0.7.7--patched/cozy/app_controller.py ---- cozy-0.7.7--orig/cozy/app_controller.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/app_controller.py 2020-11-30 18:04:36.858089048 +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-0.7.7--orig/cozy/application_settings.py cozy-0.7.7--patched/cozy/application_settings.py ---- cozy-0.7.7--orig/cozy/application_settings.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/application_settings.py 2020-11-30 18:04:36.835089013 +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-0.7.7--orig/cozy/control/artwork_cache.py cozy-0.7.7--patched/cozy/control/artwork_cache.py ---- cozy-0.7.7--orig/cozy/control/artwork_cache.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/control/artwork_cache.py 2020-11-30 18:04:36.639088715 +0100 -@@ -7,9 +7,9 @@ - from cozy.application_settings import ApplicationSettings - from cozy.control.application_directories import get_cache_dir - from cozy.control.db import get_tracks - 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-0.7.7--orig/cozy/control/db.py cozy-0.7.7--patched/cozy/control/db.py ---- cozy-0.7.7--orig/cozy/control/db.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/control/db.py 2020-11-30 18:04:36.641088718 +0100 -@@ -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 -r -U4 cozy-0.7.7--orig/cozy/control/filesystem_monitor.py cozy-0.7.7--patched/cozy/control/filesystem_monitor.py ---- cozy-0.7.7--orig/cozy/control/filesystem_monitor.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/control/filesystem_monitor.py 2020-11-30 18:04:36.634088708 +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.control.db import get_tracks -diff -r -U4 cozy-0.7.7--orig/cozy/control/offline_cache.py cozy-0.7.7--patched/cozy/control/offline_cache.py ---- cozy-0.7.7--orig/cozy/control/offline_cache.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/control/offline_cache.py 2020-11-30 18:04:36.660088747 +0100 -@@ -12,9 +12,9 @@ - - from cozy.db.book import Book - from cozy.db.track import Track - from cozy.db.offline_cache import OfflineCache as OfflineCacheModel --from cozy.ext import inject -+import inject - from cozy.report import reporter - - log = logging.getLogger("offline_cache") - -diff -r -U4 cozy-0.7.7--orig/cozy/control/playback_speed.py cozy-0.7.7--patched/cozy/control/playback_speed.py ---- cozy-0.7.7--orig/cozy/control/playback_speed.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/control/playback_speed.py 2020-11-30 18:04:36.658088744 +0100 -@@ -3,9 +3,9 @@ - import cozy.ui - - import gi - --from cozy.ext import inject -+import inject - from cozy.media.player import Player - - gi.require_version('Gtk', '3.0') - from gi.repository import Gtk -diff -r -U4 cozy-0.7.7--orig/cozy/control/player.py cozy-0.7.7--patched/cozy/control/player.py ---- cozy-0.7.7--orig/cozy/control/player.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/control/player.py 2020-11-30 18:04:36.651088733 +0100 -@@ -1,8 +1,8 @@ - import threading - import time - --import cozy.ext.inject as inject -+import inject - from gi.repository import Gst, GLib - - import gi - -diff -r -U4 cozy-0.7.7--orig/cozy/control/sleep_timer.py cozy-0.7.7--patched/cozy/control/sleep_timer.py ---- cozy-0.7.7--orig/cozy/control/sleep_timer.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/control/sleep_timer.py 2020-11-30 18:04:36.644088723 +0100 -@@ -8,9 +8,9 @@ - - import gi - - from cozy.application_settings import ApplicationSettings --from cozy.ext import inject -+import inject - - gi.require_version('Gtk', '3.0') - gi.require_version('Gst', '1.0') - from gi.repository import Gtk, Gst, Gdk, GLib -diff -r -U4 cozy-0.7.7--orig/cozy/media/files.py cozy-0.7.7--patched/cozy/media/files.py ---- cozy-0.7.7--orig/cozy/media/files.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/media/files.py 2020-11-30 18:04:36.666088756 +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 - -diff -r -U4 cozy-0.7.7--orig/cozy/media/importer.py cozy-0.7.7--patched/cozy/media/importer.py ---- cozy-0.7.7--orig/cozy/media/importer.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/media/importer.py 2020-11-30 18:04:36.695088801 +0100 -@@ -12,9 +12,9 @@ - from cozy.media.media_file import MediaFile - from cozy.model.library import Library - from cozy.architecture.event_sender import EventSender - from cozy.control.filesystem_monitor import FilesystemMonitor, StorageNotFound --from cozy.ext import inject -+import inject - from cozy.model.settings import Settings - from cozy.report import reporter - - log = logging.getLogger("importer") -diff -r -U4 cozy-0.7.7--orig/cozy/media/player.py cozy-0.7.7--patched/cozy/media/player.py ---- cozy-0.7.7--orig/cozy/media/player.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/media/player.py 2020-11-30 18:04:36.676088771 +0100 -@@ -4,9 +4,9 @@ - - from cozy.application_settings import ApplicationSettings - from cozy.architecture.event_sender import EventSender - from cozy.control import player --from cozy.ext import inject -+import inject - from cozy.model.book import Book - from cozy.model.chapter import Chapter - from cozy.model.library import Library - from cozy.report import reporter -diff -r -U4 cozy-0.7.7--orig/cozy/model/book.py cozy-0.7.7--patched/cozy/model/book.py ---- cozy-0.7.7--orig/cozy/model/book.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/model/book.py 2020-11-30 18:04:36.853089041 +0100 -@@ -6,9 +6,9 @@ - from cozy.architecture.observable import Observable - from cozy.db.book import Book as BookModel - 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.chapter import Chapter - from cozy.model.settings import Settings - from cozy.model.track import Track - -diff -r -U4 cozy-0.7.7--orig/cozy/model/library.py cozy-0.7.7--patched/cozy/model/library.py ---- cozy-0.7.7--orig/cozy/model/library.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/model/library.py 2020-11-30 18:04:36.842089024 +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.track import Track --from cozy.ext import inject -+import inject - from cozy.extensions.set import split_strings_to_set - from cozy.media.media_file import MediaFile - - from cozy.model.book import Book, BookIsEmpty -diff -r -U4 cozy-0.7.7--orig/cozy/model/settings.py cozy-0.7.7--patched/cozy/model/settings.py ---- cozy-0.7.7--orig/cozy/model/settings.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/model/settings.py 2020-11-30 18:04:36.838089018 +0100 -@@ -1,8 +1,8 @@ - import logging - from typing import List - --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 -r -U4 cozy-0.7.7--orig/cozy/model/storage_block_list.py cozy-0.7.7--patched/cozy/model/storage_block_list.py ---- cozy-0.7.7--orig/cozy/model/storage_block_list.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/model/storage_block_list.py 2020-11-30 18:04:36.855089044 +0100 -@@ -1,8 +1,8 @@ - from peewee import SqliteDatabase - - from cozy.db.storage_blacklist import StorageBlackList --from cozy.ext import inject -+import inject - - - class StorageBlockList: - _db = cache = inject.attr(SqliteDatabase) -diff -r -U4 cozy-0.7.7--orig/cozy/report/report_to_loki.py cozy-0.7.7--patched/cozy/report/report_to_loki.py ---- cozy-0.7.7--orig/cozy/report/report_to_loki.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/report/report_to_loki.py 2020-11-30 18:04:36.876089076 +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-0.7.7--orig/cozy/ui/album_element.py cozy-0.7.7--patched/cozy/ui/album_element.py ---- cozy-0.7.7--orig/cozy/ui/album_element.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/album_element.py 2020-11-30 18:04:36.721088840 +0100 -@@ -2,9 +2,9 @@ - - from cozy.control import player as player - from cozy.control.artwork_cache import ArtworkCache - from cozy.control.db import get_track_for_playback --from cozy.ext import inject -+import inject - from cozy.model.book import Book - - - class AlbumElement(Gtk.Box): -diff -r -U4 cozy-0.7.7--orig/cozy/ui/book_detail_view.py cozy-0.7.7--patched/cozy/ui/book_detail_view.py ---- cozy-0.7.7--orig/cozy/ui/book_detail_view.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/book_detail_view.py 2020-11-30 18:04:36.737088864 +0100 -@@ -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 -r -U4 cozy-0.7.7--orig/cozy/ui/book_element.py cozy-0.7.7--patched/cozy/ui/book_element.py ---- cozy-0.7.7--orig/cozy/ui/book_element.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/book_element.py 2020-11-30 18:04:36.706088817 +0100 -@@ -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 -r -U4 cozy-0.7.7--orig/cozy/ui/file_not_found_dialog.py cozy-0.7.7--patched/cozy/ui/file_not_found_dialog.py ---- cozy-0.7.7--orig/cozy/ui/file_not_found_dialog.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/file_not_found_dialog.py 2020-11-30 18:04:36.711088825 +0100 -@@ -3,9 +3,9 @@ - from gi.repository import Gtk - import cozy.control.player as player - import cozy.ui - from cozy.db.track import Track --from cozy.ext import inject -+import inject - from cozy.media.importer import Importer - - - class FileNotFoundDialog(): -diff -r -U4 cozy-0.7.7--orig/cozy/ui/library_view.py cozy-0.7.7--patched/cozy/ui/library_view.py ---- cozy-0.7.7--orig/cozy/ui/library_view.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/library_view.py 2020-11-30 18:04:36.727088849 +0100 -@@ -1,8 +1,8 @@ - from gi.repository import Gtk - from gi.repository.Gtk import Builder - --from cozy.ext import inject -+import inject - from cozy.ui.book_element import BookElement - from cozy.ui.widgets.filter_list_box import FilterListBox - from cozy.view_model.library_view_model import LibraryViewModel, LibraryViewMode - -diff -r -U4 cozy-0.7.7--orig/cozy/ui/main_view.py cozy-0.7.7--patched/cozy/ui/main_view.py ---- cozy-0.7.7--orig/cozy/ui/main_view.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/main_view.py 2020-11-30 18:04:36.744088875 +0100 -@@ -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 -r -U4 cozy-0.7.7--orig/cozy/ui/search_view.py cozy-0.7.7--patched/cozy/ui/search_view.py ---- cozy-0.7.7--orig/cozy/ui/search_view.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/search_view.py 2020-11-30 18:04:36.729088852 +0100 -@@ -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 -r -U4 cozy-0.7.7--orig/cozy/ui/settings.py cozy-0.7.7--patched/cozy/ui/settings.py ---- cozy-0.7.7--orig/cozy/ui/settings.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/settings.py 2020-11-30 18:04:36.700088808 +0100 -@@ -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.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 -r -U4 cozy-0.7.7--orig/cozy/ui/titlebar.py cozy-0.7.7--patched/cozy/ui/titlebar.py ---- cozy-0.7.7--orig/cozy/ui/titlebar.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/titlebar.py 2020-11-30 18:04:36.747088879 +0100 -@@ -5,9 +5,9 @@ - from cozy.control.artwork_cache import ArtworkCache - from cozy.control.db import get_book_remaining, get_book_progress, get_track_from_book_time, get_book_duration - from cozy.control.string_representation import seconds_to_str - from cozy.db.settings import Settings --from cozy.ext import inject -+import inject - from cozy.media.files import Files - from cozy.media.importer import Importer, ScanStatus - from cozy.media.player import Player - from cozy.model.library import Library -diff -r -U4 cozy-0.7.7--orig/cozy/ui/warnings.py cozy-0.7.7--patched/cozy/ui/warnings.py ---- cozy-0.7.7--orig/cozy/ui/warnings.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/warnings.py 2020-11-30 18:04:36.716088832 +0100 -@@ -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 -r -U4 cozy-0.7.7--orig/cozy/ui/widgets/error_reporting.py cozy-0.7.7--patched/cozy/ui/widgets/error_reporting.py ---- cozy-0.7.7--orig/cozy/ui/widgets/error_reporting.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/widgets/error_reporting.py 2020-11-30 18:04:36.763088904 +0100 -@@ -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 -r -U4 cozy-0.7.7--orig/cozy/ui/widgets/search_results.py cozy-0.7.7--patched/cozy/ui/widgets/search_results.py ---- cozy-0.7.7--orig/cozy/ui/widgets/search_results.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/widgets/search_results.py 2020-11-30 18:04:36.751088885 +0100 -@@ -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 -r -U4 cozy-0.7.7--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.7.7--patched/cozy/ui/widgets/storage_list_box_row.py ---- cozy-0.7.7--orig/cozy/ui/widgets/storage_list_box_row.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/widgets/storage_list_box_row.py 2020-11-30 18:04:36.754088890 +0100 -@@ -5,9 +5,9 @@ - - import cozy.ui - 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 -r -U4 cozy-0.7.7--orig/cozy/ui/widgets/whats_new_window.py cozy-0.7.7--patched/cozy/ui/widgets/whats_new_window.py ---- cozy-0.7.7--orig/cozy/ui/widgets/whats_new_window.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/widgets/whats_new_window.py 2020-11-30 18:04:36.778088927 +0100 -@@ -3,9 +3,9 @@ - - import gi - - from cozy.application_settings import ApplicationSettings --from cozy.ext import inject -+import inject - from cozy.ui.widgets.error_reporting import ErrorReporting - from cozy.ui.widgets.whats_new_importer import WhatsNewImporter - from cozy.ui.widgets.whats_new_m4b import WhatsNewM4B, INTRODUCED - from cozy.version import __version__ as CozyVersion -diff -r -U4 cozy-0.7.7--orig/cozy/view_model/book_detail_view_model.py cozy-0.7.7--patched/cozy/view_model/book_detail_view_model.py ---- cozy-0.7.7--orig/cozy/view_model/book_detail_view_model.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/view_model/book_detail_view_model.py 2020-11-30 18:04:36.800088960 +0100 -@@ -4,9 +4,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-0.7.7--orig/cozy/view_model/library_view_model.py cozy-0.7.7--patched/cozy/view_model/library_view_model.py ---- cozy-0.7.7--orig/cozy/view_model/library_view_model.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/view_model/library_view_model.py 2020-11-30 18:04:36.805088968 +0100 -@@ -1,7 +1,7 @@ - from enum import Enum, auto - --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 -diff -r -U4 cozy-0.7.7--orig/cozy/view_model/search_view_model.py cozy-0.7.7--patched/cozy/view_model/search_view_model.py ---- cozy-0.7.7--orig/cozy/view_model/search_view_model.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/view_model/search_view_model.py 2020-11-30 18:04:36.791088947 +0100 -@@ -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 -r -U4 cozy-0.7.7--orig/cozy/view_model/settings_view_model.py cozy-0.7.7--patched/cozy/view_model/settings_view_model.py ---- cozy-0.7.7--orig/cozy/view_model/settings_view_model.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/view_model/settings_view_model.py 2020-11-30 18:04:36.786088939 +0100 -@@ -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 -r -U4 cozy-0.7.7--orig/requirements.txt cozy-0.7.7--patched/requirements.txt ---- cozy-0.7.7--orig/requirements.txt 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/requirements.txt 2020-11-30 18:05:17.126150269 +0100 -@@ -1,7 +1,8 @@ - distro -+inject>=4.3.1 - mutagen - packaging - peewee>=3.9.6 - pytz - requests --PyGObject -\ No newline at end of file -+PyGObject -diff -r -U4 cozy-0.7.7--orig/test/cozy/media/test_importer.py cozy-0.7.7--patched/test/cozy/media/test_importer.py ---- cozy-0.7.7--orig/test/cozy/media/test_importer.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/test/cozy/media/test_importer.py 2020-11-30 18:04:36.887089092 +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-0.7.7--orig/test/cozy/model/storage_block_list.py cozy-0.7.7--patched/test/cozy/model/storage_block_list.py ---- cozy-0.7.7--orig/test/cozy/model/storage_block_list.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/test/cozy/model/storage_block_list.py 2020-11-30 18:04:36.925089150 +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-0.7.7--orig/test/cozy/model/test_book.py cozy-0.7.7--patched/test/cozy/model/test_book.py ---- cozy-0.7.7--orig/test/cozy/model/test_book.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/test/cozy/model/test_book.py 2020-11-30 18:04:36.927089153 +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-0.7.7--orig/test/cozy/model/test_library.py cozy-0.7.7--patched/test/cozy/model/test_library.py ---- cozy-0.7.7--orig/test/cozy/model/test_library.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/test/cozy/model/test_library.py 2020-11-30 18:04:36.922089146 +0100 -@@ -1,8 +1,8 @@ - import pytest - from peewee import SqliteDatabase - --from cozy.ext import inject -+import inject - from cozy.extensions.set import split_strings_to_set - - - @pytest.fixture(autouse=True) -diff -r -U4 cozy-0.7.7--orig/test/cozy/model/test_settings.py cozy-0.7.7--patched/test/cozy/model/test_settings.py ---- cozy-0.7.7--orig/test/cozy/model/test_settings.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/test/cozy/model/test_settings.py 2020-11-30 18:04:36.912089130 +0100 -@@ -1,7 +1,7 @@ - import pytest - --import cozy.ext.inject as inject -+import inject - from peewee import SqliteDatabase - - - @pytest.fixture(autouse=True) diff --git a/cozy.spec b/cozy.spec index 21632f1..4025599 100644 --- a/cozy.spec +++ b/cozy.spec @@ -2,26 +2,29 @@ Name: cozy %global rtld_name com.github.geigi.cozy Summary: Modern audiobook player -License: GPLv3+ and ASL 2.0 +License: GPLv3+ -Version: 0.7.8 -Release: 1%{?dist} +Version: 1.1.2 +Release: 2%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: %{name}--unbundle-inject.patch +Source99: find-unpatched-imports.sh + +# Unbundle python-inject +Patch0: 0000--unbundle-inject.patch BuildArch: noarch BuildRequires: desktop-file-utils BuildRequires: glib2-devel +BuildRequires: granite-devel BuildRequires: gtk3-devel >= 3.22 BuildRequires: libappstream-glib BuildRequires: libhandy1-devel >= 1.0.0 BuildRequires: meson >= 0.40.0 BuildRequires: python3-devel -BuildRequires: xmlstarlet %global with_tests 1 @@ -42,6 +45,9 @@ BuildRequires: python3dist(requests) Requires: file Requires: glib2 +Requires: granite +Requires: libdazzle +Requires: libhandy1 Requires: gstreamer1-plugins-bad-free Requires: gstreamer1-plugins-good Requires: gstreamer1-plugins-ugly-free @@ -88,13 +94,8 @@ Here are some of the current features: %patch0 -p1 rm -rf cozy/ext/inject -# Add a nonsensical

tag at the beginning of for every -# 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" +# Run the "find unpatched imports" script +"%{SOURCE99}" "$(pwd)" %build @@ -108,11 +109,15 @@ mv ./appdata.patched "data/%{rtld_name}.appdata.xml" %meson_install %find_lang %{rtld_name} +# Remove the "devel" icon +rm %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{rtld_name}.Devel.svg + %check %if 0%{?with_tests} %pytest %endif + appstream-util validate --nonet %{buildroot}/%{_datadir}/metainfo/%{rtld_name}.appdata.xml desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop @@ -126,11 +131,56 @@ desktop-file-validate %{buildroot}%{_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 +* Mon Oct 11 2021 Neal Gompa - 1.1.2-2 +- Add missing dependencies to fix launching the app + Resolves: #2013040, #2013041, #2013042 + +* Fri Aug 20 2021 Artur Frenszek-Iwicki - 1.1.2-1 +- Update to v1.1.2 + +* Fri Aug 20 2021 Artur Frenszek-Iwicki - 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 - 1.1.0-1 +- Update to v1.1.0 + +* Thu Jul 29 2021 Artur Frenszek-Iwicki - 1.0.4-1 +- Update to v1.0.4 + +* Thu Jun 17 2021 Artur Frenszek-Iwicki - 1.0.3-1 +- Update to v1.0.3 + +* Sun May 30 2021 Artur Frenszek-Iwicki - 1.0.1-1 +- Update to v1.0.1 + +* Mon May 10 2021 Artur Frenszek-Iwicki - 0.9.5-1 +- Update to latest release + +* Sun Apr 25 2021 Artur Frenszek-Iwicki - 0.9.4-1 +- Update to latest release + +* Wed Apr 21 2021 Artur Frenszek-Iwicki - 0.9.3-1 +- Update to latest release + +* Tue Apr 20 2021 Artur Frenszek-Iwicki - 0.9.2-1 +- Update to latest release + +* Mon Apr 19 2021 Artur Frenszek-Iwicki - 0.9.1-1 +- Update to latest release + +* Mon Feb 08 2021 Artur Frenszek-Iwicki - 0.8.1-1 +- Update to latest release +- Fix license tag - cozy is GPLv3, the "and ASL 2.0" part + came from a bundled library, which has been un-bundled + * Sun Dec 20 2020 Artur Frenszek-Iwicki - 0.7.8-1 - Update to latest release diff --git a/find-unpatched-imports.sh b/find-unpatched-imports.sh new file mode 100755 index 0000000..94b764e --- /dev/null +++ b/find-unpatched-imports.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +grep \ + --line-number \ + --include '*.py' \ + --fixed-strings \ + -e 'from cozy.ext import inject' \ + -e 'import cozy.ext.inject' \ + -d recurse "$1" + +# Quoting grep's man page: +# > Normally the exit status is 0 if a line is selected, +# > 1 if no lines were selected, +# > and 2 if an error occurred. +if [[ "$?" -ne 1 ]]; then + exit 1 +fi diff --git a/sources b/sources index f78a9ff..207f734 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-0.7.8.tar.gz) = a8bccb8e94fc56e58005c5e7369785780e7f44cfcc26c49a973bbe726d8227a56474c680e1a3d2931ea650b3982b18ffc5799dc5b5ca77f14a5fce79ee401a91 +SHA512 (cozy-1.1.2.tar.gz) = b6db98aca5b3d6b64efd730701e5a95fba0281db55dcfc0e0c538d9004626cace858979bb87ecd89db47a632187905a2f288b7dc9fffb067f2ba429e8ba827f6