diff options
author | Papoteur <papoteur@mageia.org> | 2023-07-03 12:46:15 +0200 |
---|---|---|
committer | Papoteur <papoteur@mageia.org> | 2023-07-03 12:46:15 +0200 |
commit | a5c8f17a12e2c533ec2d5b22548aa2d8894525aa (patch) | |
tree | 4706e220cc1d519db1991373d6bcada355cc5278 | |
parent | 617d5e73b868c798d1a3c11acb9555336458a8cb (diff) | |
download | isodumper-a5c8f17a12e2c533ec2d5b22548aa2d8894525aa.tar isodumper-a5c8f17a12e2c533ec2d5b22548aa2d8894525aa.tar.gz isodumper-a5c8f17a12e2c533ec2d5b22548aa2d8894525aa.tar.bz2 isodumper-a5c8f17a12e2c533ec2d5b22548aa2d8894525aa.tar.xz isodumper-a5c8f17a12e2c533ec2d5b22548aa2d8894525aa.zip |
Close magiback when closing isodumper
Keep the authorization one hour
Add the -d option for debug
-rwxr-xr-x | backend/magiback | 8 | ||||
-rwxr-xr-x | isodumper | 2 | ||||
-rwxr-xr-x | lib/isodumper.py | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/backend/magiback b/backend/magiback index 46cf43c..e16e1dc 100755 --- a/backend/magiback +++ b/backend/magiback @@ -12,7 +12,7 @@ DEAMON_ORG = 'org.mageia.Magiback' DEAMON_INTERFACE = DEAMON_ORG ISODUMPER_INTERFACE = DEAMON_ORG + ".Isodumper" # Keep the authorization during KEEPER (in seconds) -KEEPER = 600 +KEEPER = 3600 auth = False last_auth = 0 @@ -54,6 +54,8 @@ class Isodumper(raw_write.Dumper): <arg type='b' name='success' direction='out'/> <arg type='s' name='message' direction='out'/> </method> + <method name='close'> + </method> <property name="done" type="b" access="read"/> <property name="progress" type="i" access="read"/> <property name="message" type="s" access="read"/> @@ -132,6 +134,10 @@ class Isodumper(raw_write.Dumper): self.finished.clear() return self.return_state, self.return_message + def close(self): + logging.info("Closing") + self.loop.quit() + @property def progress(self): return self._progress @@ -14,7 +14,7 @@ class ParseCLI(args.AppArgs): yui.YUILog.setLogFileName("/dev/null") parser = ParseCLI('isodumper') -parser.parser.add_argument('--debug', help=_('allow debug information'), action='store_true') +parser.parser.add_argument('-d', '--debug', help=_('allow debug information'), action='store_true') if parser.args.version: print(version.RELEASE) else: diff --git a/lib/isodumper.py b/lib/isodumper.py index c7a61b4..75ac4e7 100755 --- a/lib/isodumper.py +++ b/lib/isodumper.py @@ -1487,6 +1487,8 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog yui.YDialog.deleteAllDialogs() # Closing # restore old application title + if hasattr(self, 'iface'): + self.iface.close() yui.YUI.app().setApplicationTitle(self.backupTitle) self.dialog.destroy() self.dialog = None @@ -1500,7 +1502,7 @@ if __name__ == "__main__": log = yui.YUILog.setLogFileName("/dev/null") parser = ParseCLI("isodumper") parser.parser.add_argument( - "--debug", help=_("allow debug information"), action="store_true" + "-d", "--debug", help=_("allow debug information"), action="store_true" ) if parser.args.version: print(version.RELEASE) |