perf: Optimize search result display

perf: Optimize the export html interface
feat: add insert network image short key

.github/workflows/package.yml

@@ -51,7 +51,7 @@ jobs:
 
       - name: ls
         run: |
-          wget https://github.com/1943time/bs-web/releases/download/v0.5.1/web.zip
+          wget https://pic.bluestone.blog/web/web.zip
           chmod 755 web.zip
           unzip web.zip
       - name: Build

.gitignore

@@ -15,3 +15,4 @@ build/entitlements.mas.plist
 build/entitlements.mas.loginhelper.plist
 src/renderer/src/share
 mas-builder.yml
+src/main/auth.ts

electron-builder.yml

@@ -18,8 +18,8 @@ files:
 asarUnpack:
   - resources/*
 artifactName: "Bluestone-${os}-${arch}-${version}.${ext}"
-#extraResources:
-#  - web
+extraResources:
+  - web
 fileAssociations:
   ext: md
   role: Editor
@@ -42,7 +42,7 @@ mac:
   target:
     - target: dmg
       arch:
-        - x64
+#        - x64
         - arm64
 linux:
   target:
@@ -56,3 +56,8 @@ publish:
   provider: github
   owner: '1943time'
   repo: 'bluestone'
+
+protocols:
+  name: Bluestone Markdown
+  schemes:
+    - bluestone-markdown

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bluestone",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "",
   "main": "./out/main/index.js",
   "license": "AGPL-3.0",
@@ -16,7 +16,7 @@
     "build": "npm run typecheck && electron-vite build",
     "postinstall": "electron-builder install-app-deps",
     "build:win": "electron-builder --win --arm64 --x64 --config",
-    "build:mac": "electron-builder --macos --arm64 --x64 --config",
+    "build:mac": "electron-builder --macos --config",
     "build:mas": "npm run build && electron-builder --macos --config mas-builder.yml",
     "build:linux": "electron-builder --linux --config",
     "unpackage": "rm -rf unpackage && asar extract dist/mac-arm64/bluestone.app/Contents/Resources/app.asar ./unpackage",

src/main/api.ts

@@ -10,6 +10,7 @@ export const baseUrl = is.dev && process.env['ELECTRON_RENDERER_URL'] ? process.
 const workerPath = join(__dirname, '../renderer/worker.html')
 import BrowserWindowConstructorOptions = Electron.BrowserWindowConstructorOptions
 import fetch from 'node-fetch'
+import {openAuth} from './auth'
 
 export const windowOptions: BrowserWindowConstructorOptions = {
   show: false,
@@ -50,6 +51,9 @@ export const registerApi = () => {
   ipcMain.handle('get-path', (e, type: Parameters<typeof app.getPath>[0]) => {
     return app.getPath(type)
   })
+  ipcMain.on('open-auth', (e, type: 'github') => {
+    openAuth(type)
+  })
   ipcMain.handle('get-env', () => {
     return {
       isPackaged: app.isPackaged,

src/main/appMenus.ts

@@ -55,7 +55,6 @@ export const createAppMenus = () => {
     italic: 'Italic',
     strikethrough: 'Strikethrough',
     inlineCode: 'Inline Code',
-    insertPicture: 'Insert Picture',
     clear: 'Clear',
     view: 'View',
     zoomIn: 'Zoom In',
@@ -164,9 +163,19 @@ export const createAppMenus = () => {
       {type: 'separator'},
       {
         label: menusLabel.pdf,
+        id: 'print-pdf',
+        enabled: false,
         click: (e, win) => {
           win?.webContents.send('call-print-pdf')
         }
+      },
+      {
+        label: menusLabel.html,
+        id: 'print-html',
+        enabled: false,
+        click: (e, win) => {
+          win?.webContents.send('call-print-html')
+        }
       }
     ]
   })
@@ -309,19 +318,32 @@ export const createAppMenus = () => {
           click: task('code')
         },
         {
-          label: menusLabel.insertPicture,
+          label: 'Image',
           accelerator: `${cmd}+p`,
-          click: (e, win) => {
-            dialog.showOpenDialog({
-              properties: ['openFile'],
-              filters: [{extensions: ['png', 'jpg', 'jpeg', 'gif', 'webp'], name: 'Image'}],
-              securityScopedBookmarks: true
-            }).then(res => {
-              if (res.filePaths.length) {
-                win?.webContents.send('key-task', 'insertImage', res.filePaths[0])
+          submenu: [
+            {
+              label: 'Insert local image',
+              accelerator: `${cmd}+p`,
+              click: (e, win) => {
+                dialog.showOpenDialog({
+                  properties: ['openFile'],
+                  filters: [{extensions: ['png', 'jpg', 'jpeg', 'gif', 'webp'], name: 'Image'}],
+                  securityScopedBookmarks: true
+                }).then(res => {
+                  if (res.filePaths.length) {
+                    win?.webContents.send('key-task', 'insertImage', res.filePaths[0])
+                  }
+                })
               }
-            })
-          }
+            },
+            {
+              accelerator: `${cmd}+shift+p`,
+              label: 'Insert image via url',
+              click: (e, win) => {
+                win?.webContents.send('key-task', 'insertNetworkImage')
+              }
+            }
+          ]
         },
         {type: 'separator'},
         {
@@ -347,8 +369,6 @@ export const createAppMenus = () => {
     }
   ]
   const devTools:MenuOptions[number]['submenu'] = is.dev ? [
-    {type: 'separator'},
-    {role: 'reload'},
     {role: 'toggleDevTools'}
   ] : []
   menus.push(
@@ -379,6 +399,8 @@ export const createAppMenus = () => {
             BrowserWindow.getFocusedWindow()?.webContents.send('open-search')
           }
         },
+        {type: 'separator'},
+        {role: 'reload'},
         ...devTools
       ],
     }
@@ -459,4 +481,8 @@ export const createAppMenus = () => {
         break
     }
   })
+  ipcMain.on('open-file', (e, isMarkdown: boolean) => {
+    instance.getMenuItemById('print-pdf')!.enabled = isMarkdown
+    instance.getMenuItemById('print-html')!.enabled = isMarkdown
+  })
 }

src/main/index.ts

@@ -5,6 +5,7 @@ import {baseUrl, isDark, registerApi, windowOptions} from './api'
 import {createAppMenus} from './appMenus'
 import {registerMenus} from './menus'
 import {store} from './store'
+import log from 'electron-log'
 import {AppUpdate} from './update'
 const isWindows = process.platform === 'win32'
 
@@ -18,6 +19,7 @@ type WinOptions = {
 }
 
 const windows = new Map<number, WinOptions>()
+app.setAsDefaultProtocolClient('bluestone-markdown')
 function createWindow(initial?: WinOptions): void {
   const dark = isDark()
   const {width, height} = screen.getPrimaryDisplay().workAreaSize
@@ -84,6 +86,10 @@ app.on('will-finish-launching', () => {
       openFiles(file)
     }
   })
+  app.on('open-url', (event, url) => {
+    log.info('open-url', url)
+    BrowserWindow.getFocusedWindow()?.webContents.send('open-schema', url)
+  })
 })
 const openFiles = (filePath: string) => {
   try {

src/main/menus.ts

@@ -42,6 +42,13 @@ export const registerMenus = () => {
           win?.webContents.send('call-print-pdf')
         }
       },
+      {
+        label: menusLabel.html,
+        enabled: filePath?.endsWith('.md'),
+        click: (e, win) => {
+          win?.webContents.send('call-print-html')
+        }
+      },
       {
         type: 'separator'
       },

src/renderer/src/api/main.ts

@@ -22,6 +22,9 @@ export const MainApi = {
   closeWindow() {
     ipcRenderer.send('close-window')
   },
+  openAuth(type: 'github') {
+    ipcRenderer.send('open-auth', type)
+  },
   getSystemDark() {
     return ipcRenderer.invoke('get-system-dark')
   },

src/renderer/src/components/AceCode.tsx

@@ -0,0 +1,26 @@
+import AceEditor from 'react-ace'
+
+export function AceCode(props: {
+  value?: string
+  onChange?: (v: string) => void
+}) {
+  return (
+    <div className={'pt-2'}>
+      <AceEditor
+        mode={'json'}
+        setOptions={{
+          showGutter: false,
+          highlightActiveLine: false,
+          useWorker: false
+        }}
+        theme="cloud9_night"
+        height={'400px'}
+        width={'100%'}
+        tabSize={2}
+        value={props.value}
+        onChange={props.onChange}
+        editorProps={{ $blockScrolling: true}}
+      />
+    </div>
+  )
+}