Merge pull request #212 from StoPlay/211-service-request-freemusicarc…

…hiveorg

New service: freemusicarchive.org

README.md

@@ -45,6 +45,8 @@ At the moment we fully support (stop and play)
 - beatport.com
 - anchor.fm
 - qub.ca
+- cikava-ideya.top
+- freemusicarchive.org
 
 ## How it works
 

package.json

@@ -23,4 +23,4 @@
     "grunt-webstore-upload": "^0.9.21",
     "grunt-zip": "^0.18.2"
   }
-}
+}

src/background/models/ProvidersList.js

@@ -55,4 +55,5 @@ export const ProvidersList = [
   "cikava-ideya.top",
   "tortuga.wtf",
   "ashdi.vip",
+  "freemusicarchive.org",
 ];

src/common/ElementClickControl.js

@@ -0,0 +1,20 @@
+export class ElementClickControl {
+    #controlSelector;
+
+    /**
+     * playSelector here optional for cases when needed different one
+     */
+    constructor(controlSelector) {
+        this.#controlSelector = controlSelector;
+    }
+
+    evaluate() {
+        const element = document.querySelector(this.#controlSelector);
+
+        if (!element) {
+            return;
+        }
+
+        element.click();
+    }
+}

src/common/ElementExistsStatus.js

@@ -0,0 +1,13 @@
+import { Status } from "../background/models/Status";
+
+export class ElementExistsStatus {
+    #selector;
+
+    constructor(selector) {
+        this.#selector = selector;
+    }
+
+    getStatus() {
+        return document.querySelector(this.#selector) ? Status.PLAYING : Status.PAUSED;
+    }
+}

src/content/index.js

@@ -2,12 +2,14 @@
 import { CheckTimer } from "./CheckTimer.js";
 import { Actions } from "../common/Actions.js";
 import { NativeMediaPlayer } from "../common/NativeMediaPlayer";
+import { ElementExistsStatus } from "../common/ElementExistsStatus.js";
+import { ElementClickControl } from "../common/ElementClickControl.js";
 
 function safeGetElementTextContentByQuery(query) {
   try {
     const element = document.querySelector(query);
 
-    return element.textContent;
+    return element.textContent.trim();
   } catch (e) {
     return "";
   }
@@ -247,7 +249,7 @@ class Provider {
 
       case "radio.garden":
         artistName = safeGetElementTextContentByQuery(
-          ".channel-list-item-name-container"
+          "[class*='channel'] [class*='titleContainer'] [class*='title']:not([class*='subtitle'])"
         );
         break;
 
@@ -260,6 +262,11 @@ class Provider {
           "[data-testid='context-item-info-title'] [data-testid='context-item-link']"
         );
         break;
+
+      case "freemusicarchive.org":
+        songName = safeGetElementTextContentByQuery(".c-player__song .c-song__artist");
+        artistName = safeGetElementTextContentByQuery(".c-player__song .c-song__title");
+        break;
     }
 
     if (artistName && songName) {
@@ -343,6 +350,10 @@ class Provider {
         status = new NativeMediaPlayer("video").status();
         break;
 
+      case "freemusicarchive.org":
+        status = new ElementExistsStatus(".c-player__control-button--pause:not([style*='display: none'])").getStatus();
+        break;
+
       case "last.fm":
         status = document
           .getElementById("webRadio")
@@ -495,10 +506,7 @@ class Provider {
         break;
 
       case "radio.garden":
-        selectorQuery = ".icon-toggle.mod-mute .icon-button.mod-sound";
-        playerPauseButton = document.querySelector(selectorQuery);
-
-        status = playerPauseButton ? Status.PLAYING : Status.PAUSED;
+        status = new ElementExistsStatus("[class*='controlsContainer'] [aria-label='stop']").getStatus();
         break;
 
       case "somafm.com":
@@ -558,6 +566,10 @@ class Provider {
           new NativeMediaPlayer("video").pause();
           break;
 
+        case "freemusicarchive.org":
+          new ElementClickControl(".c-player__control-button--pause:not([style*='display: none'])").evaluate();
+          break;
+
         case "last.fm":
           document.querySelector("#radioControlPause a") &&
             document.querySelector("#radioControlPause a").click();
@@ -700,14 +712,7 @@ class Provider {
           break;
 
         case "radio.garden":
-          selectorQuery = ".icon-toggle.mod-mute .icon-button.mod-sound";
-          playerPauseButton = document.querySelector(selectorQuery);
-
-          if (!playerPauseButton) {
-            return;
-          }
-
-          playerPauseButton.click();
+          new ElementClickControl("[class*='controlsContainer'] [aria-label='stop']").evaluate();
           break;
 
         case "somafm.com":
@@ -775,6 +780,10 @@ class Provider {
           new NativeMediaPlayer("video").play();
           break;
 
+        case "freemusicarchive.org":
+          new ElementClickControl(".c-player__control-button--play:not([style*='display: none'])").evaluate();
+          break;
+
         case "last.fm":
           document.querySelector("#radioControlPlay a") &&
             document.querySelector("#radioControlPlay a").click();
@@ -915,14 +924,7 @@ class Provider {
           break;
 
         case "radio.garden":
-          selectorQuery = ".icon-toggle.mod-mute .icon-button.mod-muted";
-          playerPlayButton = document.querySelector(selectorQuery);
-
-          if (!playerPlayButton) {
-            return;
-          }
-
-          playerPlayButton.click();
+          new ElementClickControl("[class*='controlsContainer'] [aria-label='play']").evaluate();
           break;
 
         case "somafm.com":