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

Compare commits

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

7 commits
rawhide ... f32

Author SHA1 Message Date
Artur Frenszek-Iwicki
216d117dd3 Update to v0.9.5 2021-05-10 19:30:19 +02:00
Artur Frenszek-Iwicki
68fd91226b Update to v0.9.4 2021-04-25 13:25:06 +02:00
Artur Frenszek-Iwicki
ee9733f108 Update to v0.9.3 2021-04-21 23:03:48 +02:00
Artur Frenszek-Iwicki
80e437a39d Update to v0.9.2 2021-04-20 00:39:43 +02:00
Artur Frenszek-Iwicki
1ff84b2b3c Update to v0.9.1 2021-04-19 02:00:52 +02:00
Artur Frenszek-Iwicki
a97f84ef4a Update to v0.8.1 2021-02-08 12:37:34 +01:00
Artur Frenszek-Iwicki
20bee61283 Update to v0.7.8 2020-12-20 23:42:36 +01:00
5 changed files with 363 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

@ -2,3 +2,10 @@
/cozy-0.7.3.tar.gz
/cozy-0.7.5.tar.gz
/cozy-0.7.7.tar.gz
/cozy-0.7.8.tar.gz
/cozy-0.8.1.tar.gz
/cozy-0.9.1.tar.gz
/cozy-0.9.2.tar.gz
/cozy-0.9.3.tar.gz
/cozy-0.9.4.tar.gz
/cozy-0.9.5.tar.gz

521
cozy--unbundle-inject.patch
View file

@ -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 -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 -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 -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,13 +23,12 @@ 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 -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
from cozy.control.db import get_tracks
from cozy.db.artwork_cache import ArtworkCache as ArtworkCacheModel
-from cozy.ext import inject
+import inject
@ -37,9 +36,10 @@ 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 -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 -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 -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
@ -63,65 +63,38 @@ diff -r -U4 cozy-0.7.7--orig/cozy/control/filesystem_monitor.py cozy-0.7.7--patc
from gi.repository import Gio
from cozy.architecture.event_sender import EventSender
from cozy.control.db import get_tracks
diff -r -U4 cozy-0.7.7--orig/cozy/control/offline_cache.py cozy-0.7.7--patched/cozy/control/offline_cache.py
--- cozy-0.7.7--orig/cozy/control/offline_cache.py 2020-11-29 23:34:11.000000000 +0100
+++ cozy-0.7.7--patched/cozy/control/offline_cache.py 2020-11-30 18:04:36.660088747 +0100
@@ -12,9 +12,9 @@
from cozy.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
@@ -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
-from cozy.ext import inject
+import inject
from cozy.report import reporter
log = logging.getLogger("offline_cache")
diff -r -U4 cozy-0.7.7--orig/cozy/control/playback_speed.py cozy-0.7.7--patched/cozy/control/playback_speed.py
--- cozy-0.7.7--orig/cozy/control/playback_speed.py 2020-11-29 23:34:11.000000000 +0100
+++ cozy-0.7.7--patched/cozy/control/playback_speed.py 2020-11-30 18:04:36.658088744 +0100
@@ -3,9 +3,9 @@
import cozy.ui
import gi
from cozy.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
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
diff -r -U4 cozy-0.7.7--orig/cozy/control/player.py cozy-0.7.7--patched/cozy/control/player.py
--- cozy-0.7.7--orig/cozy/control/player.py 2020-11-29 23:34:11.000000000 +0100
+++ cozy-0.7.7--patched/cozy/control/player.py 2020-11-30 18:04:36.651088733 +0100
@@ -1,8 +1,8 @@
import threading
import time
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 @@
-import cozy.ext.inject as inject
+import inject
from gi.repository import Gst, GLib
import gi
diff -r -U4 cozy-0.7.7--orig/cozy/control/sleep_timer.py cozy-0.7.7--patched/cozy/control/sleep_timer.py
--- cozy-0.7.7--orig/cozy/control/sleep_timer.py 2020-11-29 23:34:11.000000000 +0100
+++ cozy-0.7.7--patched/cozy/control/sleep_timer.py 2020-11-30 18:04:36.644088723 +0100
@@ -8,9 +8,9 @@
import gi
from cozy.application_settings import ApplicationSettings
from cozy.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 cozy.model.book import Book
from cozy.model.chapter import Chapter
from cozy.report import reporter
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 -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
@ -133,41 +106,41 @@ 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
@@ -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 -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 -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 -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 -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
@ -175,9 +148,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 -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
@ -189,12 +162,13 @@ 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
@@ -1,8 +1,8 @@
import logging
from typing import List
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
@@ -2,9 +2,9 @@
from typing import List, Optional
import peewee
-import cozy.ext.inject as inject
+import inject
@ -202,22 +176,37 @@ 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
@@ -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 -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 -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
@@ -6,9 +6,9 @@
import distro
import platform
@ -229,23 +218,23 @@ 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 -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 -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 -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
@ -257,9 +246,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 -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
@ -270,36 +259,63 @@ 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
@@ -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
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
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 -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 @@
class FileNotFoundDialog():
diff -r -U4 cozy-0.7.7--orig/cozy/ui/library_view.py cozy-0.7.7--patched/cozy/ui/library_view.py
--- cozy-0.7.7--orig/cozy/ui/library_view.py 2020-11-29 23:34:11.000000000 +0100
+++ cozy-0.7.7--patched/cozy/ui/library_view.py 2020-11-30 18:04:36.727088849 +0100
@@ -1,8 +1,8 @@
from gi.repository import Gtk
from gi.repository.Gtk import Builder
-from cozy.ext import inject
+import inject
from cozy.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 -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 -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
@ -309,9 +325,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 -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
@ -322,9 +338,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 -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
@ -332,27 +348,13 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/settings.py cozy-0.7.7--patched/cozy/ui/set
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 -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 -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
@ -363,9 +365,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 -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
@ -377,9 +379,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 -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
-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 -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
@ -390,12 +404,24 @@ 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
@@ -5,9 +5,9 @@
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
-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 -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
@ -404,9 +430,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 -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
@ -414,14 +440,14 @@ 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.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.ui.main_view import CozyUI
from cozy.version import __version__ as CozyVersion
diff -r -U4 cozy-0.7.7--orig/cozy/view_model/book_detail_view_model.py cozy-0.7.7--patched/cozy/view_model/book_detail_view_model.py
--- cozy-0.7.7--orig/cozy/view_model/book_detail_view_model.py 2020-11-29 23:34:11.000000000 +0100
+++ cozy-0.7.7--patched/cozy/view_model/book_detail_view_model.py 2020-11-30 18:04:36.800088960 +0100
@@ -4,9 +4,9 @@
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
@ -432,21 +458,64 @@ 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
@@ -1,7 +1,7 @@
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
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 -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 -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
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
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 -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.db.book import Book
-from cozy.ext import inject
+import inject
from cozy.media.player import Player
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
@@ -1,5 +1,5 @@
-import cozy.ext.inject as inject
+import inject
@ -454,9 +523,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 -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
@ -465,23 +534,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 -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
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 -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
@ -493,9 +562,23 @@ 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 -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
@ -506,35 +589,37 @@ 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
@@ -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 -r -U4 cozy-0.7.7--orig/test/cozy/model/test_library.py cozy-0.7.7--patched/test/cozy/model/test_library.py
--- cozy-0.7.7--orig/test/cozy/model/test_library.py 2020-11-29 23:34:11.000000000 +0100
+++ cozy-0.7.7--patched/test/cozy/model/test_library.py 2020-11-30 18:04:36.922089146 +0100
@@ -1,8 +1,8 @@
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
@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 -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

37
cozy.spec
View file

@ -2,14 +2,16 @@ Name: cozy
%global rtld_name com.github.geigi.cozy
Summary: Modern audiobook player
License: GPLv3+ and ASL 2.0
License: GPLv3+
Version: 0.7.7
Version: 0.9.5
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 <p> tag at the beginning of <description> for every
# <release> in the appdata XML - needed to pass validation
xmlstarlet ed \
@ -108,11 +113,15 @@ mv ./appdata.patched "data/%{rtld_name}.appdata.xml"
%meson_install
%find_lang %{rtld_name}
# Remove the "devel" icon
rm %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{rtld_name}.Devel.svg
%check
%if 0%{?with_tests}
%pytest
%endif
appstream-util validate --nonet %{buildroot}/%{_datadir}/metainfo/%{rtld_name}.appdata.xml
desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop
@ -126,11 +135,35 @@ 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 May 10 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.9.5-1
- Update to latest release
* Sun Apr 25 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.9.4-1
- Update to latest release
* Wed Apr 21 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.9.3-1
- Update to latest release
* Tue Apr 20 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.9.2-1
- Update to latest release
* Mon Apr 19 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.9.1-1
- Update to latest release
* Mon Feb 08 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 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 <fedora@svgames.pl> - 0.7.8-1
- Update to latest release
* Mon Nov 30 2020 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.7.7-1
- Update to latest release

17
find-unpatched-imports.sh Executable file
View file

@ -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

2
sources
View file

@ -1 +1 @@
SHA512 (cozy-0.7.7.tar.gz) = ac95e833cdf23eac24c2d0e97f65eb734d8a169c461c847cbff4407769becd94818850db66cdebef4aea1438a79905ca531875623aba51d7ac183cdeb2326658
SHA512 (cozy-0.9.5.tar.gz) = 70ef0dae1623af1bed8aa1aa6f3e70a81e985cf64b238b1cd430f46cc989859bed6961e5688c78a4f3a3fe23ad9caa0d5091104bd1f56fa4747089f3920b4015