First version for DNt 3.x

Author: mpco

README.md

@@ -1,31 +1,16 @@
 
 # DEVONthink Search
 
-Powerful tool for seaching in DEVONthink. [中文说明](https://github.com/mpco/AlfredWorkflow-DEVONthink-Search/blob/master/README_CN.md)
+Powerful tool for seaching in DEVONthink, for DEVONthink 3.x.
 
-There are two editions:
-
-- **DEVONthink Search**, for DEVONthink Personal
-    - [Download](https://github.com/mpco/AlfredWorkflow-DEVONthink-Search/releases/download/3.0/DEVONthink.Search.alfredworkflow)
-    - Search results aren't perfect, as the workflow searches with `Spotlight Index` generated by DEVONthink.
-    - It's necessary to enable `Create Spotlight Index` in Database Property. (Enabled by default)
-    - It **only** support the following `dnt` keyword and single database.
-- **DEVONthink Pro Search**, for DEVONthink Pro/Pro Office
-    - [Download](https://github.com/mpco/AlfredWorkflow-DEVONthink-Search/releases)
-    - Search results are the same as in DEVONthink, sorted by keywords matching score. 
-    - It's not necessary to enable `Create Spotlight Index`.
-    - The information displayed in the search results is more abundant.
-
-![Comparison](https://user-images.githubusercontent.com/3690653/48790858-3f872c00-ed2b-11e8-8ae6-683ce19cc597.png)
-
-- The subtext of result in `DEVONthink Search` is the download url or the path of Spotlight Index.
-- The subtext of result in `DEVONthink Pro Search` consists of the database name and group name which contained the file. It will show tags when you press `⌘Command`.
+For DEVONthink 2.x, you can use the versions of this workflow before V7.0. Switch to [Branch DEVONthink 2.x](https://github.com/mpco/AlfredWorkflow-DEVONthink-Search/tree/DEVONthink2.x) to access the README document and source code.
 
+[Download](https://github.com/mpco/AlfredWorkflow-DEVONthink-Search/releases) [中文说明](https://github.com/mpco/AlfredWorkflow-DEVONthink-Search/blob/master/README_CN.md)
 
 ## Usage
 
-- Type `dnt + keywords` to search in all opened databases. 
-- Type `dnts + keywords` to search in **Search Window** of DNtp.
+- Type `dnt + keywords` to search in all opened databases in Alfred. 
+- Type `dnts + keywords` to search in DEVONthink window.
 - Type `dnd` to choose which datebase to search
     - Press `Enter`, then type in `keywords` to search in the chosen database. 
     - Press `⌘Command + Enter` to list all tags in the database, then choose a tag and press `Enter` to list all documents which have the tag.

README_CN.md

@@ -1,31 +1,15 @@
 # DEVONthink Search
 
-强大的 DEVONthink 搜索工具。
+强大的 DEVONthink 搜索工具，适用于 DEVONthink 3.x 的各个版本。
 
-分为两个版本：
+DEVONthink 2.x 请使用 7.0 之前的版本，说明文档及代码请查看[相应分支](https://github.com/mpco/AlfredWorkflow-DEVONthink-Search/tree/DEVONthink2.x)。
 
-- DEVONthink Search, 适用于 DEVONthink Personal。
-    - [点击下载](https://github.com/mpco/AlfredWorkflow-DEVONthink-Search/releases/download/3.0/DEVONthink.Search.alfredworkflow)
-    - 搜索准确度一般，因为是利用生成的 Spotlight Index 进行搜索。
-    - 需要开启数据库属性中的 `Create Spotlight Index` （默认开启）。
-    - 仅支持下文中的 `dnt + 关键词` 搜索方式。
-- DEVONthink Pro Search, 适用于 DEVONthink Pro / Pro Office。
-    - [点击下载](https://github.com/mpco/AlfredWorkflow-DEVONthink-Search/releases)
-    - 搜索结果与 DEVONthink 中搜索结果一致，按照关键词匹配得分排列。
-    - 无需开启数据库属性中的 `Create Spotlight Index`。
-    - 搜索结果中显示的信息更丰富。
-
-![对比](https://user-images.githubusercontent.com/3690653/48790858-3f872c00-ed2b-11e8-8ae6-683ce19cc597.png)
-
-**说明：**
-
-- DEVONthink Search 搜索结果的子文本（subtext）为下载该文件的 URL 或相应的 Spotlight Index 文件路径。
-- DEVONthink Pro Search 搜索结果的子文本（subtext）为该文件在 DEVONthink 中所在的数据库+文件夹路径。按下 `⌘Command` 则显示为标签信息。
+[这里下载](https://github.com/mpco/AlfredWorkflow-DEVONthink-Search/releases)
 
 ## 用法
 
-- 输入 `dnt + 关键词` 在所有数据库中进行搜索。
-- 输入 `dnts + 关键词` 在 DNtp 的 **Search Window** 中进行搜索。
+- 输入 `dnt + 关键词` 在 Alfred 中搜索所有数据库。
+- 输入 `dnts + 关键词` 在 DEVONthink 的窗口中进行搜索。
 - 输入 `dnd` 选择需要搜索的数据库
     - 按 `回车` 确认，接着输入 `关键词` 以进行搜索。
     - 按 `⌘Command + 回车` 列出该数据库中的所有标签（Tag）。选择某个标签，然后按下回车键，可列出所有附有该标签的文档。
@@ -48,8 +32,6 @@
 
 ## 配置
 
-**仅适用于 DEVONthink Pro Search**
-
 ### `ignoredDbUuidList`：屏蔽某些数据库
 
 使用 `dnt` 和 `dnm` 在所有数据库中进行搜索，但是我们可能需要屏蔽某些数据库。例如，我建立了一个**存档**数据库以保存一些文件，但平时一般不需要打开或查看。在 Alfred Workflow 环境变量 `ignoredDbUuidList` 中加入以**英文逗号**分隔的多个数据库 UUID 即可屏蔽这些数据库。设置后，依旧可以通过 `dnd` 指定在被屏蔽的数据库中进行搜索。

getDbList.js

@@ -1,6 +1,6 @@
 'use strict';
 function run() {
-    var DNt = Application("DEVONthink Pro");
+    var DNt = Application("DEVONthink 3");
     var allDB = DNt.databases
     var allResult = []
     for (var db in allDB) {

getRecordListByTags.py

@@ -16,7 +16,7 @@
     ignoredDbUuidList = os.getenv('ignoredDbUuidList', "").split(",")
     ignoredDbUuidList = [dbUuid.strip() for dbUuid in ignoredDbUuidList]
     ignoredDbUuidListStr = "\",\"".join(ignoredDbUuidList)
-    getInfoAppleScript = """'tell application "DEVONthink Pro"
+    getInfoAppleScript = """'tell application "DEVONthink 3"
     set allDb to every database
     set allResult to ""
     set ignoredDbUuidList to {"%s"}
@@ -50,7 +50,7 @@
     selectedTag = os.getenv('selectedTag', "")
     tagStr = selectedTag
     selectedDbUuid = os.getenv('selectedDbUUID', "")
-    getInfoAppleScript = """'tell application "DEVONthink Pro"
+    getInfoAppleScript = """'tell application "DEVONthink 3"
     set theDB to (get database with uuid "%s")
     set theList to lookup records with tags {"%s"} in theDB
     set theResult to ""

getTagsList.py

@@ -12,7 +12,7 @@
 
 selectedDbUUID = os.getenv('selectedDbUUID', "")
 
-cmdScript = "osascript -e 'tell application \"DEVONthink Pro\" to get name of tag group of (get database with uuid \"{}\")' -s s".format(selectedDbUUID)
+cmdScript = "osascript -e 'tell application \"DEVONthink 3\" to get name of tag group of (get database with uuid \"{}\")' -s s".format(selectedDbUUID)
 cmdList = shlex.split(cmdScript)
 cmdResult = subprocess.check_output(cmdList)
 tagList = ast.literal_eval(

icon.png

@@ -188,11 +188,11 @@
 	<key>createdby</key>
 	<string>Charles Ma</string>
 	<key>description</key>
-	<string>Powerful tool for searching in DEVONthink Pro / Pro Office</string>
+	<string>Powerful tool for searching in DEVONthink 3</string>
 	<key>disabled</key>
 	<false/>
 	<key>name</key>
-	<string>DEVONthink Pro Search</string>
+	<string>DEVONthink Search</string>
 	<key>objects</key>
 	<array>
 		<dict>
@@ -206,13 +206,7 @@
 				<string>echo '{query}' | perl -CIOED -p -e 's/(\p{Block=CJK_Unified_Ideographs}+)/ ~\1 /g' | pbcopy
 
 AScommand=$(cat&lt;&lt;EOF
-tell application "DEVONthink Pro" to activate
-tell application "System Events"
-    keystroke "f" using {command down, shift down}
-    tell application "System Events" to keystroke "v" using command down
-    delay 0.1
-    key code 36
-end tell
+tell application "DEVONthink 3" to activatetell application "System Events"	keystroke "n" using {command down, option down}	keystroke "f" using {command down, option down}	tell application "System Events" to keystroke "v" using command down	delay 0.1	key code 36end tell
 EOF)
 
 osascript -e "$AScommand"</string>
@@ -234,13 +228,13 @@ osascript -e "$AScommand"</string>
 			<key>config</key>
 			<dict>
 				<key>argumenttype</key>
-				<integer>1</integer>
+				<integer>0</integer>
 				<key>keyword</key>
 				<string>dnts</string>
 				<key>subtext</key>
 				<string></string>
 				<key>text</key>
-				<string>Search in DEVONthink Search Window</string>
+				<string>Search in DEVONthink Window</string>
 				<key>withspace</key>
 				<true/>
 			</dict>
@@ -300,7 +294,7 @@ osascript -e "$AScommand"</string>
 				<key>subtext</key>
 				<string>{var:selectedDbName}</string>
 				<key>title</key>
-				<string>Search in DEVONthink Pro</string>
+				<string>Search in DEVONthink 3</string>
 				<key>type</key>
 				<integer>0</integer>
 				<key>withspace</key>
@@ -370,7 +364,7 @@ osascript -e "$AScommand"</string>
 				<key>script</key>
 				<string>function run(argv) {
     var query = argv[0];
-    const DNt = Application('DEVONthink Pro');
+    const DNt = Application('DEVONthink 3');
 	DNt.activate()
     DNt.openWindowFor({ record: DNt.getRecordWithUuid(query) })
 }</string>
@@ -557,7 +551,7 @@ open "x-devonthink-item://${1}?reveal=1"</string>
 				<key>escaping</key>
 				<integer>68</integer>
 				<key>script</key>
-				<string>on run	set theQuery to "{query}"	tell application "DEVONthink Pro"		load workspace theQuery		activate	end tellend run</string>
+				<string>on run	set theQuery to "{query}"	tell application "DEVONthink 3"		load workspace theQuery		activate	end tellend run</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>
@@ -648,7 +642,7 @@ open "x-devonthink-item://${1}?reveal=1"</string>
 				<key>escaping</key>
 				<integer>68</integer>
 				<key>script</key>
-				<string>on run	set theQuery to "{query}"	tell application "DEVONthink Pro"		save workspace theQuery	end tellend run</string>
+				<string>on run	set theQuery to "{query}"	tell application "DEVONthink 3"		save workspace theQuery	end tellend run</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>
@@ -786,7 +780,7 @@ open "x-devonthink-item://${1}?reveal=1"</string>
 		<string>filterOutGroup</string>
 	</array>
 	<key>version</key>
-	<string>6.1</string>
+	<string>7.0</string>
 	<key>webaddress</key>
 	<string>https://github.com/mpco/AlfredWorkflow-DEVONthink-Search</string>
 </dict>

info.plist

@@ -24,7 +24,7 @@ function run(argv) {
     // const cjkRegex = /(\p{Unified_Ideograph}+)/ug
     const cjkRegex = /([\u4e00-\u9fff]+)/g
     const query = argv[0].replace(/^\s+|\s+$/g, '').replace(cjkRegex, "~$1");
-    var DNt = Application("DEVONthink Pro");
+    var DNt = Application("DEVONthink 3");
     var allDB = DNt.databases
     // if selectedDbUUID exists, only search in selected db.
     if (typeof selectedDbUUID !== 'undefined') {
@@ -68,7 +68,7 @@ function run(argv) {
                 item["type"] = "default"
                 // group 的 path() 为空，但是 item["arg"] 为空时 Alfred 不可执行后续动作
                 // 故以应用路径代替
-                item["arg"] = "/Applications/DEVONthink Pro.app"
+                item["arg"] = "/Applications/DEVONthink 3.app"
                 item["title"] = "[Group] " + itemName
                 if (itemLocation == "/Tags/") {
                     item["title"] = "[Tag] " + itemName

search.js

@@ -5,7 +5,7 @@
 import shlex
 import subprocess
 
-cmdScript = "osascript -e 'tell application \"DEVONthink Pro\" to get workspaces' -s s"
+cmdScript = "osascript -e 'tell application \"DEVONthink 3\" to get workspaces' -s s"
 cmdList = shlex.split(cmdScript)
 cmdResult = subprocess.check_output(cmdList)
 workspaceList = ast.literal_eval(