tanpengsccd/hammerspoon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 修改初始化逻辑，防止用户的配置文件更新的时候被修改。

Browse Source 
2. 解决一些BUG（监听输入法状态卡死，咖啡因状态栏图标无故消失）
3. 选中文本后，输入翻译快捷键自动翻译选中的文本
This commit is contained in:
sugood 2020-11-13 16:15:27 +08:00
parent cfc23162b2
commit 82df63193b
9 changed files with 361 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
/.idea/
/*.zip

568
.idea/workspace.xml generated
View File

@ -2,10 +2,20 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="495daa03-3ea5-4e8c-9013-c532511d508b" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/Spoons/Caffeine.spoon/caffeine-off.pdf" afterPath="" />
<change beforePath="$PROJECT_DIR$/Spoons/Caffeine.spoon/caffeine-on.pdf" afterPath="" />
<change beforePath="$PROJECT_DIR$/Spoons/Caffeine.spoon/docs.json" afterPath="" />
<change beforePath="$PROJECT_DIR$/Spoons/Caffeine.spoon/init.lua" afterPath="" />
<change beforePath="" afterPath="$PROJECT_DIR$/.gitignore" />
<change beforePath="" afterPath="$PROJECT_DIR$/data/.gitignore" />
<change beforePath="$PROJECT_DIR$/.idea/.hammerspoon.iml" afterPath="" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="" />
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="" />
<change beforePath="$PROJECT_DIR$/data/config.json" afterPath="$PROJECT_DIR$/data/initConfig.json" />
<change beforePath="$PROJECT_DIR$/data/dictHistory.json" afterPath="$PROJECT_DIR$/data/dictHistory.json" />
<change beforePath="$PROJECT_DIR$/data/history.json" afterPath="$PROJECT_DIR$/data/history.json" />
<change beforePath="$PROJECT_DIR$/init.lua" afterPath="$PROJECT_DIR$/init.lua" />
<change beforePath="$PROJECT_DIR$/modules/caffeine.lua" afterPath="$PROJECT_DIR$/modules/caffeine.lua" />
<change beforePath="$PROJECT_DIR$/modules/commons.lua" afterPath="$PROJECT_DIR$/modules/commons.lua" />
<change beforePath="$PROJECT_DIR$/modules/dict.lua" afterPath="$PROJECT_DIR$/modules/dict.lua" />
<change beforePath="$PROJECT_DIR$/modules/inputstat.lua" afterPath="$PROJECT_DIR$/modules/inputstat.lua" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@ -16,93 +26,17 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="inputstat.lua" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/modules/inputstat.lua">
<file leaf-file-name="caffeine.lua" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/modules/caffeine.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="48" lean-forward="false" selection-start-line="3" selection-start-column="48" selection-end-line="3" selection-end-column="48" />
<state relative-caret-position="435">
<caret line="29" column="17" lean-forward="false" selection-start-line="29" selection-start-column="17" selection-end-line="29" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="init.lua" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/init.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="21" lean-forward="true" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="README_en.md" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/README_en.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="369">
<caret line="82" column="24" lean-forward="true" selection-start-line="82" selection-start-column="24" selection-end-line="82" selection-end-column="24" />
<folding />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="README.md" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="728">
<caret line="108" column="0" lean-forward="true" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" />
<folding />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="timesync.sh" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/timesync/timesync.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="23" lean-forward="false" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="system.lua" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/modules/system.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="25" lean-forward="true" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="hotkey.lua" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/modules/hotkey.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="4" lean-forward="true" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="commons.lua" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/modules/commons.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1980">
<caret line="132" column="39" lean-forward="false" selection-start-line="132" selection-start-column="39" selection-end-line="132" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="dictHistory.json" pinned="false" current-in-tab="false">
<file leaf-file-name="dictHistory.json" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/data/dictHistory.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
@ -112,11 +46,87 @@
</provider>
</entry>
</file>
<file leaf-file-name="commons.lua" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/modules/commons.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="16" lean-forward="true" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="2" lean-forward="false" selection-start-line="1" selection-start-column="2" selection-end-line="1" selection-end-column="2" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="history.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/data/history.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" column="40" lean-forward="false" selection-start-line="14" selection-start-column="40" selection-end-line="14" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="README_en.md" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/README_en.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="819">
<caret line="95" column="15" lean-forward="false" selection-start-line="95" selection-start-column="15" selection-end-line="95" selection-end-column="15" />
<folding />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="initConfig.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/data/initConfig.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="22" lean-forward="false" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="README.md" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="833">
<caret line="85" column="11" lean-forward="false" selection-start-line="85" selection-start-column="11" selection-end-line="85" selection-end-column="11" />
<folding />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/data/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="12" lean-forward="true" selection-start-line="0" selection-start-column="12" selection-end-line="0" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="config.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/data/config.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="1" lean-forward="true" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
<caret line="11" column="1" lean-forward="false" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
<folding />
</state>
</provider>
@ -133,9 +143,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>historyPath</find>
<find>translation</find>
<find>hs.json</find>
<find>setState</find>
<find>isEm</find>
<find>webview</find>
@ -163,6 +170,9 @@
<find>hs.dialog.blockAlert</find>
<find>ydAppKey</find>
<find>hyperCmd</find>
<find>stringIsEmpty</find>
<find>listenerEvent</find>
<find>config.json</find>
</findStrings>
<replaceStrings>
<replace>self.menubar</replace>
@ -193,17 +203,21 @@
<option value="$PROJECT_DIR$/modules/snippet.lua" />
<option value="$PROJECT_DIR$/modules/dict1.lua" />
<option value="$PROJECT_DIR$/modules/dict2.lua" />
<option value="$PROJECT_DIR$/init.lua" />
<option value="$PROJECT_DIR$/data/history.json" />
<option value="$PROJECT_DIR$/modules/caffeine.lua" />
<option value="$PROJECT_DIR$/modules/dict.lua" />
<option value="$PROJECT_DIR$/modules/inputstat.lua" />
<option value="$PROJECT_DIR$/modules/timesync.lua" />
<option value="$PROJECT_DIR$/data/config.json" />
<option value="$PROJECT_DIR$/modules/commons.lua" />
<option value="$PROJECT_DIR$/README_zh-CN.md" />
<option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/README_en.md" />
<option value="$PROJECT_DIR$/init.lua" />
<option value="$PROJECT_DIR$/modules/inputstat.lua" />
<option value="$PROJECT_DIR$/modules/dict.lua" />
<option value="$PROJECT_DIR$/modules/caffeine.lua" />
<option value="$PROJECT_DIR$/modules/commons.lua" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/data/.gitignore" />
<option value="$PROJECT_DIR$/data/initConfig.json" />
<option value="$PROJECT_DIR$/data/dictHistory.json" />
</list>
</option>
</component>
@ -214,7 +228,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="y" value="23" />
<option name="x" value="-1920" />
<option name="y" value="-11" />
<option name="width" value="1920" />
<option name="height" value="1009" />
</component>
@ -233,7 +248,10 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="AndroidView" />
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -246,23 +264,10 @@
<item name=".hammerspoon" type="462c0819:PsiDirectoryNode" />
<item name="data" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name=".hammerspoon" type="b2602c69:ProjectViewProjectNode" />
<item name=".hammerspoon" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name=".hammerspoon" type="b2602c69:ProjectViewProjectNode" />
<item name=".hammerspoon" type="462c0819:PsiDirectoryNode" />
<item name="timesync" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scratches" />
<pane id="AndroidView" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@ -276,12 +281,12 @@
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/data" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/data" />
<recent name="$PROJECT_DIR$/modules" />
<recent name="$PROJECT_DIR$/icon" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/data" />
</key>
</component>
@ -416,15 +421,21 @@
<workItem from="1602910724222" duration="3375000" />
<workItem from="1602916148688" duration="33848000" />
<workItem from="1603074238740" duration="59948000" />
<workItem from="1603457165086" duration="42137000" />
<workItem from="1603457165086" duration="45310000" />
<workItem from="1603616514599" duration="3158000" />
<workItem from="1603819447267" duration="333000" />
<workItem from="1603984898167" duration="190000" />
<workItem from="1604403791408" duration="11438000" />
<workItem from="1604544298691" duration="6187000" />
<workItem from="1605253935454" duration="990000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="172850000" />
<option name="totallyTimeSpent" value="198319000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1920" height="1009" extended-state="0" />
<frame x="-1920" y="-11" width="1920" height="1009" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@ -435,25 +446,25 @@
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="LuaCheck" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -469,34 +480,10 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/timesync/timesync.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="13" column="4" lean-forward="true" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/data/history.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1950">
<caret line="130" column="54" lean-forward="true" selection-start-line="130" selection-start-column="54" selection-end-line="130" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/init.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/launcher.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="465">
<caret line="31" column="39" lean-forward="false" selection-start-line="31" selection-start-column="39" selection-end-line="31" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
@ -504,7 +491,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="21" lean-forward="false" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
@ -512,7 +498,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@ -527,7 +512,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="60" lean-forward="false" selection-start-line="5" selection-start-column="60" selection-end-line="5" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
@ -542,7 +526,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2415">
<caret line="161" column="37" lean-forward="true" selection-start-line="161" selection-start-column="37" selection-end-line="161" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
@ -550,7 +533,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@ -558,7 +540,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@ -580,7 +561,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="28" column="19" lean-forward="false" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
@ -588,7 +568,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@ -596,7 +575,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="9" lean-forward="false" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
@ -604,7 +582,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="9" lean-forward="false" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
@ -619,7 +596,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@ -642,38 +618,16 @@
<entry file="file://$PROJECT_DIR$/Spoons/ColorPicker.spoon/init.lua" />
<entry file="file://$PROJECT_DIR$/Spoons/SpoonInstall.spoon/init.lua" />
<entry file="file://$PROJECT_DIR$/Spoons/KSheet.spoon/init.lua" />
<entry file="file://$PROJECT_DIR$/Spoons/Caffeine.spoon/docs.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1022">
<caret line="23" column="24" lean-forward="true" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Spoons/Caffeine.spoon/init.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="42" column="31" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Spoons/Caffeine.spoon/docs.json" />
<entry file="file://$PROJECT_DIR$/Spoons/Caffeine.spoon/init.lua" />
<entry file="jar://$APPLICATION_PLUGINS_DIR$/intellij-emmylua/lib/intellij-emmylua-1.3.2.142-IDEA172.jar!/std/Lua53/debug.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1110">
<caret line="74" column="15" lean-forward="false" selection-start-line="74" selection-start-column="15" selection-end-line="74" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/colorPicker.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1938">
<caret line="22" column="49" lean-forward="false" selection-start-line="22" selection-start-column="49" selection-end-line="22" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/colorPicker.lua" />
<entry file="file://$PROJECT_DIR$/modules/dict.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="900">
@ -682,35 +636,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/snippet.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1230">
<caret line="82" column="37" lean-forward="true" selection-start-line="82" selection-start-column="37" selection-end-line="82" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/windows.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="18" column="32" lean-forward="false" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/timesync.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="38" column="15" lean-forward="true" selection-start-line="38" selection-start-column="15" selection-end-line="38" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/launcher.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" column="19" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
@ -718,23 +647,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="23" lean-forward="true" selection-start-line="2" selection-start-column="23" selection-end-line="2" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/dict.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="48" lean-forward="false" selection-start-line="3" selection-start-column="48" selection-end-line="3" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/caffeine.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="48" lean-forward="false" selection-start-line="2" selection-start-column="48" selection-end-line="2" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
@ -742,14 +654,150 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/system.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="25" lean-forward="false" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/timesync/timesync.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="20" lean-forward="false" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/launcher.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" column="19" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/timesync.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="28" column="0" lean-forward="true" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/snippet.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="117" column="42" lean-forward="true" selection-start-line="117" selection-start-column="42" selection-end-line="117" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/hotkey.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="25" lean-forward="false" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/init.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/inputstat.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1515">
<caret line="101" column="23" lean-forward="false" selection-start-line="101" selection-start-column="23" selection-end-line="101" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/dict.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1785">
<caret line="119" column="22" lean-forward="false" selection-start-line="119" selection-start-column="22" selection-end-line="119" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/caffeine.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435">
<caret line="29" column="17" lean-forward="false" selection-start-line="29" selection-start-column="17" selection-end-line="29" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/commons.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="16" lean-forward="true" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="2" lean-forward="false" selection-start-line="1" selection-start-column="2" selection-end-line="1" selection-end-column="2" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README_en.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="819">
<caret line="95" column="15" lean-forward="false" selection-start-line="95" selection-start-column="15" selection-end-line="95" selection-end-column="15" />
<folding />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="833">
<caret line="85" column="11" lean-forward="false" selection-start-line="85" selection-start-column="11" selection-end-line="85" selection-end-column="11" />
<folding />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/data/history.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="859">
<caret line="144" column="4" lean-forward="false" selection-start-line="144" selection-start-column="4" selection-end-line="144" selection-end-column="4" />
<state relative-caret-position="210">
<caret line="14" column="40" lean-forward="false" selection-start-line="14" selection-start-column="40" selection-end-line="14" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/data/initConfig.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="22" lean-forward="false" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/data/config.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="1" lean-forward="false" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/data/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="12" lean-forward="true" selection-start-line="0" selection-start-column="12" selection-end-line="0" selection-end-column="12" />
<folding />
</state>
</provider>
@ -762,84 +810,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/data/config.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="1" lean-forward="true" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/commons.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1980">
<caret line="132" column="39" lean-forward="false" selection-start-line="132" selection-start-column="39" selection-end-line="132" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/inputstat.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="48" lean-forward="false" selection-start-line="3" selection-start-column="48" selection-end-line="3" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/init.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="21" lean-forward="true" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/system.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="25" lean-forward="true" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/modules/hotkey.lua">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="4" lean-forward="true" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/timesync/timesync.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="23" lean-forward="false" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="728">
<caret line="108" column="0" lean-forward="true" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" />
<folding />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README_en.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="369">
<caret line="82" column="24" lean-forward="true" selection-start-line="82" selection-start-column="24" selection-end-line="82" selection-end-column="24" />
<folding />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

1
data/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/config.json

4
data/history.json
View File

@ -23,6 +23,10 @@
"subText" : "cmd|chmod -R 777 filename|改变文件或目录的权限",
"text" : "chmod"
},
{
"subText" : "cmd|chmod u+x|chmod u+x filemae|设置运行权限",
"text" : "chmod u+x"
},
{
"subText" : "cmd|chown newowner:newowner filename|改变文件或目录的属主",
"text" : "chown"

3
init.lua
View File

@ -9,7 +9,8 @@ require "modules/windows"
require "modules/launcher"
require "modules/snippet"
require "modules/timesync"
require "modules/caffeine"
require "modules/inputstat"
require "modules/dict"
require "modules/jsonFormat"
require "modules/caffeine"

25
modules/caffeine.lua
View File

@ -3,14 +3,33 @@
--- Created by sugood(https://github.com/sugood).
--- DateTime: 2020/10/24 14:13
---
if config ~=nil and config[1].caffeine == 'on' then
local menuBarItem = nil
local setCaffeine= function()
if config ~=nil and config[1].caffeine == 'on' and menuBarItem == nil then
print("设置状态栏")
local menuBarItem = hs.menubar.new()
menuBarItem= hs.menubar.new()
menuBarItem:setTitle("")
menuBarItem:setIcon("~/.hammerspoon/icon/caffeine-on.pdf")
hs.caffeinate.set("displayIdle", true)
else
hs.caffeinate.set("displayIdle", false)
end
end
function resetCaffeineMeun()
if(config ~=nil and config[1].caffeine == 'on' and menuBarItem:isInMenuBar() == false) then
print("重置状态栏")
menuBarItem:delete()
menuBarItem= hs.menubar.new()
menuBarItem:setTitle("")
menuBarItem:setIcon("~/.hammerspoon/icon/caffeine-on.pdf")
--hs.caffeinate.set("displayIdle", true)
end
end
function initData()
setCaffeine()
--监听咖啡因的状态,判断是否要重置
hs.timer.doEvery(1, resetCaffeineMeun)
end
-- 初始化
initData()

38
modules/commons.lua
View File

@ -4,11 +4,28 @@
--- DateTime: 2020/10/24 14:13
---
local console = require("hs.console")
version = "v0.1.1"
version = "v0.1.2"
configPath= "~/.hammerspoon/data/config.json"
initConfigPath= "~/.hammerspoon/data/initConfig.json"
config = {}
colorDialog = hs.dialog.color
--检查文件是否存在
function checkFileExist(path)
local file = hs.fs.pathToAbsolute(path)
return file ~= nil
end
--复制文件
function copyFile(source,destination)
print(destination)
sourcefile = io.open(source, "r")
destinationfile = io.open(destination, "w")
destinationfile:write(sourcefile:read("*all"))
sourcefile:close()
destinationfile:close()
end
function switchDict()
if config[1].dictEngine == '百度' then
config[1].dictEngine = '有道'
@ -138,6 +155,15 @@ function initMenu()
end
function initData()
--第一次安装需要复制一个配置文件。以后更新则不会修改用户配置文件，防止被覆盖
if(checkFileExist(configPath) == false) then
print("初始化配置文件")
--获取绝对路径，io.open只支持绝对路径
local source = hs.fs.pathToAbsolute(initConfigPath)
local destination = string.gsub(source, "initConfig.json$", "config.json")
copyFile(source,destination)
end
if hs.json.read(configPath) ~= nil then
config = hs.json.read(configPath)
end
@ -224,3 +250,13 @@ function SubStringGetByteCount(str, index)
end
return byteCount;
end
--判断是否复制成功
function isCopySuccess()
local num = hs.pasteboard.changeCount()
print("复制前数量："..num)
hs.eventtap.keyStroke({ "cmd" }, "C")
local numAfter = hs.pasteboard.changeCount()
print("复制后数量："..numAfter)
return numAfter > num
end

10
modules/dict.lua
View File

@ -115,7 +115,7 @@ function getYoudaoApi(q)
else
searchResult = {}
results = hs.json.decode(body)
print('results:'..hs.inspect(results))
--print('results:'..hs.inspect(results))
if(results['web']) then
--逆序插入
for i=#results['web'],1,-1 do
@ -193,12 +193,20 @@ function initData()
if hs.json.read(dictHistoryPath) ~= nil then
searchResult = hs.json.read(dictHistoryPath)
end
local num = hs.pasteboard.changeCount()
hs.eventtap.keyStroke({ "cmd" }, "C")
mChooser = chooser.new(completionFn)
:choices(searchResult)
:queryChangedCallback(queryChangedCallbackFn)
:rightClickCallback(rightClickCallbackFn)
:searchSubText(true)
:show()
local numAfter = hs.pasteboard.changeCount()
--如果复制成功则自动查询复制的内容，否者只打开翻译界面
if(numAfter > num) then
--粘贴选中的文本进行查询
hs.eventtap.keyStroke({ "cmd" }, "V")
end
end)
end

5
modules/inputstat.lua
View File

@ -96,8 +96,11 @@ function initData()
return false
end)
mEventtap:start()
hs.timer.doEvery(1, listenerEvent)
hs.timer.doEvery(1, listenerEvent) --有BUG,经常假死
hs.keycodes.inputSourceChanged(function()
--resetCaffeineMeun()
--切换输入法后查询下监听状态
listenerEvent()
-- 用于保存当前输入法
local currentSourceID = hs.keycodes.currentSourceID()