Sat, 20 Jan 2018 21:52:16 +0000
More error reporting
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 | |
10 | ||
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
|
11 | 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
|
12 | ACTIVE=1 |
15 | 13 | ERRORS=2 |
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
|
14 | |
15 | 15 | traynames={INACTIVE: 'B.', ACTIVE: 'B!', ERRORS: 'B?'} |
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 | |
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
|
17 | def combine_state(state1, state2): |
15 | 18 | if state1==ERRORS or state2==ERRORS: |
19 | return ERRORS | |
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
|
20 | elif state1==ACTIVE or state2==ACTIVE: |
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
|
21 | return ACTIVE |
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
|
22 | else: |
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 | return INACTIVE |
11
0bff53095f28
New tray title: B. or B! depending on activity
Tuomo Valkonen <tuomov@iki.fi>
parents:
10
diff
changeset
|
24 | |
10 | 25 | 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
|
26 | state=INACTIVE |
15 | 27 | |
10 | 28 | if status['type']=='scheduled': |
29 | # Operation scheduled | |
30 | when=status['when'] | |
31 | now=time.time() | |
32 | if when<now: | |
33 | whenstr='overdue' | |
34 | else: | |
35 | diff=datetime.timedelta(seconds=when-now) | |
36 | if diff.days>0: | |
37 | whenday=datetime.date.fromtimestamp(when) | |
38 | whenstr='on %s' % whenday.isoformat() | |
39 | else: | |
40 | twhen=time.localtime(when) | |
41 | if twhen.tm_sec>30: | |
42 | # Round up minute display to avoid user confusion | |
43 | twhen=time.localtime(when+30) | |
44 | whenstr='at %02d:%02d' % (twhen.tm_hour, twhen.tm_min) | |
45 | detail='' | |
46 | 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
|
47 | if status['detail']=='retry': |
15 | 48 | state=ERRORS |
10 | 49 | detail=status['detail']+' ' |
11
0bff53095f28
New tray title: B. or B! depending on activity
Tuomo Valkonen <tuomov@iki.fi>
parents:
10
diff
changeset
|
50 | title="%s (%s%s %s)" % (status['name'], detail, status['operation'], whenstr) |
10 | 51 | elif status['type']=='current': |
52 | # 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
|
53 | 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
|
54 | if 'progress_current' in status and 'progress_total' in status: |
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
|
55 | progress='%d%%' % (status.progress_current/status.progress_total) |
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
|
56 | title="%s (running: %s%s)" % (status['name'], status['operation'], 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
|
57 | active=ACTIVE |
10 | 58 | else: # status['type']=='nothing': |
59 | # 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
|
60 | title=status['name'] |
0bff53095f28
New tray title: B. or B! depending on activity
Tuomo Valkonen <tuomov@iki.fi>
parents:
10
diff
changeset
|
61 | |
15 | 62 | if status['errors']: |
63 | state=ERRORS | |
64 | ||
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
|
65 | return title, state |
10 | 66 | |
1
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
67 | |
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
68 | 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
|
69 | def __init__(self, name, backups): |
10 | 70 | self.lock=Lock() |
71 | self.backups=backups | |
72 | self.statuses=[None]*len(backups) | |
73 | ||
74 | with self.lock: | |
75 | # Initialise reporting callbacks and local status copy | |
76 | # (since rumps doesn't seem to be able to update menu items | |
77 | # without rebuilding the whole menu, and we don't want to lock | |
78 | # when calling Backup.status(), especially as we will be called | |
79 | # from Backup reporting its status, we keep a copy to allow | |
80 | # rebuilding the entire menu | |
81 | for index in range(len(backups)): | |
82 | b=backups[index] | |
83 | # Python closures suck dog's balls; hence the _index=index hack | |
84 | # See also http://math.andrej.com/2009/04/09/pythons-lambda-is-broken/ | |
85 | cb=(lambda obj, status, _index=index: | |
86 | self.__status_callback(obj, _index, status)) | |
87 | b.set_status_update_callback(cb) | |
88 | self.statuses[index]=b.status() | |
89 | ||
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
|
90 | 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
|
91 | |
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
|
92 | super().__init__(traynames[state], menu=menu, quit_button=None) |
10 | 93 | |
94 | def __rebuild_menu(self): | |
95 | 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
|
96 | state=INACTIVE |
10 | 97 | for index in range(len(self.backups)): |
98 | 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
|
99 | title, this_state=make_title(self.statuses[index]) |
10 | 100 | logging.info('TITLE: %s' % title) |
101 | # Python closures suck dog's balls... | |
102 | # first and the last program I write in Python until somebody | |
103 | # fixes this brain damage | |
104 | cbm=lambda sender, _b=b: self.__menu_select_backup(sender, _b) | |
105 | item=rumps.MenuItem(title, callback=cbm) | |
106 | 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
|
107 | state=combine_state(state, this_state) |
10 | 108 | |
109 | menu_quit=rumps.MenuItem("Quit...", callback=self.my_quit) | |
110 | menu.append(menu_quit) | |
111 | ||
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
|
112 | return menu, state |
10 | 113 | |
114 | ||
115 | 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
|
116 | 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
|
117 | |
10 | 118 | def __menu_select_backup(self, sender, b): |
119 | #sender.state=not sender.state | |
120 | logging.debug("Manually backup '%s'", b.name) | |
121 | 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
|
122 | |
10 | 123 | def __status_callback(self, obj, index, status): |
124 | logging.debug('Status callbackup %s' % str(status)) | |
125 | with self.lock: | |
126 | self.statuses[index]=status | |
127 | logging.debug('Rebuilding menu') | |
128 | self.menu.clear() | |
11
0bff53095f28
New tray title: B. or B! depending on activity
Tuomo Valkonen <tuomov@iki.fi>
parents:
10
diff
changeset
|
129 | menu, active=self.__rebuild_menu() |
0bff53095f28
New tray title: B. or B! depending on activity
Tuomo Valkonen <tuomov@iki.fi>
parents:
10
diff
changeset
|
130 | self.menu.update(menu) |
0bff53095f28
New tray title: B. or B! depending on activity
Tuomo Valkonen <tuomov@iki.fi>
parents:
10
diff
changeset
|
131 | self.title=traynames[active] |
10 | 132 | |
133 | ||
134 |