Sun, 21 Jan 2018 14:56:56 +0000
Use rumps.application_support instead of xdg paths. Also separated branding into config.py
| 0 | 1 | # |
| 2 | # Borgend borg launcher / processor | |
| 3 | # | |
| 4 | ||
| 5 | import json | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
6 | import logging |
|
20
fdfbe5d7b677
Keychain support and random fixes
Tuomo Valkonen <tuomov@iki.fi>
parents:
12
diff
changeset
|
7 | import os |
| 2 | 8 | from subprocess import Popen, PIPE |
| 9 | from config import settings, arglistify | |
| 0 | 10 | |
| 31 | 11 | logger=logging.getLogger(__name__) |
| 12 | ||
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
13 | necessary_opts=['--log-json', '--progress'] |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
14 | |
| 7 | 15 | necessary_opts_for={ |
| 16 | 'create': ['--json'], | |
| 17 | 'info': ['--json'], | |
| 18 | 'list': ['--json'], | |
| 19 | } | |
| 20 | ||
| 0 | 21 | class BorgInstance: |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
22 | def __init__(self, operation, archive_or_repository, args, argsl): |
| 0 | 23 | self.operation=operation; |
| 24 | self.args=args; | |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
25 | self.archive_or_repository=archive_or_repository; |
| 2 | 26 | self.argsl=argsl; |
| 0 | 27 | |
| 28 | def construct_cmdline(self): | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
29 | cmd=([settings['borg']['executable']]+necessary_opts+ |
| 2 | 30 | arglistify(settings['borg']['common_parameters'])+ |
| 31 | [self.operation]) | |
| 32 | tmp1=self.operation+'_parameters' | |
| 33 | if tmp1 in settings['borg']: | |
| 34 | cmd=cmd+arglistify(settings['borg'][tmp1]) | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
35 | |
| 7 | 36 | if self.operation in necessary_opts_for: |
| 37 | cmd=cmd+necessary_opts_for[self.operation] | |
| 38 | ||
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
39 | return cmd+arglistify(self.args)+[self.archive_or_repository]+self.argsl |
| 0 | 40 | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
41 | def launch(self, passphrase=None): |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
42 | cmd=self.construct_cmdline() |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
43 | |
| 31 | 44 | logger.info('Launching ' + str(cmd)) |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
45 | |
| 32 | 46 | # Set passphrase if not, or set to empty if not known, so borg |
| 47 | # won't hang waiting for it, which seems to happen even if we | |
| 48 | # close stdin. | |
| 29 | 49 | env=os.environ.copy() |
| 32 | 50 | env['BORG_PASSPHRASE']=passphrase or '' |
|
20
fdfbe5d7b677
Keychain support and random fixes
Tuomo Valkonen <tuomov@iki.fi>
parents:
12
diff
changeset
|
51 | |
|
24
94d58d514d69
Workaround to PYTHONPATH and PYTHONHOME being messed up by py2app.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
52 | # Workaround: if launched is a standalone app created with py2app, |
|
94d58d514d69
Workaround to PYTHONPATH and PYTHONHOME being messed up by py2app.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
53 | # borg will fail unless Python environment is reset. |
|
94d58d514d69
Workaround to PYTHONPATH and PYTHONHOME being messed up by py2app.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
54 | # TODO: Of course, this will fail if the system needs the variables |
|
94d58d514d69
Workaround to PYTHONPATH and PYTHONHOME being messed up by py2app.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
55 | # PYTHONPATH or PYTHONHOME set to certain values. |
| 29 | 56 | if '_PY2APP_LAUNCHED_' in env: |
| 57 | val=env['_PY2APP_LAUNCHED_'] | |
| 58 | if val=='1': | |
| 59 | del env['PYTHONPATH'] | |
| 60 | del env['PYTHONHOME'] | |
|
24
94d58d514d69
Workaround to PYTHONPATH and PYTHONHOME being messed up by py2app.
Tuomo Valkonen <tuomov@iki.fi>
parents:
23
diff
changeset
|
61 | |
|
20
fdfbe5d7b677
Keychain support and random fixes
Tuomo Valkonen <tuomov@iki.fi>
parents:
12
diff
changeset
|
62 | self.proc=Popen(cmd, env=env, stdout=PIPE, stderr=PIPE, stdin=PIPE) |
| 12 | 63 | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
64 | # We don't do passphrase input etc. |
| 12 | 65 | self.proc.stdin.close() |
| 0 | 66 | |
| 7 | 67 | def read_result(self): |
| 68 | stream=self.proc.stdout | |
| 69 | line=stream.read(-1) | |
| 70 | if line==b'': | |
| 31 | 71 | logger.debug('Borg stdout pipe EOF?') |
| 7 | 72 | return None |
| 73 | ||
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
74 | try: |
| 7 | 75 | return json.loads(line) |
| 32 | 76 | except Exception as err: |
| 31 | 77 | logger.warning('JSON parse failed on: "%s"' % line) |
| 7 | 78 | return None |
| 79 | ||
| 80 | def read_log(self): | |
| 81 | stream=self.proc.stderr | |
| 82 | try: | |
| 83 | line=stream.readline() | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
84 | except err: |
| 31 | 85 | logger.debug('Pipe read failed: %s' % str(err)) |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
86 | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
87 | return {'type': 'log_message', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
88 | 'levelname': 'CRITICAL', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
89 | 'name': 'borgend.instance.BorgInstance', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
90 | 'msgid': 'Borgend.Exception', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
91 | 'message': err} |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
92 | |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
93 | if line==b'': |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
94 | |
| 31 | 95 | logger.debug('Borg stderr pipe EOF?') |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
96 | |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
97 | return None |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
98 | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
99 | try: |
| 6 | 100 | res=json.loads(line) |
| 101 | if 'type' not in res: | |
| 102 | res['type']='UNKNOWN' | |
| 103 | return res | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
104 | except: |
| 31 | 105 | logger.debug('JSON parse failed on: "%s"' % str(line)) |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
106 | |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
107 | errmsg=line |
| 7 | 108 | for line in iter(stream.readline, b''): |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
109 | errmsg=errmsg+line |
|
3
4cad934aa9ce
Can launch borg now; output not yet processed
Tuomo Valkonen <tuomov@iki.fi>
parents:
2
diff
changeset
|
110 | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
111 | return {'type': 'log_message', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
112 | 'levelname': 'ERROR', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
113 | 'name': 'borgend.instance.BorgInstance', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
114 | 'msgid': 'Borgend.JSONFail', |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
115 | 'message': str(errmsg)} |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
116 | |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
117 | def terminate(self): |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
118 | self.proc.terminate() |
| 0 | 119 | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
120 | def wait(self): |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
121 | return self.proc.wait() is not None |
| 0 | 122 | |
|
4
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
123 | def has_terminated(self): |
|
d72c4844e791
Better borg output processing and some logging
Tuomo Valkonen <tuomov@iki.fi>
parents:
3
diff
changeset
|
124 | return self.proc.poll() is not None |
| 0 | 125 |