andrea/LeafLLM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: andrea:1.2.1
Branches Tags
andrea:main
andrea:1.4.1 andrea:1.4.0 andrea:1.3.1 andrea:1.3.0 andrea:1.2.3 andrea:1.2.1 andrea:1.1.0
...
compare: andrea:1.2.3
Branches Tags
andrea:main
andrea:1.4.1 andrea:1.4.0 andrea:1.3.1 andrea:1.3.0 andrea:1.2.3 andrea:1.2.1 andrea:1.1.0

2 Commits
1.2.1 ... 1.2.3

Author SHA1 Message Date
Achiya Elyasaf
15319c67ef Added an error message when API key is not set. 2023-12-03 09:55:51 +02:00
Achiya Elyasaf
693f3f2bce Fixed a bug in detecting manual changes of keyboard shortcuts 2023-11-19 15:35:15 +02:00
5 changed files with 33 additions and 15 deletions
Expand all files Collapse all files

2
manifest.json
View File

@@ -42,5 +42,5 @@
"manifest_version": 3,
"name": "LeafLLM",
"homepage_url": "https://github.com/achiyae/LeafLLM",
"version": "1.2.1"
"version": "1.2.3"
}

1
popup/popup.html
View File

@@ -1,7 +1,6 @@
<html>
<head>
<script src="/scripts/jquery.js"></script>
<script src="/scripts/utils.js" type="module"></script>
<script src="/popup/popup.js" type="module"></script>
<link rel="stylesheet" href="/popup/popup.css"/>
</head>

29
popup/popup.js
View File

@@ -17,17 +17,32 @@ async function refreshStorage() {
$('#api-token-form .api-token-status').text(chrome.runtime.lastError || !openAIAPIKey ? 'not set' : 'set')
})
const commands = await chrome.commands.getAll();
chrome.storage.local.get(['Improve', 'Complete', 'Ask']).then((settings) => {
Object.values(settings).forEach(setting => {
let command = commands.filter(({ name }) => name === setting.key)[0]
if(command.shortcut !== setting.shortcut) {
setting.shortcut = command.shortcut;
if(setting.status === 'enabled' && setting.shortcut === '') {
setting.status = 'error'
}
chrome.storage.local.set({ [setting.key]: setting });
} else if(setting.status === 'enabled' && setting.shortcut === '') {
setting.status = 'error'
chrome.storage.local.set({ [setting.key]: setting })
}
})
let bindingFailures = Object.values(settings)
.filter(({ status }) => status === 'error')
.map(({ key, shortcut }) => `${shortcut} for ${key}`)
.join(', ')
.map(({ key }) => `${key}`)
.join(', ');
if (bindingFailures.length > 0) {
addErrorMessage(`Could not bind the following shortcuts:\n${bindingFailures}.\nYou can set it manually at <a href="chrome://extensions/shortcuts">chrome://extensions/shortcuts</a>.`)
}
Object.values(settings).forEach(({ key, status, shortcut }) => {
$(`#settings-form input[name='text-${key}']:checkbox`).prop('checked', status === 'enabled')
let shortcut2 = status === 'error' ? 'not set' : shortcut
let shortcut2 = shortcut === '' ? 'not set' : shortcut
$(`#shortcut-${key}`).html(`<span>${shortcut2}</span>`)
})
})
@@ -64,7 +79,7 @@ async function handleAPITokenClear(event) {
.catch((error) => addErrorMessage(`Failed to remove API Token. Error: ${error}`))
}
async function makeHandleSettingChange(key) {
function makeHandleSettingChange(key) {
return async (event) => {
event.preventDefault()
event.stopPropagation()
@@ -72,10 +87,12 @@ async function makeHandleSettingChange(key) {
const value = event.target.checked
const setting = await chrome.storage.local.get(key)
if (setting[key].status !== 'error') {
/* let commandKey = await chrome.commands.getAll()
commandKey = commandKey.filter(({ name }) => name === key)[0]*/
// if (setting[key].status !== 'error') {
setting[key].status = value ? 'enabled' : 'disabled'
await chrome.storage.local.set({ [key]: setting[key] })
}
// }
return refreshStorage()
}
}

2
scripts/content.js
View File

@@ -181,6 +181,8 @@ chrome.runtime.onMessage.addListener(
setAPIKey(openAIAPIKey)
if (openAI) {
handleCommand(request.command)
} else {
error('OpenAI API key is not set, LeafLLM features are disabled.')
}
})
} else {

14
scripts/service-worker.js
View File

@@ -20,13 +20,7 @@ function addListener(commandName) {
})
}
chrome.runtime.onInstalled.addListener((reason) => {
if (reason.reason === chrome.runtime.OnInstalledReason.INSTALL) {
checkCommandShortcuts()
}
})
// Only use this function during the initial install phase. After
// Only use this function during the initial installation phase. After
// installation the user may have intentionally unassigned commands.
// Example for install commands: [{"description":"","name":"_execute_action","shortcut":""},{"description":"Use the selected text to ask GPT. It adds to the beginning of the selected text: 'In Latex, '","name":"Ask","shortcut":""},{"description":"Complete selected text","name":"Complete","shortcut":""},{"description":"Improve selected text","name":"Improve","shortcut":""}]
async function checkCommandShortcuts() {
@@ -45,6 +39,12 @@ async function checkCommandShortcuts() {
})
}
chrome.runtime.onInstalled.addListener((reason) => {
if (reason.reason === chrome.runtime.OnInstalledReason.INSTALL) {
checkCommandShortcuts()
}
})
async function setup() {
addListener('Improve')
addListener('Complete')