also check old config name config_archiveBoxBaseUrlfor archivebox_server_url

Author: pirate

config-tab.js

@@ -10,10 +10,11 @@ export async function initializeConfigTab() {
   const savedConfig = await chrome.storage.local.get([
     'archivebox_server_url',
     'archivebox_api_key',
-    'match_urls'
+    'match_urls',
+    'config_archiveBoxBaseUrl', // old name for archivebox_server_url
   ]);
 
-  serverUrl.value = savedConfig.archivebox_server_url || '';
+  serverUrl.value = savedConfig.archivebox_server_url || savedConfig.config_archiveBoxBaseUrl || '';
   apiKey.value = savedConfig.archivebox_api_key || '';
   matchUrls.value = savedConfig.match_urls || '';
 
@@ -195,11 +196,13 @@ export async function initializeConfigTab() {
 }
 
 async function syncToArchiveBox(entry) {
-  const { archivebox_server_url, archivebox_api_key } = await chrome.storage.local.get([
+  let { archivebox_server_url, archivebox_api_key, config_archiveBoxBaseUrl } = await chrome.storage.local.get([
     'archivebox_server_url',
-    'archivebox_api_key'
+    'archivebox_api_key',
+    'config_archiveBoxBaseUrl'
   ]);
-
+  archivebox_server_url = archivebox_server_url || config_archiveBoxBaseUrl;
+  
   if (!archivebox_server_url || !archivebox_api_key) {
     return { 
       ok: false, 

entries-tab.js

@@ -391,7 +391,8 @@ export function initializeEntriesTab() {
 
   // Modify existing renderEntries function
   async function renderEntries() {
-    const { entries = [], archivebox_server_url } = await chrome.storage.local.get(['entries', 'archivebox_server_url']);
+    let { entries = [], archivebox_server_url, config_archiveBoxBaseUrl } = await chrome.storage.local.get(['entries', 'archivebox_server_url', 'config_archiveBoxBaseUrl']);
+    archivebox_server_url = archivebox_server_url || config_archiveBoxBaseUrl;
 
     const filterText = document.getElementById('filterInput').value.toLowerCase();
     const entriesList = document.getElementById('entriesList');

utils.js

@@ -21,17 +21,17 @@ export async function addToArchiveBox(addCommandArgs, onComplete, onError) {
   console.log('i addToArchiveBox', addCommandArgs);
   try {
     const { archivebox_server_url, archivebox_api_key } = await new Promise((resolve, reject) => {
-      chrome.storage.local.get(['archivebox_server_url', 'archivebox_api_key'], (vals) => {
+      chrome.storage.local.get(['archivebox_server_url', 'archivebox_api_key', 'config_archiveBoxBaseUrl'], (vals) => {
         if (chrome.runtime.lastError) {
           reject(chrome.runtime.lastError);
         } else {
-          resolve(vals);
+          resolve({archivebox_server_url: vals.archivebox_server_url || vals.config_archiveBoxBaseUrl, archivebox_api_key: vals.archivebox_api_key});
         }
       });
     });
 
     console.log('i addToArchiveBox server url', archivebox_server_url);
-    if (!archivebox_server_url) {
+    if (archivebox_server_url) {
       throw new Error('Server not configured.');
     }