Update python-inject and remove the bundled package (#940)

com.github.geigi.cozy.json

@@ -107,6 +107,20 @@
         }
       ]
     },
+    {
+      "name": "python3-inject",
+      "buildsystem": "simple",
+      "build-commands": [
+        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"inject\" --no-build-isolation"
+      ],
+      "sources": [
+        {
+          "type": "file",
+          "url": "https://files.pythonhosted.org/packages/e9/db/3250e21ff08b3466e1ce8d0b2b09edcd6af7672f709d8625e142e824eb0b/inject-5.2.1-py2.py3-none-any.whl",
+          "sha256": "e40a5b1bebd8a4050b6f98f3396f3de6e9e2e411ad2a2145f16f351cb6f54e51"
+        }
+      ]
+    },
     {
       "name": "blueprint-compiler",
       "buildsystem": "meson",

cozy/app_controller.py

@@ -1,7 +1,7 @@
+import inject
 from gi.repository import Gio
 from peewee import SqliteDatabase
 
-import cozy.ext.inject as inject
 from cozy.application_settings import ApplicationSettings
 from cozy.architecture.singleton import Singleton
 from cozy.control.db import get_db

cozy/application_settings.py

@@ -1,7 +1,7 @@
+import inject
 from gi.repository import Gio
 
 from cozy.architecture.event_sender import EventSender
-from cozy.ext import inject
 
 
 class ApplicationSettings(EventSender):

cozy/control/artwork_cache.py

@@ -4,12 +4,12 @@
 from pathlib import Path
 from uuid import uuid4
 
+import inject
 from gi.repository import Gdk, GdkPixbuf
 
 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
 from cozy.media.importer import Importer, ScanStatus
 from cozy.report import reporter
 

cozy/control/filesystem_monitor.py

@@ -1,8 +1,8 @@
 import logging
 
+import inject
 from gi.repository import Gio
 
-import cozy.ext.inject as inject
 from cozy.architecture.event_sender import EventSender
 from cozy.model.book import Book
 from cozy.model.settings import Settings

cozy/control/mpris.py

@@ -12,11 +12,11 @@
 import time
 from dataclasses import dataclass
 
+import inject
 from gi.repository import Gio, GLib
 
 from cozy.application_settings import ApplicationSettings
 from cozy.control.artwork_cache import ArtworkCache
-from cozy.ext import inject
 from cozy.media.player import Player
 from cozy.model.book import Book
 from cozy.report import reporter

cozy/control/offline_cache.py

@@ -2,6 +2,7 @@
 import os
 import uuid
 
+import inject
 from gi.repository import Gio
 
 import cozy.tools as tools
@@ -10,7 +11,6 @@
 from cozy.db.file import File
 from cozy.db.offline_cache import OfflineCache as OfflineCacheModel
 from cozy.db.track_to_file import TrackToFile
-from cozy.ext import inject
 from cozy.model.book import Book
 from cozy.model.chapter import Chapter
 from cozy.report import reporter