diff --git a/LICENCE b/LICENCE index d0f9295..7fbf551 100644 --- a/LICENCE +++ b/LICENCE @@ -1,6 +1,7 @@ The MIT License (MIT) Copyright (c) 2017 Dean Jackson +Copyright (c) 2022 Giovanni Coppola <@giovannicoppola> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index afb5232..cac99dc 100644 --- a/README.md +++ b/README.md @@ -2,17 +2,19 @@ - -Downloads
- - ZotHero ======= [Alfred][alfred] workflow for rapidly searching your Zotero database and copying citations. +Original by Dean Jackson ([@deanishe](https://github.com/deanishe)) + + +Downloads
+ + - [Features](#features) @@ -47,9 +49,9 @@ Features Download & installation ----------------------- -Download the `ZotHero-XYZ.alfredworkflow` file from [GitHub releases](https://github.com/deanishe/zothero/releases), and double-click the downloaded file to install. +Download the `ZotHero-XYZ.alfredworkflow` file from [GitHub releases](https://github.com/giovannicoppola/zothero/releases), and double-click the downloaded file to install. -**Note**: Versions 1.3.0 and later are only compatible with Alfred 4+. If you're still using Alfred 3, download [v1.2.2][v1.2.2]. +**Note**: Versions 2.0 and later are only compatible with Alfred 5. If you're still using Alfred 4, download [v1.99.7][v1.99.7]. @@ -225,7 +227,7 @@ The [Zorro icon][icon-source] was created by [Dan Lowenstein][lowenstein] from [ [licence]: ./LICENCE [lowenstein]: https://thenounproject.com/danny_mustache [noun-project]: https://thenounproject.com -[releases]: https://github.com/deanishe/zothero/releases +[releases]: https://github.com/giovannicoppola/zothero/releases [smargh]: https://github.com/fractaledmind [zotquery]: https://github.com/fractaledmind/alfred_zotquery -[v1.2.2]: https://github.com/deanishe/zothero/releases/tag/v1.2.2 +[v1.99.7]: https://github.com/giovannicoppola/zothero/releases/tag/v1.99.7 diff --git a/releases/ZotHero2-0.alfredworkflow b/releases/ZotHero2-0.alfredworkflow new file mode 100644 index 0000000..d103aa0 Binary files /dev/null and b/releases/ZotHero2-0.alfredworkflow differ diff --git a/src/info.plist b/src/info.plist index 94fdb0d..ae9b397 100644 --- a/src/info.plist +++ b/src/info.plist @@ -679,7 +679,7 @@ escaping 102 keyword - zot + {var:mainkeyword} queuedelaycustom 3 queuedelayimmediatelyinitially @@ -719,6 +719,10 @@ python3 zh.py search "$1" browser + skipqueryencode + + skipvarencode + spaces url @@ -918,7 +922,7 @@ python3 zh.py copy $flags "$citekey" escaping 102 keyword - zot: + {var:mainkeyword}: queuedelaycustom 3 queuedelayimmediatelyinitially @@ -2006,6 +2010,10 @@ python3 zh.py locale "$1" browser + skipqueryencode + + skipvarencode + spaces url @@ -2170,12 +2178,7 @@ python3 zh.py notify $flags ======= Search your Zotero database and copy citations. - - -Configuration -------------- - -Edit the `ZOTERO_DIR` variable to point to Zotero 5's data directory if you aren't using the default (~/Zotero). +`zotconf` to view and edit workflow configuration. uidata 01395D7D-4E59-4FB9-8369-9578C42822C6 @@ -2183,50 +2186,50 @@ Edit the `ZOTERO_DIR` variable to point to Zotero 5's data directory if you aren colorindex 3 xpos - 1770 + 1770 ypos - 875 + 875 09DFDC0D-394F-470C-974D-BB4AAB208CED xpos - 860 + 860 ypos - 1435 + 1435 0E02FA87-DF30-4A39-A326-003800342DDF colorindex 12 xpos - 1330 + 1330 ypos - 240 + 240 118BDCA4-C25F-449C-93D8-877E192E22D2 xpos - 510 + 510 ypos - 1095 + 1095 1AF47A02-39EA-41B0-BD44-C933C31014F5 colorindex 9 xpos - 70 + 70 ypos - 1065 + 1065 1CA1CA5F-6531-4BE6-8FA9-734C04C5EF4B note $action = choose-locale xpos - 730 + 730 ypos - 1285 + 1285 256A2232-79C6-4956-9EDA-3EEDB0EE1CDF @@ -2235,102 +2238,102 @@ Edit the `ZOTERO_DIR` variable to point to Zotero 5's data directory if you aren note $autopaste is unset xpos - 1290 + 1290 ypos - 565 + 565 27AB4926-3249-4A80-85B5-6176911ACE7D colorindex 8 xpos - 860 + 860 ypos - 525 + 525 2B20149E-1275-476A-9CAA-254CB2DC74E0 note Clear cached data xpos - 860 + 860 ypos - 1605 + 1605 2C059A51-AE82-49BA-A5E9-13824D15C4EC note $action = show-citations xpos - 730 + 730 ypos - 555 + 555 2F6636A4-F41B-4D28-9AF3-754CE5B9975A note Open entry in Zotero xpos - 860 + 860 ypos - 50 + 50 301ED75B-77EF-4479-B2A5-ADD51A1143E5 note $action = show-attachments xpos - 730 + 730 ypos - 395 + 395 3636139E-A061-4685-8914-AC3351A9B797 note $next is set xpos - 1660 + 1660 ypos - 1095 + 1095 3D2145B0-1260-41B9-9EC1-A78EB5CA2400 note $action = set-default xpos - 730 + 730 ypos - 905 + 905 47548F5E-0787-4D45-AFAB-B000C4218019 xpos - 1050 + 1050 ypos - 55 + 55 49F6E2D6-5BF1-4E9A-A7CD-A4E04C30DFA8 colorindex 7 xpos - 860 + 860 ypos - 875 + 875 4C4E438A-90C4-463C-A31C-435EB61F8236 xpos - 550 + 550 ypos - 80 + 80 517E04B5-24AC-4071-BEC9-7FCBB8D06395 xpos - 1250 + 1250 ypos - 55 + 55 53172C76-0F6F-4E84-8C96-D0E81629CBA4 @@ -2339,18 +2342,18 @@ Edit the `ZOTERO_DIR` variable to point to Zotero 5's data directory if you aren note Search common fields xpos - 270 + 270 ypos - 50 + 50 5CFF0FD7-987C-4910-AD1E-0C40BF66585A colorindex 10 xpos - 70 + 70 ypos - 220 + 220 5D1E28B8-C1D6-495B-856F-F48C59150FE0 @@ -2359,9 +2362,9 @@ Edit the `ZOTERO_DIR` variable to point to Zotero 5's data directory if you aren note Open file or URL xpos - 1450 + 1450 ypos - 365 + 365 5ED18AC3-4DEE-4486-8717-A5742EB02AA7 @@ -2370,27 +2373,27 @@ Edit the `ZOTERO_DIR` variable to point to Zotero 5's data directory if you aren note Post a notification xpos - 1490 + 1490 ypos - 1695 + 1695 65566F30-2B84-43B7-8B3C-3F5EDDE0663F colorindex 4 xpos - 1335 + 1335 ypos - 735 + 735 65A74884-90D6-4453-963E-454CF4C84DCB colorindex 7 xpos - 1110 + 1110 ypos - 1165 + 1165 674740C4-BFDA-44C8-A478-586EF06217BF @@ -2399,45 +2402,45 @@ Edit the `ZOTERO_DIR` variable to point to Zotero 5's data directory if you aren note Configure workflow xpos - 270 + 270 ypos - 1065 + 1065 67475FEA-6BC4-4EBA-B18B-5BF88B41D320 colorindex 2 xpos - 860 + 860 ypos - 365 + 365 7123D0FE-B9BA-4300-9D28-410EE7B10E56 note $action = open-url xpos - 730 + 730 ypos - 1465 + 1465 768ECE7D-BB80-47A0-AE4A-4AA679468977 note $action = copy-citekey xpos - 730 + 730 ypos - 240 + 240 780DD041-49A4-44BF-89BE-4D53688296C0 colorindex 7 xpos - 1050 + 1050 ypos - 875 + 875 7D722132-9CB1-4556-B401-5A32F089CB28 @@ -2446,54 +2449,54 @@ Edit the `ZOTERO_DIR` variable to point to Zotero 5's data directory if you aren note Choose a field to search xpos - 270 + 270 ypos - 220 + 220 7E1721EF-1D18-410E-8ACF-810BE8A960A7 colorindex 2 xpos - 1050 + 1050 ypos - 365 + 365 7F4D56BD-6BC8-4206-87AC-33E2F9C05A2E colorindex 8 xpos - 70 + 70 ypos - 705 + 705 7FB90320-6EAF-415A-9DD9-50B79BC0F901 colorindex 10 xpos - 70 + 70 ypos - 50 + 50 88776196-8BC2-4B74-9B0E-15961AAC9A5C colorindex 3 xpos - 1110 + 1110 ypos - 1695 + 1695 89264586-3988-49CB-A0D1-7303A009E560 colorindex 12 xpos - 860 + 860 ypos - 210 + 210 8956B5DB-42F0-4570-9265-ECD302239D56 @@ -2502,54 +2505,54 @@ Edit the `ZOTERO_DIR` variable to point to Zotero 5's data directory if you aren note View citation formats xpos - 270 + 270 ypos - 705 + 705 8E44403F-E563-4611-9D78-046CD3CB6E61 colorindex 3 xpos - 1290 + 1290 ypos - 1695 + 1695 8F85FB21-8921-402F-BF70-C7C35E769212 colorindex 4 xpos - 860 + 860 ypos - 705 + 705 920760D8-E7AC-4EA8-A459-198BB5FA924A colorindex 12 xpos - 1050 + 1050 ypos - 210 + 210 9A202C58-854E-4E02-A640-BF13A9E1B823 note Copy citation to pasteboard xpos - 1630 + 1630 ypos - 705 + 705 9A384EEE-AA82-4FC5-8B13-1F7319613854 note $action = open-in-zotero xpos - 730 + 730 ypos - 80 + 80 A950947F-8EA7-4749-AF55-2C7F9D6E695E @@ -2558,18 +2561,18 @@ Edit the `ZOTERO_DIR` variable to point to Zotero 5's data directory if you aren note Generate citation xpos - 1450 + 1450 ypos - 705 + 705 A966EACB-331B-488E-937C-5D8DE7767B9D colorindex 9 xpos - 1110 + 1110 ypos - 1535 + 1535 AB53FBF0-1EC6-43BE-96BA-A30A9E6E9B66 @@ -2578,18 +2581,18 @@ Edit the `ZOTERO_DIR` variable to point to Zotero 5's data directory if you aren note Call normal search with category pre-filled xpos - 470 + 470 ypos - 220 + 220 AEE6452E-9186-4609-8AD4-D74F469F1A79 colorindex 4 xpos - 1050 + 1050 ypos - 705 + 705 AF2071DD-5096-4528-8E57-EFD4E1817FEA @@ -2598,18 +2601,18 @@ Edit the `ZOTERO_DIR` variable to point to Zotero 5's data directory if you aren note View entry attachments xpos - 1250 + 1250 ypos - 365 + 365 B07E7A55-14DC-42F2-8321-17C2E8090E03 note $action = choose-style xpos - 730 + 730 ypos - 1095 + 1095 C66B4BF4-4CED-4B3C-962E-C2F190B575EB @@ -2618,9 +2621,9 @@ Edit the `ZOTERO_DIR` variable to point to Zotero 5's data directory if you aren note Set a variable in info.plist xpos - 1450 + 1450 ypos - 875 + 875 C75ABE16-D510-4099-BE4B-7BB579DA8435 @@ -2629,88 +2632,88 @@ Edit the `ZOTERO_DIR` variable to point to Zotero 5's data directory if you aren note OneUpdater xpos - 355 + 355 ypos - 475 + 475 C93018EF-4629-4261-B997-453D8F2D6856 colorindex 8 xpos - 510 + 510 ypos - 735 + 735 CDDDFF55-9266-40A0-B22F-89192559E0E3 colorindex 4 xpos - 1250 + 1250 ypos - 735 + 735 D5227517-F91E-42FA-BE39-09BDB8443B0F colorindex 12 xpos - 1250 + 1250 ypos - 240 + 240 D78E4F18-6D77-4514-A55F-8894C014AB60 note $action = copy-citation xpos - 730 + 730 ypos - 735 + 735 D84E30BC-1391-41D8-908A-D95EFCA645A4 colorindex 12 xpos - 1450 + 1450 ypos - 210 + 210 DA0C4D5F-7B13-41B9-B85A-091DD3EE9CAD xpos - 1770 + 1770 ypos - 1065 + 1065 E1E3A9E7-0EEF-4745-A62C-79E46A2AF51F note $action = reload xpos - 730 + 730 ypos - 1635 + 1635 ED06F3FD-4D96-4866-9EEC-11B64FB6D558 note Choose locale xpos - 860 + 860 ypos - 1255 + 1255 F8F07F3C-11D6-44F1-BFE5-66F70A8C0253 colorindex 7 xpos - 1290 + 1290 ypos - 905 + 905 F9040898-2FD2-4C79-B34F-1EEAD90BE256 @@ -2719,44 +2722,154 @@ Edit the `ZOTERO_DIR` variable to point to Zotero 5's data directory if you aren note Show "generating your citation" status message xpos - 1450 + 1450 ypos - 535 + 535 F912A5F2-6586-498F-8A32-C11B59C687F5 note Choose default styles xpos - 860 + 860 ypos - 1065 + 1065 userconfigurationconfig - - variables - - ATTACHMENTS_DIR - - CITE_STYLE - http://www.zotero.org/styles/chicago-author-date - COPY_CITEKEY_MOD - - LOCALE - en-US - ZOTERO_DIR - - - variablesdontexport - ZOTERO_DIR - COPY_CITEKEY_MOD - ATTACHMENTS_DIR + + config + + default + zot + placeholder + + required + + trim + + + description + + label + Keyword + type + textfield + variable + mainkeyword + + + config + + default + + placeholder + + required + + trim + + + description + if you have set a "Linked Attachment Base Directory" in Zotero, but the workflow can't find the directory, enter its path here + label + Attachments Directory + type + textfield + variable + ATTACHMENTS_DIR + + + config + + default + http://www.zotero.org/styles/chicago-author-date + placeholder + + required + + trim + + + description + + label + Citation Style + type + textfield + variable + CITE_STYLE + + + config + + default + + placeholder + + required + + trim + + + description + When the Better-Bibtex plugin for Zotero is installed and `COPY_CITEKEY_MOD` is set to any of `-`(no modifier), `alt`, `ctrl`, `cmd`, `fn`, `shift`, the "Copy citekey" functionality can be enabled to override above operations + label + Copy Citekey Mod + type + textfield + variable + COPY_CITEKEY_MOD + + + config + + default + en-US + placeholder + + required + + trim + + + description + Locale for citations. + label + Locale + type + textfield + variable + LOCALE + + + config + + default + + placeholder + + required + + trim + + + description + Path to your Zotero data. Read from Zotero's config by default. Edit the `ZOTERO_DIR` variable to point to Zotero 5's data directory if you aren't using the default (~/Zotero). + label + Zotero Directory + type + textfield + variable + ZOTERO_DIR + + variablesdontexport + version - 1.99.7 + 2.0 webaddress - https://github.com/deanishe/zothero + https://github.com/giovannicoppola/zothero/ diff --git a/src/prefs.plist b/src/prefs.plist new file mode 100644 index 0000000..0c67376 --- /dev/null +++ b/src/prefs.plist @@ -0,0 +1,5 @@ + + + + +