From c5e0a376ec8942eb1fcb1726c7e3bf074e893b21 Mon Sep 17 00:00:00 2001
From: cybercode3 <4132889+cybercode3@users.noreply.github.com>
Date: Tue, 28 Oct 2025 16:08:40 -0500
Subject: [PATCH 1/8] Add option to empty trash on close

---
 src/options.html                         |  5 +++++
 src/scripts/app/app.js                   | 14 ++++++++++++++
 src/scripts/bgprocess/models/Settings.js |  1 +
 3 files changed, 20 insertions(+)

diff --git a/src/options.html b/src/options.html
index a97c04a6..a78d1297 100644
--- a/src/options.html
+++ b/src/options.html
@@ -415,6 +415,11 @@ <h1>Smart RSS</h1>
         </select>
       </label>
 
+      <label class="web-content-select-label">
+        <span class="selectLabel">Empty trash when closing Smart RSS:</span>
+        <input id="emptyTrashOnClose" type="checkbox" />
+      </label>
+
 
       <label class="web-content-select-label" id="queries" title="Comma separated list, case insensitive, start with : to search in contents too">
         <span class="selectLabel">Auto pin articles matching:</span>
diff --git a/src/scripts/app/app.js b/src/scripts/app/app.js
index 06e9d896..539183e2 100644
--- a/src/scripts/app/app.js
+++ b/src/scripts/app/app.js
@@ -31,6 +31,20 @@ define([
 
     browser.runtime.onMessage.addListener(onMessage);
 
+    window.addEventListener("beforeunload", () => {
+        if (!bg || !bg.items) {
+            return;
+        }
+        if (!bg.getBoolean("emptyTrashOnClose")) {
+            return;
+        }
+        bg.items
+            .where({ trashed: true, deleted: false })
+            .forEach((item) => {
+                item.markAsDeleted();
+            });
+    });
+
     function changeUserStyle() {
         const userStyle = bg.settings.get("userStyle");
         document.querySelector("[data-custom-style]").textContent = userStyle;
diff --git a/src/scripts/bgprocess/models/Settings.js b/src/scripts/bgprocess/models/Settings.js
index 4aa2b96f..b782a6d5 100644
--- a/src/scripts/bgprocess/models/Settings.js
+++ b/src/scripts/bgprocess/models/Settings.js
@@ -66,6 +66,7 @@ define(['backbone', 'preps/indexeddb'], function (BB) {
             autoremove: false,
             autoremovesetting: 'KEEP_UNREAD',
             autoremovetrash: 0,
+            emptyTrashOnClose: false,
             openNewTab: 'background',
             userStyle: '',
             defaultStyle: ':root {\n' +

From dc641c4cb7c86e3c2dfa446e74301578e500fb32 Mon Sep 17 00:00:00 2001
From: cybercode3 <4132889+cybercode3@users.noreply.github.com>
Date: Tue, 25 Nov 2025 14:07:34 -0600
Subject: [PATCH 2/8] Improve legacy imports for settings and OPML

---
 src/scripts/app/options.js | 77 ++++++++++++++++++++++++++++++--------
 1 file changed, 62 insertions(+), 15 deletions(-)

diff --git a/src/scripts/app/options.js b/src/scripts/app/options.js
index 2f50b23f..d492688e 100644
--- a/src/scripts/app/options.js
+++ b/src/scripts/app/options.js
@@ -38,6 +38,15 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
         );
     }
 
+    function getXmlUrl(outline) {
+        return (
+            outline.getAttribute("xmlUrl") ||
+            outline.getAttribute("xmlurl") ||
+            outline.getAttribute("url") ||
+            ""
+        );
+    }
+
     JSON.safeParse = function (str) {
         try {
             return JSON.parse(str);
@@ -572,6 +581,22 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
         }, 20);
     }
 
+    function normalizeLegacySettings(data) {
+        if (!data) {
+            return data;
+        }
+
+        if (!data.settings && data.preferences) {
+            data.settings = data.preferences;
+        }
+
+        if (!data.settings && data.options) {
+            data.settings = data.options;
+        }
+
+        return data;
+    }
+
     function handleImportSettings(event) {
         const settingsImportStatus =
             document.querySelector("#settings-imported");
@@ -584,7 +609,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
 
         const reader = new FileReader();
         reader.onload = function () {
-            const data = JSON.safeParse(this.result);
+            const data = normalizeLegacySettings(JSON.safeParse(this.result));
 
             if (!data || !data.settings) {
                 settingsImportStatus.textContent = "Wrong file";
@@ -634,6 +659,24 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
         }
     }
 
+    function normalizeLegacySmart(data) {
+        if (!data) {
+            return data;
+        }
+
+        if (!data.items && data.articles) {
+            data.items = data.articles;
+        }
+        if (!data.sources && data.feeds) {
+            data.sources = data.feeds;
+        }
+        if (!data.folders && data.groups) {
+            data.folders = data.groups;
+        }
+
+        return data;
+    }
+
     function handleImportSmart(event) {
         const smartImportStatus = document.querySelector("#smart-imported");
         const file = event.target.files[0];
@@ -645,7 +688,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
 
         const reader = new FileReader();
         reader.onload = function () {
-            const data = JSON.safeParse(this.result);
+            const data = normalizeLegacySmart(JSON.safeParse(this.result));
 
             if (!data || !data.items || !data.sources) {
                 smartImportStatus.textContent = "Wrong file";
@@ -720,7 +763,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
 
             [...feeds].forEach((feed) => {
                 if (!feed.hasAttribute("xmlUrl")) {
-                    const subFeeds = feed.querySelectorAll("outline[xmlUrl]");
+                    const subFeeds = feed.querySelectorAll("outline[xmlUrl], outline[xmlurl], outline[url]");
                     const folderTitle = decodeHTML(
                         feed.getAttribute("title") || feed.getAttribute("text")
                     );
@@ -740,11 +783,13 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
                     const folderId = folder.get("id");
 
                     [...subFeeds].forEach((subFeed) => {
-                        if (
-                            bg.sources.findWhere({
-                                url: decodeHTML(subFeed.getAttribute("xmlUrl")),
-                            })
-                        ) {
+                        const xmlUrl = decodeHTML(getXmlUrl(subFeed));
+
+                        if (!xmlUrl) {
+                            return;
+                        }
+
+                        if (bg.sources.findWhere({ url: xmlUrl })) {
                             return;
                         }
                         bg.sources.create(
@@ -753,7 +798,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
                                     subFeed.getAttribute("title") ||
                                         subFeed.getAttribute("text")
                                 ),
-                                url: decodeHTML(subFeed.getAttribute("xmlUrl")),
+                                url: xmlUrl,
                                 updateEvery: -1,
                                 folderID: folderId,
                             },
@@ -761,11 +806,13 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
                         );
                     });
                 } else {
-                    if (
-                        bg.sources.findWhere({
-                            url: decodeHTML(feed.getAttribute("xmlUrl")),
-                        })
-                    ) {
+                    const xmlUrl = decodeHTML(getXmlUrl(feed));
+
+                    if (!xmlUrl) {
+                        return;
+                    }
+
+                    if (bg.sources.findWhere({ url: xmlUrl })) {
                         return;
                     }
                     bg.sources.create(
@@ -774,7 +821,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
                                 feed.getAttribute("title") ||
                                     feed.getAttribute("text")
                             ),
-                            url: decodeHTML(feed.getAttribute("xmlUrl")),
+                            url: xmlUrl,
                             updateEvery: -1,
                         },
                         { wait: true }

From 1fec5dda7cbfea67df65d4c363b720791b9f09c4 Mon Sep 17 00:00:00 2001
From: cybercode3 <4132889+cybercode3@users.noreply.github.com>
Date: Tue, 25 Nov 2025 16:50:55 -0600
Subject: [PATCH 3/8] Fix legacy settings import completion

---
 src/scripts/app/options.js    | 77 ++++++++++++++++++++++++++++-------
 src/scripts/options/worker.js |  6 +--
 2 files changed, 65 insertions(+), 18 deletions(-)

diff --git a/src/scripts/app/options.js b/src/scripts/app/options.js
index 2f50b23f..d492688e 100644
--- a/src/scripts/app/options.js
+++ b/src/scripts/app/options.js
@@ -38,6 +38,15 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
         );
     }
 
+    function getXmlUrl(outline) {
+        return (
+            outline.getAttribute("xmlUrl") ||
+            outline.getAttribute("xmlurl") ||
+            outline.getAttribute("url") ||
+            ""
+        );
+    }
+
     JSON.safeParse = function (str) {
         try {
             return JSON.parse(str);
@@ -572,6 +581,22 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
         }, 20);
     }
 
+    function normalizeLegacySettings(data) {
+        if (!data) {
+            return data;
+        }
+
+        if (!data.settings && data.preferences) {
+            data.settings = data.preferences;
+        }
+
+        if (!data.settings && data.options) {
+            data.settings = data.options;
+        }
+
+        return data;
+    }
+
     function handleImportSettings(event) {
         const settingsImportStatus =
             document.querySelector("#settings-imported");
@@ -584,7 +609,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
 
         const reader = new FileReader();
         reader.onload = function () {
-            const data = JSON.safeParse(this.result);
+            const data = normalizeLegacySettings(JSON.safeParse(this.result));
 
             if (!data || !data.settings) {
                 settingsImportStatus.textContent = "Wrong file";
@@ -634,6 +659,24 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
         }
     }
 
+    function normalizeLegacySmart(data) {
+        if (!data) {
+            return data;
+        }
+
+        if (!data.items && data.articles) {
+            data.items = data.articles;
+        }
+        if (!data.sources && data.feeds) {
+            data.sources = data.feeds;
+        }
+        if (!data.folders && data.groups) {
+            data.folders = data.groups;
+        }
+
+        return data;
+    }
+
     function handleImportSmart(event) {
         const smartImportStatus = document.querySelector("#smart-imported");
         const file = event.target.files[0];
@@ -645,7 +688,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
 
         const reader = new FileReader();
         reader.onload = function () {
-            const data = JSON.safeParse(this.result);
+            const data = normalizeLegacySmart(JSON.safeParse(this.result));
 
             if (!data || !data.items || !data.sources) {
                 smartImportStatus.textContent = "Wrong file";
@@ -720,7 +763,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
 
             [...feeds].forEach((feed) => {
                 if (!feed.hasAttribute("xmlUrl")) {
-                    const subFeeds = feed.querySelectorAll("outline[xmlUrl]");
+                    const subFeeds = feed.querySelectorAll("outline[xmlUrl], outline[xmlurl], outline[url]");
                     const folderTitle = decodeHTML(
                         feed.getAttribute("title") || feed.getAttribute("text")
                     );
@@ -740,11 +783,13 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
                     const folderId = folder.get("id");
 
                     [...subFeeds].forEach((subFeed) => {
-                        if (
-                            bg.sources.findWhere({
-                                url: decodeHTML(subFeed.getAttribute("xmlUrl")),
-                            })
-                        ) {
+                        const xmlUrl = decodeHTML(getXmlUrl(subFeed));
+
+                        if (!xmlUrl) {
+                            return;
+                        }
+
+                        if (bg.sources.findWhere({ url: xmlUrl })) {
                             return;
                         }
                         bg.sources.create(
@@ -753,7 +798,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
                                     subFeed.getAttribute("title") ||
                                         subFeed.getAttribute("text")
                                 ),
-                                url: decodeHTML(subFeed.getAttribute("xmlUrl")),
+                                url: xmlUrl,
                                 updateEvery: -1,
                                 folderID: folderId,
                             },
@@ -761,11 +806,13 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
                         );
                     });
                 } else {
-                    if (
-                        bg.sources.findWhere({
-                            url: decodeHTML(feed.getAttribute("xmlUrl")),
-                        })
-                    ) {
+                    const xmlUrl = decodeHTML(getXmlUrl(feed));
+
+                    if (!xmlUrl) {
+                        return;
+                    }
+
+                    if (bg.sources.findWhere({ url: xmlUrl })) {
                         return;
                     }
                     bg.sources.create(
@@ -774,7 +821,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
                                 feed.getAttribute("title") ||
                                     feed.getAttribute("text")
                             ),
-                            url: decodeHTML(feed.getAttribute("xmlUrl")),
+                            url: xmlUrl,
                             updateEvery: -1,
                         },
                         { wait: true }
diff --git a/src/scripts/options/worker.js b/src/scripts/options/worker.js
index c9a789b7..bd0313cd 100644
--- a/src/scripts/options/worker.js
+++ b/src/scripts/options/worker.js
@@ -31,12 +31,12 @@ onmessage = function (e) {
 
 let writes = 0;
 
-function handleReq(req) {
+function handleReq(req, finishedAction = "finished") {
     writes++;
     req.onsuccess = req.onerror = function () {
         writes--;
         if (writes <= 0) {
-            postMessage({ action: "finished" });
+            postMessage({ action: finishedAction });
         }
     };
 }
@@ -49,7 +49,7 @@ function startSettingsImport() {
     if (importedSettings) {
         settings.clear();
         for (let i = 0, j = importedSettings.length; i < j; i++) {
-            handleReq(settings.add(importedSettings[i]));
+            handleReq(settings.add(importedSettings[i]), "finished-settings");
             if (i % 10 === 0) {
                 postMessage({
                     action: "message-settings",

From 1e9c80b83e518e7bf16c3f4d8d5e98ffc8601a7a Mon Sep 17 00:00:00 2001
From: cybercode3 <4132889+cybercode3@users.noreply.github.com>
Date: Tue, 25 Nov 2025 16:58:53 -0600
Subject: [PATCH 4/8] Fix settings import routing

---
 src/scripts/app/options.js    | 77 ++++++++++++++++++++++++++++-------
 src/scripts/options/worker.js | 15 +++++--
 2 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/src/scripts/app/options.js b/src/scripts/app/options.js
index 2f50b23f..d492688e 100644
--- a/src/scripts/app/options.js
+++ b/src/scripts/app/options.js
@@ -38,6 +38,15 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
         );
     }
 
+    function getXmlUrl(outline) {
+        return (
+            outline.getAttribute("xmlUrl") ||
+            outline.getAttribute("xmlurl") ||
+            outline.getAttribute("url") ||
+            ""
+        );
+    }
+
     JSON.safeParse = function (str) {
         try {
             return JSON.parse(str);
@@ -572,6 +581,22 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
         }, 20);
     }
 
+    function normalizeLegacySettings(data) {
+        if (!data) {
+            return data;
+        }
+
+        if (!data.settings && data.preferences) {
+            data.settings = data.preferences;
+        }
+
+        if (!data.settings && data.options) {
+            data.settings = data.options;
+        }
+
+        return data;
+    }
+
     function handleImportSettings(event) {
         const settingsImportStatus =
             document.querySelector("#settings-imported");
@@ -584,7 +609,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
 
         const reader = new FileReader();
         reader.onload = function () {
-            const data = JSON.safeParse(this.result);
+            const data = normalizeLegacySettings(JSON.safeParse(this.result));
 
             if (!data || !data.settings) {
                 settingsImportStatus.textContent = "Wrong file";
@@ -634,6 +659,24 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
         }
     }
 
+    function normalizeLegacySmart(data) {
+        if (!data) {
+            return data;
+        }
+
+        if (!data.items && data.articles) {
+            data.items = data.articles;
+        }
+        if (!data.sources && data.feeds) {
+            data.sources = data.feeds;
+        }
+        if (!data.folders && data.groups) {
+            data.folders = data.groups;
+        }
+
+        return data;
+    }
+
     function handleImportSmart(event) {
         const smartImportStatus = document.querySelector("#smart-imported");
         const file = event.target.files[0];
@@ -645,7 +688,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
 
         const reader = new FileReader();
         reader.onload = function () {
-            const data = JSON.safeParse(this.result);
+            const data = normalizeLegacySmart(JSON.safeParse(this.result));
 
             if (!data || !data.items || !data.sources) {
                 smartImportStatus.textContent = "Wrong file";
@@ -720,7 +763,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
 
             [...feeds].forEach((feed) => {
                 if (!feed.hasAttribute("xmlUrl")) {
-                    const subFeeds = feed.querySelectorAll("outline[xmlUrl]");
+                    const subFeeds = feed.querySelectorAll("outline[xmlUrl], outline[xmlurl], outline[url]");
                     const folderTitle = decodeHTML(
                         feed.getAttribute("title") || feed.getAttribute("text")
                     );
@@ -740,11 +783,13 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
                     const folderId = folder.get("id");
 
                     [...subFeeds].forEach((subFeed) => {
-                        if (
-                            bg.sources.findWhere({
-                                url: decodeHTML(subFeed.getAttribute("xmlUrl")),
-                            })
-                        ) {
+                        const xmlUrl = decodeHTML(getXmlUrl(subFeed));
+
+                        if (!xmlUrl) {
+                            return;
+                        }
+
+                        if (bg.sources.findWhere({ url: xmlUrl })) {
                             return;
                         }
                         bg.sources.create(
@@ -753,7 +798,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
                                     subFeed.getAttribute("title") ||
                                         subFeed.getAttribute("text")
                                 ),
-                                url: decodeHTML(subFeed.getAttribute("xmlUrl")),
+                                url: xmlUrl,
                                 updateEvery: -1,
                                 folderID: folderId,
                             },
@@ -761,11 +806,13 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
                         );
                     });
                 } else {
-                    if (
-                        bg.sources.findWhere({
-                            url: decodeHTML(feed.getAttribute("xmlUrl")),
-                        })
-                    ) {
+                    const xmlUrl = decodeHTML(getXmlUrl(feed));
+
+                    if (!xmlUrl) {
+                        return;
+                    }
+
+                    if (bg.sources.findWhere({ url: xmlUrl })) {
                         return;
                     }
                     bg.sources.create(
@@ -774,7 +821,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
                                 feed.getAttribute("title") ||
                                     feed.getAttribute("text")
                             ),
-                            url: decodeHTML(feed.getAttribute("xmlUrl")),
+                            url: xmlUrl,
                             updateEvery: -1,
                         },
                         { wait: true }
diff --git a/src/scripts/options/worker.js b/src/scripts/options/worker.js
index c9a789b7..6411d752 100644
--- a/src/scripts/options/worker.js
+++ b/src/scripts/options/worker.js
@@ -2,6 +2,7 @@ const request = indexedDB.open("backbone-indexeddb", 4);
 
 let db;
 let content;
+let importAction;
 
 request.addEventListener("error", function () {
     throw "Error code: " + this.errorCode;
@@ -10,19 +11,25 @@ request.addEventListener("error", function () {
 request.addEventListener("success", function () {
     db = this.result;
     if (content) {
-        startImport();
+        if (importAction === "settings") {
+            startSettingsImport();
+        } else {
+            startImport();
+        }
     }
 });
 
 onmessage = function (e) {
     if (e.data.action === "file-content") {
         content = e.data.value;
+        importAction = "file-content";
         if (db) {
             startImport();
         }
     }
     if (e.data.action === "settings") {
         content = e.data.value;
+        importAction = "settings";
         if (db) {
             startSettingsImport();
         }
@@ -31,12 +38,12 @@ onmessage = function (e) {
 
 let writes = 0;
 
-function handleReq(req) {
+function handleReq(req, finishedAction = "finished") {
     writes++;
     req.onsuccess = req.onerror = function () {
         writes--;
         if (writes <= 0) {
-            postMessage({ action: "finished" });
+            postMessage({ action: finishedAction });
         }
     };
 }
@@ -49,7 +56,7 @@ function startSettingsImport() {
     if (importedSettings) {
         settings.clear();
         for (let i = 0, j = importedSettings.length; i < j; i++) {
-            handleReq(settings.add(importedSettings[i]));
+            handleReq(settings.add(importedSettings[i]), "finished-settings");
             if (i % 10 === 0) {
                 postMessage({
                     action: "message-settings",

From f07098388f71926df8812930893359e28738cd6e Mon Sep 17 00:00:00 2001
From: cybercode3 <4132889+cybercode3@users.noreply.github.com>
Date: Tue, 25 Nov 2025 17:06:26 -0600
Subject: [PATCH 5/8] Handle legacy single-record settings imports

---
 src/scripts/app/options.js    | 77 ++++++++++++++++++++++++++++-------
 src/scripts/options/worker.js | 27 +++++++++---
 2 files changed, 84 insertions(+), 20 deletions(-)

diff --git a/src/scripts/app/options.js b/src/scripts/app/options.js
index 2f50b23f..d492688e 100644
--- a/src/scripts/app/options.js
+++ b/src/scripts/app/options.js
@@ -38,6 +38,15 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
         );
     }
 
+    function getXmlUrl(outline) {
+        return (
+            outline.getAttribute("xmlUrl") ||
+            outline.getAttribute("xmlurl") ||
+            outline.getAttribute("url") ||
+            ""
+        );
+    }
+
     JSON.safeParse = function (str) {
         try {
             return JSON.parse(str);
@@ -572,6 +581,22 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
         }, 20);
     }
 
+    function normalizeLegacySettings(data) {
+        if (!data) {
+            return data;
+        }
+
+        if (!data.settings && data.preferences) {
+            data.settings = data.preferences;
+        }
+
+        if (!data.settings && data.options) {
+            data.settings = data.options;
+        }
+
+        return data;
+    }
+
     function handleImportSettings(event) {
         const settingsImportStatus =
             document.querySelector("#settings-imported");
@@ -584,7 +609,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
 
         const reader = new FileReader();
         reader.onload = function () {
-            const data = JSON.safeParse(this.result);
+            const data = normalizeLegacySettings(JSON.safeParse(this.result));
 
             if (!data || !data.settings) {
                 settingsImportStatus.textContent = "Wrong file";
@@ -634,6 +659,24 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
         }
     }
 
+    function normalizeLegacySmart(data) {
+        if (!data) {
+            return data;
+        }
+
+        if (!data.items && data.articles) {
+            data.items = data.articles;
+        }
+        if (!data.sources && data.feeds) {
+            data.sources = data.feeds;
+        }
+        if (!data.folders && data.groups) {
+            data.folders = data.groups;
+        }
+
+        return data;
+    }
+
     function handleImportSmart(event) {
         const smartImportStatus = document.querySelector("#smart-imported");
         const file = event.target.files[0];
@@ -645,7 +688,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
 
         const reader = new FileReader();
         reader.onload = function () {
-            const data = JSON.safeParse(this.result);
+            const data = normalizeLegacySmart(JSON.safeParse(this.result));
 
             if (!data || !data.items || !data.sources) {
                 smartImportStatus.textContent = "Wrong file";
@@ -720,7 +763,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
 
             [...feeds].forEach((feed) => {
                 if (!feed.hasAttribute("xmlUrl")) {
-                    const subFeeds = feed.querySelectorAll("outline[xmlUrl]");
+                    const subFeeds = feed.querySelectorAll("outline[xmlUrl], outline[xmlurl], outline[url]");
                     const folderTitle = decodeHTML(
                         feed.getAttribute("title") || feed.getAttribute("text")
                     );
@@ -740,11 +783,13 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
                     const folderId = folder.get("id");
 
                     [...subFeeds].forEach((subFeed) => {
-                        if (
-                            bg.sources.findWhere({
-                                url: decodeHTML(subFeed.getAttribute("xmlUrl")),
-                            })
-                        ) {
+                        const xmlUrl = decodeHTML(getXmlUrl(subFeed));
+
+                        if (!xmlUrl) {
+                            return;
+                        }
+
+                        if (bg.sources.findWhere({ url: xmlUrl })) {
                             return;
                         }
                         bg.sources.create(
@@ -753,7 +798,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
                                     subFeed.getAttribute("title") ||
                                         subFeed.getAttribute("text")
                                 ),
-                                url: decodeHTML(subFeed.getAttribute("xmlUrl")),
+                                url: xmlUrl,
                                 updateEvery: -1,
                                 folderID: folderId,
                             },
@@ -761,11 +806,13 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
                         );
                     });
                 } else {
-                    if (
-                        bg.sources.findWhere({
-                            url: decodeHTML(feed.getAttribute("xmlUrl")),
-                        })
-                    ) {
+                    const xmlUrl = decodeHTML(getXmlUrl(feed));
+
+                    if (!xmlUrl) {
+                        return;
+                    }
+
+                    if (bg.sources.findWhere({ url: xmlUrl })) {
                         return;
                     }
                     bg.sources.create(
@@ -774,7 +821,7 @@ define(["../app/staticdb/actions", "staticdb/shortcuts"], function (
                                 feed.getAttribute("title") ||
                                     feed.getAttribute("text")
                             ),
-                            url: decodeHTML(feed.getAttribute("xmlUrl")),
+                            url: xmlUrl,
                             updateEvery: -1,
                         },
                         { wait: true }
diff --git a/src/scripts/options/worker.js b/src/scripts/options/worker.js
index c9a789b7..d78cff8d 100644
--- a/src/scripts/options/worker.js
+++ b/src/scripts/options/worker.js
@@ -2,6 +2,7 @@ const request = indexedDB.open("backbone-indexeddb", 4);
 
 let db;
 let content;
+let importAction;
 
 request.addEventListener("error", function () {
     throw "Error code: " + this.errorCode;
@@ -10,19 +11,25 @@ request.addEventListener("error", function () {
 request.addEventListener("success", function () {
     db = this.result;
     if (content) {
-        startImport();
+        if (importAction === "settings") {
+            startSettingsImport();
+        } else {
+            startImport();
+        }
     }
 });
 
 onmessage = function (e) {
     if (e.data.action === "file-content") {
         content = e.data.value;
+        importAction = "file-content";
         if (db) {
             startImport();
         }
     }
     if (e.data.action === "settings") {
         content = e.data.value;
+        importAction = "settings";
         if (db) {
             startSettingsImport();
         }
@@ -31,25 +38,35 @@ onmessage = function (e) {
 
 let writes = 0;
 
-function handleReq(req) {
+function handleReq(req, finishedAction = "finished") {
     writes++;
     req.onsuccess = req.onerror = function () {
         writes--;
         if (writes <= 0) {
-            postMessage({ action: "finished" });
+            postMessage({ action: finishedAction });
         }
     };
 }
 
 function startSettingsImport() {
+    writes = 0;
+
     const transaction = db.transaction(["settings-backbone"], "readwrite");
     const settings = transaction.objectStore("settings-backbone");
 
     const importedSettings = content.settings;
     if (importedSettings) {
         settings.clear();
-        for (let i = 0, j = importedSettings.length; i < j; i++) {
-            handleReq(settings.add(importedSettings[i]));
+        const settingsList = Array.isArray(importedSettings)
+            ? importedSettings
+            : [importedSettings];
+
+        for (let i = 0, j = settingsList.length; i < j; i++) {
+            const record = settingsList[i].id
+                ? settingsList[i]
+                : { ...settingsList[i], id: "settings-id" };
+
+            handleReq(settings.put(record), "finished-settings");
             if (i % 10 === 0) {
                 postMessage({
                     action: "message-settings",

From a30b3db50c9fed13a4c107ed6f24f6994827bf97 Mon Sep 17 00:00:00 2001
From: cybercode3 <4132889+cybercode3@users.noreply.github.com>
Date: Sat, 17 Jan 2026 15:00:08 -0600
Subject: [PATCH 6/8] Update developer name and version in manifest.json

---
 src/manifest.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 11c4f199..8a80469b 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,11 +1,11 @@
 {
   "name": "Smart RSS",
   "developer": {
-    "name": "zakius"
+    "name": "cybercode3"
   },
   "description": "RSS Reader",
   "manifest_version": 2,
-  "version": "2.26.0",
+  "version": "2.27.0",
   "background": {
     "page": "index.html"
   },
@@ -63,7 +63,7 @@
   },
   "browser_specific_settings": {
     "gecko": {
-      "id": "smart-rss@mozilla.firefox"
+      "id": "smart-rss-fork7123@mozilla.firefox"
     }
   }
-}
\ No newline at end of file
+}

From b6252b7651dfcb48fc9871154bcfb407794284d3 Mon Sep 17 00:00:00 2001
From: cybercode3 <4132889+cybercode3@users.noreply.github.com>
Date: Sat, 17 Jan 2026 15:05:07 -0600
Subject: [PATCH 7/8] Update README to reflect new project status

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 03b66d3a..449fb029 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Smart RSS extension
 
-## Now officially unmaintained, I _may_ fix some critical issue if any is found within few following weeks, but then I'll archive this repo. Feel free to fork and continue development as you wish
+## This is a fork of Smart-RSS. There’s no guarantee of active development, but anyone is welcome to use it if they find it helpful.
 
 Originally developed for Opera 15+ by BS-Harou (Martin Kadlec)
 

From 454de33b340720c563f2489755b8471863dee1bd Mon Sep 17 00:00:00 2001
From: cybercode3 <4132889+cybercode3@users.noreply.github.com>
Date: Sat, 17 Jan 2026 15:06:13 -0600
Subject: [PATCH 8/8] Update README with new repository link and remove user
 info

Removed user-specific information and updated repository link.
---
 README.md | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 449fb029..3299d16e 100644
--- a/README.md
+++ b/README.md
@@ -8,17 +8,6 @@ Translations are in scripts/nls/\*.js
 
 For technical bug reports use issues here on GitHub
 
-## For users
-
-Extension is available in following repositories:
-
-#### AMO: https://addons.mozilla.org/firefox/addon/smart-rss-reader/
-
-~#### Chrome Web Store: https://chrome.google.com/webstore/detail/eggggihfcaabljfpjiiaohloefmgejic/~
-
-If you encounter issue with a specific feed for best results please back up and include current state of that feed in your report, this will be helpful in case the feed changes before I get to check it, thanks in advance
-
-
 ## For developers
 
 If you are interested in improving Smart RSS then there are few tips to get started.
@@ -31,7 +20,7 @@ First of all you will need several command line tools:
 To setup your Smart RSS project open your console, go to your projects folders and type:
 
 ```
-git clone git@github.com:zakius/Smart-RSS.git smartrss
+git clone git@github.com:cybercode3/Smart-RSS.git smartrss
 cd smartrss
 npm install
 ```