fix: deduplicate feeds within one OPML import

Lukas Geiger · Lukas Geiger · commit 5407539cc5a0 · 2026-05-28T11:27:01.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - Booting the service worker now refreshes stored alarm diagnostics even before `onStartup` or manual settings changes run.
 - Fixed alarm updates for manual-only feeds when global interval is disabled but other feeds define per-feed intervals.
 - Fixed RSS and Atom text parsing so CDATA wrappers are removed from feed titles, item titles, links, and Atom dates.
+- Fixed OPML imports so duplicate feed URLs inside the same file are only imported once.
 - Fixed RSS 1.0/RDF parsing so item blocks outside the channel block are no longer ignored.
 - Normalized the German locale file to real UTF-8 Umlaute instead of escaped code points.
 
diff --git a/tests/options-export-ui.test.mjs b/tests/options-export-ui.test.mjs
@@ -10,6 +10,7 @@ afterEach(() => {
   delete globalThis.chrome;
   delete globalThis.document;
   delete globalThis.window;
+  delete globalThis.crypto;
 });
 
 class FakeElement {
@@ -76,6 +77,11 @@ class FakeElement {
 
 function installOptionsPage({ feeds, lifecycle } = {}) {
   const elements = new Map();
+  const store = {
+    feeds: structuredClone(feeds || {}),
+    lifecycle: structuredClone(lifecycle || {}),
+    settings: {}
+  };
   for (const id of [
     "updateOnStartup",
     "globalInterval",
@@ -119,19 +125,21 @@ function installOptionsPage({ feeds, lifecycle } = {}) {
     i18n: {
       getMessage(key, substitutions = []) {
         if (key === "optionsExported") return `exported:${substitutions[0]}`;
+        if (key === "optionsOPMLImported") return `imported:${substitutions[0]}`;
         if (key === "popupError") return `error:${substitutions[0]}`;
         return key;
       }
     },
     storage: {
       local: {
         async get(keys) {
-          return Object.fromEntries(keys.map((key) => [
-            key,
-            key === "feeds" ? feeds : key === "lifecycle" ? lifecycle : undefined
-          ]));
+          return Object.fromEntries(keys.map((key) => [key, structuredClone(store[key])]));
         },
-        async set() {}
+        async set(patch) {
+          for (const [key, value] of Object.entries(patch)) {
+            store[key] = structuredClone(value);
+          }
+        }
       }
     },
     bookmarks: {
@@ -171,7 +179,16 @@ function installOptionsPage({ feeds, lifecycle } = {}) {
     }
   };
 
-  return { elements, writes };
+  Object.defineProperty(globalThis, "crypto", {
+    configurable: true,
+    value: {
+      randomUUID() {
+        return `feed-${Object.keys(store.feeds).length + 1}`;
+      }
+    }
+  });
+
+  return { elements, writes, store };
 }
 
 test("options page exposes folder export button", () => {
@@ -205,6 +222,30 @@ test("options folder export button writes bookmark .url files and shows count",
   assert.equal(elements.get("feedStatus").textContent, "exported:1");
 });
 
+test("OPML import ignores duplicate feed URLs within the same file", async () => {
+  const { elements, store } = installOptionsPage({ feeds: {} });
+  const opmlFile = {
+    async text() {
+      return `<?xml version="1.0" encoding="UTF-8"?>
+<opml version="2.0">
+  <body>
+    <outline text="Alpha" xmlUrl="https://example.test/feed.xml" />
+    <outline text="Alpha Duplicate" xmlUrl="https://example.test/feed.xml" />
+  </body>
+</opml>`;
+    }
+  };
+
+  await import(`../ui/options.js?options-opml=${Date.now()}`);
+
+  const input = elements.get("opmlFileInput");
+  await input.listeners.change({ target: { files: [opmlFile], value: "picked.opml" } });
+
+  assert.equal(Object.keys(store.feeds).length, 1);
+  assert.equal(store.feeds["feed-1"]?.url, "https://example.test/feed.xml");
+  assert.equal(elements.get("feedStatus").textContent, "imported:1");
+});
+
 test("options page renders lifecycle diagnostics from storage", async () => {
   const { elements } = installOptionsPage({
     feeds: {},
diff --git a/ui/options.js b/ui/options.js
@@ -122,6 +122,7 @@ document.getElementById("opmlFileInput").addEventListener("change", async (e) =>
         lastError: "",
         seen: {}
       });
+      existingUrls.add(item.url);
       imported++;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,7 @@ document.getElementById("opmlFileInput").addEventListener("change", async (e) =>`
`122`	`122`	`lastError: "",`
`123`	`123`	`seen: {}`
`124`	`124`	`});`
	`125`	`+ existingUrls.add(item.url);`
`125`	`126`	`imported++;`
`126`	`127`	`}`
`127`	`128`