Working on support for Cinnamon 4.8 and newer

.gitignore

@@ -4,3 +4,4 @@ extracted/
 custom_images/
 *.txt
 selected/
+__pycache__

cinnamon-dynamic-wallpaper@TobiZog/4.8/extension.js

@@ -0,0 +1 @@
+../5.4/extension.js

cinnamon-dynamic-wallpaper@TobiZog/4.8/icon.png

@@ -0,0 +1 @@
+../5.4/icon.png

cinnamon-dynamic-wallpaper@TobiZog/4.8/icons

@@ -0,0 +1 @@
+../5.4/icons/

cinnamon-dynamic-wallpaper@TobiZog/4.8/image-configurator/data/routes.py

@@ -0,0 +1 @@
+pref_path = "/.cinnamon/configs/cinnamon-dynamic-wallpaper@TobiZog/cinnamon-dynamic-wallpaper@TobiZog.json"

cinnamon-dynamic-wallpaper@TobiZog/4.8/image-configurator/image-configurator.glade

@@ -0,0 +1 @@
+../../5.4/image-configurator/image-configurator.glade

cinnamon-dynamic-wallpaper@TobiZog/4.8/image-configurator/image-configurator.py

@@ -0,0 +1 @@
+../../5.4/image-configurator/image-configurator.py

cinnamon-dynamic-wallpaper@TobiZog/4.8/images

@@ -0,0 +1 @@
+../5.4/images/

cinnamon-dynamic-wallpaper@TobiZog/4.8/scripts

@@ -0,0 +1 @@
+../5.4/scripts/

cinnamon-dynamic-wallpaper@TobiZog/4.8/settings-schema.json

@@ -0,0 +1 @@
+../5.4/settings-schema.json

cinnamon-dynamic-wallpaper@TobiZog/5.4/image-configurator/data/enum.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+class Source(Enum):
+	SELECTED = 0	# Load previous selected images
+	EXTRACT = 1		# Use a custom image set from a heic file
+	SET = 2			# Use an included image set

cinnamon-dynamic-wallpaper@TobiZog/5.4/image-configurator/data/routes.py

@@ -0,0 +1 @@
+pref_path = "/.config/cinnamon/spices/cinnamon-dynamic-wallpaper@TobiZog/cinnamon-dynamic-wallpaper@TobiZog.json"

cinnamon-dynamic-wallpaper@TobiZog/5.4/image-configurator/image-configurator.py

@@ -1,21 +1,19 @@
 import gi, os, glob, json, shutil, enum, threading, subprocess
+from data.routes import pref_path
+from data.enum import Source
 
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, GdkPixbuf
 
 PROJECT_DIR = os.path.dirname(os.path.dirname(__file__)) + "/"
 UI_PATH = PROJECT_DIR + "image-configurator/" + "image-configurator.glade"
+PREF_PATH = os.path.expanduser("~") + pref_path
 
 IMAGE_DIR = PROJECT_DIR + "images/"
 IMAGE_EXTRACT_DIR = IMAGE_DIR + "extracted/"
 IMAGE_SETS_DIR = IMAGE_DIR + "included_image_sets/"
 IMAGE_SELECTED_DIR = IMAGE_DIR + "selected/"
 
-class Source(enum.Enum):
-	SELECTED = 0	# Load previous selected images
-	EXTRACT = 1		# Use a custom image set from a heic file
-	SET = 2			# Use an included image set
-
 
 class ImageConfigurator:
 	def __init__(self) -> None:
@@ -113,13 +111,6 @@ class ImageConfigurator:
 		version = version.decode()
 		version = version[version.find(" "):version.rfind("\n")].strip()
 
-		if version.startswith("5.4"):
-			self.pref_path = os.path.expanduser("~") + \
-				"/.cinnamon/configs/cinnamon-dynamic-wallpaper@TobiZog/cinnamon-dynamic-wallpaper@TobiZog.json"
-		else:
-			self.pref_path = os.path.expanduser("~") + \
-				"/.config/cinnamon/spices/cinnamon-dynamic-wallpaper@TobiZog/cinnamon-dynamic-wallpaper@TobiZog.json"
-
 		# Load preferences
 		self.loadFromSettings()
 
@@ -140,7 +131,7 @@ class ImageConfigurator:
 		""" Load preferences from the Cinnamon preference file
 		"""
 		# Load the settings
-		with open(self.pref_path, "r") as pref_file:
+		with open(PREF_PATH, "r") as pref_file:
 			pref_data = json.load(pref_file)
 
 
@@ -179,7 +170,7 @@ class ImageConfigurator:
 		""" Save preferences to the Cinnamon preference file
 		"""
 		# Load the settings
-		with open(self.pref_path, "r") as pref_file:
+		with open(PREF_PATH, "r") as pref_file:
 			pref_data = json.load(pref_file)
 
 
@@ -197,7 +188,7 @@ class ImageConfigurator:
 
 
 		# Write the settings
-		with open(self.pref_path, "w") as pref_file:
+		with open(PREF_PATH, "w") as pref_file:
 			json.dump(pref_data, pref_file, separators=(',', ':'), indent=4)
 
 

cinnamon-dynamic-wallpaper@TobiZog/metadata.json

@@ -3,6 +3,7 @@
 	"name": "Cinnamon Dynamic Wallpaper",
 	"description": "Cinnamon extension for dynamic desktop backgrounds based on time and location",
 	"version": "1.1",
+	"multiversion": true,
 	"cinnamon-version": [
 		"5.4",
 		"5.6",