Sun, 21 Jan 2018 01:14:06 +0000
py2app standalone app generation
|
1
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
1 | # |
|
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
2 | # MacOS UI |
|
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
3 | # |
|
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
4 | |
|
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
5 | import rumps |
| 10 | 6 | import time |
| 7 | import datetime | |
| 8 | import logging | |
| 9 | from threading import Lock | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
10 | import objc |
| 10 | 11 | |
|
14
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
12 | INACTIVE=0 |
|
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
13 | ACTIVE=1 |
|
16
d0ffae5550ef
Added offline symbol B⦙ (no offline detection yet)
Tuomo Valkonen <tuomov@iki.fi>
parents:
15
diff
changeset
|
14 | OFFLINE=2 |
|
d0ffae5550ef
Added offline symbol B⦙ (no offline detection yet)
Tuomo Valkonen <tuomov@iki.fi>
parents:
15
diff
changeset
|
15 | ERRORS=3 |
|
14
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
16 | |
|
16
d0ffae5550ef
Added offline symbol B⦙ (no offline detection yet)
Tuomo Valkonen <tuomov@iki.fi>
parents:
15
diff
changeset
|
17 | traynames={ |
|
d0ffae5550ef
Added offline symbol B⦙ (no offline detection yet)
Tuomo Valkonen <tuomov@iki.fi>
parents:
15
diff
changeset
|
18 | INACTIVE: 'B.', |
|
d0ffae5550ef
Added offline symbol B⦙ (no offline detection yet)
Tuomo Valkonen <tuomov@iki.fi>
parents:
15
diff
changeset
|
19 | ACTIVE: 'B!', |
|
d0ffae5550ef
Added offline symbol B⦙ (no offline detection yet)
Tuomo Valkonen <tuomov@iki.fi>
parents:
15
diff
changeset
|
20 | OFFLINE: 'B⦙', |
|
d0ffae5550ef
Added offline symbol B⦙ (no offline detection yet)
Tuomo Valkonen <tuomov@iki.fi>
parents:
15
diff
changeset
|
21 | ERRORS: 'B?' |
|
d0ffae5550ef
Added offline symbol B⦙ (no offline detection yet)
Tuomo Valkonen <tuomov@iki.fi>
parents:
15
diff
changeset
|
22 | } |
|
14
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
23 | |
|
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
24 | def combine_state(state1, state2): |
|
16
d0ffae5550ef
Added offline symbol B⦙ (no offline detection yet)
Tuomo Valkonen <tuomov@iki.fi>
parents:
15
diff
changeset
|
25 | return max(state1, state2) |
|
11
0bff53095f28
New tray title: B. or B! depending on activity
Tuomo Valkonen <tuomov@iki.fi>
parents:
10
diff
changeset
|
26 | |
|
19
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
27 | # Based on code snatched from |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
28 | # https://stackoverflow.com/questions/12523586/python-format-size-application-converting-b-to-kb-mb-gb-tb/37423778 |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
29 | def humanbytes(B): |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
30 | 'Return the given bytes as a human friendly KB, MB, GB, or TB string' |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
31 | B = float(B) |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
32 | KB = float(1024) |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
33 | MB = float(KB ** 2) # 1,048,576 |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
34 | GB = float(KB ** 3) # 1,073,741,824 |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
35 | TB = float(KB ** 4) # 1,099,511,627,776 |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
36 | |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
37 | if B < KB: |
|
20
fdfbe5d7b677
Keychain support and random fixes
Tuomo Valkonen <tuomov@iki.fi>
parents:
19
diff
changeset
|
38 | return '{0}B'.format(B) |
|
19
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
39 | elif KB <= B < MB: |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
40 | return '{0:.2f}KB'.format(B/KB) |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
41 | elif MB <= B < GB: |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
42 | return '{0:.2f}MB'.format(B/MB) |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
43 | elif GB <= B < TB: |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
44 | return '{0:.2f}GB'.format(B/GB) |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
45 | elif TB <= B: |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
46 | return '{0:.2f}TB'.format(B/TB) |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
47 | |
| 10 | 48 | def make_title(status): |
|
14
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
49 | state=INACTIVE |
| 15 | 50 | |
| 10 | 51 | if status['type']=='scheduled': |
| 52 | # Operation scheduled | |
| 53 | when=status['when'] | |
| 54 | now=time.time() | |
| 55 | if when<now: | |
| 56 | whenstr='overdue' | |
| 57 | else: | |
| 58 | diff=datetime.timedelta(seconds=when-now) | |
| 59 | if diff.days>0: | |
| 60 | whenday=datetime.date.fromtimestamp(when) | |
| 61 | whenstr='on %s' % whenday.isoformat() | |
| 62 | else: | |
| 63 | twhen=time.localtime(when) | |
| 64 | if twhen.tm_sec>30: | |
| 65 | # Round up minute display to avoid user confusion | |
| 66 | twhen=time.localtime(when+30) | |
| 67 | whenstr='at %02d:%02d' % (twhen.tm_hour, twhen.tm_min) | |
| 68 | detail='' | |
| 69 | if 'detail' in status and status['detail']: | |
|
14
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
70 | if status['detail']=='retry': |
| 15 | 71 | state=ERRORS |
| 10 | 72 | detail=status['detail']+' ' |
|
11
0bff53095f28
New tray title: B. or B! depending on activity
Tuomo Valkonen <tuomov@iki.fi>
parents:
10
diff
changeset
|
73 | title="%s (%s%s %s)" % (status['name'], detail, status['operation'], whenstr) |
| 10 | 74 | elif status['type']=='current': |
| 75 | # Operation running | |
|
14
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
76 | progress='' |
|
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
77 | if 'progress_current' in status and 'progress_total' in status: |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
78 | progress=' %d%%' % (status['progress_current']/status['progress_total']) |
|
19
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
79 | elif 'original_size' in status and 'deduplicated_size' in status: |
|
20
fdfbe5d7b677
Keychain support and random fixes
Tuomo Valkonen <tuomov@iki.fi>
parents:
19
diff
changeset
|
80 | progress=' %s→%s' % (humanbytes(status['original_size']), |
|
fdfbe5d7b677
Keychain support and random fixes
Tuomo Valkonen <tuomov@iki.fi>
parents:
19
diff
changeset
|
81 | humanbytes(status['deduplicated_size'])) |
|
14
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
82 | title="%s (running: %s%s)" % (status['name'], status['operation'], progress) |
| 18 | 83 | state=ACTIVE |
| 10 | 84 | else: # status['type']=='nothing': |
| 85 | # Should be unscheduled, nothing running | |
|
11
0bff53095f28
New tray title: B. or B! depending on activity
Tuomo Valkonen <tuomov@iki.fi>
parents:
10
diff
changeset
|
86 | title=status['name'] |
|
0bff53095f28
New tray title: B. or B! depending on activity
Tuomo Valkonen <tuomov@iki.fi>
parents:
10
diff
changeset
|
87 | |
| 15 | 88 | if status['errors']: |
| 89 | state=ERRORS | |
| 90 | ||
|
14
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
91 | return title, state |
| 10 | 92 | |
|
1
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
93 | |
|
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
94 | class BorgendTray(rumps.App): |
|
9
aa121291eb0e
Rumps/Mac UI stuff is fucked and disables ^C etc.; threading doesn't help
Tuomo Valkonen <tuomov@iki.fi>
parents:
1
diff
changeset
|
95 | def __init__(self, name, backups): |
| 10 | 96 | self.lock=Lock() |
| 97 | self.backups=backups | |
| 98 | self.statuses=[None]*len(backups) | |
| 99 | ||
| 100 | with self.lock: | |
| 101 | # Initialise reporting callbacks and local status copy | |
| 102 | # (since rumps doesn't seem to be able to update menu items | |
| 103 | # without rebuilding the whole menu, and we don't want to lock | |
| 104 | # when calling Backup.status(), especially as we will be called | |
| 105 | # from Backup reporting its status, we keep a copy to allow | |
| 106 | # rebuilding the entire menu | |
| 107 | for index in range(len(backups)): | |
| 108 | b=backups[index] | |
| 109 | # Python closures suck dog's balls; hence the _index=index hack | |
| 110 | # See also http://math.andrej.com/2009/04/09/pythons-lambda-is-broken/ | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
111 | cb=(lambda obj, status, _index=index, errors=None: |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
112 | self.__status_callback(obj, _index, status, errors)) |
| 10 | 113 | b.set_status_update_callback(cb) |
| 114 | self.statuses[index]=b.status() | |
| 115 | ||
|
14
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
116 | menu, state=self.__rebuild_menu() |
|
9
aa121291eb0e
Rumps/Mac UI stuff is fucked and disables ^C etc.; threading doesn't help
Tuomo Valkonen <tuomov@iki.fi>
parents:
1
diff
changeset
|
117 | |
|
14
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
118 | super().__init__(traynames[state], menu=menu, quit_button=None) |
| 10 | 119 | |
| 120 | def __rebuild_menu(self): | |
| 121 | menu=[] | |
|
14
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
122 | state=INACTIVE |
| 10 | 123 | for index in range(len(self.backups)): |
| 124 | b=self.backups[index] | |
|
14
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
125 | title, this_state=make_title(self.statuses[index]) |
| 10 | 126 | # Python closures suck dog's balls... |
| 127 | # first and the last program I write in Python until somebody | |
| 128 | # fixes this brain damage | |
| 129 | cbm=lambda sender, _b=b: self.__menu_select_backup(sender, _b) | |
| 130 | item=rumps.MenuItem(title, callback=cbm) | |
| 131 | menu.append(item) | |
|
14
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
132 | state=combine_state(state, this_state) |
| 10 | 133 | |
| 134 | menu_quit=rumps.MenuItem("Quit...", callback=self.my_quit) | |
| 135 | menu.append(menu_quit) | |
| 136 | ||
|
14
5a988a2c2624
UI: progress percentange support (Borg doesn't seem to be reporting) + error indicator in tray: B?
Tuomo Valkonen <tuomov@iki.fi>
parents:
11
diff
changeset
|
137 | return menu, state |
| 10 | 138 | |
| 139 | ||
| 140 | def my_quit(self, _): | |
|
9
aa121291eb0e
Rumps/Mac UI stuff is fucked and disables ^C etc.; threading doesn't help
Tuomo Valkonen <tuomov@iki.fi>
parents:
1
diff
changeset
|
141 | rumps.quit_application() |
|
aa121291eb0e
Rumps/Mac UI stuff is fucked and disables ^C etc.; threading doesn't help
Tuomo Valkonen <tuomov@iki.fi>
parents:
1
diff
changeset
|
142 | |
| 10 | 143 | def __menu_select_backup(self, sender, b): |
| 144 | #sender.state=not sender.state | |
| 145 | logging.debug("Manually backup '%s'", b.name) | |
| 146 | b.create(None) | |
|
9
aa121291eb0e
Rumps/Mac UI stuff is fucked and disables ^C etc.; threading doesn't help
Tuomo Valkonen <tuomov@iki.fi>
parents:
1
diff
changeset
|
147 | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
148 | def __status_callback(self, obj, index, status, errorlog): |
| 10 | 149 | logging.debug('Status callbackup %s' % str(status)) |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
150 | |
| 10 | 151 | with self.lock: |
| 152 | self.statuses[index]=status | |
| 153 | logging.debug('Rebuilding menu') | |
| 154 | self.menu.clear() | |
|
11
0bff53095f28
New tray title: B. or B! depending on activity
Tuomo Valkonen <tuomov@iki.fi>
parents:
10
diff
changeset
|
155 | menu, active=self.__rebuild_menu() |
|
0bff53095f28
New tray title: B. or B! depending on activity
Tuomo Valkonen <tuomov@iki.fi>
parents:
10
diff
changeset
|
156 | self.menu.update(menu) |
|
0bff53095f28
New tray title: B. or B! depending on activity
Tuomo Valkonen <tuomov@iki.fi>
parents:
10
diff
changeset
|
157 | self.title=traynames[active] |
| 10 | 158 | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
159 | if errorlog: |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
160 | if 'msgid' not in errorlog or not isinstance(errorlog['msgid'], str): |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
161 | msgid='UnknownError' |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
162 | else: |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
163 | msgid=errorlog['msgid'] |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
164 | |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
165 | logging.debug('Opening notification for error') |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
166 | |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
167 | # Workaround to rumps brokenness |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
168 | # See https://github.com/jaredks/rumps/issues/59 |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
169 | NSDictionary = objc.lookUpClass("NSDictionary") |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
170 | d=NSDictionary() |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
171 | |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
172 | rumps.notification('Borgend', msgid, errorlog['message'], data=d) |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
173 | |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
174 | @rumps.notifications |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
175 | def notification_center(data): |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
176 | pass |
| 10 | 177 | |
| 178 | ||
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
179 | |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
180 |