From 90ea35ac6820bb4b5c7e93d643a44b165d30cb99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20H=C3=A4usler?= Date: Wed, 21 Mar 2018 12:00:45 +0100 Subject: [PATCH] fix: fix home path on windows (#47) --- src/main/actions/file.js | 8 ++++---- src/main/actions/marktext.js | 2 +- src/main/utils.js | 6 +++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/actions/file.js b/src/main/actions/file.js index 5f3bdcf1..1e56cb9b 100644 --- a/src/main/actions/file.js +++ b/src/main/actions/file.js @@ -6,7 +6,7 @@ import path from 'path' import { app, dialog, ipcMain, BrowserWindow } from 'electron' import createWindow, { windows } from '../createWindow' import { EXTENSIONS, EXTENSION_HASN } from '../config' -import { getUserPreference, setUserPreference } from '../utils' +import { getPath, getUserPreference, setUserPreference } from '../utils' const watchAndReload = (pathname, win) => { // when i build, and failed. // const watcher = chokidar.watch(pathname, { @@ -51,7 +51,7 @@ const forceClose = win => { const handleResponseForExport = (e, { type, content, filename, pathname }) => { const win = BrowserWindow.fromWebContents(e.sender) const extension = EXTENSION_HASN[type] - const dirname = pathname ? path.dirname(pathname) : '~' + const dirname = pathname ? path.dirname(pathname) : getPath('documents') const nakedFilename = pathname ? path.basename(pathname, '.md') : 'untitled' const defaultPath = `${dirname}/${nakedFilename}${extension}` const filePath = dialog.showSaveDialog(win, { @@ -76,7 +76,7 @@ const handleResponseForSave = (e, { markdown, pathname }) => { }) } else { const filePath = dialog.showSaveDialog(win, { - defaultPath: '~/Untitled.md' + defaultPath: getPath('documents') + '/Untitled.md' }) writeFile(filePath, markdown, '.md', win, e) } @@ -85,7 +85,7 @@ const handleResponseForSave = (e, { markdown, pathname }) => { ipcMain.on('AGANI::response-file-save-as', (e, { markdown, pathname }) => { const win = BrowserWindow.fromWebContents(e.sender) let filePath = dialog.showSaveDialog(win, { - defaultPath: pathname || '~/Untitled.md' + defaultPath: pathname || getPath('documents') + '/Untitled.md' }) writeFile(filePath, markdown, '.md', win, e) }) diff --git a/src/main/actions/marktext.js b/src/main/actions/marktext.js index 61f5dbb8..1bf301f3 100644 --- a/src/main/actions/marktext.js +++ b/src/main/actions/marktext.js @@ -47,7 +47,7 @@ autoUpdater.on('update-downloaded', () => { }) export const userSetting = (menuItem, browserWindow) => { - const settingPath = path.join(__static, '/preference.md') + const settingPath = path.join(__static, 'preference.md') createWindow(settingPath) } diff --git a/src/main/utils.js b/src/main/utils.js index a9b98619..9659bfb3 100644 --- a/src/main/utils.js +++ b/src/main/utils.js @@ -1,6 +1,6 @@ import fs from 'fs' import path from 'path' -import { Menu } from 'electron' +import { app, Menu } from 'electron' const JSON_REG = /```json(.+)```/g const preferencePath = path.join(__static, 'preference.md') @@ -45,3 +45,7 @@ export const setUserPreference = (key, value) => { }) }) } + +export const getPath = directory => { + return app.getPath(directory) +}