cheykrym/glass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

settings big update

Browse Source
This commit is contained in:
jhyang0 2025-07-07 06:17:42 +09:00
parent 401e83de6f
commit 549a3cdeb9
3 changed files with 59 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/features/settings/repositories/index.js
View File

@ -13,8 +13,6 @@ function getRepository() {
// Directly export functions for ease of use, decided by the strategy
module.exports = {
getSettings: (...args) => getRepository().getSettings(...args),
saveSettings: (...args) => getRepository().saveSettings(...args),
getPresets: (...args) => getRepository().getPresets(...args),
getPresetTemplates: (...args) => getRepository().getPresetTemplates(...args),
createPreset: (...args) => getRepository().createPreset(...args),

160
src/features/settings/repositories/sqlite.repository.js
View File

@ -1,127 +1,5 @@
const sqliteClient = require('../../../common/services/sqliteClient');
function getSettings(uid) {
const db = sqliteClient.getDb();
return new Promise((resolve, reject) => {
const query = `
SELECT * FROM user_settings
WHERE uid = ?
`;
db.get(query, [uid], (err, row) => {
if (err) {
console.error('SQLite: Failed to get settings:', err);
reject(err);
} else if (row) {
// Parse JSON fields
try {
if (row.keybinds) row.keybinds = JSON.parse(row.keybinds);
} catch (parseError) {
console.warn('SQLite: Failed to parse keybinds JSON:', parseError);
row.keybinds = {};
}
resolve(row);
} else {
// Return default settings if none exist
resolve({
uid: uid,
profile: 'school',
language: 'en',
screenshot_interval: '5000',
image_quality: '0.8',
layout_mode: 'stacked',
keybinds: {},
throttle_tokens: 500,
max_tokens: 2000,
throttle_percent: 80,
google_search_enabled: 0,
background_transparency: 0.5,
font_size: 14,
content_protection: 1,
created_at: Math.floor(Date.now() / 1000),
updated_at: Math.floor(Date.now() / 1000)
});
}
});
});
}
function saveSettings(uid, settings) {
const db = sqliteClient.getDb();
const now = Math.floor(Date.now() / 1000);
return new Promise((resolve, reject) => {
// Prepare settings object
const settingsToSave = {
uid: uid,
profile: settings.profile || 'school',
language: settings.language || 'en',
screenshot_interval: settings.screenshot_interval || '5000',
image_quality: settings.image_quality || '0.8',
layout_mode: settings.layout_mode || 'stacked',
keybinds: JSON.stringify(settings.keybinds || {}),
throttle_tokens: settings.throttle_tokens || 500,
max_tokens: settings.max_tokens || 2000,
throttle_percent: settings.throttle_percent || 80,
google_search_enabled: settings.google_search_enabled ? 1 : 0,
background_transparency: settings.background_transparency || 0.5,
font_size: settings.font_size || 14,
content_protection: settings.content_protection ? 1 : 0,
updated_at: now
};
const query = `
INSERT INTO user_settings (
uid, profile, language, screenshot_interval, image_quality, layout_mode,
keybinds, throttle_tokens, max_tokens, throttle_percent, google_search_enabled,
background_transparency, font_size, content_protection, created_at, updated_at
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
ON CONFLICT(uid) DO UPDATE SET
profile=excluded.profile,
language=excluded.language,
screenshot_interval=excluded.screenshot_interval,
image_quality=excluded.image_quality,
layout_mode=excluded.layout_mode,
keybinds=excluded.keybinds,
throttle_tokens=excluded.throttle_tokens,
max_tokens=excluded.max_tokens,
throttle_percent=excluded.throttle_percent,
google_search_enabled=excluded.google_search_enabled,
background_transparency=excluded.background_transparency,
font_size=excluded.font_size,
content_protection=excluded.content_protection,
updated_at=excluded.updated_at
`;
const values = [
settingsToSave.uid,
settingsToSave.profile,
settingsToSave.language,
settingsToSave.screenshot_interval,
settingsToSave.image_quality,
settingsToSave.layout_mode,
settingsToSave.keybinds,
settingsToSave.throttle_tokens,
settingsToSave.max_tokens,
settingsToSave.throttle_percent,
settingsToSave.google_search_enabled,
settingsToSave.background_transparency,
settingsToSave.font_size,
settingsToSave.content_protection,
now, // created_at
settingsToSave.updated_at
];
db.run(query, values, function(err) {
if (err) {
console.error('SQLite: Failed to save settings:', err);
reject(err);
} else {
resolve({ changes: this.changes });
}
});
});
}
function getPresets(uid) {
const db = sqliteClient.getDb();
return new Promise((resolve, reject) => {
@ -162,17 +40,19 @@ function getPresetTemplates() {
function createPreset({ uid, title, prompt }) {
const db = sqliteClient.getDb();
const presetId = require('crypto').randomUUID();
const now = Math.floor(Date.now() / 1000);
const query = `INSERT INTO prompt_presets (id, uid, title, prompt, is_default, created_at, sync_state) VALUES (?, ?, ?, ?, 0, ?, 'dirty')`;
return new Promise((resolve, reject) => {
db.run(query, [presetId, uid, title, prompt, now], function(err) {
const id = require('crypto').randomUUID();
const now = Math.floor(Date.now() / 1000);
const query = `
INSERT INTO prompt_presets (id, uid, title, prompt, is_default, created_at, sync_state)
VALUES (?, ?, ?, ?, 0, ?, 'dirty')
`;
db.run(query, [id, uid, title, prompt, now], function(err) {
if (err) {
console.error('SQLite: Failed to create preset:', err);
reject(err);
} else {
resolve({ id: presetId });
resolve({ id });
}
});
});
@ -180,15 +60,19 @@ function createPreset({ uid, title, prompt }) {
function updatePreset(id, { title, prompt }, uid) {
const db = sqliteClient.getDb();
const query = `UPDATE prompt_presets SET title = ?, prompt = ?, sync_state = 'dirty' WHERE id = ? AND uid = ? AND is_default = 0`;
return new Promise((resolve, reject) => {
db.run(query, [title, prompt, id, uid], function(err) {
const now = Math.floor(Date.now() / 1000);
const query = `
UPDATE prompt_presets
SET title = ?, prompt = ?, sync_state = 'dirty', updated_at = ?
WHERE id = ? AND uid = ? AND is_default = 0
`;
db.run(query, [title, prompt, now, id, uid], function(err) {
if (err) {
console.error('SQLite: Failed to update preset:', err);
reject(err);
} else if (this.changes === 0) {
reject(new Error("Preset not found or permission denied."));
reject(new Error('Preset not found, is default, or permission denied'));
} else {
resolve({ changes: this.changes });
}
@ -198,15 +82,17 @@ function updatePreset(id, { title, prompt }, uid) {
function deletePreset(id, uid) {
const db = sqliteClient.getDb();
const query = `DELETE FROM prompt_presets WHERE id = ? AND uid = ? AND is_default = 0`;
return new Promise((resolve, reject) => {
const query = `
DELETE FROM prompt_presets
WHERE id = ? AND uid = ? AND is_default = 0
`;
db.run(query, [id, uid], function(err) {
if (err) {
console.error('SQLite: Failed to delete preset:', err);
reject(err);
} else if (this.changes === 0) {
reject(new Error("Preset not found or permission denied."));
reject(new Error('Preset not found, is default, or permission denied'));
} else {
resolve({ changes: this.changes });
}
@ -215,11 +101,9 @@ function deletePreset(id, uid) {
}
module.exports = {
getSettings,
saveSettings,
getPresets,
getPresetTemplates,
createPreset,
updatePreset,
deletePreset,
deletePreset
};

60
src/features/settings/settingsService.js
View File

@ -1,9 +1,17 @@
const { ipcMain, BrowserWindow } = require('electron');
const Store = require('electron-store');
const authService = require('../../common/services/authService');
const userRepository = require('../../common/repositories/user');
const settingsRepository = require('./repositories');
const { getStoredApiKey, getStoredProvider, windowPool } = require('../../electron/windowManager');
const store = new Store({
name: 'pickle-glass-settings',
defaults: {
users: {}
}
});
// Configuration constants
const NOTIFICATION_CONFIG = {
RELEVANT_WINDOW_TYPES: ['settings', 'main'],
@ -142,22 +150,6 @@ const DEFAULT_KEYBINDS = {
// Service state
let currentSettings = null;
async function getSettings() {
try {
const uid = authService.getCurrentUserId();
if (!uid) {
throw new Error("User not logged in, cannot get settings.");
}
const settings = await settingsRepository.getSettings(uid);
currentSettings = settings;
return settings;
} catch (error) {
console.error('[SettingsService] Error getting settings:', error);
return null;
}
}
function getDefaultSettings() {
const isMac = process.platform === 'darwin';
return {
@ -177,18 +169,39 @@ function getDefaultSettings() {
};
}
async function getSettings() {
try {
const uid = authService.getCurrentUserId();
const userSettingsKey = uid ? `users.${uid}` : 'users.default';
const defaultSettings = getDefaultSettings();
const savedSettings = store.get(userSettingsKey, {});
currentSettings = { ...defaultSettings, ...savedSettings };
return currentSettings;
} catch (error) {
console.error('[SettingsService] Error getting settings from store:', error);
return getDefaultSettings();
}
}
async function saveSettings(settings) {
try {
const uid = authService.getCurrentUserId();
if (!uid) {
throw new Error("User not logged in, cannot save settings.");
}
const userSettingsKey = uid ? `users.${uid}` : 'users.default';
await settingsRepository.saveSettings(uid, settings);
currentSettings = settings;
const currentSaved = store.get(userSettingsKey, {});
const newSettings = { ...currentSaved, ...settings };
store.set(userSettingsKey, newSettings);
currentSettings = newSettings;
// Use smart notification system
windowNotificationManager.notifyRelevantWindows('settings-updated', currentSettings);
return { success: true };
} catch (error) {
console.error('[SettingsService] Error saving settings:', error);
console.error('[SettingsService] Error saving settings to store:', error);
return { success: false, error: error.message };
}
}
@ -197,7 +210,8 @@ async function getPresets() {
try {
const uid = authService.getCurrentUserId();
if (!uid) {
throw new Error("User not logged in, cannot get presets.");
// Logged out users only see default presets
return await settingsRepository.getPresetTemplates();
}
const presets = await settingsRepository.getPresets(uid);