From 13b92d548da6c0450835461feec82c92a7c9f25e Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Mon, 8 Feb 2021 12:26:04 +0100 Subject: [PATCH 01/13] Update to v0.8.1 --- .gitignore | 1 + cozy--unbundle-inject.patch | 378 ++++++++++++++++++++---------------- cozy.spec | 13 +- sources | 2 +- 4 files changed, 221 insertions(+), 173 deletions(-) diff --git a/.gitignore b/.gitignore index f9b5528..26e19c4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /cozy-0.7.5.tar.gz /cozy-0.7.7.tar.gz /cozy-0.7.8.tar.gz +/cozy-0.8.1.tar.gz diff --git a/cozy--unbundle-inject.patch b/cozy--unbundle-inject.patch index 17fe046..053197c 100644 --- a/cozy--unbundle-inject.patch +++ b/cozy--unbundle-inject.patch @@ -1,6 +1,6 @@ -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 +diff -U4 -r cozy-0.8.1--orig/cozy/app_controller.py cozy-0.8.1--patched/cozy/app_controller.py +--- cozy-0.8.1--orig/cozy/app_controller.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/app_controller.py 2021-02-08 12:07:35.528713507 +0100 @@ -1,7 +1,7 @@ from gi.repository import Gio @@ -10,9 +10,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/app_controller.py cozy-0.7.7--patched/cozy/app 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 +diff -U4 -r cozy-0.8.1--orig/cozy/application_settings.py cozy-0.8.1--patched/cozy/application_settings.py +--- cozy-0.8.1--orig/cozy/application_settings.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/application_settings.py 2021-02-08 12:07:35.497713413 +0100 @@ -1,8 +1,8 @@ from gi.repository import Gio @@ -23,9 +23,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/application_settings.py cozy-0.7.7--patched/co 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 +diff -U4 -r cozy-0.8.1--orig/cozy/control/artwork_cache.py cozy-0.8.1--patched/cozy/control/artwork_cache.py +--- cozy-0.8.1--orig/cozy/control/artwork_cache.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/control/artwork_cache.py 2021-02-08 12:07:35.222712577 +0100 @@ -7,9 +7,9 @@ from cozy.application_settings import ApplicationSettings from cozy.control.application_directories import get_cache_dir @@ -37,9 +37,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/control/artwork_cache.py cozy-0.7.7--patched/c 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 +diff -U4 -r cozy-0.8.1--orig/cozy/control/db.py cozy-0.8.1--patched/cozy/control/db.py +--- cozy-0.8.1--orig/cozy/control/db.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/control/db.py 2021-02-08 12:07:35.226712589 +0100 @@ -1,9 +1,9 @@ import logging import os @@ -51,9 +51,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/control/db.py cozy-0.7.7--patched/cozy/control 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 +diff -U4 -r cozy-0.8.1--orig/cozy/control/filesystem_monitor.py cozy-0.8.1--patched/cozy/control/filesystem_monitor.py +--- cozy-0.8.1--orig/cozy/control/filesystem_monitor.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/control/filesystem_monitor.py 2021-02-08 12:07:35.212712547 +0100 @@ -1,8 +1,8 @@ import logging from typing import List @@ -64,9 +64,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/control/filesystem_monitor.py cozy-0.7.7--patc 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 +diff -U4 -r cozy-0.8.1--orig/cozy/control/offline_cache.py cozy-0.8.1--patched/cozy/control/offline_cache.py +--- cozy-0.8.1--orig/cozy/control/offline_cache.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/control/offline_cache.py 2021-02-08 12:07:35.245712647 +0100 @@ -12,9 +12,9 @@ from cozy.db.book import Book @@ -78,23 +78,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/control/offline_cache.py cozy-0.7.7--patched/c 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 +diff -U4 -r cozy-0.8.1--orig/cozy/control/player.py cozy-0.8.1--patched/cozy/control/player.py +--- cozy-0.8.1--orig/cozy/control/player.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/control/player.py 2021-02-08 12:07:35.238712626 +0100 @@ -1,8 +1,8 @@ import threading import time @@ -105,23 +91,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/control/player.py cozy-0.7.7--patched/cozy/con 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 +diff -U4 -r cozy-0.8.1--orig/cozy/media/files.py cozy-0.8.1--patched/cozy/media/files.py +--- cozy-0.8.1--orig/cozy/media/files.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/media/files.py 2021-02-08 12:07:35.254712674 +0100 @@ -5,9 +5,9 @@ from gi.repository import Gio @@ -133,9 +105,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/media/files.py cozy-0.7.7--patched/cozy/media/ 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 +diff -U4 -r cozy-0.8.1--orig/cozy/media/importer.py cozy-0.8.1--patched/cozy/media/importer.py +--- cozy-0.8.1--orig/cozy/media/importer.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/media/importer.py 2021-02-08 12:07:35.281712756 +0100 @@ -12,9 +12,9 @@ from cozy.media.media_file import MediaFile from cozy.model.library import Library @@ -147,10 +119,10 @@ diff -r -U4 cozy-0.7.7--orig/cozy/media/importer.py cozy-0.7.7--patched/cozy/med 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 @@ +diff -U4 -r cozy-0.8.1--orig/cozy/media/player.py cozy-0.8.1--patched/cozy/media/player.py +--- cozy-0.8.1--orig/cozy/media/player.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/media/player.py 2021-02-08 12:07:35.263712702 +0100 +@@ -5,9 +5,9 @@ from cozy.application_settings import ApplicationSettings from cozy.architecture.event_sender import EventSender @@ -161,9 +133,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/media/player.py cozy-0.7.7--patched/cozy/media 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 +diff -U4 -r cozy-0.8.1--orig/cozy/model/book.py cozy-0.8.1--patched/cozy/model/book.py +--- cozy-0.8.1--orig/cozy/model/book.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/model/book.py 2021-02-08 12:07:35.522713489 +0100 @@ -6,9 +6,9 @@ from cozy.architecture.observable import Observable from cozy.db.book import Book as BookModel @@ -175,9 +147,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/model/book.py cozy-0.7.7--patched/cozy/model/b 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 +diff -U4 -r cozy-0.8.1--orig/cozy/model/library.py cozy-0.8.1--patched/cozy/model/library.py +--- cozy-0.8.1--orig/cozy/model/library.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/model/library.py 2021-02-08 12:07:35.508713446 +0100 @@ -6,9 +6,9 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.profiler import timing @@ -189,9 +161,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/model/library.py cozy-0.7.7--patched/cozy/mode 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 +diff -U4 -r cozy-0.8.1--orig/cozy/model/settings.py cozy-0.8.1--patched/cozy/model/settings.py +--- cozy-0.8.1--orig/cozy/model/settings.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/model/settings.py 2021-02-08 12:07:35.501713425 +0100 @@ -1,8 +1,8 @@ import logging from typing import List @@ -202,9 +174,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/model/settings.py cozy-0.7.7--patched/cozy/mod 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 +diff -U4 -r cozy-0.8.1--orig/cozy/model/storage_block_list.py cozy-0.8.1--patched/cozy/model/storage_block_list.py +--- cozy-0.8.1--orig/cozy/model/storage_block_list.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/model/storage_block_list.py 2021-02-08 12:07:35.525713498 +0100 @@ -1,8 +1,8 @@ from peewee import SqliteDatabase @@ -215,9 +187,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/model/storage_block_list.py cozy-0.7.7--patche 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 +diff -U4 -r cozy-0.8.1--orig/cozy/report/report_to_loki.py cozy-0.8.1--patched/cozy/report/report_to_loki.py +--- cozy-0.8.1--orig/cozy/report/report_to_loki.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/report/report_to_loki.py 2021-02-08 12:07:35.553713583 +0100 @@ -6,9 +6,9 @@ import distro import platform @@ -229,9 +201,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/report/report_to_loki.py cozy-0.7.7--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-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 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/album_element.py cozy-0.8.1--patched/cozy/ui/album_element.py +--- cozy-0.8.1--orig/cozy/ui/album_element.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/album_element.py 2021-02-08 12:07:35.311712848 +0100 @@ -2,9 +2,9 @@ from cozy.control import player as player @@ -243,9 +215,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/album_element.py cozy-0.7.7--patched/cozy/u 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 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/book_detail_view.py cozy-0.8.1--patched/cozy/ui/book_detail_view.py +--- cozy-0.8.1--orig/cozy/ui/book_detail_view.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/book_detail_view.py 2021-02-08 12:07:35.342712942 +0100 @@ -3,9 +3,9 @@ import gi @@ -257,9 +229,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/book_detail_view.py cozy-0.7.7--patched/coz 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 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/book_element.py cozy-0.8.1--patched/cozy/ui/book_element.py +--- cozy-0.8.1--orig/cozy/ui/book_element.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/book_element.py 2021-02-08 12:07:35.288712778 +0100 @@ -1,8 +1,8 @@ import os import subprocess @@ -270,9 +242,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/book_element.py cozy-0.7.7--patched/cozy/ui 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 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/file_not_found_dialog.py cozy-0.8.1--patched/cozy/ui/file_not_found_dialog.py +--- cozy-0.8.1--orig/cozy/ui/file_not_found_dialog.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/file_not_found_dialog.py 2021-02-08 12:07:35.297712805 +0100 @@ -3,9 +3,9 @@ from gi.repository import Gtk import cozy.control.player as player @@ -284,9 +256,23 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/file_not_found_dialog.py cozy-0.7.7--patche 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 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/headerbar.py cozy-0.8.1--patched/cozy/ui/headerbar.py +--- cozy-0.8.1--orig/cozy/ui/headerbar.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/headerbar.py 2021-02-08 12:07:35.293712793 +0100 +@@ -3,9 +3,9 @@ + import gi + + from cozy.control.artwork_cache import ArtworkCache + from cozy.db.book import Book +-from cozy.ext import inject ++import inject + from cozy.ui.widgets.playback_speed_popover import PlaybackSpeedPopover + from cozy.ui.widgets.seek_bar import SeekBar + from cozy.ui.widgets.sleep_timer import SleepTimer + from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState +diff -U4 -r cozy-0.8.1--orig/cozy/ui/library_view.py cozy-0.8.1--patched/cozy/ui/library_view.py +--- cozy-0.8.1--orig/cozy/ui/library_view.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/library_view.py 2021-02-08 12:07:35.324712887 +0100 @@ -1,8 +1,8 @@ from gi.repository import Gtk from gi.repository.Gtk import Builder @@ -297,9 +283,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/library_view.py cozy-0.7.7--patched/cozy/ui 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 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/main_view.py cozy-0.8.1--patched/cozy/ui/main_view.py +--- cozy-0.8.1--orig/cozy/ui/main_view.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/main_view.py 2021-02-08 12:07:35.355712981 +0100 @@ -1,7 +1,7 @@ import webbrowser @@ -309,9 +295,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/main_view.py cozy-0.7.7--patched/cozy/ui/ma 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 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/search_view.py cozy-0.8.1--patched/cozy/ui/search_view.py +--- cozy-0.8.1--orig/cozy/ui/search_view.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/search_view.py 2021-02-08 12:07:35.328712899 +0100 @@ -1,8 +1,8 @@ import threading from threading import Thread @@ -322,9 +308,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/search_view.py cozy-0.7.7--patched/cozy/ui/ 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 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/settings.py cozy-0.8.1--patched/cozy/ui/settings.py +--- cozy-0.8.1--orig/cozy/ui/settings.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/settings.py 2021-02-08 12:07:35.286712772 +0100 @@ -4,9 +4,9 @@ from cozy.control.db import remove_tracks_with_path @@ -336,23 +322,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/settings.py cozy-0.7.7--patched/cozy/ui/set 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 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/warnings.py cozy-0.8.1--patched/cozy/ui/warnings.py +--- cozy-0.8.1--orig/cozy/ui/warnings.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/warnings.py 2021-02-08 12:07:35.301712817 +0100 @@ -1,8 +1,8 @@ from gettext import gettext @@ -363,9 +335,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/warnings.py cozy-0.7.7--patched/cozy/ui/war 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 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/error_reporting.py cozy-0.8.1--patched/cozy/ui/widgets/error_reporting.py +--- cozy-0.8.1--orig/cozy/ui/widgets/error_reporting.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/widgets/error_reporting.py 2021-02-08 12:07:35.391713091 +0100 @@ -2,9 +2,9 @@ import gi @@ -377,9 +349,21 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/widgets/error_reporting.py cozy-0.7.7--patc 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 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-0.8.1--patched/cozy/ui/widgets/playback_speed_popover.py +--- cozy-0.8.1--orig/cozy/ui/widgets/playback_speed_popover.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/widgets/playback_speed_popover.py 2021-02-08 12:07:35.366713015 +0100 +@@ -1,7 +1,7 @@ + import gi + +-from cozy.ext import inject ++import inject + from cozy.view_model.playback_speed_view_model import PlaybackSpeedViewModel + + gi.require_version('Gtk', '3.0') + from gi.repository import Gtk +diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/search_results.py cozy-0.8.1--patched/cozy/ui/widgets/search_results.py +--- cozy-0.8.1--orig/cozy/ui/widgets/search_results.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/widgets/search_results.py 2021-02-08 12:07:35.362713002 +0100 @@ -1,8 +1,8 @@ from gi.repository import Gtk, Gdk import cozy.tools as tools @@ -390,9 +374,21 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/widgets/search_results.py cozy-0.7.7--patch 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 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/sleep_timer.py cozy-0.8.1--patched/cozy/ui/widgets/sleep_timer.py +--- cozy-0.8.1--orig/cozy/ui/widgets/sleep_timer.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/widgets/sleep_timer.py 2021-02-08 12:07:35.384713069 +0100 +@@ -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 -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.8.1--patched/cozy/ui/widgets/storage_list_box_row.py +--- cozy-0.8.1--orig/cozy/ui/widgets/storage_list_box_row.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/widgets/storage_list_box_row.py 2021-02-08 12:07:35.370713027 +0100 @@ -5,9 +5,9 @@ import cozy.ui @@ -404,9 +400,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.7.7- 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 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/whats_new_window.py cozy-0.8.1--patched/cozy/ui/widgets/whats_new_window.py +--- cozy-0.8.1--orig/cozy/ui/widgets/whats_new_window.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/widgets/whats_new_window.py 2021-02-08 12:07:35.404713130 +0100 @@ -3,9 +3,9 @@ import gi @@ -414,13 +410,13 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/widgets/whats_new_window.py cozy-0.7.7--pat from cozy.application_settings import ApplicationSettings -from cozy.ext import inject +import inject + from cozy.ui.main_view import CozyUI 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 +diff -U4 -r cozy-0.8.1--orig/cozy/view_model/book_detail_view_model.py cozy-0.8.1--patched/cozy/view_model/book_detail_view_model.py +--- cozy-0.8.1--orig/cozy/view_model/book_detail_view_model.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/view_model/book_detail_view_model.py 2021-02-08 12:07:35.444713252 +0100 @@ -4,9 +4,9 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable @@ -432,9 +428,23 @@ diff -r -U4 cozy-0.7.7--orig/cozy/view_model/book_detail_view_model.py cozy-0.7. 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 +diff -U4 -r cozy-0.8.1--orig/cozy/view_model/headerbar_view_model.py cozy-0.8.1--patched/cozy/view_model/headerbar_view_model.py +--- cozy-0.8.1--orig/cozy/view_model/headerbar_view_model.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/view_model/headerbar_view_model.py 2021-02-08 12:07:35.435713224 +0100 +@@ -2,9 +2,9 @@ + + from cozy.architecture.event_sender import EventSender + from cozy.architecture.observable import Observable + from cozy.control.offline_cache import OfflineCache +-from cozy.ext import inject ++import inject + from cozy.media.files import Files + from cozy.media.importer import Importer, ScanStatus + from cozy.model.library import Library + +diff -U4 -r cozy-0.8.1--orig/cozy/view_model/library_view_model.py cozy-0.8.1--patched/cozy/view_model/library_view_model.py +--- cozy-0.8.1--orig/cozy/view_model/library_view_model.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/view_model/library_view_model.py 2021-02-08 12:07:35.446713258 +0100 @@ -1,7 +1,7 @@ from enum import Enum, auto @@ -444,9 +454,37 @@ diff -r -U4 cozy-0.7.7--orig/cozy/view_model/library_view_model.py cozy-0.7.7--p 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 +diff -U4 -r cozy-0.8.1--orig/cozy/view_model/playback_control_view_model.py cozy-0.8.1--patched/cozy/view_model/playback_control_view_model.py +--- cozy-0.8.1--orig/cozy/view_model/playback_control_view_model.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/view_model/playback_control_view_model.py 2021-02-08 12:07:35.431713212 +0100 +@@ -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 -U4 -r cozy-0.8.1--orig/cozy/view_model/playback_speed_view_model.py cozy-0.8.1--patched/cozy/view_model/playback_speed_view_model.py +--- cozy-0.8.1--orig/cozy/view_model/playback_speed_view_model.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/view_model/playback_speed_view_model.py 2021-02-08 12:07:35.417713170 +0100 +@@ -1,9 +1,9 @@ + from cozy.architecture.event_sender import EventSender + from cozy.architecture.observable import Observable + from cozy.control import player + from cozy.db.book import Book +-from cozy.ext import inject ++import inject + from cozy.media.player import Player + + + class PlaybackSpeedViewModel(Observable, EventSender): +diff -U4 -r cozy-0.8.1--orig/cozy/view_model/search_view_model.py cozy-0.8.1--patched/cozy/view_model/search_view_model.py +--- cozy-0.8.1--orig/cozy/view_model/search_view_model.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/view_model/search_view_model.py 2021-02-08 12:07:35.426713197 +0100 @@ -1,5 +1,5 @@ -import cozy.ext.inject as inject +import inject @@ -454,9 +492,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/view_model/search_view_model.py cozy-0.7.7--pa 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 +diff -U4 -r cozy-0.8.1--orig/cozy/view_model/settings_view_model.py cozy-0.8.1--patched/cozy/view_model/settings_view_model.py +--- cozy-0.8.1--orig/cozy/view_model/settings_view_model.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/view_model/settings_view_model.py 2021-02-08 12:07:35.422713185 +0100 @@ -1,6 +1,6 @@ from cozy.architecture.observable import Observable -from cozy.ext import inject @@ -465,23 +503,23 @@ diff -r -U4 cozy-0.7.7--orig/cozy/view_model/settings_view_model.py cozy-0.7.7-- 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 +diff -U4 -r cozy-0.8.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-0.8.1--patched/cozy/view_model/sleep_timer_view_model.py +--- cozy-0.8.1--orig/cozy/view_model/sleep_timer_view_model.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/view_model/sleep_timer_view_model.py 2021-02-08 12:07:35.413713157 +0100 +@@ -5,9 +5,9 @@ + + from cozy import tools + from cozy.application_settings import ApplicationSettings + from cozy.architecture.observable import Observable +-from cozy.ext import inject ++import inject + from cozy.media.player import Player + from cozy.tools import IntervalTimer + + log = logging.getLogger("sleep_timer_view_model") +diff -U4 -r cozy-0.8.1--orig/test/cozy/media/test_importer.py cozy-0.8.1--patched/test/cozy/media/test_importer.py +--- cozy-0.8.1--orig/test/cozy/media/test_importer.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/test/cozy/media/test_importer.py 2021-02-08 12:07:35.571713637 +0100 @@ -2,9 +2,9 @@ import pytest @@ -493,9 +531,9 @@ diff -r -U4 cozy-0.7.7--orig/test/cozy/media/test_importer.py cozy-0.7.7--patche 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 +diff -U4 -r cozy-0.8.1--orig/test/cozy/model/storage_block_list.py cozy-0.8.1--patched/test/cozy/model/storage_block_list.py +--- cozy-0.8.1--orig/test/cozy/model/storage_block_list.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/test/cozy/model/storage_block_list.py 2021-02-08 12:07:35.604713738 +0100 @@ -1,8 +1,8 @@ import pytest from peewee import SqliteDatabase @@ -506,9 +544,9 @@ diff -r -U4 cozy-0.7.7--orig/test/cozy/model/storage_block_list.py cozy-0.7.7--p @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 +diff -U4 -r cozy-0.8.1--orig/test/cozy/model/test_book.py cozy-0.8.1--patched/test/cozy/model/test_book.py +--- cozy-0.8.1--orig/test/cozy/model/test_book.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/test/cozy/model/test_book.py 2021-02-08 12:07:35.608713750 +0100 @@ -1,8 +1,8 @@ import pytest from peewee import SqliteDatabase @@ -519,9 +557,9 @@ diff -r -U4 cozy-0.7.7--orig/test/cozy/model/test_book.py cozy-0.7.7--patched/te @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 +diff -U4 -r cozy-0.8.1--orig/test/cozy/model/test_library.py cozy-0.8.1--patched/test/cozy/model/test_library.py +--- cozy-0.8.1--orig/test/cozy/model/test_library.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/test/cozy/model/test_library.py 2021-02-08 12:07:35.601713729 +0100 @@ -1,8 +1,8 @@ import pytest from peewee import SqliteDatabase @@ -529,12 +567,12 @@ diff -r -U4 cozy-0.7.7--orig/test/cozy/model/test_library.py cozy-0.7.7--patched -from cozy.ext import inject +import inject from cozy.extensions.set import split_strings_to_set + from cozy.model.settings import Settings - @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 +diff -U4 -r cozy-0.8.1--orig/test/cozy/model/test_settings.py cozy-0.8.1--patched/test/cozy/model/test_settings.py +--- cozy-0.8.1--orig/test/cozy/model/test_settings.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/test/cozy/model/test_settings.py 2021-02-08 12:07:35.594713707 +0100 @@ -1,7 +1,7 @@ import pytest diff --git a/cozy.spec b/cozy.spec index 21632f1..681c184 100644 --- a/cozy.spec +++ b/cozy.spec @@ -2,9 +2,9 @@ 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 +Version: 0.8.1 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -108,6 +108,9 @@ 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} @@ -126,11 +129,17 @@ 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 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/sources b/sources index f78a9ff..f8330ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-0.7.8.tar.gz) = a8bccb8e94fc56e58005c5e7369785780e7f44cfcc26c49a973bbe726d8227a56474c680e1a3d2931ea650b3982b18ffc5799dc5b5ca77f14a5fce79ee401a91 +SHA512 (cozy-0.8.1.tar.gz) = a6589968cd2acd2001c53d0d61c8ba5f28e5a2a773db99bf035684eb5fca458260f8541809a94119791c4adf39dd09dc1f6964228f93256d1e087078033dd36c From a528b1cc8076b0c377af5bcf31a6e7b8108cbb68 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Mon, 19 Apr 2021 01:40:00 +0200 Subject: [PATCH 02/13] Update to v0.9.1 --- .gitignore | 1 + cozy--unbundle-inject.patch | 396 +++++++++++++++++++----------------- cozy.spec | 5 +- sources | 2 +- 4 files changed, 220 insertions(+), 184 deletions(-) diff --git a/.gitignore b/.gitignore index 26e19c4..20c2337 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /cozy-0.7.7.tar.gz /cozy-0.7.8.tar.gz /cozy-0.8.1.tar.gz +/cozy-0.9.1.tar.gz diff --git a/cozy--unbundle-inject.patch b/cozy--unbundle-inject.patch index 053197c..6bdca34 100644 --- a/cozy--unbundle-inject.patch +++ b/cozy--unbundle-inject.patch @@ -1,6 +1,6 @@ -diff -U4 -r cozy-0.8.1--orig/cozy/app_controller.py cozy-0.8.1--patched/cozy/app_controller.py ---- cozy-0.8.1--orig/cozy/app_controller.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/app_controller.py 2021-02-08 12:07:35.528713507 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/app_controller.py cozy-0.9.1--patched/cozy/app_controller.py +--- cozy-0.9.1--orig/cozy/app_controller.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/app_controller.py 2021-04-19 01:31:38.733519002 +0200 @@ -1,7 +1,7 @@ from gi.repository import Gio @@ -10,9 +10,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/app_controller.py cozy-0.8.1--patched/cozy/app from cozy.control.offline_cache import OfflineCache from cozy.media.files import Files -diff -U4 -r cozy-0.8.1--orig/cozy/application_settings.py cozy-0.8.1--patched/cozy/application_settings.py ---- cozy-0.8.1--orig/cozy/application_settings.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/application_settings.py 2021-02-08 12:07:35.497713413 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/application_settings.py cozy-0.9.1--patched/cozy/application_settings.py +--- cozy-0.9.1--orig/cozy/application_settings.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/application_settings.py 2021-04-19 01:31:38.716518967 +0200 @@ -1,8 +1,8 @@ from gi.repository import Gio @@ -23,9 +23,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/application_settings.py cozy-0.8.1--patched/co class ApplicationSettings(EventSender): _settings: Gio.Settings = inject.attr(Gio.Settings) -diff -U4 -r cozy-0.8.1--orig/cozy/control/artwork_cache.py cozy-0.8.1--patched/cozy/control/artwork_cache.py ---- cozy-0.8.1--orig/cozy/control/artwork_cache.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/control/artwork_cache.py 2021-02-08 12:07:35.222712577 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/control/artwork_cache.py cozy-0.9.1--patched/cozy/control/artwork_cache.py +--- cozy-0.9.1--orig/cozy/control/artwork_cache.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/control/artwork_cache.py 2021-04-19 01:31:38.583518698 +0200 @@ -7,9 +7,9 @@ from cozy.application_settings import ApplicationSettings from cozy.control.application_directories import get_cache_dir @@ -37,9 +37,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/control/artwork_cache.py cozy-0.8.1--patched/c from cozy.report import reporter log = logging.getLogger("artwork_cache") -diff -U4 -r cozy-0.8.1--orig/cozy/control/db.py cozy-0.8.1--patched/cozy/control/db.py ---- cozy-0.8.1--orig/cozy/control/db.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/control/db.py 2021-02-08 12:07:35.226712589 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/control/db.py cozy-0.9.1--patched/cozy/control/db.py +--- cozy-0.9.1--orig/cozy/control/db.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/control/db.py 2021-04-19 01:31:38.586518704 +0200 @@ -1,9 +1,9 @@ import logging import os @@ -51,9 +51,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/control/db.py cozy-0.8.1--patched/cozy/control from cozy.control.db_updater import update_db from cozy.db.artwork_cache import ArtworkCache from cozy.db.book import Book -diff -U4 -r cozy-0.8.1--orig/cozy/control/filesystem_monitor.py cozy-0.8.1--patched/cozy/control/filesystem_monitor.py ---- cozy-0.8.1--orig/cozy/control/filesystem_monitor.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/control/filesystem_monitor.py 2021-02-08 12:07:35.212712547 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/control/filesystem_monitor.py cozy-0.9.1--patched/cozy/control/filesystem_monitor.py +--- cozy-0.9.1--orig/cozy/control/filesystem_monitor.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/control/filesystem_monitor.py 2021-04-19 01:31:38.577518686 +0200 @@ -1,8 +1,8 @@ import logging from typing import List @@ -64,36 +64,37 @@ diff -U4 -r cozy-0.8.1--orig/cozy/control/filesystem_monitor.py cozy-0.8.1--patc from cozy.architecture.event_sender import EventSender from cozy.control.db import get_tracks -diff -U4 -r cozy-0.8.1--orig/cozy/control/offline_cache.py cozy-0.8.1--patched/cozy/control/offline_cache.py ---- cozy-0.8.1--orig/cozy/control/offline_cache.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/control/offline_cache.py 2021-02-08 12:07:35.245712647 +0100 -@@ -12,9 +12,9 @@ +diff -U4 -rN cozy-0.9.1--orig/cozy/control/mpris.py cozy-0.9.1--patched/cozy/control/mpris.py +--- cozy-0.9.1--orig/cozy/control/mpris.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/control/mpris.py 2021-04-19 01:31:38.592518716 +0200 +@@ -22,9 +22,9 @@ - from cozy.db.book import Book - from cozy.db.track import Track - from cozy.db.offline_cache import OfflineCache as OfflineCacheModel + 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 - log = logging.getLogger("offline_cache") +diff -U4 -rN cozy-0.9.1--orig/cozy/control/offline_cache.py cozy-0.9.1--patched/cozy/control/offline_cache.py +--- cozy-0.9.1--orig/cozy/control/offline_cache.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/control/offline_cache.py 2021-04-19 01:31:38.600518733 +0200 +@@ -12,9 +12,9 @@ -diff -U4 -r cozy-0.8.1--orig/cozy/control/player.py cozy-0.8.1--patched/cozy/control/player.py ---- cozy-0.8.1--orig/cozy/control/player.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/control/player.py 2021-02-08 12:07:35.238712626 +0100 -@@ -1,8 +1,8 @@ - import threading - import time - --import cozy.ext.inject as inject + from cozy.db.track import Track + from cozy.db.offline_cache import OfflineCache as OfflineCacheModel + from cozy.db.book import Book as BookDB +-from cozy.ext import inject +import inject - from gi.repository import Gst, GLib + from cozy.model.book import Book + from cozy.model.chapter import Chapter + from cozy.report import reporter - import gi - -diff -U4 -r cozy-0.8.1--orig/cozy/media/files.py cozy-0.8.1--patched/cozy/media/files.py ---- cozy-0.8.1--orig/cozy/media/files.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/media/files.py 2021-02-08 12:07:35.254712674 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/media/files.py cozy-0.9.1--patched/cozy/media/files.py +--- cozy-0.9.1--orig/cozy/media/files.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/media/files.py 2021-04-19 01:31:38.606518745 +0200 @@ -5,9 +5,9 @@ from gi.repository import Gio @@ -105,41 +106,41 @@ diff -U4 -r cozy-0.8.1--orig/cozy/media/files.py cozy-0.8.1--patched/cozy/media/ from cozy.model.settings import Settings from cozy.report import reporter -diff -U4 -r cozy-0.8.1--orig/cozy/media/importer.py cozy-0.8.1--patched/cozy/media/importer.py ---- cozy-0.8.1--orig/cozy/media/importer.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/media/importer.py 2021-02-08 12:07:35.281712756 +0100 -@@ -12,9 +12,9 @@ - from cozy.media.media_file import MediaFile - from cozy.model.library import Library +diff -U4 -rN cozy-0.9.1--orig/cozy/media/importer.py cozy-0.9.1--patched/cozy/media/importer.py +--- cozy-0.9.1--orig/cozy/media/importer.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/media/importer.py 2021-04-19 01:31:38.622518777 +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.library import Library from cozy.model.settings import Settings - from cozy.report import reporter - - log = logging.getLogger("importer") -diff -U4 -r cozy-0.8.1--orig/cozy/media/player.py cozy-0.8.1--patched/cozy/media/player.py ---- cozy-0.8.1--orig/cozy/media/player.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/media/player.py 2021-02-08 12:07:35.263712702 +0100 -@@ -5,9 +5,9 @@ +diff -U4 -rN cozy-0.9.1--orig/cozy/media/player.py cozy-0.9.1--patched/cozy/media/player.py +--- cozy-0.9.1--orig/cozy/media/player.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/media/player.py 2021-04-19 01:31:38.611518755 +0200 +@@ -6,9 +6,9 @@ from cozy.application_settings import ApplicationSettings from cozy.architecture.event_sender import EventSender - from cozy.control import player + 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 - from cozy.report import reporter -diff -U4 -r cozy-0.8.1--orig/cozy/model/book.py cozy-0.8.1--patched/cozy/model/book.py ---- cozy-0.8.1--orig/cozy/model/book.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/model/book.py 2021-02-08 12:07:35.522713489 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/model/book.py cozy-0.9.1--patched/cozy/model/book.py +--- cozy-0.9.1--orig/cozy/model/book.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/model/book.py 2021-04-19 01:31:38.730518995 +0200 @@ -6,9 +6,9 @@ + from cozy.architecture.event_sender import EventSender 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 @@ -147,9 +148,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/model/book.py cozy-0.8.1--patched/cozy/model/b from cozy.model.settings import Settings from cozy.model.track import Track -diff -U4 -r cozy-0.8.1--orig/cozy/model/library.py cozy-0.8.1--patched/cozy/model/library.py ---- cozy-0.8.1--orig/cozy/model/library.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/model/library.py 2021-02-08 12:07:35.508713446 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/model/library.py cozy-0.9.1--patched/cozy/model/library.py +--- cozy-0.9.1--orig/cozy/model/library.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/model/library.py 2021-04-19 01:31:38.721518977 +0200 @@ -6,9 +6,9 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.profiler import timing @@ -161,9 +162,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/model/library.py cozy-0.8.1--patched/cozy/mode from cozy.media.media_file import MediaFile from cozy.model.book import Book, BookIsEmpty -diff -U4 -r cozy-0.8.1--orig/cozy/model/settings.py cozy-0.8.1--patched/cozy/model/settings.py ---- cozy-0.8.1--orig/cozy/model/settings.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/model/settings.py 2021-02-08 12:07:35.501713425 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/model/settings.py cozy-0.9.1--patched/cozy/model/settings.py +--- cozy-0.9.1--orig/cozy/model/settings.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/model/settings.py 2021-04-19 01:31:38.718518971 +0200 @@ -1,8 +1,8 @@ import logging from typing import List @@ -174,22 +175,23 @@ diff -U4 -r cozy-0.8.1--orig/cozy/model/settings.py cozy-0.8.1--patched/cozy/mod from cozy.db.book import Book from cozy.db.settings import Settings as SettingsModel -diff -U4 -r cozy-0.8.1--orig/cozy/model/storage_block_list.py cozy-0.8.1--patched/cozy/model/storage_block_list.py ---- cozy-0.8.1--orig/cozy/model/storage_block_list.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/model/storage_block_list.py 2021-02-08 12:07:35.525713498 +0100 -@@ -1,8 +1,8 @@ +diff -U4 -rN cozy-0.9.1--orig/cozy/model/storage_block_list.py cozy-0.9.1--patched/cozy/model/storage_block_list.py +--- cozy-0.9.1--orig/cozy/model/storage_block_list.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/model/storage_block_list.py 2021-04-19 01:31:38.732519000 +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: - _db = cache = inject.attr(SqliteDatabase) -diff -U4 -r cozy-0.8.1--orig/cozy/report/report_to_loki.py cozy-0.8.1--patched/cozy/report/report_to_loki.py ---- cozy-0.8.1--orig/cozy/report/report_to_loki.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/report/report_to_loki.py 2021-02-08 12:07:35.553713583 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/report/report_to_loki.py cozy-0.9.1--patched/cozy/report/report_to_loki.py +--- cozy-0.9.1--orig/cozy/report/report_to_loki.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/report/report_to_loki.py 2021-04-19 01:31:38.747519030 +0200 @@ -6,9 +6,9 @@ import distro import platform @@ -201,23 +203,23 @@ diff -U4 -r cozy-0.8.1--orig/cozy/report/report_to_loki.py cozy-0.8.1--patched/c from cozy.version import __version__ as CozyVersion from peewee import __version__ as PeeweeVersion from mutagen import version_string as MutagenVersion -diff -U4 -r cozy-0.8.1--orig/cozy/ui/album_element.py cozy-0.8.1--patched/cozy/ui/album_element.py ---- cozy-0.8.1--orig/cozy/ui/album_element.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/album_element.py 2021-02-08 12:07:35.311712848 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/album_element.py cozy-0.9.1--patched/cozy/ui/album_element.py +--- cozy-0.9.1--orig/cozy/ui/album_element.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/album_element.py 2021-04-19 01:31:38.637518807 +0200 @@ -2,9 +2,9 @@ - from cozy.control import player as player + from gi.repository import Gtk, Gdk, GdkPixbuf, GObject + 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 + log = logging.getLogger("album_element") - class AlbumElement(Gtk.Box): -diff -U4 -r cozy-0.8.1--orig/cozy/ui/book_detail_view.py cozy-0.8.1--patched/cozy/ui/book_detail_view.py ---- cozy-0.8.1--orig/cozy/ui/book_detail_view.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/book_detail_view.py 2021-02-08 12:07:35.342712942 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/book_detail_view.py cozy-0.9.1--patched/cozy/ui/book_detail_view.py +--- cozy-0.9.1--orig/cozy/ui/book_detail_view.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/book_detail_view.py 2021-04-19 01:31:38.648518830 +0200 @@ -3,9 +3,9 @@ import gi @@ -229,9 +231,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/book_detail_view.py cozy-0.8.1--patched/coz from cozy.model.chapter import Chapter from cozy.report import reporter from cozy.ui.disk_element import DiskElement -diff -U4 -r cozy-0.8.1--orig/cozy/ui/book_element.py cozy-0.8.1--patched/cozy/ui/book_element.py ---- cozy-0.8.1--orig/cozy/ui/book_element.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/book_element.py 2021-02-08 12:07:35.288712778 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/book_element.py cozy-0.9.1--patched/cozy/ui/book_element.py +--- cozy-0.9.1--orig/cozy/ui/book_element.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/book_element.py 2021-04-19 01:31:38.627518787 +0200 @@ -1,8 +1,8 @@ import os import subprocess @@ -242,23 +244,35 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/book_element.py cozy-0.8.1--patched/cozy/ui import cozy.tools as tools import cozy.ui -diff -U4 -r cozy-0.8.1--orig/cozy/ui/file_not_found_dialog.py cozy-0.8.1--patched/cozy/ui/file_not_found_dialog.py ---- cozy-0.8.1--orig/cozy/ui/file_not_found_dialog.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/file_not_found_dialog.py 2021-02-08 12:07:35.297712805 +0100 -@@ -3,9 +3,9 @@ +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/delete_book_view.py cozy-0.9.1--patched/cozy/ui/delete_book_view.py +--- cozy-0.9.1--orig/cozy/ui/delete_book_view.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/delete_book_view.py 2021-04-19 01:31:38.628518789 +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 - import cozy.control.player as player + +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/file_not_found_dialog.py cozy-0.9.1--patched/cozy/ui/file_not_found_dialog.py +--- cozy-0.9.1--orig/cozy/ui/file_not_found_dialog.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/file_not_found_dialog.py 2021-04-19 01:31:38.632518797 +0200 +@@ -2,9 +2,9 @@ + + from gi.repository import Gtk + import cozy.ui - from cozy.db.track import Track -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 - - class FileNotFoundDialog(): -diff -U4 -r cozy-0.8.1--orig/cozy/ui/headerbar.py cozy-0.8.1--patched/cozy/ui/headerbar.py ---- cozy-0.8.1--orig/cozy/ui/headerbar.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/headerbar.py 2021-02-08 12:07:35.293712793 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/headerbar.py cozy-0.9.1--patched/cozy/ui/headerbar.py +--- cozy-0.9.1--orig/cozy/ui/headerbar.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/headerbar.py 2021-04-19 01:31:38.630518793 +0200 @@ -3,9 +3,9 @@ import gi @@ -270,22 +284,23 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/headerbar.py cozy-0.8.1--patched/cozy/ui/he from cozy.ui.widgets.seek_bar import SeekBar from cozy.ui.widgets.sleep_timer import SleepTimer from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState -diff -U4 -r cozy-0.8.1--orig/cozy/ui/library_view.py cozy-0.8.1--patched/cozy/ui/library_view.py ---- cozy-0.8.1--orig/cozy/ui/library_view.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/library_view.py 2021-02-08 12:07:35.324712887 +0100 -@@ -1,8 +1,8 @@ +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/library_view.py cozy-0.9.1--patched/cozy/ui/library_view.py +--- cozy-0.9.1--orig/cozy/ui/library_view.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/library_view.py 2021-04-19 01:31:38.641518815 +0200 +@@ -2,9 +2,9 @@ + from gi.repository import Gtk from gi.repository.Gtk import Builder -from cozy.ext import inject +import inject + from cozy.model.book import Book from cozy.ui.book_element import BookElement + from cozy.ui.delete_book_view import DeleteBookView from cozy.ui.widgets.filter_list_box import FilterListBox - from cozy.view_model.library_view_model import LibraryViewModel, LibraryViewMode - -diff -U4 -r cozy-0.8.1--orig/cozy/ui/main_view.py cozy-0.8.1--patched/cozy/ui/main_view.py ---- cozy-0.8.1--orig/cozy/ui/main_view.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/main_view.py 2021-02-08 12:07:35.355712981 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/main_view.py cozy-0.9.1--patched/cozy/ui/main_view.py +--- cozy-0.9.1--orig/cozy/ui/main_view.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/main_view.py 2021-04-19 01:31:38.653518840 +0200 @@ -1,7 +1,7 @@ import webbrowser @@ -295,9 +310,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/main_view.py cozy-0.8.1--patched/cozy/ui/ma from cozy.architecture.event_sender import EventSender from cozy.control.db import books, close_db -diff -U4 -r cozy-0.8.1--orig/cozy/ui/search_view.py cozy-0.8.1--patched/cozy/ui/search_view.py ---- cozy-0.8.1--orig/cozy/ui/search_view.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/search_view.py 2021-02-08 12:07:35.328712899 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/search_view.py cozy-0.9.1--patched/cozy/ui/search_view.py +--- cozy-0.9.1--orig/cozy/ui/search_view.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/search_view.py 2021-04-19 01:31:38.643518819 +0200 @@ -1,8 +1,8 @@ import threading from threading import Thread @@ -308,9 +323,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/search_view.py cozy-0.8.1--patched/cozy/ui/ import gi -diff -U4 -r cozy-0.8.1--orig/cozy/ui/settings.py cozy-0.8.1--patched/cozy/ui/settings.py ---- cozy-0.8.1--orig/cozy/ui/settings.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/settings.py 2021-02-08 12:07:35.286712772 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/settings.py cozy-0.9.1--patched/cozy/ui/settings.py +--- cozy-0.9.1--orig/cozy/ui/settings.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/settings.py 2021-04-19 01:31:38.625518783 +0200 @@ -4,9 +4,9 @@ from cozy.control.db import remove_tracks_with_path @@ -322,9 +337,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/settings.py cozy-0.8.1--patched/cozy/ui/set from cozy.ui.widgets.storage_list_box_row import StorageListBoxRow from cozy.view_model.settings_view_model import SettingsViewModel -diff -U4 -r cozy-0.8.1--orig/cozy/ui/warnings.py cozy-0.8.1--patched/cozy/ui/warnings.py ---- cozy-0.8.1--orig/cozy/ui/warnings.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/warnings.py 2021-02-08 12:07:35.301712817 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/warnings.py cozy-0.9.1--patched/cozy/ui/warnings.py +--- cozy-0.9.1--orig/cozy/ui/warnings.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/warnings.py 2021-04-19 01:31:38.634518801 +0200 @@ -1,8 +1,8 @@ from gettext import gettext @@ -335,9 +350,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/warnings.py cozy-0.8.1--patched/cozy/ui/war from cozy.control.filesystem_monitor import FilesystemMonitor gi.require_version('Gtk', '3.0') -diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/error_reporting.py cozy-0.8.1--patched/cozy/ui/widgets/error_reporting.py ---- cozy-0.8.1--orig/cozy/ui/widgets/error_reporting.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/widgets/error_reporting.py 2021-02-08 12:07:35.391713091 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/error_reporting.py cozy-0.9.1--patched/cozy/ui/widgets/error_reporting.py +--- cozy-0.9.1--orig/cozy/ui/widgets/error_reporting.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/widgets/error_reporting.py 2021-04-19 01:31:38.672518878 +0200 @@ -2,9 +2,9 @@ import gi @@ -349,9 +364,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/error_reporting.py cozy-0.8.1--patc gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-0.8.1--patched/cozy/ui/widgets/playback_speed_popover.py ---- cozy-0.8.1--orig/cozy/ui/widgets/playback_speed_popover.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/widgets/playback_speed_popover.py 2021-02-08 12:07:35.366713015 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-0.9.1--patched/cozy/ui/widgets/playback_speed_popover.py +--- cozy-0.9.1--orig/cozy/ui/widgets/playback_speed_popover.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/widgets/playback_speed_popover.py 2021-04-19 01:31:38.660518854 +0200 @@ -1,7 +1,7 @@ import gi @@ -361,9 +376,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-0.8. gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/search_results.py cozy-0.8.1--patched/cozy/ui/widgets/search_results.py ---- cozy-0.8.1--orig/cozy/ui/widgets/search_results.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/widgets/search_results.py 2021-02-08 12:07:35.362713002 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/search_results.py cozy-0.9.1--patched/cozy/ui/widgets/search_results.py +--- cozy-0.9.1--orig/cozy/ui/widgets/search_results.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/widgets/search_results.py 2021-04-19 01:31:38.656518846 +0200 @@ -1,8 +1,8 @@ from gi.repository import Gtk, Gdk import cozy.tools as tools @@ -374,9 +389,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/search_results.py cozy-0.8.1--patch MAX_BOOK_LENGTH = 80 BOOK_ICON_SIZE = 40 -diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/sleep_timer.py cozy-0.8.1--patched/cozy/ui/widgets/sleep_timer.py ---- cozy-0.8.1--orig/cozy/ui/widgets/sleep_timer.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/widgets/sleep_timer.py 2021-02-08 12:07:35.384713069 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/sleep_timer.py cozy-0.9.1--patched/cozy/ui/widgets/sleep_timer.py +--- cozy-0.9.1--orig/cozy/ui/widgets/sleep_timer.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/widgets/sleep_timer.py 2021-04-19 01:31:38.668518870 +0200 @@ -1,7 +1,7 @@ import gi @@ -386,12 +401,12 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/sleep_timer.py cozy-0.8.1--patched/ gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.8.1--patched/cozy/ui/widgets/storage_list_box_row.py ---- cozy-0.8.1--orig/cozy/ui/widgets/storage_list_box_row.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/widgets/storage_list_box_row.py 2021-02-08 12:07:35.370713027 +0100 -@@ -5,9 +5,9 @@ - +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.9.1--patched/cozy/ui/widgets/storage_list_box_row.py +--- cozy-0.9.1--orig/cozy/ui/widgets/storage_list_box_row.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/widgets/storage_list_box_row.py 2021-04-19 01:31:38.661518856 +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 @@ -400,9 +415,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.8.1- from cozy.model.storage_block_list import StorageBlockList log = logging.getLogger("settings") -diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/whats_new_window.py cozy-0.8.1--patched/cozy/ui/widgets/whats_new_window.py ---- cozy-0.8.1--orig/cozy/ui/widgets/whats_new_window.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/widgets/whats_new_window.py 2021-02-08 12:07:35.404713130 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/whats_new_window.py cozy-0.9.1--patched/cozy/ui/widgets/whats_new_window.py +--- cozy-0.9.1--orig/cozy/ui/widgets/whats_new_window.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/widgets/whats_new_window.py 2021-04-19 01:31:38.677518888 +0200 @@ -3,9 +3,9 @@ import gi @@ -411,13 +426,13 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/whats_new_window.py cozy-0.8.1--pat -from cozy.ext import inject +import inject from cozy.ui.main_view import CozyUI - 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 -diff -U4 -r cozy-0.8.1--orig/cozy/view_model/book_detail_view_model.py cozy-0.8.1--patched/cozy/view_model/book_detail_view_model.py ---- cozy-0.8.1--orig/cozy/view_model/book_detail_view_model.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/view_model/book_detail_view_model.py 2021-02-08 12:07:35.444713252 +0100 -@@ -4,9 +4,9 @@ + from cozy.version import __version__ as CozyVersion + + gi.require_version('Gtk', '3.0') +diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/book_detail_view_model.py cozy-0.9.1--patched/cozy/view_model/book_detail_view_model.py +--- cozy-0.9.1--orig/cozy/view_model/book_detail_view_model.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/view_model/book_detail_view_model.py 2021-04-19 01:31:38.693518921 +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 @@ -428,9 +443,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/view_model/book_detail_view_model.py cozy-0.8. from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.model.library import Library -diff -U4 -r cozy-0.8.1--orig/cozy/view_model/headerbar_view_model.py cozy-0.8.1--patched/cozy/view_model/headerbar_view_model.py ---- cozy-0.8.1--orig/cozy/view_model/headerbar_view_model.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/view_model/headerbar_view_model.py 2021-02-08 12:07:35.435713224 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/headerbar_view_model.py cozy-0.9.1--patched/cozy/view_model/headerbar_view_model.py +--- cozy-0.9.1--orig/cozy/view_model/headerbar_view_model.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/view_model/headerbar_view_model.py 2021-04-19 01:31:38.689518912 +0200 @@ -2,9 +2,9 @@ from cozy.architecture.event_sender import EventSender @@ -442,21 +457,23 @@ diff -U4 -r cozy-0.8.1--orig/cozy/view_model/headerbar_view_model.py cozy-0.8.1- from cozy.media.importer import Importer, ScanStatus from cozy.model.library import Library -diff -U4 -r cozy-0.8.1--orig/cozy/view_model/library_view_model.py cozy-0.8.1--patched/cozy/view_model/library_view_model.py ---- cozy-0.8.1--orig/cozy/view_model/library_view_model.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/view_model/library_view_model.py 2021-02-08 12:07:35.446713258 +0100 -@@ -1,7 +1,7 @@ +diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/library_view_model.py cozy-0.9.1--patched/cozy/view_model/library_view_model.py +--- cozy-0.9.1--orig/cozy/view_model/library_view_model.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/view_model/library_view_model.py 2021-04-19 01:31:38.694518923 +0200 +@@ -2,9 +2,9 @@ + import os from enum import Enum, auto + from typing import Optional -import cozy.ext.inject as inject +import inject - from cozy.application_settings import ApplicationSettings from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable -diff -U4 -r cozy-0.8.1--orig/cozy/view_model/playback_control_view_model.py cozy-0.8.1--patched/cozy/view_model/playback_control_view_model.py ---- cozy-0.8.1--orig/cozy/view_model/playback_control_view_model.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/view_model/playback_control_view_model.py 2021-02-08 12:07:35.431713212 +0100 + from cozy.control.filesystem_monitor import FilesystemMonitor +diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/playback_control_view_model.py cozy-0.9.1--patched/cozy/view_model/playback_control_view_model.py +--- cozy-0.9.1--orig/cozy/view_model/playback_control_view_model.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/view_model/playback_control_view_model.py 2021-04-19 01:31:38.687518908 +0200 @@ -1,9 +1,9 @@ from typing import Optional @@ -468,13 +485,12 @@ diff -U4 -r cozy-0.8.1--orig/cozy/view_model/playback_control_view_model.py cozy from cozy.model.book import Book from cozy.open_view import OpenView -diff -U4 -r cozy-0.8.1--orig/cozy/view_model/playback_speed_view_model.py cozy-0.8.1--patched/cozy/view_model/playback_speed_view_model.py ---- cozy-0.8.1--orig/cozy/view_model/playback_speed_view_model.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/view_model/playback_speed_view_model.py 2021-02-08 12:07:35.417713170 +0100 -@@ -1,9 +1,9 @@ +diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/playback_speed_view_model.py cozy-0.9.1--patched/cozy/view_model/playback_speed_view_model.py +--- cozy-0.9.1--orig/cozy/view_model/playback_speed_view_model.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/view_model/playback_speed_view_model.py 2021-04-19 01:31:38.682518898 +0200 +@@ -1,8 +1,8 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable - from cozy.control import player from cozy.db.book import Book -from cozy.ext import inject +import inject @@ -482,9 +498,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/view_model/playback_speed_view_model.py cozy-0 class PlaybackSpeedViewModel(Observable, EventSender): -diff -U4 -r cozy-0.8.1--orig/cozy/view_model/search_view_model.py cozy-0.8.1--patched/cozy/view_model/search_view_model.py ---- cozy-0.8.1--orig/cozy/view_model/search_view_model.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/view_model/search_view_model.py 2021-02-08 12:07:35.426713197 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/search_view_model.py cozy-0.9.1--patched/cozy/view_model/search_view_model.py +--- cozy-0.9.1--orig/cozy/view_model/search_view_model.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/view_model/search_view_model.py 2021-04-19 01:31:38.686518906 +0200 @@ -1,5 +1,5 @@ -import cozy.ext.inject as inject +import inject @@ -492,9 +508,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/view_model/search_view_model.py cozy-0.8.1--pa from cozy.extensions.set import split_strings_to_set from cozy.open_view import OpenView from cozy.application_settings import ApplicationSettings -diff -U4 -r cozy-0.8.1--orig/cozy/view_model/settings_view_model.py cozy-0.8.1--patched/cozy/view_model/settings_view_model.py ---- cozy-0.8.1--orig/cozy/view_model/settings_view_model.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/view_model/settings_view_model.py 2021-02-08 12:07:35.422713185 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/settings_view_model.py cozy-0.9.1--patched/cozy/view_model/settings_view_model.py +--- cozy-0.9.1--orig/cozy/view_model/settings_view_model.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/view_model/settings_view_model.py 2021-04-19 01:31:38.684518902 +0200 @@ -1,6 +1,6 @@ from cozy.architecture.observable import Observable -from cozy.ext import inject @@ -503,9 +519,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/view_model/settings_view_model.py cozy-0.8.1-- from cozy.model.settings import Settings -diff -U4 -r cozy-0.8.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-0.8.1--patched/cozy/view_model/sleep_timer_view_model.py ---- cozy-0.8.1--orig/cozy/view_model/sleep_timer_view_model.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/view_model/sleep_timer_view_model.py 2021-02-08 12:07:35.413713157 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-0.9.1--patched/cozy/view_model/sleep_timer_view_model.py +--- cozy-0.9.1--orig/cozy/view_model/sleep_timer_view_model.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/view_model/sleep_timer_view_model.py 2021-04-19 01:31:38.680518894 +0200 @@ -5,9 +5,9 @@ from cozy import tools @@ -517,9 +533,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-0.8. from cozy.tools import IntervalTimer log = logging.getLogger("sleep_timer_view_model") -diff -U4 -r cozy-0.8.1--orig/test/cozy/media/test_importer.py cozy-0.8.1--patched/test/cozy/media/test_importer.py ---- cozy-0.8.1--orig/test/cozy/media/test_importer.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/test/cozy/media/test_importer.py 2021-02-08 12:07:35.571713637 +0100 +diff -U4 -rN cozy-0.9.1--orig/test/cozy/media/test_importer.py cozy-0.9.1--patched/test/cozy/media/test_importer.py +--- cozy-0.9.1--orig/test/cozy/media/test_importer.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/test/cozy/media/test_importer.py 2021-04-19 01:31:38.756519048 +0200 @@ -2,9 +2,9 @@ import pytest @@ -531,9 +547,23 @@ diff -U4 -r cozy-0.8.1--orig/test/cozy/media/test_importer.py cozy-0.8.1--patche from cozy.model.library import Library -diff -U4 -r cozy-0.8.1--orig/test/cozy/model/storage_block_list.py cozy-0.8.1--patched/test/cozy/model/storage_block_list.py ---- cozy-0.8.1--orig/test/cozy/model/storage_block_list.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/test/cozy/model/storage_block_list.py 2021-02-08 12:07:35.604713738 +0100 +diff -U4 -rN cozy-0.9.1--orig/test/cozy/media/test_player.py cozy-0.9.1--patched/test/cozy/media/test_player.py +--- cozy-0.9.1--orig/test/cozy/media/test_player.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/test/cozy/media/test_player.py 2021-04-19 01:31:38.761519058 +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 -U4 -rN cozy-0.9.1--orig/test/cozy/model/storage_block_list.py cozy-0.9.1--patched/test/cozy/model/storage_block_list.py +--- cozy-0.9.1--orig/test/cozy/model/storage_block_list.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/test/cozy/model/storage_block_list.py 2021-04-19 01:31:38.776519088 +0200 @@ -1,8 +1,8 @@ import pytest from peewee import SqliteDatabase @@ -544,35 +574,37 @@ diff -U4 -r cozy-0.8.1--orig/test/cozy/model/storage_block_list.py cozy-0.8.1--p @pytest.fixture(autouse=True) def setup_inject(peewee_database_storage): -diff -U4 -r cozy-0.8.1--orig/test/cozy/model/test_book.py cozy-0.8.1--patched/test/cozy/model/test_book.py ---- cozy-0.8.1--orig/test/cozy/model/test_book.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/test/cozy/model/test_book.py 2021-02-08 12:07:35.608713750 +0100 -@@ -1,8 +1,8 @@ +diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_book.py cozy-0.9.1--patched/test/cozy/model/test_book.py +--- cozy-0.9.1--orig/test/cozy/model/test_book.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/test/cozy/model/test_book.py 2021-04-19 01:31:38.778519093 +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) - def setup_inject(peewee_database): -diff -U4 -r cozy-0.8.1--orig/test/cozy/model/test_library.py cozy-0.8.1--patched/test/cozy/model/test_library.py ---- cozy-0.8.1--orig/test/cozy/model/test_library.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/test/cozy/model/test_library.py 2021-02-08 12:07:35.601713729 +0100 -@@ -1,8 +1,8 @@ +diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_library.py cozy-0.9.1--patched/test/cozy/model/test_library.py +--- cozy-0.9.1--orig/test/cozy/model/test_library.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/test/cozy/model/test_library.py 2021-04-19 01:31:38.775519087 +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 -U4 -r cozy-0.8.1--orig/test/cozy/model/test_settings.py cozy-0.8.1--patched/test/cozy/model/test_settings.py ---- cozy-0.8.1--orig/test/cozy/model/test_settings.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/test/cozy/model/test_settings.py 2021-02-08 12:07:35.594713707 +0100 +diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_settings.py cozy-0.9.1--patched/test/cozy/model/test_settings.py +--- cozy-0.9.1--orig/test/cozy/model/test_settings.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/test/cozy/model/test_settings.py 2021-04-19 01:31:38.771519079 +0200 @@ -1,7 +1,7 @@ import pytest diff --git a/cozy.spec b/cozy.spec index 681c184..ba59284 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 0.8.1 +Version: 0.9.1 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -135,6 +135,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* 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 diff --git a/sources b/sources index f8330ba..bd1bc2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-0.8.1.tar.gz) = a6589968cd2acd2001c53d0d61c8ba5f28e5a2a773db99bf035684eb5fca458260f8541809a94119791c4adf39dd09dc1f6964228f93256d1e087078033dd36c +SHA512 (cozy-0.9.1.tar.gz) = 48a86c8d78f9e27d5e309608ed768ef0dcf7e032f089a43e50a1ecf1a5fe21f3356f6bea7321163b6a946a6a414aab8a687f814d582adc0815a65da46a91ba15 From 78851d0580a0a7ab660907e59919c2ec2f42e1d9 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Tue, 20 Apr 2021 00:06:06 +0200 Subject: [PATCH 03/13] Update to v0.9.2 --- .gitignore | 1 + cozy--unbundle-inject.patch | 2 +- cozy.spec | 5 ++++- sources | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 20c2337..14c3d0f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /cozy-0.7.8.tar.gz /cozy-0.8.1.tar.gz /cozy-0.9.1.tar.gz +/cozy-0.9.2.tar.gz diff --git a/cozy--unbundle-inject.patch b/cozy--unbundle-inject.patch index 6bdca34..5225d67 100644 --- a/cozy--unbundle-inject.patch +++ b/cozy--unbundle-inject.patch @@ -29,7 +29,6 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/control/artwork_cache.py cozy-0.9.1--patched/ @@ -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 @@ -37,6 +36,7 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/control/artwork_cache.py cozy-0.9.1--patched/ from cozy.report import reporter log = logging.getLogger("artwork_cache") + diff -U4 -rN cozy-0.9.1--orig/cozy/control/db.py cozy-0.9.1--patched/cozy/control/db.py --- cozy-0.9.1--orig/cozy/control/db.py 2021-04-18 22:50:27.000000000 +0200 +++ cozy-0.9.1--patched/cozy/control/db.py 2021-04-19 01:31:38.586518704 +0200 diff --git a/cozy.spec b/cozy.spec index ba59284..0faacfd 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 0.9.1 +Version: 0.9.2 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -135,6 +135,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* 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 diff --git a/sources b/sources index bd1bc2e..0f7a6ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-0.9.1.tar.gz) = 48a86c8d78f9e27d5e309608ed768ef0dcf7e032f089a43e50a1ecf1a5fe21f3356f6bea7321163b6a946a6a414aab8a687f814d582adc0815a65da46a91ba15 +SHA512 (cozy-0.9.2.tar.gz) = 5d33f89a77469a6ba1afd9706823a6fcfab2649745ea99a822cf29507002820296f842ca5ec5c880e3697ecf8d4cd608e44efff66218c1d13b76a4978088a40b From 652d800804c549d2f3d14cdeaf7eb493a1ccebc2 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Wed, 21 Apr 2021 22:42:29 +0200 Subject: [PATCH 04/13] Update to v0.9.3 --- .gitignore | 1 + cozy.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 14c3d0f..dc1d36b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /cozy-0.8.1.tar.gz /cozy-0.9.1.tar.gz /cozy-0.9.2.tar.gz +/cozy-0.9.3.tar.gz diff --git a/cozy.spec b/cozy.spec index 0faacfd..80f72eb 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -135,6 +135,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* 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 diff --git a/sources b/sources index 0f7a6ef..80ecaa8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-0.9.2.tar.gz) = 5d33f89a77469a6ba1afd9706823a6fcfab2649745ea99a822cf29507002820296f842ca5ec5c880e3697ecf8d4cd608e44efff66218c1d13b76a4978088a40b +SHA512 (cozy-0.9.3.tar.gz) = 3e80e63f59172607e5a22d0aa72f66f9814b1bfc83a380b77d7b8d77b7883b368441c155f4320d349247d645f81d9a9a903d75801589da5100e3275eac42679c From 5b21d92dbdb9cb3a73951b2078ba250adae7b959 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Sun, 25 Apr 2021 12:55:02 +0200 Subject: [PATCH 05/13] Update to v0.9.4 --- .gitignore | 1 + cozy--unbundle-inject.patch | 25 ++++++++++++++++++++----- cozy.spec | 11 ++++++++++- find-unpatched-imports.sh | 17 +++++++++++++++++ sources | 2 +- 5 files changed, 49 insertions(+), 7 deletions(-) create mode 100755 find-unpatched-imports.sh diff --git a/.gitignore b/.gitignore index dc1d36b..3b0b59e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /cozy-0.9.1.tar.gz /cozy-0.9.2.tar.gz /cozy-0.9.3.tar.gz +/cozy-0.9.4.tar.gz diff --git a/cozy--unbundle-inject.patch b/cozy--unbundle-inject.patch index 5225d67..3684644 100644 --- a/cozy--unbundle-inject.patch +++ b/cozy--unbundle-inject.patch @@ -63,7 +63,7 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/control/filesystem_monitor.py cozy-0.9.1--pat from gi.repository import Gio from cozy.architecture.event_sender import EventSender - from cozy.control.db import get_tracks + from cozy.model.book import Book diff -U4 -rN cozy-0.9.1--orig/cozy/control/mpris.py cozy-0.9.1--patched/cozy/control/mpris.py --- cozy-0.9.1--orig/cozy/control/mpris.py 2021-04-18 22:50:27.000000000 +0200 +++ cozy-0.9.1--patched/cozy/control/mpris.py 2021-04-19 01:31:38.592518716 +0200 @@ -165,9 +165,10 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/model/library.py cozy-0.9.1--patched/cozy/mod diff -U4 -rN cozy-0.9.1--orig/cozy/model/settings.py cozy-0.9.1--patched/cozy/model/settings.py --- cozy-0.9.1--orig/cozy/model/settings.py 2021-04-18 22:50:27.000000000 +0200 +++ cozy-0.9.1--patched/cozy/model/settings.py 2021-04-19 01:31:38.718518971 +0200 -@@ -1,8 +1,8 @@ - import logging - from typing import List +@@ -2,9 +2,9 @@ + from typing import List, Optional + + import peewee -import cozy.ext.inject as inject +import inject @@ -189,6 +190,20 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/model/storage_block_list.py cozy-0.9.1--patch class StorageBlockList: +diff -U4 -rN cozy-0.9.4--orig/cozy/power_manager.py cozy-0.9.4--patched/cozy/power_manager.py +--- cozy-0.9.4--orig/cozy/power_manager.py 2021-04-24 13:52:19.000000000 +0200 ++++ cozy-0.9.4--patched/cozy/power_managerpatched.py 2021-04-25 12:39:28.447341956 +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 -U4 -rN cozy-0.9.1--orig/cozy/report/report_to_loki.py cozy-0.9.1--patched/cozy/report/report_to_loki.py --- cozy-0.9.1--orig/cozy/report/report_to_loki.py 2021-04-18 22:50:27.000000000 +0200 +++ cozy-0.9.1--patched/cozy/report/report_to_loki.py 2021-04-19 01:31:38.747519030 +0200 @@ -333,10 +348,10 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/settings.py cozy-0.9.1--patched/cozy/ui/se 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 -U4 -rN cozy-0.9.1--orig/cozy/ui/warnings.py cozy-0.9.1--patched/cozy/ui/warnings.py --- cozy-0.9.1--orig/cozy/ui/warnings.py 2021-04-18 22:50:27.000000000 +0200 +++ cozy-0.9.1--patched/cozy/ui/warnings.py 2021-04-19 01:31:38.634518801 +0200 diff --git a/cozy.spec b/cozy.spec index 80f72eb..ba82b82 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,12 +4,14 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 0.9.3 +Version: 0.9.4 Release: 1%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Source99: find-unpatched-imports.sh + Patch0: %{name}--unbundle-inject.patch BuildArch: noarch @@ -88,6 +90,9 @@ Here are some of the current features: %patch0 -p1 rm -rf cozy/ext/inject +# Run the "find unpatched imports" script +%{SOURCE99} $(pwd) + # Add a nonsensical

tag at the beginning of for every # in the appdata XML - needed to pass validation xmlstarlet ed \ @@ -116,6 +121,7 @@ rm %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{rtld_name}.Devel.svg %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 @@ -135,6 +141,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* 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 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 80ecaa8..c431f02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-0.9.3.tar.gz) = 3e80e63f59172607e5a22d0aa72f66f9814b1bfc83a380b77d7b8d77b7883b368441c155f4320d349247d645f81d9a9a903d75801589da5100e3275eac42679c +SHA512 (cozy-0.9.4.tar.gz) = 57bdffda4b9a3a7d3e38d72a57d8c383a993bab80da1fe9efcc3cf36ef08ca8a3d9af1053a8bec5876994872e68c07450be87cdd455d279429074d27207ce556 From d387f95b6d21772d04a4ad589a24030af3150c6c Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Mon, 10 May 2021 19:02:55 +0200 Subject: [PATCH 06/13] Update to v0.9.5 --- .gitignore | 1 + cozy.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3b0b59e..f4ed717 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /cozy-0.9.2.tar.gz /cozy-0.9.3.tar.gz /cozy-0.9.4.tar.gz +/cozy-0.9.5.tar.gz diff --git a/cozy.spec b/cozy.spec index ba82b82..8c76dbf 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 0.9.4 +Version: 0.9.5 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -141,6 +141,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* 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 diff --git a/sources b/sources index c431f02..8957c41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-0.9.4.tar.gz) = 57bdffda4b9a3a7d3e38d72a57d8c383a993bab80da1fe9efcc3cf36ef08ca8a3d9af1053a8bec5876994872e68c07450be87cdd455d279429074d27207ce556 +SHA512 (cozy-0.9.5.tar.gz) = 70ef0dae1623af1bed8aa1aa6f3e70a81e985cf64b238b1cd430f46cc989859bed6961e5688c78a4f3a3fe23ad9caa0d5091104bd1f56fa4747089f3920b4015 From ad1fbe331266f088941a05c9ad4da355b60378dc Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Sun, 30 May 2021 11:36:03 +0200 Subject: [PATCH 07/13] Update to v1.0.1 --- .gitignore | 1 + cozy--unbundle-inject.patch | 343 ++++++++++++++++++++---------------- cozy.spec | 5 +- sources | 2 +- 4 files changed, 198 insertions(+), 153 deletions(-) diff --git a/.gitignore b/.gitignore index f4ed717..b3740d3 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /cozy-0.9.3.tar.gz /cozy-0.9.4.tar.gz /cozy-0.9.5.tar.gz +/cozy-1.0.1.tar.gz diff --git a/cozy--unbundle-inject.patch b/cozy--unbundle-inject.patch index 3684644..dd5b375 100644 --- a/cozy--unbundle-inject.patch +++ b/cozy--unbundle-inject.patch @@ -1,6 +1,6 @@ -diff -U4 -rN cozy-0.9.1--orig/cozy/app_controller.py cozy-0.9.1--patched/cozy/app_controller.py ---- cozy-0.9.1--orig/cozy/app_controller.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/app_controller.py 2021-04-19 01:31:38.733519002 +0200 +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 -U4 -rN cozy-0.9.1--orig/cozy/app_controller.py cozy-0.9.1--patched/cozy/ap from cozy.control.offline_cache import OfflineCache from cozy.media.files import Files -diff -U4 -rN cozy-0.9.1--orig/cozy/application_settings.py cozy-0.9.1--patched/cozy/application_settings.py ---- cozy-0.9.1--orig/cozy/application_settings.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/application_settings.py 2021-04-19 01:31:38.716518967 +0200 +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,10 +23,11 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/application_settings.py cozy-0.9.1--patched/c class ApplicationSettings(EventSender): _settings: Gio.Settings = inject.attr(Gio.Settings) -diff -U4 -rN cozy-0.9.1--orig/cozy/control/artwork_cache.py cozy-0.9.1--patched/cozy/control/artwork_cache.py ---- cozy-0.9.1--orig/cozy/control/artwork_cache.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/control/artwork_cache.py 2021-04-19 01:31:38.583518698 +0200 -@@ -7,9 +7,9 @@ +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 @@ -36,10 +37,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/control/artwork_cache.py cozy-0.9.1--patched/ from cozy.report import reporter log = logging.getLogger("artwork_cache") - -diff -U4 -rN cozy-0.9.1--orig/cozy/control/db.py cozy-0.9.1--patched/cozy/control/db.py ---- cozy-0.9.1--orig/cozy/control/db.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/control/db.py 2021-04-19 01:31:38.586518704 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/control/db.py cozy-1.0.1--patched/cozy/control/db.py +--- cozy-1.0.1--orig/cozy/control/db.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/control/db.py 2021-05-30 11:14:55.786892252 +0200 @@ -1,9 +1,9 @@ import logging import os @@ -51,9 +51,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/control/db.py cozy-0.9.1--patched/cozy/contro from cozy.control.db_updater import update_db from cozy.db.artwork_cache import ArtworkCache from cozy.db.book import Book -diff -U4 -rN cozy-0.9.1--orig/cozy/control/filesystem_monitor.py cozy-0.9.1--patched/cozy/control/filesystem_monitor.py ---- cozy-0.9.1--orig/cozy/control/filesystem_monitor.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/control/filesystem_monitor.py 2021-04-19 01:31:38.577518686 +0200 +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 @@ -64,9 +64,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/control/filesystem_monitor.py cozy-0.9.1--pat from cozy.architecture.event_sender import EventSender from cozy.model.book import Book -diff -U4 -rN cozy-0.9.1--orig/cozy/control/mpris.py cozy-0.9.1--patched/cozy/control/mpris.py ---- cozy-0.9.1--orig/cozy/control/mpris.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/control/mpris.py 2021-04-19 01:31:38.592518716 +0200 +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 @@ -78,23 +78,23 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/control/mpris.py cozy-0.9.1--patched/cozy/con from cozy.model.book import Book from cozy.report import reporter -diff -U4 -rN cozy-0.9.1--orig/cozy/control/offline_cache.py cozy-0.9.1--patched/cozy/control/offline_cache.py ---- cozy-0.9.1--orig/cozy/control/offline_cache.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/control/offline_cache.py 2021-04-19 01:31:38.600518733 +0200 +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.track import Track + from cozy.db.file import File from cozy.db.offline_cache import OfflineCache as OfflineCacheModel - from cozy.db.book import Book as BookDB + from cozy.db.track_to_file import TrackToFile -from cozy.ext import inject +import inject from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.report import reporter -diff -U4 -rN cozy-0.9.1--orig/cozy/media/files.py cozy-0.9.1--patched/cozy/media/files.py ---- cozy-0.9.1--orig/cozy/media/files.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/media/files.py 2021-04-19 01:31:38.606518745 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/media/files.py cozy-1.0.1--patched/cozy/media/files.py +--- cozy-1.0.1--orig/cozy/media/files.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/media/files.py 2021-05-30 11:14:55.798892254 +0200 @@ -5,9 +5,9 @@ from gi.repository import Gio @@ -106,9 +106,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/media/files.py cozy-0.9.1--patched/cozy/media from cozy.model.settings import Settings from cozy.report import reporter -diff -U4 -rN cozy-0.9.1--orig/cozy/media/importer.py cozy-0.9.1--patched/cozy/media/importer.py ---- cozy-0.9.1--orig/cozy/media/importer.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/media/importer.py 2021-04-19 01:31:38.622518777 +0200 +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 @@ -118,11 +118,11 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/media/importer.py cozy-0.9.1--patched/cozy/me +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 - from cozy.model.settings import Settings -diff -U4 -rN cozy-0.9.1--orig/cozy/media/player.py cozy-0.9.1--patched/cozy/media/player.py ---- cozy-0.9.1--orig/cozy/media/player.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/media/player.py 2021-04-19 01:31:38.611518755 +0200 +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 @@ -134,37 +134,51 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/media/player.py cozy-0.9.1--patched/cozy/medi from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.model.library import Library -diff -U4 -rN cozy-0.9.1--orig/cozy/model/book.py cozy-0.9.1--patched/cozy/model/book.py ---- cozy-0.9.1--orig/cozy/model/book.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/model/book.py 2021-04-19 01:31:38.730518995 +0200 -@@ -6,9 +6,9 @@ - from cozy.architecture.event_sender import EventSender +diff -rU4 cozy-1.0.1--orig/cozy/model/book.py cozy-1.0.1--patched/cozy/model/book.py +--- cozy-1.0.1--orig/cozy/model/book.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/model/book.py 2021-05-30 11:14:55.901892272 +0200 +@@ -7,9 +7,9 @@ from cozy.architecture.observable import Observable from cozy.db.book import Book as BookModel from cozy.db.track import Track as TrackModel + from cozy.db.track_to_file import TrackToFile -from cozy.ext import inject +import inject from cozy.model.chapter import Chapter from cozy.model.settings import Settings from cozy.model.track import Track -diff -U4 -rN cozy-0.9.1--orig/cozy/model/library.py cozy-0.9.1--patched/cozy/model/library.py ---- cozy-0.9.1--orig/cozy/model/library.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/model/library.py 2021-04-19 01:31:38.721518977 +0200 +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.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 -U4 -rN cozy-0.9.1--orig/cozy/model/settings.py cozy-0.9.1--patched/cozy/model/settings.py ---- cozy-0.9.1--orig/cozy/model/settings.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/model/settings.py 2021-04-19 01:31:38.718518971 +0200 + 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 @@ -176,9 +190,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/model/settings.py cozy-0.9.1--patched/cozy/mo from cozy.db.book import Book from cozy.db.settings import Settings as SettingsModel -diff -U4 -rN cozy-0.9.1--orig/cozy/model/storage_block_list.py cozy-0.9.1--patched/cozy/model/storage_block_list.py ---- cozy-0.9.1--orig/cozy/model/storage_block_list.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/model/storage_block_list.py 2021-04-19 01:31:38.732519000 +0200 +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 @@ -190,9 +204,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/model/storage_block_list.py cozy-0.9.1--patch class StorageBlockList: -diff -U4 -rN cozy-0.9.4--orig/cozy/power_manager.py cozy-0.9.4--patched/cozy/power_manager.py ---- cozy-0.9.4--orig/cozy/power_manager.py 2021-04-24 13:52:19.000000000 +0200 -+++ cozy-0.9.4--patched/cozy/power_managerpatched.py 2021-04-25 12:39:28.447341956 +0200 +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 @@ -204,9 +218,9 @@ diff -U4 -rN cozy-0.9.4--orig/cozy/power_manager.py cozy-0.9.4--patched/cozy/pow log = logging.getLogger("power_mgr") -diff -U4 -rN cozy-0.9.1--orig/cozy/report/report_to_loki.py cozy-0.9.1--patched/cozy/report/report_to_loki.py ---- cozy-0.9.1--orig/cozy/report/report_to_loki.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/report/report_to_loki.py 2021-04-19 01:31:38.747519030 +0200 +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 @@ -218,9 +232,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/report/report_to_loki.py cozy-0.9.1--patched/ from cozy.version import __version__ as CozyVersion from peewee import __version__ as PeeweeVersion from mutagen import version_string as MutagenVersion -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/album_element.py cozy-0.9.1--patched/cozy/ui/album_element.py ---- cozy-0.9.1--orig/cozy/ui/album_element.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/album_element.py 2021-04-19 01:31:38.637518807 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/album_element.py cozy-1.0.1--patched/cozy/ui/album_element.py +--- cozy-1.0.1--orig/cozy/ui/album_element.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/album_element.py 2021-05-30 11:14:55.823892259 +0200 @@ -2,9 +2,9 @@ from gi.repository import Gtk, Gdk, GdkPixbuf, GObject @@ -232,9 +246,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/album_element.py cozy-0.9.1--patched/cozy/ log = logging.getLogger("album_element") -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/book_detail_view.py cozy-0.9.1--patched/cozy/ui/book_detail_view.py ---- cozy-0.9.1--orig/cozy/ui/book_detail_view.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/book_detail_view.py 2021-04-19 01:31:38.648518830 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/book_detail_view.py cozy-1.0.1--patched/cozy/ui/book_detail_view.py +--- cozy-1.0.1--orig/cozy/ui/book_detail_view.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/book_detail_view.py 2021-05-30 11:14:55.831892260 +0200 @@ -3,9 +3,9 @@ import gi @@ -246,9 +260,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/book_detail_view.py cozy-0.9.1--patched/co from cozy.model.chapter import Chapter from cozy.report import reporter from cozy.ui.disk_element import DiskElement -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/book_element.py cozy-0.9.1--patched/cozy/ui/book_element.py ---- cozy-0.9.1--orig/cozy/ui/book_element.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/book_element.py 2021-04-19 01:31:38.627518787 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/book_element.py cozy-1.0.1--patched/cozy/ui/book_element.py +--- cozy-1.0.1--orig/cozy/ui/book_element.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/book_element.py 2021-05-30 11:14:55.813892257 +0200 @@ -1,8 +1,8 @@ import os import subprocess @@ -259,9 +273,23 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/book_element.py cozy-0.9.1--patched/cozy/u import cozy.tools as tools import cozy.ui -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/delete_book_view.py cozy-0.9.1--patched/cozy/ui/delete_book_view.py ---- cozy-0.9.1--orig/cozy/ui/delete_book_view.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/delete_book_view.py 2021-04-19 01:31:38.628518789 +0200 +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 @@ -271,9 +299,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/delete_book_view.py cozy-0.9.1--patched/co gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/file_not_found_dialog.py cozy-0.9.1--patched/cozy/ui/file_not_found_dialog.py ---- cozy-0.9.1--orig/cozy/ui/file_not_found_dialog.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/file_not_found_dialog.py 2021-04-19 01:31:38.632518797 +0200 +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 @@ -285,9 +313,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/file_not_found_dialog.py cozy-0.9.1--patch from cozy.model.chapter import Chapter from cozy.model.library import Library -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/headerbar.py cozy-0.9.1--patched/cozy/ui/headerbar.py ---- cozy-0.9.1--orig/cozy/ui/headerbar.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/headerbar.py 2021-04-19 01:31:38.630518793 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/headerbar.py cozy-1.0.1--patched/cozy/ui/headerbar.py +--- cozy-1.0.1--orig/cozy/ui/headerbar.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/headerbar.py 2021-05-30 11:14:55.816892257 +0200 @@ -3,9 +3,9 @@ import gi @@ -299,9 +327,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/headerbar.py cozy-0.9.1--patched/cozy/ui/h from cozy.ui.widgets.seek_bar import SeekBar from cozy.ui.widgets.sleep_timer import SleepTimer from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/library_view.py cozy-0.9.1--patched/cozy/ui/library_view.py ---- cozy-0.9.1--orig/cozy/ui/library_view.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/library_view.py 2021-04-19 01:31:38.641518815 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/library_view.py cozy-1.0.1--patched/cozy/ui/library_view.py +--- cozy-1.0.1--orig/cozy/ui/library_view.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/library_view.py 2021-05-30 11:14:55.826892259 +0200 @@ -2,9 +2,9 @@ from gi.repository import Gtk @@ -313,9 +341,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/library_view.py cozy-0.9.1--patched/cozy/u from cozy.ui.book_element import BookElement from cozy.ui.delete_book_view import DeleteBookView from cozy.ui.widgets.filter_list_box import FilterListBox -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/main_view.py cozy-0.9.1--patched/cozy/ui/main_view.py ---- cozy-0.9.1--orig/cozy/ui/main_view.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/main_view.py 2021-04-19 01:31:38.653518840 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/main_view.py cozy-1.0.1--patched/cozy/ui/main_view.py +--- cozy-1.0.1--orig/cozy/ui/main_view.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/main_view.py 2021-05-30 11:14:55.835892261 +0200 @@ -1,7 +1,7 @@ import webbrowser @@ -325,9 +353,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/main_view.py cozy-0.9.1--patched/cozy/ui/m from cozy.architecture.event_sender import EventSender from cozy.control.db import books, close_db -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/search_view.py cozy-0.9.1--patched/cozy/ui/search_view.py ---- cozy-0.9.1--orig/cozy/ui/search_view.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/search_view.py 2021-04-19 01:31:38.643518819 +0200 +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 @@ -338,9 +366,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/search_view.py cozy-0.9.1--patched/cozy/ui import gi -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/settings.py cozy-0.9.1--patched/cozy/ui/settings.py ---- cozy-0.9.1--orig/cozy/ui/settings.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/settings.py 2021-04-19 01:31:38.625518783 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/settings.py cozy-1.0.1--patched/cozy/ui/settings.py +--- cozy-1.0.1--orig/cozy/ui/settings.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/settings.py 2021-05-30 11:14:55.812892257 +0200 @@ -4,9 +4,9 @@ from cozy.control.db import remove_tracks_with_path @@ -352,9 +380,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/settings.py cozy-0.9.1--patched/cozy/ui/se 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 -U4 -rN cozy-0.9.1--orig/cozy/ui/warnings.py cozy-0.9.1--patched/cozy/ui/warnings.py ---- cozy-0.9.1--orig/cozy/ui/warnings.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/warnings.py 2021-04-19 01:31:38.634518801 +0200 +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 @@ -365,9 +393,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/warnings.py cozy-0.9.1--patched/cozy/ui/wa from cozy.control.filesystem_monitor import FilesystemMonitor gi.require_version('Gtk', '3.0') -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/error_reporting.py cozy-0.9.1--patched/cozy/ui/widgets/error_reporting.py ---- cozy-0.9.1--orig/cozy/ui/widgets/error_reporting.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/widgets/error_reporting.py 2021-04-19 01:31:38.672518878 +0200 +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 @@ -379,9 +407,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/error_reporting.py cozy-0.9.1--pat gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-0.9.1--patched/cozy/ui/widgets/playback_speed_popover.py ---- cozy-0.9.1--orig/cozy/ui/widgets/playback_speed_popover.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/widgets/playback_speed_popover.py 2021-04-19 01:31:38.660518854 +0200 +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 @@ -391,9 +419,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-0.9 gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/search_results.py cozy-0.9.1--patched/cozy/ui/widgets/search_results.py ---- cozy-0.9.1--orig/cozy/ui/widgets/search_results.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/widgets/search_results.py 2021-04-19 01:31:38.656518846 +0200 +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 @@ -404,9 +432,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/search_results.py cozy-0.9.1--patc MAX_BOOK_LENGTH = 80 BOOK_ICON_SIZE = 40 -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/sleep_timer.py cozy-0.9.1--patched/cozy/ui/widgets/sleep_timer.py ---- cozy-0.9.1--orig/cozy/ui/widgets/sleep_timer.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/widgets/sleep_timer.py 2021-04-19 01:31:38.668518870 +0200 +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 @@ -416,9 +444,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/sleep_timer.py cozy-0.9.1--patched gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.9.1--patched/cozy/ui/widgets/storage_list_box_row.py ---- cozy-0.9.1--orig/cozy/ui/widgets/storage_list_box_row.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/widgets/storage_list_box_row.py 2021-04-19 01:31:38.661518856 +0200 +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 @@ -430,9 +458,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.9.1 from cozy.model.storage_block_list import StorageBlockList log = logging.getLogger("settings") -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/whats_new_window.py cozy-0.9.1--patched/cozy/ui/widgets/whats_new_window.py ---- cozy-0.9.1--orig/cozy/ui/widgets/whats_new_window.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/widgets/whats_new_window.py 2021-04-19 01:31:38.677518888 +0200 +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 @@ -444,9 +472,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/whats_new_window.py cozy-0.9.1--pa from cozy.version import __version__ as CozyVersion gi.require_version('Gtk', '3.0') -diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/book_detail_view_model.py cozy-0.9.1--patched/cozy/view_model/book_detail_view_model.py ---- cozy-0.9.1--orig/cozy/view_model/book_detail_view_model.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/view_model/book_detail_view_model.py 2021-04-19 01:31:38.693518921 +0200 +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 @@ -458,9 +486,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/book_detail_view_model.py cozy-0.9 from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.model.library import Library -diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/headerbar_view_model.py cozy-0.9.1--patched/cozy/view_model/headerbar_view_model.py ---- cozy-0.9.1--orig/cozy/view_model/headerbar_view_model.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/view_model/headerbar_view_model.py 2021-04-19 01:31:38.689518912 +0200 +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 @@ -472,9 +500,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/headerbar_view_model.py cozy-0.9.1 from cozy.media.importer import Importer, ScanStatus from cozy.model.library import Library -diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/library_view_model.py cozy-0.9.1--patched/cozy/view_model/library_view_model.py ---- cozy-0.9.1--orig/cozy/view_model/library_view_model.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/view_model/library_view_model.py 2021-04-19 01:31:38.694518923 +0200 +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 @@ -486,9 +514,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/library_view_model.py cozy-0.9.1-- from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable from cozy.control.filesystem_monitor import FilesystemMonitor -diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/playback_control_view_model.py cozy-0.9.1--patched/cozy/view_model/playback_control_view_model.py ---- cozy-0.9.1--orig/cozy/view_model/playback_control_view_model.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/view_model/playback_control_view_model.py 2021-04-19 01:31:38.687518908 +0200 +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 @@ -500,9 +528,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/playback_control_view_model.py coz from cozy.model.book import Book from cozy.open_view import OpenView -diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/playback_speed_view_model.py cozy-0.9.1--patched/cozy/view_model/playback_speed_view_model.py ---- cozy-0.9.1--orig/cozy/view_model/playback_speed_view_model.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/view_model/playback_speed_view_model.py 2021-04-19 01:31:38.682518898 +0200 +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 @@ -513,9 +541,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/playback_speed_view_model.py cozy- class PlaybackSpeedViewModel(Observable, EventSender): -diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/search_view_model.py cozy-0.9.1--patched/cozy/view_model/search_view_model.py ---- cozy-0.9.1--orig/cozy/view_model/search_view_model.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/view_model/search_view_model.py 2021-04-19 01:31:38.686518906 +0200 +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 @@ -523,9 +551,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/search_view_model.py cozy-0.9.1--p from cozy.extensions.set import split_strings_to_set from cozy.open_view import OpenView from cozy.application_settings import ApplicationSettings -diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/settings_view_model.py cozy-0.9.1--patched/cozy/view_model/settings_view_model.py ---- cozy-0.9.1--orig/cozy/view_model/settings_view_model.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/view_model/settings_view_model.py 2021-04-19 01:31:38.684518902 +0200 +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 @@ -534,9 +562,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/settings_view_model.py cozy-0.9.1- from cozy.model.settings import Settings -diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-0.9.1--patched/cozy/view_model/sleep_timer_view_model.py ---- cozy-0.9.1--orig/cozy/view_model/sleep_timer_view_model.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/view_model/sleep_timer_view_model.py 2021-04-19 01:31:38.680518894 +0200 +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 @@ -548,9 +576,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-0.9 from cozy.tools import IntervalTimer log = logging.getLogger("sleep_timer_view_model") -diff -U4 -rN cozy-0.9.1--orig/test/cozy/media/test_importer.py cozy-0.9.1--patched/test/cozy/media/test_importer.py ---- cozy-0.9.1--orig/test/cozy/media/test_importer.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/test/cozy/media/test_importer.py 2021-04-19 01:31:38.756519048 +0200 +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 @@ -562,9 +590,9 @@ diff -U4 -rN cozy-0.9.1--orig/test/cozy/media/test_importer.py cozy-0.9.1--patch from cozy.model.library import Library -diff -U4 -rN cozy-0.9.1--orig/test/cozy/media/test_player.py cozy-0.9.1--patched/test/cozy/media/test_player.py ---- cozy-0.9.1--orig/test/cozy/media/test_player.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/test/cozy/media/test_player.py 2021-04-19 01:31:38.761519058 +0200 +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 @@ -576,9 +604,9 @@ diff -U4 -rN cozy-0.9.1--orig/test/cozy/media/test_player.py cozy-0.9.1--patched from cozy.model.library import Library from cozy.model.settings import Settings -diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/storage_block_list.py cozy-0.9.1--patched/test/cozy/model/storage_block_list.py ---- cozy-0.9.1--orig/test/cozy/model/storage_block_list.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/test/cozy/model/storage_block_list.py 2021-04-19 01:31:38.776519088 +0200 +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 @@ -589,9 +617,9 @@ diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/storage_block_list.py cozy-0.9.1-- @pytest.fixture(autouse=True) def setup_inject(peewee_database_storage): -diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_book.py cozy-0.9.1--patched/test/cozy/model/test_book.py ---- cozy-0.9.1--orig/test/cozy/model/test_book.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/test/cozy/model/test_book.py 2021-04-19 01:31:38.778519093 +0200 +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 @@ -603,9 +631,22 @@ diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_book.py cozy-0.9.1--patched/t @pytest.fixture(autouse=True) -diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_library.py cozy-0.9.1--patched/test/cozy/model/test_library.py ---- cozy-0.9.1--orig/test/cozy/model/test_library.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/test/cozy/model/test_library.py 2021-04-19 01:31:38.775519087 +0200 +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 @@ -617,9 +658,9 @@ diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_library.py cozy-0.9.1--patche from cozy.model.settings import Settings from test.cozy.mocks import ApplicationSettingsMock -diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_settings.py cozy-0.9.1--patched/test/cozy/model/test_settings.py ---- cozy-0.9.1--orig/test/cozy/model/test_settings.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/test/cozy/model/test_settings.py 2021-04-19 01:31:38.771519079 +0200 +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/cozy.spec b/cozy.spec index 8c76dbf..db5e160 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 0.9.5 +Version: 1.0.1 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -141,6 +141,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* 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 diff --git a/sources b/sources index 8957c41..5374030 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-0.9.5.tar.gz) = 70ef0dae1623af1bed8aa1aa6f3e70a81e985cf64b238b1cd430f46cc989859bed6961e5688c78a4f3a3fe23ad9caa0d5091104bd1f56fa4747089f3920b4015 +SHA512 (cozy-1.0.1.tar.gz) = 6c95735172c52531bf2cd5fdfc24dab69e93a7438a08ca2e7c29d9abac904b45bfc2aa75bedfed26cc87c68fda7977ccf6c126f50a772bfb7b6ff08c289bcec5 From e3d8dd6808394867d6426c585e6bcbe25c23d90e Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Thu, 17 Jun 2021 02:24:07 +0200 Subject: [PATCH 08/13] Update to v1.0.3 --- .gitignore | 1 + cozy--unbundle-inject.patch | 42 ++++++++++++++++++------------------- cozy.spec | 6 +++++- sources | 2 +- 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index b3740d3..ea4fca9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /cozy-0.9.4.tar.gz /cozy-0.9.5.tar.gz /cozy-1.0.1.tar.gz +/cozy-1.0.3.tar.gz diff --git a/cozy--unbundle-inject.patch b/cozy--unbundle-inject.patch index dd5b375..d658209 100644 --- a/cozy--unbundle-inject.patch +++ b/cozy--unbundle-inject.patch @@ -37,20 +37,6 @@ diff -rU4 cozy-1.0.1--orig/cozy/control/artwork_cache.py cozy-1.0.1--patched/coz from cozy.report import reporter log = logging.getLogger("artwork_cache") -diff -rU4 cozy-1.0.1--orig/cozy/control/db.py cozy-1.0.1--patched/cozy/control/db.py ---- cozy-1.0.1--orig/cozy/control/db.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/control/db.py 2021-05-30 11:14:55.786892252 +0200 -@@ -1,9 +1,9 @@ - import logging - import os - import time - --import cozy.ext.inject as inject -+import inject - - from cozy.control.db_updater import update_db - from cozy.db.artwork_cache import ArtworkCache - from cozy.db.book import Book diff -rU4 cozy-1.0.1--orig/cozy/control/filesystem_monitor.py cozy-1.0.1--patched/cozy/control/filesystem_monitor.py --- cozy-1.0.1--orig/cozy/control/filesystem_monitor.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/control/filesystem_monitor.py 2021-05-30 11:14:55.780892251 +0200 @@ -92,9 +78,8 @@ diff -rU4 cozy-1.0.1--orig/cozy/control/offline_cache.py cozy-1.0.1--patched/coz from cozy.model.chapter import Chapter from cozy.report import reporter -diff -rU4 cozy-1.0.1--orig/cozy/media/files.py cozy-1.0.1--patched/cozy/media/files.py ---- cozy-1.0.1--orig/cozy/media/files.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/media/files.py 2021-05-30 11:14:55.798892254 +0200 +--- 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 @@ -105,7 +90,7 @@ diff -rU4 cozy-1.0.1--orig/cozy/media/files.py cozy-1.0.1--patched/cozy/media/fi 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 @@ -146,7 +131,7 @@ diff -rU4 cozy-1.0.1--orig/cozy/model/book.py cozy-1.0.1--patched/cozy/model/boo +import inject from cozy.model.chapter import Chapter from cozy.model.settings import Settings - from cozy.model.track import Track + 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 @@ -166,10 +151,10 @@ diff -rU4 cozy-1.0.1--orig/cozy/model/library.py cozy-1.0.1--patched/cozy/model/ --- 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 @@ -327,6 +312,19 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/headerbar.py cozy-1.0.1--patched/cozy/ui/head from cozy.ui.widgets.seek_bar import SeekBar from cozy.ui.widgets.sleep_timer import SleepTimer from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState +--- 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.0.1--orig/cozy/ui/library_view.py cozy-1.0.1--patched/cozy/ui/library_view.py --- cozy-1.0.1--orig/cozy/ui/library_view.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/ui/library_view.py 2021-05-30 11:14:55.826892259 +0200 @@ -369,9 +367,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/search_view.py cozy-1.0.1--patched/cozy/ui/se diff -rU4 cozy-1.0.1--orig/cozy/ui/settings.py cozy-1.0.1--patched/cozy/ui/settings.py --- cozy-1.0.1--orig/cozy/ui/settings.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/ui/settings.py 2021-05-30 11:14:55.812892257 +0200 -@@ -4,9 +4,9 @@ +@@ -2,9 +2,9 @@ + import gi - 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 diff --git a/cozy.spec b/cozy.spec index db5e160..4356081 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 1.0.1 +Version: 1.0.3 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -18,6 +18,7 @@ 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 @@ -141,6 +142,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* 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 diff --git a/sources b/sources index 5374030..2949c31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-1.0.1.tar.gz) = 6c95735172c52531bf2cd5fdfc24dab69e93a7438a08ca2e7c29d9abac904b45bfc2aa75bedfed26cc87c68fda7977ccf6c126f50a772bfb7b6ff08c289bcec5 +SHA512 (cozy-1.0.3.tar.gz) = 5bc3b6e211af61021432619dcbcd3556209d2c595d5227c940b71f90986ce97f0d944212732460fecaa10108e3b9e32c881a3bb95f8e80cc33717d811328952f From 572e3875fea4cdfe7262606a278b12d0b914e0b1 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Thu, 29 Jul 2021 10:25:06 +0200 Subject: [PATCH 09/13] Update to v1.0.4 --- .gitignore | 1 + cozy.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ea4fca9..8ba903c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /cozy-0.9.5.tar.gz /cozy-1.0.1.tar.gz /cozy-1.0.3.tar.gz +/cozy-1.0.4.tar.gz diff --git a/cozy.spec b/cozy.spec index 4356081..cd1e90e 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -92,7 +92,7 @@ Here are some of the current features: rm -rf cozy/ext/inject # Run the "find unpatched imports" script -%{SOURCE99} $(pwd) +"%{SOURCE99}" "$(pwd)" # Add a nonsensical

tag at the beginning of for every # in the appdata XML - needed to pass validation @@ -142,6 +142,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* 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 diff --git a/sources b/sources index 2949c31..6dfaada 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-1.0.3.tar.gz) = 5bc3b6e211af61021432619dcbcd3556209d2c595d5227c940b71f90986ce97f0d944212732460fecaa10108e3b9e32c881a3bb95f8e80cc33717d811328952f +SHA512 (cozy-1.0.4.tar.gz) = 86a19d48b69d45eb9ff80c9fc95828c7b953fdb3d95a2d5c535173853a44511aac0548d7a34ec0a560c5849606fa71d37dd25d51a45e17f64dbd77a7ee941a9a From 1405df2d8a077d79aea0e248897a451579dcb3c7 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Mon, 9 Aug 2021 12:01:27 +0200 Subject: [PATCH 10/13] Update to v1.1.0 --- .gitignore | 1 + ...nject.patch => 0000--unbundle-inject.patch | 111 +++++++++++------- 0001--fix-POTFILES.patch | 12 ++ cozy.spec | 13 +- sources | 2 +- 5 files changed, 94 insertions(+), 45 deletions(-) rename cozy--unbundle-inject.patch => 0000--unbundle-inject.patch (90%) create mode 100644 0001--fix-POTFILES.patch diff --git a/.gitignore b/.gitignore index 8ba903c..fc8ba70 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /cozy-1.0.1.tar.gz /cozy-1.0.3.tar.gz /cozy-1.0.4.tar.gz +/cozy-1.1.0.tar.gz diff --git a/cozy--unbundle-inject.patch b/0000--unbundle-inject.patch similarity index 90% rename from cozy--unbundle-inject.patch rename to 0000--unbundle-inject.patch index d658209..10622e4 100644 --- a/cozy--unbundle-inject.patch +++ b/0000--unbundle-inject.patch @@ -217,24 +217,22 @@ diff -rU4 cozy-1.0.1--orig/cozy/report/report_to_loki.py cozy-1.0.1--patched/coz from cozy.version import __version__ as CozyVersion from peewee import __version__ as PeeweeVersion from mutagen import version_string as MutagenVersion -diff -rU4 cozy-1.0.1--orig/cozy/ui/album_element.py cozy-1.0.1--patched/cozy/ui/album_element.py ---- cozy-1.0.1--orig/cozy/ui/album_element.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/album_element.py 2021-05-30 11:14:55.823892259 +0200 -@@ -2,9 +2,9 @@ +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 gi.repository import Gtk, Gdk, GdkPixbuf, GObject - - from cozy.control.artwork_cache import ArtworkCache -from cozy.ext import inject +import inject - from cozy.model.book import Book + from cozy.view_model.app_view_model import AppViewModel + from cozy.view import View - log = logging.getLogger("album_element") - -diff -rU4 cozy-1.0.1--orig/cozy/ui/book_detail_view.py cozy-1.0.1--patched/cozy/ui/book_detail_view.py ---- cozy-1.0.1--orig/cozy/ui/book_detail_view.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/book_detail_view.py 2021-05-30 11:14:55.831892260 +0200 -@@ -3,9 +3,9 @@ + 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 @@ -244,20 +242,7 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/book_detail_view.py cozy-1.0.1--patched/cozy/ from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.report import reporter - from cozy.ui.disk_element import DiskElement -diff -rU4 cozy-1.0.1--orig/cozy/ui/book_element.py cozy-1.0.1--patched/cozy/ui/book_element.py ---- cozy-1.0.1--orig/cozy/ui/book_element.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/book_element.py 2021-05-30 11:14:55.813892257 +0200 -@@ -1,8 +1,8 @@ - import os - import subprocess - --import cozy.ext.inject as inject -+import inject - from gi.repository import Gtk, Gdk, Pango, GObject - - import cozy.tools as tools - import cozy.ui + 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 @@ -302,16 +287,16 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/headerbar.py cozy-1.0.1--patched/cozy/ui/head --- 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.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.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 @@ @@ -325,20 +310,20 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/headerbar.py cozy-1.0.1--patched/cozy/ui/head class InfoBanner: _builder: Gtk.Builder = inject.attr("MainWindowBuilder") -diff -rU4 cozy-1.0.1--orig/cozy/ui/library_view.py cozy-1.0.1--patched/cozy/ui/library_view.py ---- cozy-1.0.1--orig/cozy/ui/library_view.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/library_view.py 2021-05-30 11:14:55.826892259 +0200 +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 + from gi.repository import Gtk, Handy from gi.repository.Gtk import Builder -from cozy.ext import inject +import inject - from cozy.model.book import Book - from cozy.ui.book_element import BookElement + from cozy.ui.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.0.1--orig/cozy/ui/main_view.py cozy-1.0.1--patched/cozy/ui/main_view.py --- cozy-1.0.1--orig/cozy/ui/main_view.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/ui/main_view.py 2021-05-30 11:14:55.835892261 +0200 @@ -351,6 +336,34 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/main_view.py cozy-1.0.1--patched/cozy/ui/main from cozy.architecture.event_sender import EventSender from cozy.control.db import books, close_db +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 @@ -391,6 +404,20 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/warnings.py cozy-1.0.1--patched/cozy/ui/warni 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 @@ -497,15 +524,15 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/headerbar_view_model.py cozy-1.0.1--p 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 @@ - 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 diff --git a/0001--fix-POTFILES.patch b/0001--fix-POTFILES.patch new file mode 100644 index 0000000..388979b --- /dev/null +++ b/0001--fix-POTFILES.patch @@ -0,0 +1,12 @@ +--- cozy-1.1.0--orig/po/POTFILES 2021-08-07 09:44:45.000000000 +0200 ++++ cozy-1.1.0--patched/po/POTFILES 2021-08-09 11:57:42.821473549 +0200 +@@ -4,9 +4,8 @@ + cozy/media/files.py + cozy/model/track.py + cozy/tools.py + cozy/ui/book_detail_view.py +-cozy/ui/book_element.py + cozy/ui/chapter_element.py + cozy/ui/disk_element.py + cozy/ui/file_not_found_dialog.py + cozy/ui/main_view.py diff --git a/cozy.spec b/cozy.spec index cd1e90e..4b5e749 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 1.0.4 +Version: 1.1.0 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -12,7 +12,10 @@ Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}. Source99: find-unpatched-imports.sh -Patch0: %{name}--unbundle-inject.patch +# Unbundle python-inject +Patch0: 0000--unbundle-inject.patch +# The list of files to translate references a non-existent file +Patch1: 0001--fix-POTFILES.patch BuildArch: noarch @@ -94,6 +97,9 @@ rm -rf cozy/ext/inject # Run the "find unpatched imports" script "%{SOURCE99}" "$(pwd)" +# Apply other patches +%patch1 -p1 + # Add a nonsensical

tag at the beginning of for every # in the appdata XML - needed to pass validation xmlstarlet ed \ @@ -142,6 +148,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* 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 diff --git a/sources b/sources index 6dfaada..319e655 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-1.0.4.tar.gz) = 86a19d48b69d45eb9ff80c9fc95828c7b953fdb3d95a2d5c535173853a44511aac0548d7a34ec0a560c5849606fa71d37dd25d51a45e17f64dbd77a7ee941a9a +SHA512 (cozy-1.1.0.tar.gz) = d79db2e27bf7c3dbd030be5dbb6c2f7efb1dfdd0a13b486ade9353d71e787f52591a196e2c7fdee37d3d6c9765e1c51300dd471d04fb55d27ae02f5d9118a235 From a6ef85a5a8f9497aed27fd9830fc1b3b264392f6 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Fri, 20 Aug 2021 13:44:34 +0200 Subject: [PATCH 11/13] Update to v1.1.1 --- .gitignore | 1 + 0000--unbundle-inject.patch | 16 +++++++++------- 0001--fix-POTFILES.patch | 12 ------------ cozy.spec | 21 ++++++--------------- sources | 2 +- 5 files changed, 17 insertions(+), 35 deletions(-) delete mode 100644 0001--fix-POTFILES.patch diff --git a/.gitignore b/.gitignore index fc8ba70..f5557a9 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /cozy-1.0.3.tar.gz /cozy-1.0.4.tar.gz /cozy-1.1.0.tar.gz +/cozy-1.1.1.tar.gz diff --git a/0000--unbundle-inject.patch b/0000--unbundle-inject.patch index 10622e4..1ee8c36 100644 --- a/0000--unbundle-inject.patch +++ b/0000--unbundle-inject.patch @@ -324,18 +324,20 @@ diff -rU4 cozy-1.1.0--orig/cozy/ui/library_view.py cozy-1.1.0--patched/cozy/ui/l 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.0.1--orig/cozy/ui/main_view.py cozy-1.0.1--patched/cozy/ui/main_view.py ---- cozy-1.0.1--orig/cozy/ui/main_view.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/main_view.py 2021-05-30 11:14:55.835892261 +0200 -@@ -1,7 +1,7 @@ - import webbrowser +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.control.db import books, close_db + from cozy.architecture.singleton import Singleton diff -rU4 cozy-1.1.0--orig/cozy/ui/media_controller_big.py cozy-1.1.0--patched/cozy/ui/media_controller_big.py --- cozy-1.1.0--orig/cozy/ui/media_controller_big.py 2021-08-07 09:44:45.000000000 +0200 +++ cozy-1.1.0--patched/cozy/ui/media_controller_big.py 2021-08-09 11:53:21.875598752 +0200 diff --git a/0001--fix-POTFILES.patch b/0001--fix-POTFILES.patch deleted file mode 100644 index 388979b..0000000 --- a/0001--fix-POTFILES.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- cozy-1.1.0--orig/po/POTFILES 2021-08-07 09:44:45.000000000 +0200 -+++ cozy-1.1.0--patched/po/POTFILES 2021-08-09 11:57:42.821473549 +0200 -@@ -4,9 +4,8 @@ - cozy/media/files.py - cozy/model/track.py - cozy/tools.py - cozy/ui/book_detail_view.py --cozy/ui/book_element.py - cozy/ui/chapter_element.py - cozy/ui/disk_element.py - cozy/ui/file_not_found_dialog.py - cozy/ui/main_view.py diff --git a/cozy.spec b/cozy.spec index 4b5e749..8797153 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 1.1.0 +Version: 1.1.1 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -14,8 +14,6 @@ Source99: find-unpatched-imports.sh # Unbundle python-inject Patch0: 0000--unbundle-inject.patch -# The list of files to translate references a non-existent file -Patch1: 0001--fix-POTFILES.patch BuildArch: noarch @@ -27,7 +25,6 @@ BuildRequires: libappstream-glib BuildRequires: libhandy1-devel >= 1.0.0 BuildRequires: meson >= 0.40.0 BuildRequires: python3-devel -BuildRequires: xmlstarlet %global with_tests 1 @@ -97,17 +94,6 @@ rm -rf cozy/ext/inject # Run the "find unpatched imports" script "%{SOURCE99}" "$(pwd)" -# Apply other patches -%patch1 -p1 - -# 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" - %build %meson @@ -148,6 +134,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* 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 diff --git a/sources b/sources index 319e655..9e8c3f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-1.1.0.tar.gz) = d79db2e27bf7c3dbd030be5dbb6c2f7efb1dfdd0a13b486ade9353d71e787f52591a196e2c7fdee37d3d6c9765e1c51300dd471d04fb55d27ae02f5d9118a235 +SHA512 (cozy-1.1.1.tar.gz) = 21333839e8567e5bfbe1720a286ec3ca467e4f483711017911b52529f457540d5384a7323c20dad0b66d1af08a9c687a5799baa55066f3c439c1b07306d40c23 From efc05a56b4a8a8211aa480b54517f9d46822a9b6 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Fri, 20 Aug 2021 16:26:16 +0200 Subject: [PATCH 12/13] Update to v1.1.2 --- .gitignore | 1 + cozy.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f5557a9..8cb8f06 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /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/cozy.spec b/cozy.spec index 8797153..dbdbf6c 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -134,6 +134,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* 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) diff --git a/sources b/sources index 9e8c3f8..207f734 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-1.1.1.tar.gz) = 21333839e8567e5bfbe1720a286ec3ca467e4f483711017911b52529f457540d5384a7323c20dad0b66d1af08a9c687a5799baa55066f3c439c1b07306d40c23 +SHA512 (cozy-1.1.2.tar.gz) = b6db98aca5b3d6b64efd730701e5a95fba0281db55dcfc0e0c538d9004626cace858979bb87ecd89db47a632187905a2f288b7dc9fffb067f2ba429e8ba827f6 From f694ed1bb9dd38352384e62b03adda51dad667b2 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 11 Oct 2021 19:56:21 -0400 Subject: [PATCH 13/13] Add missing dependencies to fix launching the app Resolves: #2013040, #2013041, #2013042 --- cozy.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index dbdbf6c..4025599 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPLv3+ Version: 1.1.2 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -45,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 @@ -134,6 +137,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %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