Ver código fonte

ref: logging stuff

Sv443 1 ano atrás
pai
commit
fced9dde29
5 arquivos alterados com 13 adições e 13 exclusões
  1. 6 6
      src/features/layout.ts
  2. 1 1
      src/features/lyrics.ts
  3. 1 1
      src/features/menu/menu_old.ts
  4. 3 3
      src/index.ts
  5. 2 2
      src/utils.ts

+ 6 - 6
src/features/layout.ts

@@ -41,7 +41,7 @@ export function addWatermark() {
   const logoElem = document.querySelector("#left-content") as HTMLElement;
   insertAfter(logoElem, watermark);
 
-  log("Added watermark element:", watermark);
+  log("Added watermark element", watermark);
 }
 
 /** Called whenever the menu exists to add a BYTM-Configuration button */
@@ -74,7 +74,7 @@ export function addConfigMenuOption(container: HTMLElement) {
 
   container.appendChild(cfgOptElem);
 
-  log("Added BYTM-Configuration button to menu popover");
+  log("Added BYTM-Configuration button to menu popover", cfgOptElem);
 }
 
 //#MARKER remove upgrade tab
@@ -139,7 +139,7 @@ export function initQueueButtons() {
 
   queueItems.forEach(itm => addQueueButtons(itm as HTMLElement));
 
-  log(`Added buttons to ${queueItems.length} existing queue items`);
+  log(`Added buttons to ${queueItems.length} existing queue ${autoPlural("item", queueItems)}`);
 }
 
 /**
@@ -293,7 +293,7 @@ export function addAnchorImprovements() {
         const itemsElem = el.querySelector<HTMLElement>("ul#items");
         if(itemsElem) {
           const improvedElems = improveCarouselAnchors(itemsElem);
-          improvedElems > 0 && log(`Added anchor improvements to ${improvedElems} carousel shelf items`);
+          improvedElems > 0 && log(`Added anchor improvements to ${improvedElems} carousel shelf ${autoPlural("item", improvedElems)}`);
         }
       }
     };
@@ -354,12 +354,12 @@ export function addAnchorImprovements() {
 
     onSelectorExists("ytmusic-app-layout tp-yt-app-drawer #contentContainer #guide-content #items ytmusic-guide-entry-renderer", (sidebarCont) => {
       const itemsAmt = addSidebarAnchors(sidebarCont);
-      log(`Added anchors around ${itemsAmt} sidebar items`);
+      log(`Added anchors around ${itemsAmt} sidebar ${autoPlural("item", itemsAmt)}`);
     });
 
     onSelectorExists("ytmusic-app-layout #mini-guide ytmusic-guide-renderer ytmusic-guide-section-renderer #items ytmusic-guide-entry-renderer", (miniSidebarCont) => {
       const itemsAmt = addSidebarAnchors(miniSidebarCont);
-      log(`Added anchors around ${itemsAmt} mini sidebar items`);
+      log(`Added anchors around ${itemsAmt} mini sidebar ${autoPlural("item", itemsAmt)}`);
     });
   }
   catch(err) {

+ 1 - 1
src/features/lyrics.ts

@@ -76,7 +76,7 @@ function addActualMediaCtrlLyricsBtn(likeContainer: HTMLElement) {
         if(!lyricsBtn)
           return;
 
-        log(`Song title changed from '${mcCurrentSongTitle}' to '${newTitle}'`);
+        info(`Song title changed from '${mcCurrentSongTitle}' to '${newTitle}'`);
 
         lyricsBtn.style.cursor = "wait";
         lyricsBtn.style.pointerEvents = "none";

+ 1 - 1
src/features/menu/menu_old.ts

@@ -306,7 +306,7 @@ export async function addMenu() {
 
   document.body.appendChild(backgroundElem);
 
-  log("Added menu elem:", backgroundElem);
+  log("Added menu element:", backgroundElem);
 }
 
 //#MARKER utilities

+ 3 - 3
src/index.ts

@@ -1,6 +1,6 @@
 import { loadFeatureConf } from "./config";
 import { logLevel, scriptInfo } from "./constants";
-import { addGlobalStyle, error, getAssetUrl, getDomain, initSelectorExistsCheck, log, onSelectorExists, precacheImages, setLogLevel } from "./utils";
+import { addGlobalStyle, autoPlural, error, getAssetUrl, getDomain, initSelectorExistsCheck, log, onSelectorExists, precacheImages, setLogLevel } from "./utils";
 import { initSiteEvents } from "./events";
 import {
   // layout
@@ -58,11 +58,11 @@ async function init() {
 
     if(domain === "ytm")
       precacheImages(precacheImgs)
-        .then(() => log(`Pre-cached ${precacheImgs.length} images`))
+        .then(() => log(`Pre-cached ${precacheImgs.length} ${autoPlural("image", precacheImgs)}`))
         .catch((e) => error(`Pre-caching error: ${e}`));
   }
   catch(err) {
-    console.error(`${scriptInfo.name} - General Error:`, err);
+    error("General Error:", err);
   }
 
   try {

+ 2 - 2
src/utils.ts

@@ -343,8 +343,8 @@ export function getAssetUrl(path: string) {
  * @param word A word in singular form, to auto-convert to plural
  * @param num If this is an array, the amount of items is used
  */
-export function autoPlural(word: string, num: number | unknown[]) {
-  if(Array.isArray(num))
+export function autoPlural(word: string, num: number | unknown[] | NodeList) {
+  if(Array.isArray(num) || num instanceof NodeList)
     num = num.length;
   return `${word}${num === 1 ? "" : "s"}`;
 }