baalajimaestro/ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add prettier and address comments

Browse source
This commit is contained in:
Eva Ho 2023-07-21 17:10:05 -04:00
parent e0a73d7fbe
commit 3f7d2336c7
3 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/package.json
View file

@ -11,7 +11,9 @@
"make": "electron-forge make", "make": "electron-forge make",
"make:sign": "SIGN=1 electron-forge make", "make:sign": "SIGN=1 electron-forge make",
"publish": "SIGN=1 electron-forge publish", "publish": "SIGN=1 electron-forge publish",
"lint": "eslint --ext .ts,.tsx ." "lint": "eslint --ext .ts,.tsx .",
"format": "prettier --check . --ignore-path .gitignore",
"format:fix": "prettier --write . --ignore-path .gitignore"
}, },
"keywords": [], "keywords": [],
"author": { "author": {

6
app/src/declarations.d.ts vendored
View file

@ -1,4 +1,4 @@
declare module '*.svg' { declare module '*.svg' {
const content: string; const content: string
export default content; export default content
} }

31
app/src/index.ts
View file

@ -67,25 +67,25 @@ function firstRunWindow() {
function createSystemtray() { function createSystemtray() {
let iconPath = nativeTheme.shouldUseDarkColors let iconPath = nativeTheme.shouldUseDarkColors
? path.join(__dirname, '..', '..', 'assets', 'ollama_icon_16x16Template.png') ? path.join(__dirname, '..', '..', 'assets', 'ollama_icon_16x16Template.png')
: path.join(__dirname, '..', '..', 'assets', 'ollama_outline_icon_16x16Template.png') : path.join(__dirname, '..', '..', 'assets', 'ollama_outline_icon_16x16Template.png')
if (app.isPackaged) { if (app.isPackaged) {
iconPath = nativeTheme.shouldUseDarkColors iconPath = nativeTheme.shouldUseDarkColors
? path.join(process.resourcesPath, 'ollama_icon_16x16Template.png') ? path.join(process.resourcesPath, 'ollama_icon_16x16Template.png')
: path.join(process.resourcesPath, 'ollama_outline_icon_16x16Template.png') : path.join(process.resourcesPath, 'ollama_outline_icon_16x16Template.png')
} }
tray = new Tray(iconPath) tray = new Tray(iconPath)
nativeTheme.on('updated', function theThemeHasChanged () { nativeTheme.on('updated', function theThemeHasChanged() {
if (nativeTheme.shouldUseDarkColors) { if (nativeTheme.shouldUseDarkColors) {
app.isPackaged app.isPackaged
? tray.setImage(path.join(process.resourcesPath, 'ollama_icon_16x16Template.png')) ? tray.setImage(path.join(process.resourcesPath, 'ollama_icon_16x16Template.png'))
: tray.setImage(path.join(__dirname, '..', '..', 'assets', 'ollama_icon_16x16Template.png')) : tray.setImage(path.join(__dirname, '..', '..', 'assets', 'ollama_icon_16x16Template.png'))
} else { } else {
app.isPackaged app.isPackaged
? tray.setImage(path.join(process.resourcesPath, 'ollama_outline_icon_16x16Template.png')) ? tray.setImage(path.join(process.resourcesPath, 'ollama_outline_icon_16x16Template.png'))
: tray.setImage(path.join(__dirname, '..', '..', 'assets', 'ollama_outline_icon_16x16Template.png')) : tray.setImage(path.join(__dirname, '..', '..', 'assets', 'ollama_outline_icon_16x16Template.png'))
} }
}) })
@ -102,8 +102,8 @@ if (require('electron-squirrel-startup')) {
function server() { function server() {
const binary = app.isPackaged const binary = app.isPackaged
? path.join(process.resourcesPath, 'ollama') ? path.join(process.resourcesPath, 'ollama')
: path.resolve(process.cwd(), '..', 'ollama') : path.resolve(process.cwd(), '..', 'ollama')
const proc = spawn(binary, ['serve']) const proc = spawn(binary, ['serve'])
@ -114,15 +114,16 @@ function server() {
proc.stderr.on('data', data => { proc.stderr.on('data', data => {
logger.error(data.toString().trim()) logger.error(data.toString().trim())
}) })
proc.on('exit', (code) => { function restart(code: number) {
logger.error(`Server exited with code: ${code}`) logger.info(`Server exited with code: ${code}`)
setTimeout(server, 3000) setTimeout(server, 3000)
}) }
proc.on('exit', code => restart(code))
app.on('before-quit', () => { app.on('before-quit', () => {
proc.off('exit', server) proc.off('exit', code => restart(code))
proc.kill() proc.kill()
}) })
} }