Rework UI in preparation for multiple sources #143

Lucki · 2022-12-11T22:11:54Z

Conflicts:
[email protected]/metadata.json
[email protected]/prefs.js

This should be a drop-in replacement and is a preparation for #141

If you have any comments please don't hesitate to mention them but keep in mind, that it might be already changed in the next PR. (Example is the enum change to int, which I changed back later back to an enum)
I'll make sure then that the requested changes will appear in the last stacked PR (change to TS).

Original message:

This rebuilds the UI in the blueprint-compiler language. I've seen you mentioning problems with the UI-files before while using glade, so this might be easier to maintain.
Building the UI requires blueprint-compiler.

This includes some enhancements to the GenericJSON. It now exposes more of the history element options and tries to match the same $[@random] across all paths until they deviate. ~~This probably isn't tested enough.~~

ifl0w · 2022-12-13T22:56:11Z

install.sh

@@ -1,8 +1,10 @@
 #!/bin/bash

+datahome="${XDG_DATA_HOME:-HOME/.local/share}"


Well, that's embarrassing - I missed a $ before HOME, just recognized this while looking in the description of #144 where I wrote the example correctly…
Another fixing commit for the last PR, sry!

ifl0w

That already looks like a lot of great work! Thanks! 😃
The UI is a bit rough here and there and needs improvements in the end, but it already looks like a great start towards a new version!
I just have some smaller comments & questions.

Just a high-level note: there are some changes unrelated to the commits. For example, formatting changes or .gitignore changes that would be better to have in a separate commit. I am fine with this for now since I haven't been super exact about this myself in this repository in the past. However, I might be pickier about that in the future (probably only after all your current PRs are merged 😄).

build.sh

[email protected]/schemas/.gitignore

[email protected]/schemas/org.gnome.shell.extensions.space.iflow.randomwallpaper.gschema.xml

[email protected]/sourceAdapter.js

[email protected]/ui/generic_json.blp

ifl0w · 2022-12-13T23:16:58Z

[email protected]/sourceAdapter.js

+				let identifier = this._settings.get("generic-json-id", "string");
+				let imageJSONPath = this._settings.get("generic-json-image-path", "string");
+				let postJSONPath = this._settings.get("generic-json-post-path", "string");
+				let domainUrl = this._settings.get("generic-json-domain", "string");
+				let authorNameJSONPath = this._settings.get("generic-json-author-name-path", "string");
+				let authorUrlJSONPath = this._settings.get("generic-json-author-url-path", "string");
+
+				if (identifier === null || identifier === "") {
+					identifier = 'Generic JSON Source';
+				}
+
+				let rObject = this._jsonPathParser.access(response_body, imageJSONPath);
+				let imageDownloadUrl = this._settings.get("generic-json-image-prefix", "string") + rObject.Object;
+
+				// '@random' would yield different results so lets make sure the values stay
+				// the same as long as the path is identical
+				let samePath = imageJSONPath.substring(0, this.findFirstDifference(imageJSONPath, postJSONPath));
+
+				// count occurrences of '@random' to slice the array later
+				// https://stackoverflow.com/a/4009768
+				let occurrences = (samePath.match(/@random/g) || []).length;
+				let slicedRandomElements = rObject.RandomElements.slice(0, occurrences);
+
+				let postUrl = this._jsonPathParser.access(response_body, postJSONPath, slicedRandomElements, false).Object;
+				postUrl = this._settings.get("generic-json-post-prefix", "string") + postUrl;
+				if (typeof postUrl !== 'string' || !postUrl instanceof String) {
+					postUrl = null;
+				}
+
+				let authorName = this._jsonPathParser.access(response_body, authorNameJSONPath, slicedRandomElements, false).Object;
+				if (typeof authorName !== 'string' || !authorName instanceof String) {
+					authorName = null;
+				}
+
+				let authorUrl = this._jsonPathParser.access(response_body, authorUrlJSONPath, slicedRandomElements, false).Object;
+				authorUrl = this._settings.get("generic-json-author-url-prefix", "string") + authorUrl;
+				if (typeof authorUrl !== 'string' || !authorUrl instanceof String) {
+					authorUrl = null;
+				}


I see what you wanted to achieve here! However, I think we need a fundamentally better approach to handling the meta data (author, post link, etc.) of the images.

Also, I think we can make the JsonPath part little bit easier (see the other comment).

To be clear, it is fine for now to add the multiple JSON path fields for the meta data, but we might find a better way in the future.

For me, the generic JSON source didn't work and threw an error BaseAdapter :: {"error":"Unexpected response. (TypeError: rObject.RandomElements is null)"}
I didn't debug the issue. Should that already work, or are there fixes for this in later PRs?

It should work! I'll have a look at it, maybe something got lost while transfering the commits between the branches.

Hm, it works just fine here.

In the past I had the problem that the gnome extension app was overwriting my local folder on gnome shell restart - maybe that's interfering on your side?

Hm, it worked after restting my stored settings with dconf... That's somewhat unfortunate since I can't restore my previous state to test what caused the issue. We could change the schema id in the end so that other users do not run into the same issue with the next version.

Fyi, created an issue for tracking here: #156

[email protected]/prefs.js

[email protected]/jsonpath/jsonpath.js

[email protected]/ui/source_row.blp

[email protected]/wallpaperController.js

Introduces new function to resolve a new random path according to an already resolved path with similar elements. Reference: ifl0w#143 (comment)

ifl0w

Ok, so this one is done! Great work, thanks! One down, 12 to go. 😅

I just changed the base branch, so we do not break the extension for any users that have cloned the develop branch directly. We'll collect all changes in the WIP_3.0.0 branch and merge them in develop once we have a somewhat stable version.

Introduces new function to resolve a new random path according to an already resolved path with similar elements. Reference: ifl0w#143 (comment)

* Prefix HOME variable to correctly get the users home path * Prevent whitespace issues by quoting the users home path variable Reference: ifl0w#143 (comment)

Introduces new function to resolve a new random path according to an already resolved path with similar elements. Reference: ifl0w#143 (comment)

* Prefix HOME variable to correctly get the users home path * Prevent whitespace issues by quoting the users home path variable Reference: ifl0w#143 (comment)

Introduces new function to resolve a new random path according to an already resolved path with similar elements. Reference: #143 (comment)

* Prefix HOME variable to correctly get the users home path * Prevent whitespace issues by quoting the users home path variable Reference: #143 (comment)

Introduces new function to resolve a new random path according to an already resolved path with similar elements. Reference: #143 (comment)

* Prefix HOME variable to correctly get the users home path * Prevent whitespace issues by quoting the users home path variable Reference: #143 (comment)

Introduces new function to resolve a new random path according to an already resolved path with similar elements. Reference: #143 (comment)

* Prefix HOME variable to correctly get the users home path * Prevent whitespace issues by quoting the users home path variable Reference: #143 (comment)

Lucki marked this pull request as draft December 11, 2022 22:15

Lucki added 2 commits December 11, 2022 23:23

Expose some convenience settings

a3a0e91

Fixate randomness for the same path

049bfb6

Lucki force-pushed the blp branch 3 times, most recently from bb05e2a to b3bc5f8 Compare December 11, 2022 22:58

Rework UI in preparation for multiple sources

9ae64d7

Lucki force-pushed the blp branch from b3bc5f8 to 9ae64d7 Compare December 11, 2022 23:03

Lucki marked this pull request as ready for review December 11, 2022 23:05

Lucki mentioned this pull request Dec 12, 2022

Multiple Sources (Requires #143) #141

Merged

ifl0w self-requested a review December 13, 2022 22:24

ifl0w reviewed Dec 13, 2022

View reviewed changes

ifl0w reviewed Dec 14, 2022

View reviewed changes

ifl0w mentioned this pull request Dec 14, 2022

Old settings might cause new extension versions to crash #156

Open

ifl0w changed the base branch from develop to WIP_v3.0.0 December 14, 2022 21:37

ifl0w self-requested a review December 14, 2022 21:37

ifl0w approved these changes Dec 14, 2022

View reviewed changes

ifl0w merged commit b90bfb7 into ifl0w:WIP_v3.0.0 Dec 14, 2022

Lucki added a commit to Lucki/RandomWallpaperGnome3 that referenced this pull request Feb 11, 2023

Install script fixes:

1569700

* Prefix HOME variable to correctly get the users home path * Prevent whitespace issues by quoting the users home path variable Reference: ifl0w#143 (comment)

Lucki added a commit to Lucki/RandomWallpaperGnome3 that referenced this pull request Apr 7, 2023

Install script fixes:

e04af31

* Prefix HOME variable to correctly get the users home path * Prevent whitespace issues by quoting the users home path variable Reference: ifl0w#143 (comment)

ifl0w pushed a commit that referenced this pull request Aug 15, 2023

Return the full JsonPath if the object was found

7a3acb9

Introduces new function to resolve a new random path according to an already resolved path with similar elements. Reference: #143 (comment)

ifl0w pushed a commit that referenced this pull request Aug 15, 2023

Install script fixes:

d966de4

* Prefix HOME variable to correctly get the users home path * Prevent whitespace issues by quoting the users home path variable Reference: #143 (comment)

ifl0w pushed a commit that referenced this pull request Feb 11, 2024

Return the full JsonPath if the object was found

ff3f8b9

Introduces new function to resolve a new random path according to an already resolved path with similar elements. Reference: #143 (comment)

ifl0w pushed a commit that referenced this pull request Feb 11, 2024

Install script fixes:

f86e308

* Prefix HOME variable to correctly get the users home path * Prevent whitespace issues by quoting the users home path variable Reference: #143 (comment)

ifl0w pushed a commit that referenced this pull request Feb 11, 2024

Return the full JsonPath if the object was found

0951824

Introduces new function to resolve a new random path according to an already resolved path with similar elements. Reference: #143 (comment)

ifl0w pushed a commit that referenced this pull request Feb 11, 2024

Install script fixes:

01c83cf

* Prefix HOME variable to correctly get the users home path * Prevent whitespace issues by quoting the users home path variable Reference: #143 (comment)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rework UI in preparation for multiple sources #143

Rework UI in preparation for multiple sources #143

Lucki commented Dec 11, 2022

ifl0w Dec 13, 2022

Lucki Dec 14, 2022 •

edited

Loading

ifl0w left a comment

ifl0w Dec 13, 2022

ifl0w Dec 13, 2022

ifl0w Dec 14, 2022

Lucki Dec 14, 2022

Lucki Dec 14, 2022

ifl0w Dec 14, 2022

ifl0w left a comment

		@@ -1,8 +1,10 @@
		#!/bin/bash

		datahome="${XDG_DATA_HOME:-HOME/.local/share}"

Rework UI in preparation for multiple sources #143

Rework UI in preparation for multiple sources #143

Conversation

Lucki commented Dec 11, 2022

ifl0w Dec 13, 2022

Choose a reason for hiding this comment

Lucki Dec 14, 2022 • edited Loading

Choose a reason for hiding this comment

ifl0w left a comment

Choose a reason for hiding this comment

ifl0w Dec 13, 2022

Choose a reason for hiding this comment

ifl0w Dec 13, 2022

Choose a reason for hiding this comment

ifl0w Dec 14, 2022

Choose a reason for hiding this comment

Lucki Dec 14, 2022

Choose a reason for hiding this comment

Lucki Dec 14, 2022

Choose a reason for hiding this comment

ifl0w Dec 14, 2022

Choose a reason for hiding this comment

ifl0w left a comment

Choose a reason for hiding this comment

Lucki Dec 14, 2022 •

edited

Loading