|
@@ -7,6 +7,8 @@ import json
|
|
|
import subprocess
|
|
|
import time
|
|
|
|
|
|
+from .exceptions import SanityCheckError
|
|
|
+
|
|
|
class AlfredParser:
|
|
|
alfred_json = 'alfred-json'
|
|
|
alfred_datatypes = [('static', 158), ('dynamic', 159)]
|
|
@@ -24,12 +26,14 @@ class AlfredParser:
|
|
|
cmd = [self.alfred_json, '-z', '-r', str(int(self.alfred_datatypes[0][1]))]
|
|
|
testdata = subprocess.check_output(cmd)
|
|
|
except Exception as err:
|
|
|
- raise Exception("alfred-json not found or incompatible: " + str(err))
|
|
|
+ raise SanityCheckError(
|
|
|
+ self, "alfred-json not found or incompatible", err)
|
|
|
|
|
|
try:
|
|
|
json.loads(testdata)
|
|
|
except Exception as err:
|
|
|
- raise Exception("alfred-json does not return valid JSON data: " + str(err))
|
|
|
+ raise SanityCheckError(
|
|
|
+ self, "alfred-json does not return valid JSON data", err)
|
|
|
|
|
|
return True
|
|
|
|
|
@@ -108,7 +112,7 @@ if __name__ == "__main__":
|
|
|
a = AlfredParser()
|
|
|
try:
|
|
|
a.sanitycheck()
|
|
|
- except Exception as err:
|
|
|
+ except SanityCheckError as err:
|
|
|
print('SANITY-CHECK failed:', str(err))
|
|
|
import sys
|
|
|
sys.exit(1)
|