From babcae1bd5f5a19e9698eb87d50a038922081321 Mon Sep 17 00:00:00 2001 From: dragonwocky Date: Wed, 1 Jul 2020 16:13:03 +1000 Subject: [PATCH] fix cross-platform filepaths and cleaner.py? --- CHANGELOG.md | 16 ++++-- cleaner.py | 32 ++++++++---- customiser.py | 115 +++++++++++++++++++++++--------------------- resources/theme.css | 2 +- resources/tray.js | 1 + 5 files changed, 99 insertions(+), 67 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21508c8..42bd047 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,17 +3,27 @@ if something is ~~crossed out~~, then it is no longer a feature included by default, but can still easily be enabled by following instructions in the [docs](README.md). +### v0.6.1 (wip) + +- new: semi-mac support? installs, but can't confirm changes have taken effect. +- bugfix: `cleaner.py` patched for linux. +- bugfix: odd mix of `\\` and `/` being used for windows filepaths. + +//todo + +- bugfix: app crashes when sidebar is toggled + ### v0.6.0 (2020-06-30) - style: custom fonts. - style: font resizing. -- style: hide discussions (thanks to [u/Roosmaryn](https://www.reddit.com/user/Roosmaryn/)) +- style: hide discussions (thanks to [u/Roosmaryn](https://www.reddit.com/user/Roosmaryn/)). - new: custom colour theming, demonstrated via the dark+ theme. -- new: linux support (thanks for [@Blacksuan19](https://github.com/Blacksuan19)). +- new: linux support (thanks to [@Blacksuan19](https://github.com/Blacksuan19)). - improved: if hotkey is pressed while notion is unfocused, it will bring it to the front rather than hiding it. - improved: stop window buttons breaking at smaller widths. - improved: more obviously visible drag area. -- bugfix: specify UTF-8 encoding to prevent multibyte/gbk codec errors (thanks to [@etnperlong](https://github.com/etnperlong)) +- bugfix: specify UTF-8 encoding to prevent multibyte/gbk codec errors (thanks to [@etnperlong](https://github.com/etnperlong)). > 📥 [notion-enhancer.v0.6.0.zip](https://github.com/dragonwocky/notion-enhancer/archive/v0.6.0.zip) diff --git a/cleaner.py b/cleaner.py index 0f93f10..04c01f6 100644 --- a/cleaner.py +++ b/cleaner.py @@ -30,29 +30,43 @@ try: .rstrip().decode('utf-8')[3:].replace('\\', '/') + '/Programs/Notion/resources' elif sys.platform == 'win32': filepath = subprocess.run(['echo', '%localappdata%'], shell=True, capture_output=True).stdout \ - .rstrip().decode('utf-8').replace('\\', '/') + '/Programs/Notion/resources' + .rstrip().decode('utf-8') + '\\Programs\\Notion\\resources' + elif sys.platform == 'linux': + filepath = '/opt/notion-app' + elif sys.platform == 'darwin': + filepath = '/Applications/Notion.app/Contents/Resources' else: print(' > script not compatible with your os!\n (report this to dragonwocky#8449 on discord)') exit() - if os.path.exists(filepath + '/app'): + if os.path.exists(os.path.join(filepath, 'app')): print( - f' ...removing folder {filepath}/app/') - rmtree(filepath + '/app') + f' ...removing folder {os.path.join(filepath, "app")}') + rmtree(os.path.join(filepath, 'app')) else: print( - f' * {filepath}/app/ was not found: step skipped.') + f' * {os.path.join(filepath, "app")} was not found: step skipped.') - if os.path.isfile(filepath + '/app.asar.bak'): + if os.path.isfile(os.path.join(filepath, 'app.asar.bak')): print(' ...renaming asar.app.bak to asar.app') - os.rename(filepath + '/app.asar.bak', filepath + '/app.asar') + os.rename(os.path.join(filepath, 'app.asar.bak'), + os.path.join(filepath, 'app.asar')) else: print( - f' * {filepath}/app.asar.bak was not found: step skipped.') + f' * {os.path.join(filepath, "app.asar.bak")} was not found: step skipped.') + + if sys.platform == 'linux' and 'microsoft' not in platform.uname()[3].lower(): + print( + f' ...patching app launcher') + subprocess.call( + ['sed', '-i', r's/app/app\.asar/', '/usr/bin/notion-app']) + # patch this too just in case + subprocess.call(['sed', '-i', r's/app/app\.asar/', + os.path.join(filepath, "notion-app")]) print(f'\n{bold}>>> SUCCESSFULLY CLEANED <<<{normal}') except Exception as e: - print(f'\n{bold}### ERROR ###{normal}\n{str(e)}') + print(f'\n{bold}### ERROR (report this to dragonwocky#8449 on discord) ###{normal}\n{str(e)}') print(f'\n{bold}=== END OF LOG ==={normal}') diff --git a/customiser.py b/customiser.py index 84409ac..f9d99c5 100755 --- a/customiser.py +++ b/customiser.py @@ -13,7 +13,7 @@ from shutil import copyfile, rmtree from time import sleep # to smooth the update process -enhancer_version = '0.6.0' +enhancer_version = '0.6.1~beta1' # for toggling notion visibility hotkey = 'CmdOrCtrl+Shift+A' @@ -28,7 +28,7 @@ print('=== NOTION ENHANCER CUSTOMISATION LOG ===\n') try: filepath = '' - __folder__ = os.path.dirname(os.path.realpath(__file__)).replace('\\', '/') + __folder__ = os.path.dirname(os.path.realpath(__file__)) if 'microsoft' in platform.uname()[3].lower() and sys.platform == 'linux': filepath = '/mnt/c/' + \ subprocess.run( @@ -39,42 +39,44 @@ try: __folder__ = drive + ':/' + __folder__[6:] elif sys.platform == 'win32': filepath = subprocess.run(['echo', '%localappdata%'], shell=True, capture_output=True).stdout \ - .rstrip().decode('utf-8').replace('\\', '/') + '/Programs/Notion/resources' + .rstrip().decode('utf-8') + '\\Programs\\Notion\\resources' elif sys.platform == 'linux': filepath = '/opt/notion-app' + elif sys.platform == 'darwin': + filepath = '/Applications/Notion.app/Contents/Resources' else: print(' > script not compatible with your os!\n (report this to dragonwocky#8449 on discord)') exit() unpacking_asar = True - if not os.path.isfile(filepath + '/app.asar'): - print(f' ## file {filepath}/app.asar not found!') + if not os.path.isfile(os.path.join(filepath, 'app.asar')): + print(f' ## file {os.path.join(filepath, "app.asar")} not found!') print(' * attempting to locate') - if os.path.exists(filepath + '/app'): + if os.path.exists(os.path.join(filepath, 'app')): unpacking_asar = False print(' * app.asar was already unpacked: checking version.') cleaning_asar = True - if os.path.isfile(filepath + '/app/ENHANCER_VERSION.txt'): - with open(filepath + '/app/ENHANCER_VERSION.txt', 'r', encoding='UTF-8') as content: + if os.path.isfile(os.path.join(filepath, 'app', 'ENHANCER_VERSION.txt')): + with open(os.path.join(filepath, 'app', 'ENHANCER_VERSION.txt'), 'r', encoding='UTF-8') as content: if content.read() == enhancer_version: cleaning_asar = False if cleaning_asar: unpacking_asar = True print(' * version does not match: cleaning.') - if os.path.exists(filepath + '/app'): + if os.path.exists(os.path.join(filepath, 'app')): print( - f' ...removing folder {filepath}/app/') - rmtree(filepath + '/app') + f' ...removing folder {os.path.join(filepath, "app")}') + rmtree(os.path.join(filepath, 'app')) else: print( - f' * {filepath}/app/ was not found: step skipped.') - if os.path.isfile(filepath + '/app.asar.bak'): + f' * {os.path.join(filepath, "app")} was not found: step skipped.') + if os.path.isfile(os.path.join(filepath, 'app.asar.bak')): print(' ...renaming asar.app.bak to asar.app') - os.rename(filepath + '/app.asar.bak', - filepath + '/app.asar') + os.rename(os.path.join(filepath, 'app.asar.bak'), + os.path.join(filepath, 'app.asar')) else: print( - f' * {filepath}/app.asar.bak was not found: exiting. notion install is corrupted.') + f' * {os.path.join(filepath, "app.asar.bak")} was not found: exiting. notion install is corrupted.') exit() else: print(' * version matches: continuing.') @@ -84,16 +86,18 @@ try: exit() if unpacking_asar: print(' ...unpacking app.asar') - subprocess.run(['asar', 'extract', filepath + - '/app.asar', filepath + '/app'], shell=(True if sys.platform == 'win32' else False)) + subprocess.run(['asar', 'extract', os.path.join(filepath, 'app.asar'), os.path.join( + filepath, 'app')], shell=(True if sys.platform == 'win32' else False)) print(' ...renaming asar.app to asar.app.bak') - os.rename(filepath + '/app.asar', filepath + '/app.asar.bak') - with open(filepath + '/app/ENHANCER_VERSION.txt', 'w', encoding='UTF-8') as write: + os.rename(os.path.join(filepath, 'app.asar'), + os.path.join(filepath, 'app.asar.bak')) + with open(os.path.join(filepath, 'app', 'ENHANCER_VERSION.txt'), 'w', encoding='UTF-8') as write: write.write(enhancer_version) - if os.path.isfile(filepath + '/app/renderer/preload.js'): - print(f' ...adding preload.js to {filepath}/app/renderer/preload.js') - with open(filepath + '/app/renderer/preload.js', 'r', encoding='UTF-8') as content: + if os.path.isfile(os.path.join(filepath, "app", "renderer", "preload.js")): + print( + f' ...adding preload.js to {os.path.join(filepath, "app","renderer","preload.js")}') + with open(os.path.join(filepath, "app", "renderer", "preload.js"), 'r', encoding='UTF-8') as content: if '/* === INJECTION MARKER === */' in content.read(): print(' * preload.js already added. replacing it.') content.seek(0) @@ -102,12 +106,12 @@ try: if '/* === INJECTION MARKER === */' in line: break original += line - with open(filepath + '/app/renderer/preload.js', 'w', encoding='UTF-8') as write: + with open(os.path.join(filepath, "app", "renderer", "preload.js"), 'w', encoding='UTF-8') as write: write.writelines(original) else: - with open(filepath + '/app/renderer/preload.js', 'a', encoding='UTF-8') as append: + with open(os.path.join(filepath, "app", "renderer", "preload.js"), 'a', encoding='UTF-8') as append: append.write('\n\n') - with open(filepath + '/app/renderer/preload.js', 'a', encoding='UTF-8') as append: + with open(os.path.join(filepath, "app", "renderer", "preload.js"), 'a', encoding='UTF-8') as append: print(' ...linking to ./resources/user.css') with open('./resources/preload.js', 'r', encoding='UTF-8') as insert: append.write(insert.read().replace( @@ -115,18 +119,18 @@ try: + '/resources')) else: print( - f' * {filepath}/app/renderer/preload.js was not found: step skipped.') + f' * {os.path.join(filepath, "app","renderer","preload.js")} was not found: step skipped.') - if os.path.isfile(filepath + '/app/main/createWindow.js'): - with open(filepath + '/app/main/createWindow.js', 'r', encoding='UTF-8') as content: + if os.path.isfile(os.path.join(filepath, "app", "main", "createWindow.js")): + with open(os.path.join(filepath, "app", "main", "createWindow.js"), 'r', encoding='UTF-8') as content: content = content.read() print( - f' ...making window frameless @ {filepath}/app/main/createWindow.js') + f' ...making window frameless @ {os.path.join(filepath, "app", "main", "createWindow.js")}') if '{ frame: false, show: false' not in content: content = content.replace( '{ show: false', '{ frame: false, show: false') print( - f' ...adding "open hidden" capabilities to {filepath}/app/main/createWindow.js') + f' ...adding "open hidden" capabilities to {os.path.join(filepath, "app", "main", "createWindow.js")}') content = re.sub('\\s*\\/\\* === INJECTION START === \\*\\/.*?\\/\\* === INJECTION END === \\*\\/\\s*', 'window.show()', content, flags=re.DOTALL).replace('window.show()', """ /* === INJECTION START === */ @@ -142,35 +146,35 @@ try: { window.show(); if (store.maximized) window.maximize(); } /* === INJECTION END === */ """) - with open(filepath + '/app/main/createWindow.js', 'w', encoding='UTF-8') as write: + with open(os.path.join(filepath, "app", "main", "createWindow.js"), 'w', encoding='UTF-8') as write: write.write(content) else: print( - f' * {filepath}/app/main/createWindow.js was not found: step skipped.') + f' * {os.path.join(filepath, "app", "main", "createWindow.js")} was not found: step skipped.') - if os.path.isfile(filepath + '/app/renderer/index.js'): - with open(filepath + '/app/renderer/index.js', 'r', encoding='UTF-8') as content: + if os.path.isfile(os.path.join(filepath, "app", "renderer", "index.js")): + with open(os.path.join(filepath, "app", "renderer", "index.js"), 'r', encoding='UTF-8') as content: print( - f' ...adjusting drag area for frameless window in {filepath}/app/renderer/index.js') + f' ...adjusting drag area for frameless window in {os.path.join(filepath, "app", "renderer", "index.js")}') content = content.read() loc = content.rfind('dragRegionStyle') content = content[:loc] + content[loc:] \ .replace('top: 0', 'top: 1', 1) \ .replace('height: 34', 'height: 10', 1) - with open(filepath + '/app/renderer/index.js', 'w', encoding='UTF-8') as write: + with open(os.path.join(filepath, "app", "renderer", "index.js"), 'w', encoding='UTF-8') as write: write.write(content) else: print( - f' * {filepath}/app/renderer/index.js was not found: step skipped.') + f' * {os.path.join(filepath, "app", "renderer", "index.js")} was not found: step skipped.') - if os.path.isfile(filepath + '/app/main/main.js'): - with open(filepath + '/app/main/main.js', 'r', encoding='UTF-8') as content: + if os.path.isfile(os.path.join(filepath, "app", "main", "main.js")): + with open(os.path.join(filepath, "app", "main", "main.js"), 'r', encoding='UTF-8') as content: print( - f' ...adding tray support (inc. context menu with settings) to {filepath}/app/main/main.js') + f' ...adding tray support (inc. context menu with settings) to {os.path.join(filepath, "app", "main", "main.js")}') print( - f' ...adding window toggle hotkey to {filepath}/app/main/main.js') + f' ...adding window toggle hotkey to {os.path.join(filepath, "app", "main", "main.js")}') content = content.read() - with open(filepath + '/app/main/main.js', 'w', encoding='UTF-8') as write: + with open(os.path.join(filepath, "app", "main", "main.js"), 'w', encoding='UTF-8') as write: if '/* === INJECTION MARKER === */' in content: print(' * tray.js already added. replacing it.') original = [] @@ -183,32 +187,35 @@ try: write.write(content.replace( 'electron_1.app.on("ready", handleReady);', 'electron_1.app.on("ready", () => handleReady() && enhancements());') + '\n') - with open(filepath + '/app/main/main.js', 'a', encoding='UTF-8') as append: + with open(os.path.join(filepath, "app", "main", "main.js"), 'a', encoding='UTF-8') as append: with open('./resources/tray.js', 'r', encoding='UTF-8') as insert: append.write('\n' + insert.read().replace( '☃☃☃hotkey☃☃☃', hotkey)) print( - f' ...copying tray icon ./resources/notion.ico to {filepath}/app/main/') + f' ...copying tray icon ./resources/notion.ico to {os.path.join(filepath, "app")}main/') copyfile('./resources/notion.ico', - filepath + '/app/main/notion.ico') + os.path.join(filepath, "app", "main", "notion.ico")) print( - f' ...copying datastore wrapper ./resources/store.js to {filepath}/app/') - copyfile('./resources/store.js', filepath + '/app/store.js') + f' ...copying datastore wrapper ./resources/store.js to {os.path.join(filepath, "app")}') + copyfile('./resources/store.js', + os.path.join(filepath, "app", "store.js")) else: print( - f' * {filepath}/app/main/main.js was not found: step skipped.') + f' * {os.path.join(filepath, "app", "main", "main.js")} was not found: step skipped.') if sys.platform == 'linux' and 'microsoft' not in platform.uname()[3].lower(): - print(f' ...patching app launcher {filepath}/notion-app') + print( + f' ...patching app launcher') subprocess.call( - ['sed', '-i', 's/app\.asar/app/', '/usr/bin/notion-app']) + ['sed', '-i', r's/app\.asar/app/', '/usr/bin/notion-app']) # patch this too just in case - subprocess.call(['sed', '-i', 's/app\.asar/app/', - f'{filepath}/notion-app']) + subprocess.call(['sed', '-i', r's/app\.asar/app/', + os.path.join(filepath, "notion-app")]) print('\n>>> SUCCESSFULLY CUSTOMISED <<<') except Exception as e: - print(f'\n### ERROR ###\n{str(e)}') + print( + f'\n### ERROR (report this to dragonwocky#8449 on discord) ###\n{str(e)}') print('\n=== END OF LOG ===') diff --git a/resources/theme.css b/resources/theme.css index b7fd909..f79799a 100644 --- a/resources/theme.css +++ b/resources/theme.css @@ -110,7 +110,7 @@ background: var(--theme-primary) !important; } [style*='background: rgb(6, 156, 205)'] { - background: var(--theme-primary-hover) !important; + background: var(--theme-primary_hover) !important; } [style*='background: rgb(0, 141, 190)'] { background: var(--theme-primary_click) !important; diff --git a/resources/tray.js b/resources/tray.js index 590119b..1e16d21 100644 --- a/resources/tray.js +++ b/resources/tray.js @@ -89,6 +89,7 @@ function enhancements() { }, ]); tray.setContextMenu(contextMenu); + tray.setToolTip('notion enhancements'); function showWindows(windows) { if (store.maximized)