wagesj45/Sortana
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

Merge pull request #81 from wagesj45/codex/add-themeutils-module-and-refactor-code

Browse source 
Refactor theme detection
This commit is contained in:
Jordan Wages 2025-07-08 16:54:32 -05:00 • committed by GitHub
commit 0c7d40a56d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

20
background.js
View file

@ -29,6 +29,7 @@ let collapseWhitespace = false;
let TurndownService = null;
let userTheme = 'auto';
let currentTheme = 'light';
let detectSystemTheme;
function normalizeRules(rules) {
return Array.isArray(rules) ? rules.map(r => {
@ -50,24 +51,6 @@ function iconPaths(name) {
};
}
async function detectSystemTheme() {
try {
const t = await browser.theme.getCurrent();
const scheme = t?.properties?.color_scheme;
if (scheme === 'dark' || scheme === 'light') {
return scheme;
}
const color = t?.colors?.frame || t?.colors?.toolbar;
if (color && /^#/.test(color)) {
const r = parseInt(color.slice(1, 3), 16);
const g = parseInt(color.slice(3, 5), 16);
const b = parseInt(color.slice(5, 7), 16);
const lum = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
return lum < 0.5 ? 'dark' : 'light';
}
} catch {}
return 'light';
}
const ICONS = {
logo: () => 'resources/img/logo.png',
@ -298,6 +281,7 @@ async function clearCacheForMessages(idsInput) {
(async () => {
logger = await import(browser.runtime.getURL("logger.js"));
({ detectSystemTheme } = await import(browser.runtime.getURL('modules/themeUtils.js')));
try {
AiClassifier = await import(browser.runtime.getURL("modules/AiClassifier.js"));
logger.aiLog("AiClassifier imported", { debug: true });

3
details.js
View file

@ -1,8 +1,9 @@
const aiLog = (await import(browser.runtime.getURL("logger.js"))).aiLog;
const storage = (globalThis.messenger ?? browser).storage;
const { detectSystemTheme } = await import(browser.runtime.getURL('modules/themeUtils.js'));
const { theme } = await storage.local.get('theme');
const mode = (theme || 'auto') === 'auto'
? (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light')
? await detectSystemTheme()
: theme;
document.documentElement.dataset.theme = mode;

20
modules/themeUtils.js Normal file
View file

@ -0,0 +1,20 @@
"use strict";
export async function detectSystemTheme() {
try {
const t = await browser.theme.getCurrent();
const scheme = t?.properties?.color_scheme;
if (scheme === 'dark' || scheme === 'light') {
return scheme;
}
const color = t?.colors?.frame || t?.colors?.toolbar;
if (color && /^#/.test(color)) {
const r = parseInt(color.slice(1, 3), 16);
const g = parseInt(color.slice(3, 5), 16);
const b = parseInt(color.slice(5, 7), 16);
const lum = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
return lum < 0.5 ? 'dark' : 'light';
}
} catch {}
return 'light';
}

17
options/options.js
View file

@ -3,6 +3,7 @@ document.addEventListener('DOMContentLoaded', async () => {
const logger = await import(browser.runtime.getURL('logger.js'));
const AiClassifier = await import(browser.runtime.getURL('modules/AiClassifier.js'));
const dataTransfer = await import(browser.runtime.getURL('options/dataTransfer.js'));
const { detectSystemTheme } = await import(browser.runtime.getURL('modules/themeUtils.js'));
const defaults = await storage.local.get([
'endpoint',
'templateName',
@ -42,10 +43,6 @@ document.addEventListener('DOMContentLoaded', async () => {
const themeSelect = document.getElementById('theme-select');
themeSelect.value = defaults.theme || 'auto';
function systemTheme() {
return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
}
function updateIcons(theme) {
document.querySelectorAll('img[data-icon]').forEach(img => {
const name = img.dataset.icon;
@ -58,16 +55,16 @@ document.addEventListener('DOMContentLoaded', async () => {
});
}
function applyTheme(setting) {
const mode = setting === 'auto' ? systemTheme() : setting;
async function applyTheme(setting) {
const mode = setting === 'auto' ? await detectSystemTheme() : setting;
document.documentElement.dataset.theme = mode;
updateIcons(mode);
}
applyTheme(themeSelect.value);
themeSelect.addEventListener('change', () => {
await applyTheme(themeSelect.value);
themeSelect.addEventListener('change', async () => {
markDirty();
applyTheme(themeSelect.value);
await applyTheme(themeSelect.value);
});
const DEFAULT_AI_PARAMS = {
max_tokens: 4096,
@ -486,7 +483,7 @@ document.addEventListener('DOMContentLoaded', async () => {
const collapseWhitespace = collapseWhitespaceToggle.checked;
const theme = themeSelect.value;
await storage.local.set({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging, htmlToMarkdown, stripUrlParams, altTextImages, collapseWhitespace, aiRules: rules, theme });
applyTheme(theme);
await applyTheme(theme);
try {
await AiClassifier.setConfig({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging });
logger.setDebug(debugLogging);