Sun, 21 Jan 2018 22:01:57 +0000
--no-tray command line option for running on non-MacOS systems
|
1
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
1 | # |
|
40
cfbeeec8cb82
Improved exception reporting etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
2 | # Borgend MacOS UI |
|
1
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 | |
|
34
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
9 | import borgend |
|
40
cfbeeec8cb82
Improved exception reporting etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
10 | import utils |
|
27
a347387868be
UI refresh delay to reduce flicker
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
11 | from threading import Lock, Timer |
|
34
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
12 | from config import settings |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
13 | import objc |
| 10 | 14 | |
|
34
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
15 | logger=borgend.logger.getChild(__name__) |
| 31 | 16 | |
|
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
|
17 | INACTIVE=0 |
| 38 | 18 | SCHEDULED_OK=1 |
| 19 | ACTIVE=2 | |
| 20 | OFFLINE=3 | |
| 21 | ERRORS=4 | |
|
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
|
22 | |
|
16
d0ffae5550ef
Added offline symbol B⦙ (no offline detection yet)
Tuomo Valkonen <tuomov@iki.fi>
parents:
15
diff
changeset
|
23 | traynames={ |
|
d0ffae5550ef
Added offline symbol B⦙ (no offline detection yet)
Tuomo Valkonen <tuomov@iki.fi>
parents:
15
diff
changeset
|
24 | INACTIVE: 'B.', |
| 38 | 25 | SCHEDULED_OK: 'B.', |
|
16
d0ffae5550ef
Added offline symbol B⦙ (no offline detection yet)
Tuomo Valkonen <tuomov@iki.fi>
parents:
15
diff
changeset
|
26 | ACTIVE: 'B!', |
|
d0ffae5550ef
Added offline symbol B⦙ (no offline detection yet)
Tuomo Valkonen <tuomov@iki.fi>
parents:
15
diff
changeset
|
27 | OFFLINE: 'B⦙', |
|
d0ffae5550ef
Added offline symbol B⦙ (no offline detection yet)
Tuomo Valkonen <tuomov@iki.fi>
parents:
15
diff
changeset
|
28 | ERRORS: 'B?' |
|
d0ffae5550ef
Added offline symbol B⦙ (no offline detection yet)
Tuomo Valkonen <tuomov@iki.fi>
parents:
15
diff
changeset
|
29 | } |
|
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
|
30 | |
|
27
a347387868be
UI refresh delay to reduce flicker
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
31 | # Refresh the menu at most once a second to reduce flicker |
|
a347387868be
UI refresh delay to reduce flicker
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
32 | refresh_interval=1.0 |
|
a347387868be
UI refresh delay to reduce flicker
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
33 | |
|
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
|
34 | def combine_state(state1, state2): |
|
16
d0ffae5550ef
Added offline symbol B⦙ (no offline detection yet)
Tuomo Valkonen <tuomov@iki.fi>
parents:
15
diff
changeset
|
35 | return max(state1, state2) |
|
11
0bff53095f28
New tray title: B. or B! depending on activity
Tuomo Valkonen <tuomov@iki.fi>
parents:
10
diff
changeset
|
36 | |
| 32 | 37 | # Workaround to rumps brokenness; |
| 38 | # see https://github.com/jaredks/rumps/issues/59 | |
| 39 | def notification_workaround(title, subtitle, message): | |
|
34
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
40 | try: |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
41 | NSDictionary = objc.lookUpClass("NSDictionary") |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
42 | d=NSDictionary() |
| 32 | 43 | |
|
34
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
44 | rumps.notification(title, subtitle, message, data=d) |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
45 | except Exception as err: |
|
40
cfbeeec8cb82
Improved exception reporting etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
46 | utils.log_exception(logger, err, |
|
cfbeeec8cb82
Improved exception reporting etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
47 | detail='Unable to display notification') |
| 32 | 48 | |
|
19
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
49 | # Based on code snatched from |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
50 | # 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
|
51 | def humanbytes(B): |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
52 | '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
|
53 | B = float(B) |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
54 | KB = float(1024) |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
55 | 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
|
56 | 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
|
57 | 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
|
58 | |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
59 | if B < KB: |
|
20
fdfbe5d7b677
Keychain support and random fixes
Tuomo Valkonen <tuomov@iki.fi>
parents:
19
diff
changeset
|
60 | 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
|
61 | elif KB <= B < MB: |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
62 | 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
|
63 | elif MB <= B < GB: |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
64 | 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
|
65 | elif GB <= B < TB: |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
66 | 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
|
67 | elif TB <= B: |
|
f9ce2442f14f
Display original/deduplicatd size if no progress percentage available
Tuomo Valkonen <tuomov@iki.fi>
parents:
18
diff
changeset
|
68 | 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
|
69 | |
| 10 | 70 | 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
|
71 | state=INACTIVE |
| 15 | 72 | |
| 10 | 73 | if status['type']=='scheduled': |
| 74 | # Operation scheduled | |
| 75 | when=status['when'] | |
| 76 | now=time.time() | |
| 77 | if when<now: | |
| 78 | whenstr='overdue' | |
| 79 | else: | |
| 80 | diff=datetime.timedelta(seconds=when-now) | |
| 81 | if diff.days>0: | |
| 82 | whenday=datetime.date.fromtimestamp(when) | |
| 83 | whenstr='on %s' % whenday.isoformat() | |
| 84 | else: | |
| 85 | twhen=time.localtime(when) | |
| 86 | if twhen.tm_sec>30: | |
| 87 | # Round up minute display to avoid user confusion | |
| 88 | twhen=time.localtime(when+30) | |
| 89 | whenstr='at %02d:%02d' % (twhen.tm_hour, twhen.tm_min) | |
| 38 | 90 | |
| 91 | if status['detail']=='normal': | |
| 92 | state=SCHEDULED_OK | |
| 93 | detail='' | |
| 94 | else: | |
| 95 | if status['detail']=='retry': | |
| 96 | state=ERRORS | |
| 97 | detail=status['detail']+' ' | |
|
11
0bff53095f28
New tray title: B. or B! depending on activity
Tuomo Valkonen <tuomov@iki.fi>
parents:
10
diff
changeset
|
98 | title="%s (%s%s %s)" % (status['name'], detail, status['operation'], whenstr) |
| 10 | 99 | elif status['type']=='current': |
| 100 | # 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
|
101 | 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
|
102 | 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
|
103 | 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
|
104 | 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
|
105 | progress=' %s→%s' % (humanbytes(status['original_size']), |
|
fdfbe5d7b677
Keychain support and random fixes
Tuomo Valkonen <tuomov@iki.fi>
parents:
19
diff
changeset
|
106 | 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
|
107 | title="%s (running: %s%s)" % (status['name'], status['operation'], progress) |
| 18 | 108 | state=ACTIVE |
| 10 | 109 | else: # status['type']=='nothing': |
| 110 | # 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
|
111 | title=status['name'] |
| 38 | 112 | if status['errors']: |
| 113 | title=title + " (errors)" | |
|
11
0bff53095f28
New tray title: B. or B! depending on activity
Tuomo Valkonen <tuomov@iki.fi>
parents:
10
diff
changeset
|
114 | |
| 15 | 115 | if status['errors']: |
| 116 | state=ERRORS | |
| 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 | return title, state |
| 10 | 119 | |
|
1
4cdc9c1f6b28
basic scheduler structure draft, etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
diff
changeset
|
120 | class BorgendTray(rumps.App): |
|
33
91421eeb4426
Use rumps.application_support instead of xdg paths. Also separated branding into config.py
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
121 | def __init__(self, backups): |
| 10 | 122 | self.lock=Lock() |
| 123 | self.backups=backups | |
| 124 | self.statuses=[None]*len(backups) | |
| 125 | ||
| 126 | with self.lock: | |
| 127 | # Initialise reporting callbacks and local status copy | |
| 128 | # (since rumps doesn't seem to be able to update menu items | |
| 129 | # without rebuilding the whole menu, and we don't want to lock | |
| 130 | # when calling Backup.status(), especially as we will be called | |
| 131 | # from Backup reporting its status, we keep a copy to allow | |
| 132 | # rebuilding the entire menu | |
| 133 | for index in range(len(backups)): | |
| 134 | b=backups[index] | |
| 135 | # Python closures suck dog's balls; hence the _index=index hack | |
| 136 | # 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
|
137 | cb=(lambda obj, status, _index=index, errors=None: |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
138 | self.__status_callback(obj, _index, status, errors)) |
| 10 | 139 | b.set_status_update_callback(cb) |
| 140 | self.statuses[index]=b.status() | |
| 141 | ||
|
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
|
142 | 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
|
143 | |
|
27
a347387868be
UI refresh delay to reduce flicker
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
144 | self.refresh_timer=None |
|
34
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
145 | self.logwindow=None |
|
27
a347387868be
UI refresh delay to reduce flicker
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
146 | |
|
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
|
147 | super().__init__(traynames[state], menu=menu, quit_button=None) |
| 10 | 148 | |
| 149 | def __rebuild_menu(self): | |
| 150 | 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
|
151 | state=INACTIVE |
| 10 | 152 | for index in range(len(self.backups)): |
| 153 | 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
|
154 | title, this_state=make_title(self.statuses[index]) |
| 10 | 155 | # Python closures suck dog's balls... |
| 156 | # first and the last program I write in Python until somebody | |
| 157 | # fixes this brain damage | |
| 158 | cbm=lambda sender, _b=b: self.__menu_select_backup(sender, _b) | |
| 159 | item=rumps.MenuItem(title, callback=cbm) | |
| 38 | 160 | if this_state==SCHEDULED_OK: |
| 161 | item.state=1 | |
| 162 | elif this_state>=OFFLINE: | |
| 163 | item.state=-1 | |
| 10 | 164 | 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
|
165 | state=combine_state(state, this_state) |
| 10 | 166 | |
|
34
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
167 | menu_log=rumps.MenuItem("Show log", callback=self.showlog) |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
168 | menu.append(menu_log) |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
169 | |
|
30
3dd525652dc8
Added no_quit_menu_entry option
Tuomo Valkonen <tuomov@iki.fi>
parents:
28
diff
changeset
|
170 | if not settings['no_quit_menu_entry']: |
|
3dd525652dc8
Added no_quit_menu_entry option
Tuomo Valkonen <tuomov@iki.fi>
parents:
28
diff
changeset
|
171 | menu_quit=rumps.MenuItem("Quit...", callback=self.my_quit) |
|
3dd525652dc8
Added no_quit_menu_entry option
Tuomo Valkonen <tuomov@iki.fi>
parents:
28
diff
changeset
|
172 | menu.append(menu_quit) |
| 10 | 173 | |
|
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
|
174 | return menu, state |
| 10 | 175 | |
|
27
a347387868be
UI refresh delay to reduce flicker
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
176 | def refresh_ui(self): |
|
a347387868be
UI refresh delay to reduce flicker
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
177 | with self.lock: |
|
a347387868be
UI refresh delay to reduce flicker
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
178 | self.refresh_timer=None |
| 31 | 179 | logger.debug('Rebuilding menu') |
| 28 | 180 | menu, active=self.__rebuild_menu() |
|
27
a347387868be
UI refresh delay to reduce flicker
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
181 | self.menu.clear() |
|
a347387868be
UI refresh delay to reduce flicker
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
182 | self.menu.update(menu) |
|
a347387868be
UI refresh delay to reduce flicker
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
183 | self.title=traynames[active] |
|
a347387868be
UI refresh delay to reduce flicker
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
184 | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
185 | def __status_callback(self, obj, index, status, errorlog): |
| 31 | 186 | logger.debug('Status callbackup %s' % str(status)) |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
187 | |
| 10 | 188 | with self.lock: |
| 189 | self.statuses[index]=status | |
|
27
a347387868be
UI refresh delay to reduce flicker
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
190 | if self.refresh_timer==None: |
|
a347387868be
UI refresh delay to reduce flicker
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
191 | self.refresh_timer=Timer(refresh_interval, self.refresh_ui) |
|
a347387868be
UI refresh delay to reduce flicker
Tuomo Valkonen <tuomov@iki.fi>
parents:
21
diff
changeset
|
192 | self.refresh_timer.start() |
| 10 | 193 | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
194 | if errorlog: |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
195 | 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
|
196 | msgid='UnknownError' |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
197 | else: |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
198 | msgid=errorlog['msgid'] |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
199 | |
| 32 | 200 | logger.debug("Opening notification for error %s '%s'", |
| 201 | msgid, errorlog['message']) | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
202 | |
|
34
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
203 | notification_workaround(borgend.appname_stylised, |
|
33
91421eeb4426
Use rumps.application_support instead of xdg paths. Also separated branding into config.py
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
204 | msgid, errorlog['message']) |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
205 | |
| 28 | 206 | def my_quit(self, _): |
|
34
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
207 | logging.shutdown() |
| 28 | 208 | rumps.quit_application() |
| 209 | ||
| 210 | def __menu_select_backup(self, sender, b): | |
| 211 | #sender.state=not sender.state | |
| 31 | 212 | logger.debug("Manually backup '%s'", b.name) |
| 32 | 213 | try: |
| 214 | b.create(None) | |
| 215 | except Exception as err: | |
|
40
cfbeeec8cb82
Improved exception reporting etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
216 | utils.log_exception(logger, err) |
|
34
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
217 | notification_workaround(borgend.appname_stylised, |
|
33
91421eeb4426
Use rumps.application_support instead of xdg paths. Also separated branding into config.py
Tuomo Valkonen <tuomov@iki.fi>
parents:
32
diff
changeset
|
218 | err.__class__.__name__, str(err)) |
| 28 | 219 | |
|
21
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
220 | @rumps.notifications |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
221 | def notification_center(data): |
|
c36e549a7f12
Errors as rumps notifications
Tuomo Valkonen <tuomov@iki.fi>
parents:
20
diff
changeset
|
222 | pass |
| 10 | 223 | |
|
34
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
224 | def showlog(self, _): |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
225 | try: |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
226 | if not self.logwindow: |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
227 | lines=borgend.fifolog.formatAll() |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
228 | msg="\n".join(lines[0:]) |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
229 | self.logwindow=rumps.Window(title=borgend.appname_stylised+' log', |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
230 | default_text=msg, |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
231 | ok='Close', |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
232 | dimensions=(640,320)) |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
233 | self.logwindow.run() |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
234 | # Does not return until closed |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
235 | self.logwindow=None |
|
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
236 | except Exception as err: |
|
40
cfbeeec8cb82
Improved exception reporting etc.
Tuomo Valkonen <tuomov@iki.fi>
parents:
38
diff
changeset
|
237 | utils.log_exception(logger, err) |
|
34
9fce700d42de
Log window and other logging improvements
Tuomo Valkonen <tuomov@iki.fi>
parents:
33
diff
changeset
|
238 |