Merge pull request #2 from maro114510/fix/selected-sections

fix: Apply already selected section

Author: maro114510

.editorconfig

@@ -7,3 +7,7 @@ charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[*.{js,css,json}]
+indent_style = space
+indent_size = 2

content.js

@@ -1,6 +1,10 @@
 const api = typeof browser !== "undefined" ? browser : chrome;
 const usesPromises = typeof browser !== "undefined";
 
+// =============================================================================
+// Constants
+// =============================================================================
+
 // Feedly Read Later pages can vary by user id and legacy paths.
 const READ_LATER_PATTERNS = [
   /https:\/\/feedly\.com\/i\/board\/content\/user\/[^/]+\/tag\/global\.saved/i,
@@ -25,6 +29,10 @@ const READ_LATER_SELECTORS = [
 ];
 const READ_LATER_LABELS = ["read later", "後で読む", "あとで読む"];
 
+// =============================================================================
+// Utility Functions
+// =============================================================================
+
 function delay(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -95,68 +103,41 @@ function toOpenableUrl(href) {
   return url.toString();
 }
 
-async function getSavedEntriesWithUrls(settings) {
-  const entries = getEntryElements();
-  const seen = new Set();
-  const results = [];
-  const limit =
-    settings.mode === "count" ? Math.max(settings.count || 1, 1) : Infinity;
+// =============================================================================
+// Save State Detection
+// =============================================================================
 
-  for (const entry of entries) {
-    if (results.length >= limit) {
-      break;
-    }
-    const url = getEntryLink(entry);
-    if (!url || seen.has(url)) {
-      continue;
-    }
-
-    entry.scrollIntoView({ block: "center", inline: "center" });
-    await revealToolbar(entry);
-    const button = findUnsaveButton(entry);
-    if (!button) {
-      continue;
-    }
-
-    seen.add(url);
-    results.push({ entry, url, button });
+function hasAccentClass(element) {
+  const classAttr = element.getAttribute("class") || "";
+  if (classAttr.includes("color--accent")) {
+    return true;
   }
-
-  return results;
-}
-
-function findUnsaveButton(entry) {
-  // Prefer toolbar bookmark icon when available (hover-only in Feedly UI).
-  const toolbarButtons = entry.querySelectorAll(TOOLBAR_BUTTON_SELECTOR);
-  for (const button of toolbarButtons) {
-    if (isSavedButton(button)) {
-      return button;
+  if (element.classList) {
+    for (const className of element.classList) {
+      if (className.startsWith("color--accent")) {
+        return true;
+      }
     }
   }
+  return false;
+}
 
-  // Primary path: explicit Read Later button in metadata row.
-  const explicit = entry.querySelector(READ_LATER_SELECTORS.join(","));
-  if (explicit) {
-    const button = explicit.closest("a,button") || explicit;
-    return isSavedButton(button) ? button : null;
+function hasSecondaryClass(element) {
+  const classAttr = element.getAttribute("class") || "";
+  if (classAttr.includes("color--secondary")) {
+    return true;
   }
-
-  // Fallback: look for buttons that contain the Read Later label.
-  const candidates = entry.querySelectorAll("a[role='button'], button");
-  for (const candidate of candidates) {
-    if (!containsReadLaterText(candidate)) {
-      continue;
-    }
-    if (isSavedButton(candidate)) {
-      return candidate;
+  if (element.classList) {
+    for (const className of element.classList) {
+      if (className.startsWith("color--secondary")) {
+        return true;
+      }
     }
   }
-
-  return null;
+  return false;
 }
 
 function isSavedButton(button) {
-  // Be conservative: only click when we can confirm "saved" state to avoid re-saving.
   const svg = button.querySelector("svg");
   if (svg && hasSecondaryClass(svg)) {
     return false;
@@ -186,39 +167,109 @@ function containsReadLaterText(element) {
   return READ_LATER_LABELS.some((label) => text.includes(label));
 }
 
-function hasAccentClass(element) {
-  const classAttr = element.getAttribute("class") || "";
-  if (classAttr.includes("color--accent")) {
-    return true;
+/**
+ * Quick pre-check if entry appears to be saved (before DOM operations).
+ * Returns true if saved, false if not saved, null if cannot determine.
+ */
+function quickCheckSaved(entry) {
+  const toolbarButton = entry.querySelector(TOOLBAR_BUTTON_SELECTOR);
+  if (toolbarButton) {
+    const svg = toolbarButton.querySelector("svg");
+    if (hasSecondaryClass(toolbarButton) || (svg && hasSecondaryClass(svg))) {
+      return false;
+    }
+    if (hasAccentClass(toolbarButton) || (svg && hasAccentClass(svg))) {
+      return true;
+    }
   }
-  if (element.classList) {
-    for (const className of element.classList) {
-      if (className.startsWith("color--accent")) {
-        return true;
-      }
+
+  const metaButton = entry.querySelector(READ_LATER_SELECTORS.join(","));
+  if (metaButton) {
+    const btn = metaButton.closest("a,button") || metaButton;
+    const svg = btn.querySelector("svg");
+    if (hasSecondaryClass(btn) || (svg && hasSecondaryClass(svg))) {
+      return false;
+    }
+    if (hasAccentClass(btn) || (svg && hasAccentClass(svg))) {
+      return true;
     }
   }
-  return false;
+
+  return null;
 }
 
-function hasSecondaryClass(element) {
-  const classAttr = element.getAttribute("class") || "";
-  if (classAttr.includes("color--secondary")) {
-    return true;
+// =============================================================================
+// Button Detection
+// =============================================================================
+
+function findUnsaveButton(entry) {
+  const toolbarButtons = entry.querySelectorAll(TOOLBAR_BUTTON_SELECTOR);
+  for (const button of toolbarButtons) {
+    if (isSavedButton(button)) {
+      return button;
+    }
   }
-  if (element.classList) {
-    for (const className of element.classList) {
-      if (className.startsWith("color--secondary")) {
-        return true;
-      }
+
+  const explicit = entry.querySelector(READ_LATER_SELECTORS.join(","));
+  if (explicit) {
+    const button = explicit.closest("a,button") || explicit;
+    return isSavedButton(button) ? button : null;
+  }
+
+  const candidates = entry.querySelectorAll("a[role='button'], button");
+  for (const candidate of candidates) {
+    if (!containsReadLaterText(candidate)) {
+      continue;
+    }
+    if (isSavedButton(candidate)) {
+      return candidate;
     }
   }
-  return false;
+
+  return null;
+}
+
+// =============================================================================
+// Entry Processing
+// =============================================================================
+
+async function getSavedEntriesWithUrls(settings) {
+  const entries = getEntryElements();
+  const seen = new Set();
+  const results = [];
+  const limit =
+    settings.mode === "count" ? Math.max(settings.count || 1, 1) : Infinity;
+
+  for (const entry of entries) {
+    if (results.length >= limit) {
+      break;
+    }
+    const url = getEntryLink(entry);
+    if (!url || seen.has(url)) {
+      continue;
+    }
+
+    // Pre-check: skip entries that appear unsaved (before DOM operations)
+    if (quickCheckSaved(entry) === false) {
+      continue;
+    }
+
+    entry.scrollIntoView({ block: "center", inline: "center" });
+    await revealToolbar(entry);
+    const button = findUnsaveButton(entry);
+    if (!button) {
+      continue;
+    }
+
+    seen.add(url);
+    results.push({ entry, url, button });
+  }
+
+  return results;
 }
 
 async function unsaveEntry(entry, knownButton) {
   entry.scrollIntoView({ block: "center", inline: "center" });
-  // Feedly reveals toolbar actions on hover. Simulate hover first.
   await revealToolbar(entry);
   await delay(120);
   const button = knownButton || findUnsaveButton(entry);
@@ -251,6 +302,10 @@ async function revealToolbar(entry) {
   await delay(120);
 }
 
+// =============================================================================
+// Event Dispatching
+// =============================================================================
+
 function clickElement(element) {
   element.scrollIntoView({ block: "center", inline: "center" });
 
@@ -292,6 +347,10 @@ function activateAsButton(element) {
   element.click();
 }
 
+// =============================================================================
+// Infinite Scroll Loading
+// =============================================================================
+
 async function loadAllEntries({ maxRounds, idleThreshold }) {
   let idleRounds = 0;
   let lastCount = getEntryElements().length;
@@ -340,6 +399,10 @@ function findScrollContainer(startNode) {
   return document.scrollingElement || document.documentElement || document.body;
 }
 
+// =============================================================================
+// Main Handler
+// =============================================================================
+
 async function handleOpen(settings) {
   if (!(await waitForReadLaterPage(2000))) {
     return { ok: false, error: "This tab is not a Feedly Read Later page." };
@@ -405,6 +468,10 @@ function isRecentlyReadLater() {
   return location.origin === "https://feedly.com" && lastReadLaterUrl.length > 0;
 }
 
+// =============================================================================
+// Message Listener
+// =============================================================================
+
 if (!window.__feedlyReadLaterOpenerListenerAdded) {
   window.__feedlyReadLaterOpenerListenerAdded = true;
   api.runtime.onMessage.addListener((message, sender, sendResponse) => {

manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Feedly Read Later Opener",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Open Feedly Read Later items in background tabs and unsave them.",
   "icons": {
     "16": "icons/icon-16.png",
@@ -19,12 +19,22 @@
     "default_popup": "popup.html",
     "default_title": "Feedly Read Later Opener"
   },
-  "permissions": ["storage", "tabs", "scripting"],
-  "host_permissions": ["https://feedly.com/*"],
+  "permissions": [
+    "storage",
+    "tabs",
+    "scripting"
+  ],
+  "host_permissions": [
+    "https://feedly.com/*"
+  ],
   "web_accessible_resources": [
     {
-      "resources": ["content.js"],
-      "matches": ["https://feedly.com/*"]
+      "resources": [
+        "content.js"
+      ],
+      "matches": [
+        "https://feedly.com/*"
+      ]
     }
   ],
   "content_scripts": [
@@ -33,7 +43,9 @@
         "https://feedly.com/i/board/content/user/*/tag/global.saved*",
         "https://feedly.com/i/read-later*"
       ],
-      "js": ["content.js"]
+      "js": [
+        "content.js"
+      ]
     }
   ]
 }