let's try again

holyspiritomb · Nov 30, 2023 · 86612da · 86612da
1 parent 779abb0
commit 86612da
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/goodreads-libby-adguard.user.js b/goodreads-libby-adguard.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name          Goodreads Libby Results (forked)
 // @namespace     https://github.com/holyspiritomb
-// @version       1.1.2
+// @version       1.2.0
 // @description   Searches for the book you are looking at on Goodreads across all your libby libraries. Forked from Dylancyclone's script.
 // @author        holyspiritomb
 // @updateURL      https://raw.githubusercontent.com/holyspiritomb/goodreads-libby-userscript/main/goodreads-libby-adguard.user.js
@@ -66,17 +66,16 @@
   };
 
   const addGoodreadsResults = async () => {
-    let isRedesign = (document.querySelector("div#__next"));
-	  let bookTitle = isRedesign ? document.querySelector("[data-testid='bookTitle']").innerText : document.querySelector("meta[property='og:title']").content;
-	  let bookAuthor = isRedesign ? document.querySelector("[aria-label^='By: ']").innerText : document.querySelector(".authorName").innerText;
-    if (bookAuthor == null) {
-      bookAuthor = document.querySelector("span.ContributorLink__name").innerText;
-    }
+    let bookTitle = document.querySelector("[data-testid='bookTitle']").innerText;
+    let bookAuthor;
+    let findBookAuthorEl = () => document.querySelector("[aria-label^='By: ']") || document.querySelector("span.ContributorLink__name");
     let searchTitle = bookTitle.replace(/\(.*\)/, "").replace(/^\s+|\s+$/g, '').replace(/[&|,]/g, ' ').replace(/: .*/, '').replace(/[ ]+/, ' ');
     let searchString;
-    if (bookAuthor == null) {
+    let bookAuthorEl = findBookAuthorEl();
+    if (bookAuthorEl == null) {
       searchString = encodeURIComponent(searchTitle);
     } else {
+      bookAuthor = bookAuthorEl.innerText;
       searchString = encodeURIComponent(searchTitle) + "&creator=" + encodeURIComponent(bookAuthor);
     }
     //console.log(searchString);

diff --git a/goodreads-libby.user.js b/goodreads-libby.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name          Goodreads Libby Results (forked)
 // @namespace     https://github.com/holyspiritomb
-// @version       1.1.3
+// @version       1.2.0
 // @description   Searches for the book you are looking at on Goodreads across all your libby libraries. Forked from Dylancyclone's script.
 // @author        holyspiritomb
 // @updateURL      https://raw.githubusercontent.com/holyspiritomb/goodreads-libby-userscript/main/goodreads-libby.user.js
@@ -65,15 +65,12 @@
   };
 
   const addGoodreadsResults = async () => {
-    let isRedesign = (document.querySelector("div#__next"));
-	  let bookTitle = isRedesign ? document.querySelector("[data-testid='bookTitle']").innerText : document.querySelector("meta[property='og:title']").content;
+    let bookTitle = document.querySelector("[data-testid='bookTitle']").innerText;
     let bookAuthor;
-	let bookAuthorEl = document.querySelector("[aria-label^='By: ']");
-    if (bookAuthorEl == null) {
-      bookAuthorEl = document.querySelector("span.ContributorLink__name");
-    }
+    let findBookAuthorEl = () => document.querySelector("[aria-label^='By: ']") || document.querySelector("span.ContributorLink__name");
     let searchTitle = bookTitle.replace(/\(.*\)/, "").replace(/^\s+|\s+$/g, '').replace(/[&|,]/g, ' ').replace(/: .*/, '').replace(/[ ]+/, ' ');
     let searchString;
+    let bookAuthorEl = findBookAuthorEl();
     if (bookAuthorEl == null) {
       searchString = encodeURIComponent(searchTitle);
     } else {

diff --git a/pre-push.sh → pre-commit.sh b/pre-push.sh → pre-commit.sh
@@ -3,4 +3,3 @@
 cat goodreads-libby.user.js | sed "s/@grant         GM_addStyle/@grant         GM_addStyle\n\/\/ @grant         unsafeWindow/;s/main\/goodreads-libby.user.js/main\/goodreads-libby-adguard.user.js/" > goodreads-libby-adguard.user.js
 
 git add goodreads-libby-adguard.user.js
-# git commit goodreads-libby-adguard.user.js -m "adguard version automatic commit"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,3 @@
		cat goodreads-libby.user.js \| sed "s/@grant GM_addStyle/@grant GM_addStyle\n\/\/ @grant unsafeWindow/;s/main\/goodreads-libby.user.js/main\/goodreads-libby-adguard.user.js/" > goodreads-libby-adguard.user.js

		git add goodreads-libby-adguard.user.js
		# git commit goodreads-libby-adguard.user.js -m "adguard version automatic commit"