OpenWebUI/desktop
1
0
Fork 0
mirror of https://github.com/open-webui/desktop synced 2025-06-26 18:15:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refac: path

Browse Source
This commit is contained in:
Timothy Jaeryang Baek 2025-01-13 22:41:55 -08:00
parent 25b98ea31b
commit c19a17a820
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/render/lib/components/Main.svelte
View File

@ -56,7 +56,10 @@
<div class="flex flex-row w-full h-full relative dark:text-gray-100 p-1 drag-region"> <div class="flex flex-row w-full h-full relative dark:text-gray-100 p-1 drag-region">
<div class="fixed right-0 m-10 z-50"> <div class="fixed right-0 m-10 z-50">
<div class="flex space-x-2"> <div class="flex space-x-2">
<button class=" self-center cursor-pointer" onclick={() => (showLogs = !showLogs)}> <button
class=" self-center cursor-pointer outline-none"
onclick={() => (showLogs = !showLogs)}
>
<img <img
src="./assets/images/splash.png" src="./assets/images/splash.png"
class=" w-6 rounded-full dark:invert" class=" w-6 rounded-full dark:invert"

36
src/utils/index.ts
View File

@ -35,11 +35,11 @@ export function getAppPath(): string {
appPath = path.dirname(appPath); appPath = path.dirname(appPath);
} }
return appPath; return path.normalize(appPath);
} }
export function getUserHomePath(): string { export function getUserHomePath(): string {
return app.getPath('home'); return path.normalize(app.getPath('home'))
} }
export function getUserDataPath(): string { export function getUserDataPath(): string {
@ -53,7 +53,7 @@ export function getUserDataPath(): string {
} }
} }
return userDataDir; return path.normalize(userDataDir);
} }
export function getOpenWebUIDataPath(): string { export function getOpenWebUIDataPath(): string {
@ -67,7 +67,7 @@ export function getOpenWebUIDataPath(): string {
} }
} }
return openWebUIDataDir; return path.normalize(openWebUIDataDir);
} }
export function getSecretKey(keyPath?: string, key?: string): string { export function getSecretKey(keyPath?: string, key?: string): string {
@ -120,7 +120,7 @@ export async function portInUse(port: number, host: string = '0.0.0.0'): Promise
export function getBundledPythonTarPath(): string { export function getBundledPythonTarPath(): string {
const appPath = getAppPath(); const appPath = getAppPath();
return path.join(appPath, 'resources', 'python.tar.gz'); return path.normalize(path.join(appPath, 'resources', 'python.tar.gz'));
} }
export function getBundledPythonInstallationPath(): string { export function getBundledPythonInstallationPath(): string {
@ -133,7 +133,7 @@ export function getBundledPythonInstallationPath(): string {
log.error(error); log.error(error);
} }
} }
return installDir; return path.normalize(installDir);
} }
export function isCondaEnv(envPath: string): boolean { export function isCondaEnv(envPath: string): boolean {
@ -142,16 +142,16 @@ export function isCondaEnv(envPath: string): boolean {
export function getPythonPath(envPath: string, isConda?: boolean) { export function getPythonPath(envPath: string, isConda?: boolean) {
if (process.platform === 'win32') { if (process.platform === 'win32') {
return (isConda ?? isCondaEnv(envPath)) return path.normalize((isConda ?? isCondaEnv(envPath))
? path.join(envPath, 'python.exe') ? path.join(envPath, 'python.exe')
: path.join(envPath, 'Scripts', 'python.exe'); : path.join(envPath, 'Scripts', 'python.exe'));
} else { } else {
return path.join(envPath, 'bin', 'python'); return path.normalize(path.join(envPath, 'bin', 'python'));
} }
} }
export function getBundledPythonPath() { export function getBundledPythonPath() {
return getPythonPath(getBundledPythonInstallationPath()); return path.normalize(getPythonPath(getBundledPythonInstallationPath()));
} }
export function isBundledPythonInstalled() { export function isBundledPythonInstalled() {
@ -201,7 +201,7 @@ export async function installOpenWebUI(
// Build the appropriate unpack command based on the platform // Build the appropriate unpack command based on the platform
let unpackCommand = let unpackCommand =
process.platform === 'win32' process.platform === 'win32'
? `${installationPath}\\Scripts\\activate.bat && pip install open-webui${version ? `==${version}` : ' -U'}` ? `"${installationPath}\\Scripts\\activate.bat" && pip install open-webui${version ? `==${version}` : ' -U'}`
: `source "${installationPath}/bin/activate" && pip install open-webui${version ? `==${version}` : ' -U'}`; : `source "${installationPath}/bin/activate" && pip install open-webui${version ? `==${version}` : ' -U'}`;
// only unsign when installing from bundled installer // only unsign when installing from bundled installer
@ -403,14 +403,14 @@ export async function startServer(installationPath?: string, port?: number): Pro
let startCommand = let startCommand =
process.platform === 'win32' process.platform === 'win32'
? `${installationPath}\\Scripts\\activate.bat && set DATA_DIR="${path.join( ? `"${installationPath}\\Scripts\\activate.bat" && set DATA_DIR="${path.join(
app.getPath('userData'), app.getPath('userData'),
'data' 'data'
)}" && set WEBUI_SECRET_KEY=${getSecretKey()} && open-webui serve` )}" && set WEBUI_SECRET_KEY=${getSecretKey()} && open-webui serve`
: `source "${installationPath}/bin/activate" && export DATA_DIR="${path.join( : `source "${installationPath}/bin/activate" && export DATA_DIR="${path.join(
app.getPath('userData'), app.getPath('userData'),
'data' 'data'
)}" && export WEBUI_SECRET_KEY=${getSecretKey()} && open-webui serve`; )}" && export WEBUI_SECRET_KEY=${getSecretKey()} && open-webui serve`;
port = port || 8080; port = port || 8080;
while (await portInUse(port)) { while (await portInUse(port)) {