diff --git a/.gitignore b/.gitignore index 36704c2..8cb8f06 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,3 @@ /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 diff --git a/0000--unbundle-inject.patch b/0000--unbundle-inject.patch index a618e10..1ee8c36 100644 --- a/0000--unbundle-inject.patch +++ b/0000--unbundle-inject.patch @@ -1,6 +1,6 @@ -diff -r -U4 cozy-1.3.0--orig/cozy/app_controller.py cozy-1.3.0--patched/cozy/app_controller.py ---- cozy-1.3.0--orig/cozy/app_controller.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/app_controller.py 2024-03-03 11:51:34.062151406 +0100 +diff -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 @@ -10,9 +10,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/app_controller.py cozy-1.3.0--patched/cozy/app from cozy.control.offline_cache import OfflineCache from cozy.media.files import Files -diff -r -U4 cozy-1.3.0--orig/cozy/application_settings.py cozy-1.3.0--patched/cozy/application_settings.py ---- cozy-1.3.0--orig/cozy/application_settings.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/application_settings.py 2024-03-03 11:52:23.623579214 +0100 +diff -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 @@ -23,9 +23,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/application_settings.py cozy-1.3.0--patched/co class ApplicationSettings(EventSender): _settings: Gio.Settings = inject.attr(Gio.Settings) -diff -r -U4 cozy-1.3.0--orig/cozy/control/artwork_cache.py cozy-1.3.0--patched/cozy/control/artwork_cache.py ---- cozy-1.3.0--orig/cozy/control/artwork_cache.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/control/artwork_cache.py 2024-03-03 11:52:23.625579231 +0100 +diff -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 @@ -37,9 +37,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/control/artwork_cache.py cozy-1.3.0--patched/c from cozy.report import reporter log = logging.getLogger("artwork_cache") -diff -r -U4 cozy-1.3.0--orig/cozy/control/filesystem_monitor.py cozy-1.3.0--patched/cozy/control/filesystem_monitor.py ---- cozy-1.3.0--orig/cozy/control/filesystem_monitor.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/control/filesystem_monitor.py 2024-03-03 11:51:34.062151406 +0100 +diff -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 @@ -50,23 +50,23 @@ diff -r -U4 cozy-1.3.0--orig/cozy/control/filesystem_monitor.py cozy-1.3.0--patc from cozy.architecture.event_sender import EventSender from cozy.model.book import Book -diff -r -U4 cozy-1.3.0--orig/cozy/control/mpris.py cozy-1.3.0--patched/cozy/control/mpris.py ---- cozy-1.3.0--orig/cozy/control/mpris.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/control/mpris.py 2024-03-03 11:52:23.625579231 +0100 -@@ -15,9 +15,9 @@ - from gi.repository import Gio, GLib +diff -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 NS_TO_SEC, US_TO_SEC, Player + from cozy.media.player import Player from cozy.model.book import Book from cozy.report import reporter -diff -r -U4 cozy-1.3.0--orig/cozy/control/offline_cache.py cozy-1.3.0--patched/cozy/control/offline_cache.py ---- cozy-1.3.0--orig/cozy/control/offline_cache.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/control/offline_cache.py 2024-03-03 11:52:23.624579222 +0100 +diff -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 @@ -77,10 +77,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/control/offline_cache.py cozy-1.3.0--patched/c 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 + +--- 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 @@ -91,10 +90,10 @@ diff -r -U4 cozy-1.3.0--orig/cozy/media/files.py cozy-1.3.0--patched/cozy/media/ from cozy.media.importer import Importer from cozy.model.settings import Settings from cozy.report import reporter - from cozy.ui.toaster import ToastNotifier -diff -r -U4 cozy-1.3.0--orig/cozy/media/importer.py cozy-1.3.0--patched/cozy/media/importer.py ---- cozy-1.3.0--orig/cozy/media/importer.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/media/importer.py 2024-03-03 11:52:23.626579240 +0100 + 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 @@ -106,10 +105,10 @@ diff -r -U4 cozy-1.3.0--orig/cozy/media/importer.py cozy-1.3.0--patched/cozy/med from cozy.media.media_file import MediaFile from cozy.model.database_importer import DatabaseImporter from cozy.model.library import Library -diff -r -U4 cozy-1.3.0--orig/cozy/media/player.py cozy-1.3.0--patched/cozy/media/player.py ---- cozy-1.3.0--orig/cozy/media/player.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/media/player.py 2024-03-03 11:52:23.626579240 +0100 -@@ -9,9 +9,9 @@ +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 @@ -120,11 +119,11 @@ diff -r -U4 cozy-1.3.0--orig/cozy/media/player.py cozy-1.3.0--patched/cozy/media from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.model.library import Library -diff -r -U4 cozy-1.3.0--orig/cozy/model/book.py cozy-1.3.0--patched/cozy/model/book.py ---- cozy-1.3.0--orig/cozy/model/book.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/model/book.py 2024-03-03 11:52:23.624579222 +0100 -@@ -10,9 +10,9 @@ - from cozy.db.collation import collate_natural +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 @@ -134,9 +133,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/model/book.py cozy-1.3.0--patched/cozy/model/b from cozy.model.settings import Settings from cozy.model.track import Track, TrackInconsistentData -diff -r -U4 cozy-1.3.0--orig/cozy/model/database_importer.py cozy-1.3.0--patched/cozy/model/database_importer.py ---- cozy-1.3.0--orig/cozy/model/database_importer.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/model/database_importer.py 2024-03-03 11:52:23.624579222 +0100 +diff -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 @@ -148,10 +147,10 @@ diff -r -U4 cozy-1.3.0--orig/cozy/model/database_importer.py cozy-1.3.0--patched from cozy.media.media_file import MediaFile from cozy.model.book import Book, BookIsEmpty -diff -r -U4 cozy-1.3.0--orig/cozy/model/library.py cozy-1.3.0--patched/cozy/model/library.py ---- cozy-1.3.0--orig/cozy/model/library.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/model/library.py 2024-03-03 11:52:23.624579222 +0100 -@@ -6,9 +6,9 @@ +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 @@ -162,23 +161,37 @@ diff -r -U4 cozy-1.3.0--orig/cozy/model/library.py cozy-1.3.0--patched/cozy/mode from cozy.model.book import Book, BookIsEmpty from cozy.model.chapter import Chapter from cozy.model.settings import Settings -diff -r -U4 cozy-1.3.0--orig/cozy/model/settings.py cozy-1.3.0--patched/cozy/model/settings.py ---- cozy-1.3.0--orig/cozy/model/settings.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/model/settings.py 2024-03-03 11:51:34.061151397 +0100 -@@ -3,9 +3,9 @@ +diff -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 - from peewee import SqliteDatabase -import cozy.ext.inject as inject +import inject + from peewee import SqliteDatabase + from cozy.db.book import Book from cozy.db.settings import Settings as SettingsModel - from cozy.db.storage import Storage as StorageModel - from cozy.model.storage import InvalidPath, Storage -diff -r -U4 cozy-1.3.0--orig/cozy/power_manager.py cozy-1.3.0--patched/cozy/power_manager.py ---- cozy-1.3.0--orig/cozy/power_manager.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/power_manager.py 2024-03-03 11:52:23.627579248 +0100 +diff -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 @@ -190,9 +203,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/power_manager.py cozy-1.3.0--patched/cozy/powe log = logging.getLogger("power_mgr") -diff -r -U4 cozy-1.3.0--orig/cozy/report/report_to_loki.py cozy-1.3.0--patched/cozy/report/report_to_loki.py ---- cozy-1.3.0--orig/cozy/report/report_to_loki.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/report/report_to_loki.py 2024-03-03 11:52:23.625579231 +0100 +diff -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 @@ -204,11 +217,11 @@ diff -r -U4 cozy-1.3.0--orig/cozy/report/report_to_loki.py cozy-1.3.0--patched/c from cozy.version import __version__ as CozyVersion from peewee import __version__ as PeeweeVersion from mutagen import version_string as MutagenVersion -diff -r -U4 cozy-1.3.0--orig/cozy/ui/app_view.py cozy-1.3.0--patched/cozy/ui/app_view.py ---- cozy-1.3.0--orig/cozy/ui/app_view.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/ui/app_view.py 2024-03-03 11:52:23.629579266 +0100 +diff -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, Adw + from gi.repository import Gtk, Handy -from cozy.ext import inject +import inject @@ -216,9 +229,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/ui/app_view.py cozy-1.3.0--patched/cozy/ui/app from cozy.view import View LIBRARY = "main" -diff -r -U4 cozy-1.3.0--orig/cozy/ui/book_detail_view.py cozy-1.3.0--patched/cozy/ui/book_detail_view.py ---- cozy-1.3.0--orig/cozy/ui/book_detail_view.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/ui/book_detail_view.py 2024-03-03 11:52:23.630579274 +0100 +diff -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 @@ -230,36 +243,50 @@ diff -r -U4 cozy-1.3.0--orig/cozy/ui/book_detail_view.py cozy-1.3.0--patched/coz from cozy.model.chapter import Chapter from cozy.report import reporter from cozy.ui.chapter_element import ChapterElement -diff -r -U4 cozy-1.3.0--orig/cozy/ui/delete_book_view.py cozy-1.3.0--patched/cozy/ui/delete_book_view.py ---- cozy-1.3.0--orig/cozy/ui/delete_book_view.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/ui/delete_book_view.py 2024-03-03 11:52:23.629579266 +0100 -@@ -1,7 +1,7 @@ - from gi.repository import Adw, Gtk +diff -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 - from cozy.model.book import Book - from cozy.ui.widgets.book_row import BookRow + gi.require_version('Gtk', '3.0') + from gi.repository import Gtk -diff -r -U4 cozy-1.3.0--orig/cozy/ui/file_not_found_dialog.py cozy-1.3.0--patched/cozy/ui/file_not_found_dialog.py ---- cozy-1.3.0--orig/cozy/ui/file_not_found_dialog.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/ui/file_not_found_dialog.py 2024-03-03 11:52:23.627579248 +0100 -@@ -1,9 +1,9 @@ - from pathlib import Path +diff -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 gi.repository import Adw, Gio, GLib, Gtk +-from cozy.ext import inject ++import inject + gi.require_version('Gtk', '3.0') + from gi.repository import Gtk + +diff -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 -r -U4 cozy-1.3.0--orig/cozy/ui/headerbar.py cozy-1.3.0--patched/cozy/ui/headerbar.py ---- cozy-1.3.0--orig/cozy/ui/headerbar.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/ui/headerbar.py 2024-03-03 11:52:23.631579283 +0100 -@@ -1,15 +1,15 @@ +diff -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 @@ -269,48 +296,40 @@ diff -r -U4 cozy-1.3.0--orig/cozy/ui/headerbar.py cozy-1.3.0--patched/cozy/ui/he from cozy.ui.widgets.progress_popover import ProgressPopover from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState - from gi.repository import Adw, Gtk, GObject + 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 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 gi.repository import Gtk, Granite -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 + 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 typing import Optional - from gi.repository import Adw, Gtk + from gi.repository import Gtk, Handy + from gi.repository.Gtk import Builder -from cozy.ext import inject +import inject from cozy.ui.widgets.book_element import BookElement from cozy.ui.delete_book_view import DeleteBookView from cozy.ui.widgets.filter_list_box import FilterListBox - from cozy.view_model.library_view_model import LibraryViewModel, LibraryViewMode -diff -r -U4 cozy-1.3.0--orig/cozy/ui/main_view.py cozy-1.3.0--patched/cozy/ui/main_view.py ---- cozy-1.3.0--orig/cozy/ui/main_view.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/ui/main_view.py 2024-03-03 11:51:34.062151406 +0100 -@@ -6,9 +6,9 @@ + from cozy.view_model.library_view_model import LibraryViewModel, LibraryViewMode, LibraryPage +diff -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 Adw, Gdk, Gio, GLib, Gtk + from gi.repository import Gtk, Gio, Gdk, GLib import cozy.control.filesystem_monitor as fs_monitor -import cozy.ext.inject as inject @@ -319,9 +338,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/ui/main_view.py cozy-1.3.0--patched/cozy/ui/ma from cozy.application_settings import ApplicationSettings from cozy.architecture.event_sender import EventSender from cozy.architecture.singleton import Singleton -diff -r -U4 cozy-1.3.0--orig/cozy/ui/media_controller.py cozy-1.3.0--patched/cozy/ui/media_controller.py ---- cozy-1.3.0--orig/cozy/ui/media_controller.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/ui/media_controller.py 2024-03-03 11:52:23.631579283 +0100 +diff -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 @@ -333,52 +352,67 @@ diff -r -U4 cozy-1.3.0--orig/cozy/ui/media_controller.py cozy-1.3.0--patched/coz from cozy.ui.widgets.seek_bar import SeekBar from cozy.ui.widgets.sleep_timer import SleepTimer from cozy.view_model.playback_control_view_model import PlaybackControlViewModel -diff -r -U4 cozy-1.3.0--orig/cozy/ui/preferences_view.py cozy-1.3.0--patched/cozy/ui/preferences_view.py ---- cozy-1.3.0--orig/cozy/ui/preferences_view.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/ui/preferences_view.py 2024-03-03 11:52:23.630579274 +0100 -@@ -1,8 +1,8 @@ - from typing import Any - from gi.repository import Adw, Gio, Gtk - --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 +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 @@ -386,23 +420,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/album_element.py cozy-1.3.0--patche from gi.repository import Gtk, GObject, Gdk ALBUM_ART_SIZE = 200 -diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/book_row.py cozy-1.3.0--patched/cozy/ui/widgets/book_row.py ---- cozy-1.3.0--orig/cozy/ui/widgets/book_row.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/ui/widgets/book_row.py 2024-03-03 11:52:23.628579257 +0100 -@@ -2,9 +2,9 @@ - - from gi.repository import Adw, Gtk - - from cozy.control.artwork_cache import ArtworkCache --from cozy.ext import inject -+import inject - from cozy.model.book import Book - - BOOK_ICON_SIZE = 52 - -diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/error_reporting.py cozy-1.3.0--patched/cozy/ui/widgets/error_reporting.py ---- cozy-1.3.0--orig/cozy/ui/widgets/error_reporting.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/ui/widgets/error_reporting.py 2024-03-03 11:52:23.628579257 +0100 +diff -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 @@ -411,47 +431,78 @@ diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/error_reporting.py cozy-1.3.0--patc -from cozy.ext import inject +import inject + gi.require_version('Gtk', '3.0') from gi.repository import Gtk - LEVELS = [ -diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/playback_speed_popover.py cozy-1.3.0--patched/cozy/ui/widgets/playback_speed_popover.py ---- cozy-1.3.0--orig/cozy/ui/widgets/playback_speed_popover.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/ui/widgets/playback_speed_popover.py 2024-03-03 11:52:23.628579257 +0100 -@@ -1,5 +1,5 @@ +diff -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 -diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/sleep_timer.py cozy-1.3.0--patched/cozy/ui/widgets/sleep_timer.py ---- cozy-1.3.0--orig/cozy/ui/widgets/sleep_timer.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/ui/widgets/sleep_timer.py 2024-03-03 11:52:23.627579248 +0100 -@@ -1,5 +1,5 @@ -from cozy.ext import inject +import inject from cozy.view_model.sleep_timer_view_model import SleepTimerViewModel, SystemPowerControl + gi.require_version('Gtk', '3.0') from gi.repository import Gtk - -diff -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 - +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.storage import Storage - from cozy.view_model.storages_view_model import StoragesViewModel + from cozy.model.library import Library + from cozy.model.storage_block_list import StorageBlockList - -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 + 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 @@ -462,9 +513,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/view_model/book_detail_view_model.py cozy-1.3. from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.model.library import Library -diff -r -U4 cozy-1.3.0--orig/cozy/view_model/headerbar_view_model.py cozy-1.3.0--patched/cozy/view_model/headerbar_view_model.py ---- cozy-1.3.0--orig/cozy/view_model/headerbar_view_model.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/view_model/headerbar_view_model.py 2024-03-03 11:52:23.623579214 +0100 +diff -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 @@ -476,24 +527,26 @@ diff -r -U4 cozy-1.3.0--orig/cozy/view_model/headerbar_view_model.py cozy-1.3.0- from cozy.media.importer import Importer, ScanStatus from cozy.model.library import Library from cozy.open_view import OpenView -diff -r -U4 cozy-1.3.0--orig/cozy/view_model/library_view_model.py cozy-1.3.0--patched/cozy/view_model/library_view_model.py ---- cozy-1.3.0--orig/cozy/view_model/library_view_model.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/view_model/library_view_model.py 2024-03-03 11:51:34.061151397 +0100 +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 + from gi.repository import Gtk + -import cozy.ext.inject as inject +import inject from cozy.application_settings import ApplicationSettings from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable from cozy.control.filesystem_monitor import FilesystemMonitor -diff -r -U4 cozy-1.3.0--orig/cozy/view_model/playback_control_view_model.py cozy-1.3.0--patched/cozy/view_model/playback_control_view_model.py ---- cozy-1.3.0--orig/cozy/view_model/playback_control_view_model.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/view_model/playback_control_view_model.py 2024-03-03 11:52:23.622579205 +0100 -@@ -1,7 +1,7 @@ +diff -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 @@ -502,9 +555,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/view_model/playback_control_view_model.py cozy from cozy.model.book import Book from cozy.open_view import OpenView -diff -r -U4 cozy-1.3.0--orig/cozy/view_model/playback_speed_view_model.py cozy-1.3.0--patched/cozy/view_model/playback_speed_view_model.py ---- cozy-1.3.0--orig/cozy/view_model/playback_speed_view_model.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/view_model/playback_speed_view_model.py 2024-03-03 11:52:23.622579205 +0100 +diff -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 @@ -515,37 +568,30 @@ diff -r -U4 cozy-1.3.0--orig/cozy/view_model/playback_speed_view_model.py cozy-1 class PlaybackSpeedViewModel(Observable, EventSender): -diff -r -U4 cozy-1.3.0--orig/cozy/view_model/search_view_model.py cozy-1.3.0--patched/cozy/view_model/search_view_model.py ---- cozy-1.3.0--orig/cozy/view_model/search_view_model.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/view_model/search_view_model.py 2024-03-03 11:51:34.061151397 +0100 -@@ -1,9 +1,9 @@ - from typing import Callable - - from gi.repository import GLib - +diff -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.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.extensions.set import split_strings_to_set + from cozy.open_view import OpenView from cozy.application_settings import ApplicationSettings - from cozy.architecture.event_sender import EventSender +diff -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 - 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 + +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 @@ -557,23 +603,9 @@ diff -r -U4 cozy-1.3.0--orig/cozy/view_model/sleep_timer_view_model.py cozy-1.3. from cozy.tools import IntervalTimer log = logging.getLogger("sleep_timer_view_model") -diff -r -U4 cozy-1.3.0--orig/cozy/view_model/storages_view_model.py cozy-1.3.0--patched/cozy/view_model/storages_view_model.py ---- cozy-1.3.0--orig/cozy/view_model/storages_view_model.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/cozy/view_model/storages_view_model.py 2024-03-03 11:52:23.621579196 +0100 -@@ -6,9 +6,9 @@ - from cozy.application_settings import ApplicationSettings - from cozy.architecture.event_sender import EventSender - from cozy.architecture.observable import Observable - from cozy.control.filesystem_monitor import FilesystemMonitor --from cozy.ext import inject -+import inject - from cozy.media.importer import Importer - from cozy.model.library import Library - from cozy.model.settings import Settings - from cozy.model.storage import Storage -diff -r -U4 cozy-1.3.0--orig/test/cozy/media/test_importer.py cozy-1.3.0--patched/test/cozy/media/test_importer.py ---- cozy-1.3.0--orig/test/cozy/media/test_importer.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/test/cozy/media/test_importer.py 2024-03-03 11:52:23.633579300 +0100 +diff -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 @@ -585,9 +617,9 @@ diff -r -U4 cozy-1.3.0--orig/test/cozy/media/test_importer.py cozy-1.3.0--patche from cozy.model.library import Library -diff -r -U4 cozy-1.3.0--orig/test/cozy/media/test_player.py cozy-1.3.0--patched/test/cozy/media/test_player.py ---- cozy-1.3.0--orig/test/cozy/media/test_player.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/test/cozy/media/test_player.py 2024-03-03 11:52:23.633579300 +0100 +diff -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 @@ -599,9 +631,9 @@ diff -r -U4 cozy-1.3.0--orig/test/cozy/media/test_player.py cozy-1.3.0--patched/ from cozy.model.library import Library from cozy.model.settings import Settings -diff -r -U4 cozy-1.3.0--orig/test/cozy/model/storage_block_list.py cozy-1.3.0--patched/test/cozy/model/storage_block_list.py ---- cozy-1.3.0--orig/test/cozy/model/storage_block_list.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/test/cozy/model/storage_block_list.py 2024-03-03 11:52:23.632579291 +0100 +diff -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 @@ -612,9 +644,9 @@ diff -r -U4 cozy-1.3.0--orig/test/cozy/model/storage_block_list.py cozy-1.3.0--p @pytest.fixture(autouse=True) def setup_inject(peewee_database_storage): -diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_book.py cozy-1.3.0--patched/test/cozy/model/test_book.py ---- cozy-1.3.0--orig/test/cozy/model/test_book.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/test/cozy/model/test_book.py 2024-03-03 11:52:23.633579300 +0100 +diff -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 @@ -626,9 +658,9 @@ diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_book.py cozy-1.3.0--patched/te @pytest.fixture(autouse=True) -diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_database_importer.py cozy-1.3.0--patched/test/cozy/model/test_database_importer.py ---- cozy-1.3.0--orig/test/cozy/model/test_database_importer.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/test/cozy/model/test_database_importer.py 2024-03-03 11:52:23.632579291 +0100 +diff -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 @@ -639,9 +671,9 @@ diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_database_importer.py cozy-1.3. @pytest.fixture(autouse=True) def setup_inject(peewee_database): -diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_library.py cozy-1.3.0--patched/test/cozy/model/test_library.py ---- cozy-1.3.0--orig/test/cozy/model/test_library.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/test/cozy/model/test_library.py 2024-03-03 11:52:23.632579291 +0100 +diff -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 @@ -653,9 +685,9 @@ diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_library.py cozy-1.3.0--patched from cozy.model.settings import Settings from test.cozy.mocks import ApplicationSettingsMock -diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_settings.py cozy-1.3.0--patched/test/cozy/model/test_settings.py ---- cozy-1.3.0--orig/test/cozy/model/test_settings.py 2024-03-01 15:44:03.000000000 +0100 -+++ cozy-1.3.0--patched/test/cozy/model/test_settings.py 2024-03-03 11:51:34.063151414 +0100 +diff -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 diff --git a/0001-fix-appdata-file.patch b/0001-fix-appdata-file.patch deleted file mode 100644 index 576f10d..0000000 --- a/0001-fix-appdata-file.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 @@ - - - - -+

This minor release includes various assorted fixes.

-