diff --git a/Viscosity-2.0.alfredworkflow b/Viscosity-2.0.1.alfredworkflow similarity index 79% rename from Viscosity-2.0.alfredworkflow rename to Viscosity-2.0.1.alfredworkflow index daf652e..dc05bac 100644 Binary files a/Viscosity-2.0.alfredworkflow and b/Viscosity-2.0.1.alfredworkflow differ diff --git a/src/info.plist b/src/info.plist index 3e7dd81..337bc13 100644 --- a/src/info.plist +++ b/src/info.plist @@ -81,9 +81,9 @@ escaping 0 script - /usr/bin/python viscosity.py $1 + /usr/bin/python viscosity.py {query} scriptargtype - 1 + 0 scriptfile type @@ -122,7 +122,7 @@ Requires Viscosity app from https://www.sparklabs.com/viscosity/ version - 2.0 + 2.0.1 webaddress diff --git a/src/scripts/connect_vpn.scpt b/src/scripts/connect_vpn.scpt index fe7c2c6..4cf0433 100644 Binary files a/src/scripts/connect_vpn.scpt and b/src/scripts/connect_vpn.scpt differ diff --git a/src/scripts/disconnect_vpn.scpt b/src/scripts/disconnect_vpn.scpt index b1533e2..2e5e269 100644 Binary files a/src/scripts/disconnect_vpn.scpt and b/src/scripts/disconnect_vpn.scpt differ diff --git a/src/scripts/get_connections.scpt b/src/scripts/get_connections.scpt index 1e2be19..d9f1c9f 100644 Binary files a/src/scripts/get_connections.scpt and b/src/scripts/get_connections.scpt differ diff --git a/src/workflow/version b/src/workflow/version index 581595d..7c819a9 100644 --- a/src/workflow/version +++ b/src/workflow/version @@ -1 +1 @@ -1.25 \ No newline at end of file +1.25.1 \ No newline at end of file diff --git a/src/workflow/workflow.py b/src/workflow/workflow.py index d968ff7..4fd8db4 100644 --- a/src/workflow/workflow.py +++ b/src/workflow/workflow.py @@ -1974,26 +1974,30 @@ def filter(self, query, items, key=lambda x: x, ascending=False, By default, :meth:`filter` uses all of the following flags (i.e. :const:`MATCH_ALL`). The tests are always run in the given order: - 1. :const:`MATCH_STARTSWITH` : Item search key startswith - ``query``(case-insensitive). - 2. :const:`MATCH_CAPITALS` : The list of capital letters in item - search key starts with ``query`` (``query`` may be - lower-case). E.g., ``of`` would match ``OmniFocus``, - ``gc`` would match ``Google Chrome``. - 3. :const:`MATCH_ATOM` : Search key is split into "atoms" on - non-word characters (.,-,' etc.). Matches if ``query`` is - one of these atoms (case-insensitive). - 4. :const:`MATCH_INITIALS_STARTSWITH` : Initials are the first - characters of the above-described "atoms" (case-insensitive). - 5. :const:`MATCH_INITIALS_CONTAIN` : ``query`` is a substring of - the above-described initials. - 6. :const:`MATCH_INITIALS` : Combination of (4) and (5). - 7. :const:`MATCH_SUBSTRING` : Match if ``query`` is a substring - of item search key (case-insensitive). - 8. :const:`MATCH_ALLCHARS` : Matches if all characters in - ``query`` appear in item search key in the same order + 1. :const:`MATCH_STARTSWITH` + Item search key starts with ``query`` (case-insensitive). + 2. :const:`MATCH_CAPITALS` + The list of capital letters in item search key starts with + ``query`` (``query`` may be lower-case). E.g., ``of`` + would match ``OmniFocus``, ``gc`` would match ``Google Chrome``. + 3. :const:`MATCH_ATOM` + Search key is split into "atoms" on non-word characters + (.,-,' etc.). Matches if ``query`` is one of these atoms (case-insensitive). - 9. :const:`MATCH_ALL` : Combination of all the above. + 4. :const:`MATCH_INITIALS_STARTSWITH` + Initials are the first characters of the above-described + "atoms" (case-insensitive). + 5. :const:`MATCH_INITIALS_CONTAIN` + ``query`` is a substring of the above-described initials. + 6. :const:`MATCH_INITIALS` + Combination of (4) and (5). + 7. :const:`MATCH_SUBSTRING` + ``query`` is a substring of item search key (case-insensitive). + 8. :const:`MATCH_ALLCHARS` + All characters in ``query`` appear in item search key in + the same order (case-insensitive). + 9. :const:`MATCH_ALL` + Combination of all the above. :const:`MATCH_ALLCHARS` is considerably slower than the other @@ -2432,7 +2436,11 @@ def update_available(self): :returns: ``True`` if an update is available, else ``False`` """ - update_data = self.cached_data('__workflow_update_status', max_age=0) + # Create a new workflow object to ensure standard serialiser + # is used (update.py is called without the user's settings) + update_data = Workflow().cached_data('__workflow_update_status', + max_age=0) + self.logger.debug('update_data : {0}'.format(update_data)) if not update_data or not update_data.get('available'):