Blob Blame History Raw
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
 
-import cozy.ext.inject as inject
+import inject
 from peewee import SqliteDatabase
 
 from cozy.control.offline_cache import OfflineCache
 from cozy.media.files import Files
diff -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
 
 from cozy.architecture.event_sender import EventSender
-from cozy.ext import inject
+import inject
 
 
 class ApplicationSettings(EventSender):
     _settings: Gio.Settings = inject.attr(Gio.Settings)
diff -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.db.artwork_cache import ArtworkCache as ArtworkCacheModel
-from cozy.ext import inject
+import inject
 from cozy.media.importer import Importer, ScanStatus
 from cozy.report import reporter
 
 log = logging.getLogger("artwork_cache")
 
diff -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
 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 -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
 
-import cozy.ext.inject as inject
+import inject
 from gi.repository import Gio
 
 from cozy.architecture.event_sender import EventSender
 from cozy.model.book import Book
diff -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 @@
 
 import cozy.ui
 from cozy.application_settings import ApplicationSettings
 from cozy.control.artwork_cache import ArtworkCache
-from cozy.ext import inject
+import inject
 from cozy.media.player import Player
 from cozy.model.book import Book
 from cozy.report import reporter
 
diff -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 @@
 
 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
 
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
 
 from cozy.architecture.event_sender import EventSender
-from cozy.ext import inject
+import inject
 from cozy.media.importer import Importer
 from cozy.model.settings import Settings
 from cozy.report import reporter
 
diff -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
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.offline_cache import OfflineCache
-from cozy.ext import inject
+import inject
 from cozy.media.gst_player import GstPlayer, GstPlayerState
 from cozy.model.book import Book
 from cozy.model.chapter import Chapter
 from cozy.model.library import Library
diff -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.track import Track as TrackModel
-from cozy.ext import inject
+import inject
 from cozy.model.chapter import Chapter
 from cozy.model.settings import Settings
 from cozy.model.track import Track
 
diff -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
 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
@@ -2,9 +2,9 @@
 from typing import List, Optional
 
 import peewee
 
-import cozy.ext.inject as inject
+import inject
 from peewee import SqliteDatabase
 
 from cozy.db.book import Book
 from cozy.db.settings import Settings as SettingsModel
diff -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:
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
 
 from cozy.application_settings import ApplicationSettings
-from cozy.ext import inject
+import inject
 from cozy.report.log_level import LogLevel
 from cozy.version import __version__ as CozyVersion
 from peewee import __version__ as PeeweeVersion
 from mutagen import version_string as MutagenVersion
diff -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 gi.repository import Gtk, Gdk, GdkPixbuf, GObject
 
 from cozy.control.artwork_cache import ArtworkCache
-from cozy.ext import inject
+import inject
 from cozy.model.book import Book
 
 log = logging.getLogger("album_element")
 
diff -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
 
 from cozy.control.artwork_cache import ArtworkCache
-from cozy.ext import inject
+import inject
 from cozy.model.book import Book
 from cozy.model.chapter import Chapter
 from cozy.report import reporter
 from cozy.ui.disk_element import DiskElement
diff -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
 
-import cozy.ext.inject as inject
+import inject
 from gi.repository import Gtk, Gdk, Pango, GObject
 
 import cozy.tools as tools
 import cozy.ui
diff -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
 
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.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 @@
 
 from gi.repository import Gtk
 from gi.repository.Gtk import Builder
 
-from cozy.ext import inject
+import inject
 from cozy.model.book import Book
 from cozy.ui.book_element import BookElement
 from cozy.ui.delete_book_view import DeleteBookView
 from cozy.ui.widgets.filter_list_box import FilterListBox
diff -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
 
-import cozy.ext.inject as inject
+import inject
 from cozy.application_settings import ApplicationSettings
 from cozy.architecture.event_sender import EventSender
 
 from cozy.control.db import books, close_db
diff -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
 
-from cozy.ext import inject
+import inject
 from cozy.ui.widgets.search_results import BookSearchResult, ArtistSearchResult
 
 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
@@ -4,9 +4,9 @@
 
 from cozy.control.db import remove_tracks_with_path
 from cozy.db.storage import Storage
 from cozy.db.storage_blacklist import StorageBlackList
-from cozy.ext import inject
+import inject
 from cozy.model.library import Library
 from cozy.ui.widgets.ScrollWrapper import ScrollWrapper
 from cozy.ui.widgets.storage_list_box_row import StorageListBoxRow
 from cozy.view_model.settings_view_model import SettingsViewModel
diff -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
 
 import gi
-import cozy.ext.inject as inject
+import inject
 
 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
@@ -2,9 +2,9 @@
 
 import gi
 
 from cozy.application_settings import ApplicationSettings
-from cozy.ext import inject
+import inject
 
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 
diff -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
 from cozy.control.artwork_cache import ArtworkCache
-from cozy.ext import inject
+import inject
 from cozy.model.book import Book
 
 MAX_BOOK_LENGTH = 80
 BOOK_ICON_SIZE = 40
diff -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
+import inject
 from cozy.model.library import Library
 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
@@ -3,9 +3,9 @@
 
 import gi
 
 from cozy.application_settings import ApplicationSettings
-from cozy.ext import inject
+import inject
 from cozy.ui.main_view import CozyUI
 from cozy.version import __version__ as CozyVersion
 
 gi.require_version('Gtk', '3.0')
diff -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
 from cozy.control.offline_cache import OfflineCache
-from cozy.ext import inject
+import inject
 from cozy.media.player import Player
 from cozy.model.book import Book
 from cozy.model.chapter import Chapter
 from cozy.model.library import Library
diff -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
 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
 
 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
@@ -1,6 +1,6 @@
 from cozy.architecture.observable import Observable
-from cozy.ext import inject
+import inject
 from cozy.media.importer import Importer
 from cozy.model.settings import Settings
 
 
diff -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
 from peewee import SqliteDatabase
 
-from cozy.ext import inject
+import inject
 from cozy.media.media_file import MediaFile
 from cozy.model.library import Library
 
 
diff -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
 
-from cozy.ext import inject
+import inject
 
 
 @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
@@ -1,9 +1,9 @@
 import pytest
 from peewee import SqliteDatabase
 
 from cozy.application_settings import ApplicationSettings
-from cozy.ext import inject
+import inject
 from test.cozy.mocks import ApplicationSettingsMock
 
 
 @pytest.fixture(autouse=True)
diff -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 -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
 
-import cozy.ext.inject as inject
+import inject
 from peewee import SqliteDatabase
 
 
 @pytest.fixture(autouse=True)