From 68fd91226b92e718fc30c158346aa6596b340456 Mon Sep 17 00:00:00 2001
From: Artur Frenszek-Iwicki <fedora@svgames.pl>
Date: Apr 25 2021 11:25:06 +0000
Subject: Update to v0.9.4


---

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 <p> tag at the beginning of <description> for every
 # <release> 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 <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
 
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