Rework UI in preparation for multiple sources

build.sh

@@ -3,11 +3,21 @@
 BASEDIR="[email protected]"
 ZIPNAME="$BASEDIR.zip"
 
-rm $ZIPNAME
-rm $BASEDIR/schemas/gschemas.compiled
-rm $BASEDIR/wallpapers/*
-glib-compile-schemas $BASEDIR/schemas/
-
-cd $BASEDIR
-zip -r $ZIPNAME .
-mv $ZIPNAME ..
+rm "$ZIPNAME"
+rm "$BASEDIR/schemas/gschemas.compiled"
+rm "$BASEDIR/wallpapers/"*
+glib-compile-schemas "$BASEDIR/schemas/"
+
+# cd "$BASEDIR/ui" || exit 1
+blueprint-compiler batch-compile "$BASEDIR/ui" "$BASEDIR/ui" \
+    "$BASEDIR/ui/generic_json.blp" \
+    "$BASEDIR/ui/page_general.blp" \
+    "$BASEDIR/ui/page_sources.blp" \
+    "$BASEDIR/ui/reddit.blp" \
+    "$BASEDIR/ui/source_row.blp" \
+    "$BASEDIR/ui/unsplash.blp" \
+    "$BASEDIR/ui/wallhaven.blp"
+
+cd "$BASEDIR" || exit 1
+zip -r "$ZIPNAME" .
+mv "$ZIPNAME" ..

install.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
 
+datahome="${XDG_DATA_HOME:-HOME/.local/share}"
+
 extensionFolder="[email protected]"
 sourcepath="$PWD/$extensionFolder"
-targetpath="/home/$USER/.local/share/gnome-shell/extensions"
+targetpath="$datahome/gnome-shell/extensions"
 
 if [ "$1" = "uninstall" ]; then
 	echo "# Removing $targetpath/$extensionFolder"

randomwallpaper@iflow.space/jsonpath/jsonpath.js

@@ -6,15 +6,25 @@ var JSONPathParser = function () {
 	 *
 	 * @param inputObject the object to access
 	 * @param inputString the json path expression
+	 * @param randomElements the predefined random Elements
+	 * @param newRandomness whether to ignore previously defined random Elements
 	 * @returns {*}
 	 */
-	this.access = function (inputObject, inputString) {
+	this.access = function (inputObject, inputString, randomElements = null, newRandomness = true) {
 		if (inputObject === null || inputObject === undefined) {
 			return null;
 		}
 
 		if (inputString.length === 0) {
-			return inputObject;
+			return {
+				Object: inputObject,
+				RandomElements: randomElements,
+			};
+		}
+
+		if (randomElements === null) {
+			randomElements = [];
+			newRandomness = true;
 		}
 
 		let startDot = inputString.indexOf('.');
@@ -34,7 +44,7 @@ var JSONPathParser = function () {
 				return null;
 			}
 
-			return this.access(targetObject, inputStringTail)
+			return this.access(targetObject, inputStringTail, randomElements, newRandomness);
 
 		} else {
 
@@ -48,11 +58,22 @@ var JSONPathParser = function () {
 
 			switch (indexString) {
 				case "@random":
-					return this.access(this.randomElement(targetObject), inputStringTail);
+					let randomNumber = null;
+					if (!newRandomness && randomElements.length >= 1) {
+						// Take and remove first element
+						randomNumber = randomElements.shift();
+					} else if (!newRandomness && randomElements.length < 1) {
+						randomNumber = this.randomElement(targetObject);
+					} else {
+						randomNumber = this.randomElement(targetObject);
+						randomElements.push(randomNumber);
+					}
+
+					return this.access(randomNumber, inputStringTail, randomElements, newRandomness);
 				// add special keywords here
 				default:
 					// expecting integer
-					return this.access(targetObject[parseInt(indexString)], inputStringTail);
+					return this.access(targetObject[parseInt(indexString)], inputStringTail, randomElements, newRandomness);
 			}
 
 		}