New Upstream Snapshot - snapper-gui
Ready changes
Summary
Merged new upstream version: 0.1+git20220626.1.1915750 (was: 0git.960a94834f).
Resulting package
Built on 2022-12-19T04:01 (took 3m48s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots snapper-gui
Lintian Result
Diff
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 3dc1b27..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.egg-info
-__pycache__/
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..14140b0
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,9 @@
+Metadata-Version: 2.1
+Name: snappergui
+Version: 0.1
+Summary: snapper-gui graphical user interface for snapper btrfs snapshot manager
+Home-page: https://github.com/ricardo-vieira/snapper-gui
+Download-URL: https://github.com/ricardo-vieira/snapper-gui
+Author: Ricardo Vieira
+Author-email: ricardo.vieira@ist.utl.pt
+License-File: LICENSE
diff --git a/debian/changelog b/debian/changelog
index dc91a02..7b20896 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+snapper-gui (0.1+git20220626.1.1915750-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Mon, 19 Dec 2022 03:58:28 -0000
+
snapper-gui (0git.960a94834f-4) unstable; urgency=medium
[ Ondřej Nový ]
diff --git a/setup.cfg b/setup.cfg
index 16a40ac..a9cbd78 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,8 @@
[install]
single_version_externally_managed = 1
-record = RECORD
\ No newline at end of file
+record = RECORD
+
+[egg_info]
+tag_build =
+tag_date = 0
+
diff --git a/setup.py b/setup.py
index eac9819..d63d160 100644
--- a/setup.py
+++ b/setup.py
@@ -2,24 +2,24 @@ try:
from setuptools import setup
except ImportError:
from distutils.core import setup
-
+
# from options["setup"] in build.vel
config = {
- 'name': 'snappergui',
- 'version': '0.1',
- 'packages': ['snappergui'],
- 'description': 'snapper-gui grafical user interface for snapper btrfs snapshot manager',
- 'author': 'Ricardo Vieira',
- 'url': 'https://github.com/ricardo-vieira/snapper-gui',
- 'download_url': 'https://github.com/ricardo-vieira/snapper-gui',
- 'author_email': 'ricardo.vieira@ist.utl.pt',
- 'package_data' : {"snappergui": ["glade/*.glade",
- "icons/*.svg",
- "ui/*.ui"]},
- 'data_files': [ ('share/applications', ['snapper-gui.desktop'])],
- 'entry_points' : { 'gui_scripts' :
- [ 'snapper-gui = snappergui.application:start_ui' ] }
+ 'name': 'snappergui',
+ 'version': '0.1',
+ 'packages': ['snappergui'],
+ 'description': 'snapper-gui graphical user interface for snapper btrfs snapshot manager',
+ 'author': 'Ricardo Vieira',
+ 'url': 'https://github.com/ricardo-vieira/snapper-gui',
+ 'download_url': 'https://github.com/ricardo-vieira/snapper-gui',
+ 'author_email': 'ricardo.vieira@ist.utl.pt',
+ 'package_data': {"snappergui": ["glade/*.glade",
+ "icons/*.svg",
+ "ui/*.ui"]},
+ 'data_files': [('share/applications', ['snapper-gui.desktop'])],
+ 'entry_points': {'gui_scripts':
+ ['snapper-gui = snappergui.application:start_ui']}
}
setup(**config)
diff --git a/snapper-gui.desktop b/snapper-gui.desktop
index aa0b278..a1a879f 100644
--- a/snapper-gui.desktop
+++ b/snapper-gui.desktop
@@ -6,5 +6,4 @@ Icon=drive-harddisk
Terminal=false
Type=Application
StartupNotify=true
-Categories=Utilities;
-
\ No newline at end of file
+Categories=Utilities;System;
diff --git a/snappergui.egg-info/PKG-INFO b/snappergui.egg-info/PKG-INFO
new file mode 100644
index 0000000..14140b0
--- /dev/null
+++ b/snappergui.egg-info/PKG-INFO
@@ -0,0 +1,9 @@
+Metadata-Version: 2.1
+Name: snappergui
+Version: 0.1
+Summary: snapper-gui graphical user interface for snapper btrfs snapshot manager
+Home-page: https://github.com/ricardo-vieira/snapper-gui
+Download-URL: https://github.com/ricardo-vieira/snapper-gui
+Author: Ricardo Vieira
+Author-email: ricardo.vieira@ist.utl.pt
+License-File: LICENSE
diff --git a/snappergui.egg-info/SOURCES.txt b/snappergui.egg-info/SOURCES.txt
new file mode 100644
index 0000000..49aeb25
--- /dev/null
+++ b/snappergui.egg-info/SOURCES.txt
@@ -0,0 +1,27 @@
+LICENSE
+README.md
+setup.cfg
+setup.py
+snapper-gui.desktop
+snappergui/__init__.py
+snappergui/application.py
+snappergui/changesWindow.py
+snappergui/createConfig.py
+snappergui/createSnapshot.py
+snappergui/deleteDialog.py
+snappergui/mainWindow.py
+snappergui/propertiesDialog.py
+snappergui/snapshotsView.py
+snappergui.egg-info/PKG-INFO
+snappergui.egg-info/SOURCES.txt
+snappergui.egg-info/dependency_links.txt
+snappergui.egg-info/entry_points.txt
+snappergui.egg-info/top_level.txt
+snappergui/glade/changesWindow.glade
+snappergui/glade/createConfig.glade
+snappergui/glade/createSnapshot.glade
+snappergui/glade/deleteSnapshot.glade
+snappergui/glade/mainWindow.glade
+snappergui/glade/propertiesDialog.glade
+snappergui/glade/snapshotsView.glade
+snappergui/ui/app-menu.ui
\ No newline at end of file
diff --git a/snappergui.egg-info/dependency_links.txt b/snappergui.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/snappergui.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/snappergui.egg-info/entry_points.txt b/snappergui.egg-info/entry_points.txt
new file mode 100644
index 0000000..ef5ce0c
--- /dev/null
+++ b/snappergui.egg-info/entry_points.txt
@@ -0,0 +1,2 @@
+[gui_scripts]
+snapper-gui = snappergui.application:start_ui
diff --git a/snappergui.egg-info/top_level.txt b/snappergui.egg-info/top_level.txt
new file mode 100644
index 0000000..972cdde
--- /dev/null
+++ b/snappergui.egg-info/top_level.txt
@@ -0,0 +1 @@
+snappergui
diff --git a/snappergui/application.py b/snappergui/application.py
index 55f996e..a89e704 100644
--- a/snappergui/application.py
+++ b/snappergui/application.py
@@ -3,12 +3,14 @@ from gi.repository import Gtk, GLib, GdkPixbuf, Gio
from snappergui.mainWindow import SnapperGUI
from snappergui.propertiesDialog import propertiesDialog
+
def start_ui():
app = Application()
signal.signal(signal.SIGINT, signal.SIG_DFL)
exit_status = app.run(sys.argv)
sys.exit(exit_status)
+
class Application(Gtk.Application):
def __init__(self):
Gtk.Application.__init__(self)
diff --git a/snappergui/changesWindow.py b/snappergui/changesWindow.py
index 7184dfb..44a2203 100644
--- a/snappergui/changesWindow.py
+++ b/snappergui/changesWindow.py
@@ -6,16 +6,18 @@ from gi.repository import Gtk, GtkSource, GObject, Gdk
class StatusFlags(object):
"""File status flags from https://github.com/openSUSE/snapper/blob/master/snapper/File.h#L39-L51"""
- CREATED = 1 # created
- DELETED = 2 # deleted
- TYPE = 4 # type has changed
- CONTENT = 8 # content has changed
- PERMISSIONS = 16 # permissions have changed, see chmod(2)
- OWNER = 32 # owner has changed, see chown(2)
- USER = 32 # deprecated - alias for OWNER
- GROUP = 64 # group has changed, see chown(2)
- XATTRS = 128 # extended attributes changed, see attr(5)
- ACL = 256 # access control list changed, see acl(5)
+ # @formatter:off
+ CREATED = 1 # created
+ DELETED = 2 # deleted
+ TYPE = 4 # type has changed
+ CONTENT = 8 # content has changed
+ PERMISSIONS = 16 # permissions have changed, see chmod(2)
+ OWNER = 32 # owner has changed, see chown(2)
+ USER = 32 # deprecated - alias for OWNER
+ GROUP = 64 # group has changed, see chown(2)
+ XATTRS = 128 # extended attributes changed, see attr(5)
+ ACL = 256 # access control list changed, see acl(5)
+ # @formatter:on
class changesWindow(object):
@@ -30,7 +32,7 @@ class changesWindow(object):
builder.add_from_file(pkg_resources.resource_filename("snappergui",
"glade/changesWindow.glade"))
- builder.get_object("titlelabel").set_text("%s -> %s"%(begin, end))
+ builder.get_object("titlelabel").set_text("%s -> %s" % (begin, end))
self.window = builder.get_object("changesWindow")
self.statusbar = builder.get_object("statusbar1")
self.pathstreeview = builder.get_object("pathstreeview")
@@ -102,8 +104,9 @@ class changesWindow(object):
def get_treestore_from_tree(self, tree):
# Row: [gtk-stock-icon, file name, file complete path, entry color, tooltip]
treestore = Gtk.TreeStore(str, str, str, Gdk.RGBA, str)
- def get_childs(tree, parent=None):
- for file_name, child in tree.children.items():
+
+ def get_children(subtree, parent=None):
+ for file_name, child in subtree.children.items():
color = Gdk.RGBA(0.0, 0.0, 0.0)
if child.status & StatusFlags.CREATED: # Created file
color = Gdk.RGBA(0.0, 0.57, 0.0)
@@ -112,14 +115,15 @@ class changesWindow(object):
elif child.status > 0: # Modified file
color = Gdk.RGBA(0.49, 0.47, 0.0)
- node = treestore.append(parent,[
+ node = treestore.append(parent, [
Gtk.STOCK_DIRECTORY if child.is_dir else Gtk.STOCK_FILE,
file_name, child.path, color, self.file_status_to_string(child.status)
- ])
+ ])
# if this child is a directory get childs
if child.children is not None:
- get_childs(child, node)
- get_childs(tree)
+ get_children(child, node)
+
+ get_children(tree)
return treestore
def on_query_tooltip(self, widget, x, y, keyboard_tip, tooltip):
@@ -135,23 +139,23 @@ class changesWindow(object):
return False
def on_idle_init_paths_tree(self):
- snapper.CreateComparison(self.config,self.snapshot_begin,self.snapshot_end)
+ snapper.CreateComparison(self.config, self.snapshot_begin, self.snapshot_end)
- dbus_array = snapper.GetFiles(self.config,self.snapshot_begin,self.snapshot_end)
+ dbus_array = snapper.GetFiles(self.config, self.snapshot_begin, self.snapshot_end)
# create structure to sort paths into tree
files_tree = changesWindow.TreeNode("/", {}, 0, True)
for entry in dbus_array:
self.add_path_to_tree(str(entry[0]), int(entry[1]), files_tree)
- #self.print_tree(files_tree)
+ # self.print_tree(files_tree)
self.pathstreeview.set_model(self.get_treestore_from_tree(files_tree))
- #self.pathstreeview.expand_all()
+ # self.pathstreeview.expand_all()
# display in statusbar how many files have changed
- self.statusbar.push(1,"%d files"%len(dbus_array))
+ self.statusbar.push(1, "%d files" % len(dbus_array))
- snapper.DeleteComparison(self.config,self.snapshot_begin,self.snapshot_end)
+ snapper.DeleteComparison(self.config, self.snapshot_begin, self.snapshot_end)
# we dont want this function to be called anymore
return False
@@ -167,18 +171,18 @@ class changesWindow(object):
pass
except PermissionError:
print("PermissionError")
- pass # TODO maybe display a dialog with the error?
+ pass # TODO maybe display a dialog with the error?
return None
def _on_pathstree_selection_changed(self, selection):
(model, treeiter) = selection.get_selected()
- if treeiter != None and model[treeiter] != "":
+ if treeiter is not None and model[treeiter] != "":
# append file path to snapshot mountpoint
- fromfile = self.beginpath+model[treeiter][2]
- tofile = self.endpath+model[treeiter][2]
+ fromfile = self.beginpath + model[treeiter][2]
+ tofile = self.endpath + model[treeiter][2]
fromlines = self.get_lines_from_file(fromfile)
- if fromlines == None:
+ if fromlines is None:
return
elif fromlines == "":
fromfile = "New File"
@@ -187,7 +191,7 @@ class changesWindow(object):
fromdate = time.ctime(os.stat(fromfile).st_mtime)
tolines = self.get_lines_from_file(tofile)
- if tolines == None:
+ if tolines is None:
return
elif tolines == "":
tofile = "Deleted File"
@@ -198,10 +202,10 @@ class changesWindow(object):
languagemanager = GtkSource.LanguageManager()
currentview = self.choicesviewgroup.get_action("end").get_current_value()
- if currentview == 0: # show file from begin snapshot
+ if currentview == 0: # show file from begin snapshot
self.sourcebuffer.set_language(languagemanager.get_language("text"))
self.sourcebuffer.set_text("".join(fromlines))
- elif currentview == 1: # show diff of file changes between snapshots
+ elif currentview == 1: # show diff of file changes between snapshots
self.sourcebuffer.set_language(languagemanager.get_language("diff"))
difflines = difflib.unified_diff(fromlines,
tolines,
diff --git a/snappergui/createConfig.py b/snappergui/createConfig.py
index 24731e9..8c54db1 100644
--- a/snappergui/createConfig.py
+++ b/snappergui/createConfig.py
@@ -2,8 +2,10 @@ from snappergui import snapper
import pkg_resources
from gi.repository import Gtk
+
class createConfig(object):
"""docstring for createConfig"""
+
def __init__(self, parent):
super(createConfig, self).__init__()
builder = Gtk.Builder()
@@ -21,20 +23,19 @@ class createConfig(object):
builder.get_object("fsTypeCombo").set_active(0)
def on_name_changed(self, widget):
- self.name = widget.get_chars(0,-1)
+ self.name = widget.get_chars(0, -1)
def on_subvolume_changed(self, widget):
- self.subvolume = widget.get_chars(0,-1)
+ self.subvolume = widget.get_chars(0, -1)
def on_fstype_changed(self, widget):
self.fstype = widget.get_active_text()
def on_template_changed(self, widget):
- self.template = widget.get_chars(0,-1)
+ self.template = widget.get_chars(0, -1)
def run(self):
return self.dialog.run()
def destroy(self):
self.dialog.destroy()
-
diff --git a/snappergui/createSnapshot.py b/snappergui/createSnapshot.py
index d230782..a6ba5a3 100644
--- a/snappergui/createSnapshot.py
+++ b/snappergui/createSnapshot.py
@@ -2,6 +2,7 @@ from snappergui import snapper
import pkg_resources
from gi.repository import Gtk, Gdk
+
class createSnapshot(object):
TYPE_HERE = "<Type here>"
@@ -34,8 +35,6 @@ class createSnapshot(object):
builder.get_object("cleanupcombo").set_active(0)
-
-
def on_config_changed(self,widget):
self.config = widget.get_model()[widget.get_active()][0]
@@ -66,7 +65,6 @@ class createSnapshot(object):
else:
userdatamodel[path][0] = new_text
-
def _on_value_edited(self, renderer, path, new_text):
userdatamodel = self.userdataTree.get_model()
userdatamodel[path][1] = new_text
diff --git a/snappergui/deleteDialog.py b/snappergui/deleteDialog.py
index cac822f..932f4e8 100644
--- a/snappergui/deleteDialog.py
+++ b/snappergui/deleteDialog.py
@@ -6,6 +6,7 @@ from pwd import getpwuid
class deleteDialog(object):
"""docstring for deleteDialog"""
+
def __init__(self, parent, config, snapshots):
super(deleteDialog, self).__init__()
builder = Gtk.Builder()
@@ -21,21 +22,21 @@ class deleteDialog(object):
self.to_delete = snapshots
parents = []
- self.deleteTreeStore = Gtk.TreeStore(bool, int, str, str)
+ self.deleteTreeStore = Gtk.TreeStore(bool, int, str, str)
for snapshot in snapshots:
- snapinfo = snapper.GetSnapshot(config,snapshot)
- #self.deleteTreeStore.append(self.get_row(snapinfo))
- if (snapinfo[1] == 1): # Pre Snapshot
+ snapinfo = snapper.GetSnapshot(config, snapshot)
+ # self.deleteTreeStore.append(self.get_row(snapinfo))
+ if snapinfo[1] == 1: # Pre snapshot
parents.append(self.deleteTreeStore.append(None, self.get_row(snapinfo)))
- elif (snapinfo[1] == 2): # Post snappshot
+ elif snapinfo[1] == 2: # Post snapshot
parent_node = None
for parent in parents:
- if (self.deleteTreeStore.get_value(parent, 1) == snapinfo[2]):
+ if self.deleteTreeStore.get_value(parent, 1) == snapinfo[2]:
parent_node = parent
break
- self.deleteTreeStore.append(parent_node, )
+ self.deleteTreeStore.append(parent_node)
else: # Single snapshot
- self.deleteTreeStore.append(None , self.get_row(snapinfo))
+ self.deleteTreeStore.append(None, self.get_row(snapinfo))
self.deletetreeview.set_model(self.deleteTreeStore)
self.deletetreeview.expand_all()
@@ -47,13 +48,13 @@ class deleteDialog(object):
self.dialog.destroy()
return response
- def on_toggle_delete_snapshot(self,widget,path):
+ def on_toggle_delete_snapshot(self, widget, path):
treeiter = self.deleteTreeStore.get_iter(path)
self.deleteTreeStore.set_value(treeiter,
False,
- not(self.deleteTreeStore.get_value(treeiter, False)))
+ not (self.deleteTreeStore.get_value(treeiter, False)))
snapshot_num = self.deleteTreeStore.get_value(treeiter, True)
- if self.deleteTreeStore.get_value(treeiter,False):
+ if self.deleteTreeStore.get_value(treeiter, False):
if snapshot_num not in self.to_delete:
self.to_delete.append(snapshot_num)
else:
diff --git a/snappergui/mainWindow.py b/snappergui/mainWindow.py
index b603523..5dd6a92 100644
--- a/snappergui/mainWindow.py
+++ b/snappergui/mainWindow.py
@@ -9,6 +9,7 @@ from gi.repository import Gtk
from time import strftime, localtime
from pwd import getpwuid
+
class SnapperGUI():
"""docstring for SnapperGUI"""
@@ -38,8 +39,8 @@ class SnapperGUI():
self.init_dbus_signal_handlers()
self.window.show()
- def snapshot_columns(self,snapshot):
- if(snapshot[3] == -1):
+ def snapshot_columns(self, snapshot):
+ if snapshot[3] == -1:
date = "Now"
else:
date = strftime("%a %x %R", localtime(snapshot[3]))
@@ -77,7 +78,7 @@ class SnapperGUI():
self.builder.get_object("view-changes").set_sensitive(True)
try:
- snapshot_data = snapper.GetSnapshot(config,model[model.get_iter(paths[0])][0])
+ snapshot_data = snapper.GetSnapshot(config, model[model.get_iter(paths[0])][0])
userdata_liststore = Gtk.ListStore(str, str)
for key, value in snapshot_data[7].items():
userdata_liststore.append([key, value])
@@ -91,9 +92,9 @@ class SnapperGUI():
dialog.destroy()
if response == Gtk.ResponseType.OK:
newSnapshot = snapper.CreateSingleSnapshot(dialog.config,
- dialog.description,
- dialog.cleanup,
- dialog.userdata)
+ dialog.description,
+ dialog.cleanup,
+ dialog.userdata)
elif response == Gtk.ResponseType.CANCEL:
pass
@@ -103,9 +104,9 @@ class SnapperGUI():
dialog.destroy()
if response == Gtk.ResponseType.OK:
snapper.CreateConfig(dialog.name,
- dialog.subvolume,
- dialog.fstype,
- dialog.template)
+ dialog.subvolume,
+ dialog.fstype,
+ dialog.template)
elif response == Gtk.ResponseType.CANCEL:
pass
@@ -123,7 +124,7 @@ class SnapperGUI():
if model.iter_has_child(treeiter):
child_treeiter = model.iter_children(treeiter)
snapshots.append(model[child_treeiter][0])
- dialog = deleteDialog(self.window, config,snapshots)
+ dialog = deleteDialog(self.window, config, snapshots)
response = dialog.run()
if response == Gtk.ResponseType.YES and len(dialog.to_delete) > 0:
snapper.DeleteSnapshots(config, dialog.to_delete)
@@ -136,11 +137,11 @@ class SnapperGUI():
treeiter = model.get_iter(path)
mountpoint = snapper.GetMountPoint(config, model[treeiter][0])
if model[treeiter][6] != '':
- snapper.MountSnapshot(config,model[treeiter][0],'true')
+ snapper.MountSnapshot(config, model[treeiter][0], 'true')
subprocess.Popen(['xdg-open', mountpoint])
self.statusbar.push(True,
- "The mount point for the snapshot %s from %s is %s"%
- (model[treeiter][0], config, mountpoint))
+ "The mount point for the snapshot %s from %s is %s" %
+ (model[treeiter][0], config, mountpoint))
def on_viewchanges_clicked(self, widget):
config = self.get_current_config()
@@ -152,36 +153,36 @@ class SnapperGUI():
end = model[paths[-1]][0]
window = changesWindow(config, begin, end)
elif len(paths) == 1 and model.iter_has_child(model.get_iter(paths[0])):
- # open a changes window with the selected pre snapshot and is's post
+ # open a changes window with the selected pre snapshot and its corresponding post snapshot
child_iter = model.iter_children(model.get_iter(paths[0]))
begin = model[paths[0]][0]
- end = model.get_value(child_iter,0)
+ end = model.get_value(child_iter, 0)
window = changesWindow(config, begin, end)
def init_dbus_signal_handlers(self):
signals = {
- "SnapshotCreated" : self.on_dbus_snapshot_created,
- "SnapshotModified" : self.on_dbus_snapshot_modified,
- "SnapshotsDeleted" : self.on_dbus_snapshots_deleted,
- "ConfigCreated" : self.on_dbus_config_created,
- "ConfigModified" : self.on_dbus_config_modified,
- "ConfigDeleted" : self.on_dbus_config_deleted
+ "SnapshotCreated": self.on_dbus_snapshot_created,
+ "SnapshotModified": self.on_dbus_snapshot_modified,
+ "SnapshotsDeleted": self.on_dbus_snapshots_deleted,
+ "ConfigCreated": self.on_dbus_config_created,
+ "ConfigModified": self.on_dbus_config_modified,
+ "ConfigDeleted": self.on_dbus_config_deleted
}
for signal, handler in signals.items():
- snapper.connect_to_signal(signal,handler)
+ snapper.connect_to_signal(signal, handler)
- def on_dbus_snapshot_created(self,config,snapshot):
- self.statusbar.push(True, "Snapshot %s created for %s"% (str(snapshot), config))
+ def on_dbus_snapshot_created(self, config, snapshot):
+ self.statusbar.push(True, "Snapshot %s created for %s" % (str(snapshot), config))
self.configView[config].add_snapshot_to_tree(str(snapshot))
- def on_dbus_snapshot_modified(self,config,snapshot):
+ def on_dbus_snapshot_modified(self, config, snapshot):
print("Snapshot SnapshotModified")
- def on_dbus_snapshots_deleted(self,config,snapshots):
+ def on_dbus_snapshots_deleted(self, config, snapshots):
snaps_str = ""
for snapshot in snapshots:
snaps_str += str(snapshot) + " "
- self.statusbar.push(True, "Snapshots deleted from %s: %s"% (config, snaps_str))
+ self.statusbar.push(True, "Snapshots deleted from %s: %s" % (config, snaps_str))
for deleted in snapshots:
self.configView[config].remove_snapshot_from_tree(deleted)
@@ -189,18 +190,16 @@ class SnapperGUI():
self.configView[config] = snapshotsView(config)
self.configView[config].update_view()
self.stack.add_titled(self.configView[config]._TreeView, config, config)
- self.statusbar.push(5,"Created new configuration %s"% config)
-
+ self.statusbar.push(5, "Created new configuration %s" % config)
- def on_dbus_config_modified(self,args):
+ def on_dbus_config_modified(self, args):
print("Config Modified")
- def on_dbus_config_deleted(self,args):
+ def on_dbus_config_deleted(self, args):
print("Config Deleted")
- def on_main_destroy(self,args):
+ def on_main_destroy(self, args):
for config in snapper.ListConfigs():
for snapshot in snapper.ListSnapshots(config[0]):
if snapshot[6] != '':
- snapper.UmountSnapshot(config[0],snapshot[0],'true')
-
+ snapper.UmountSnapshot(config[0], snapshot[0], 'true')
diff --git a/snappergui/propertiesDialog.py b/snappergui/propertiesDialog.py
index d03c015..dd03ad7 100644
--- a/snappergui/propertiesDialog.py
+++ b/snappergui/propertiesDialog.py
@@ -2,8 +2,10 @@ from snappergui import snapper
import pkg_resources, dbus
from gi.repository import Gtk
+
class PropertiesTab(object):
"""docstring for PropertiesTab"""
+
def __init__(self, config):
builder = Gtk.Builder()
builder.add_from_file(pkg_resources.resource_filename("snappergui",
@@ -29,7 +31,7 @@ class PropertiesTab(object):
elif v == "no":
widget.set_active(False)
else:
- print("ERROR: Could not handle property \"%s\"."% k)
+ print("ERROR: Could not handle property \"%s\"." % k)
self.widgets[k] = widget
def get_current_value(self, setting):
@@ -37,7 +39,7 @@ class PropertiesTab(object):
if type(widget) == Gtk.Entry:
return widget.get_text()
elif type(widget) == Gtk.Switch:
- if(widget.get_active()):
+ if widget.get_active():
return "yes"
else:
return "no"
@@ -47,6 +49,7 @@ class PropertiesTab(object):
class propertiesDialog(object):
"""docstring for propertiesDialog"""
+
def __init__(self, widget, parent):
self.parent = parent
@@ -66,7 +69,6 @@ class propertiesDialog(object):
self.notebook.append_page(currentTab.configsGrid, Gtk.Label.new(config[0]))
self.notebook.show_all()
-
def get_changed_settings(self, config):
changed = {}
for k, v in snapper.GetConfig(config)[2].items():
@@ -81,9 +83,10 @@ class propertiesDialog(object):
try:
snapper.SetConfig(currentConfig, self.get_changed_settings(currentConfig))
except dbus.exceptions.DBusException as error:
- if(str(error).find("error.no_permission") != -1):
+ if str(error).find("error.no_permission") != -1:
self.dialog.destroy()
dialog = Gtk.MessageDialog(self.parent, 0, Gtk.MessageType.WARNING,
- Gtk.ButtonsType.OK, "You don't have permission to edit configurations")
+ Gtk.ButtonsType.OK,
+ "You don't have permission to edit configurations")
dialog.run()
dialog.destroy()
diff --git a/snappergui/snapshotsView.py b/snappergui/snapshotsView.py
index f432969..d9b799b 100644
--- a/snappergui/snapshotsView.py
+++ b/snappergui/snapshotsView.py
@@ -4,8 +4,10 @@ from gi.repository import Gtk
from time import strftime, localtime
from pwd import getpwuid
+
class snapshotsView(Gtk.Widget):
"""docstring for snapshotsView"""
+
def __init__(self, config):
super(snapshotsView, self).__init__()
self.config = config
@@ -24,8 +26,8 @@ class snapshotsView(Gtk.Widget):
if treestore:
self._TreeView.set_model(treestore)
- def snapshot_columns(self,snapshot):
- if(snapshot[3] == -1):
+ def snapshot_columns(self, snapshot):
+ if snapshot[3] == -1:
date = "Now"
else:
date = strftime("%a %x %R", localtime(snapshot[3]))
@@ -47,17 +49,17 @@ class snapshotsView(Gtk.Widget):
parents = []
self.count = len(snapshots_list)
for snapshot in snapshots_list:
- if (snapshot[1] == 1): # Pre Snapshot
- parents.append(configstree.append(None , self.snapshot_columns(snapshot)))
- elif (snapshot[1] == 2): # Post snappshot
+ if snapshot[1] == 1: # Pre snapshot
+ parents.append(configstree.append(None, self.snapshot_columns(snapshot)))
+ elif snapshot[1] == 2: # Post snapshot
parent_node = None
for parent in parents:
- if (configstree.get_value(parent, 0) == snapshot[2]):
+ if configstree.get_value(parent, 0) == snapshot[2]:
parent_node = parent
break
- configstree.append(parent_node , self.snapshot_columns(snapshot))
+ configstree.append(parent_node, self.snapshot_columns(snapshot))
else: # Single snapshot
- configstree.append(None , self.snapshot_columns(snapshot))
+ configstree.append(None, self.snapshot_columns(snapshot))
return configstree
def add_snapshot_to_tree(self, snapshot, pre_snapshot=None):
@@ -68,9 +70,9 @@ class snapshotsView(Gtk.Widget):
except dbus.exceptions.DBusException:
return
pre_number = snapinfo[2]
- if (snapinfo[1] == 2): # if type is post
+ if snapinfo[1] == 2: # if type is post
for aux, row in enumerate(treemodel):
- if(pre_number == row[0]):
+ if pre_number == row[0]:
pre_snapshot = treemodel.get_iter(aux)
break
treemodel.append(pre_snapshot, self.snapshot_columns(snapinfo))
@@ -78,9 +80,9 @@ class snapshotsView(Gtk.Widget):
def remove_snapshot_from_tree(self, snapshot):
treemodel = self._TreeView.get_model()
for aux, row in enumerate(treemodel):
- if(snapshot == row[0]):
+ if snapshot == row[0]:
has_child = treemodel.iter_has_child(treemodel.get_iter(aux))
- if(has_child):
+ if has_child:
# FIXME meh
self.update_view()
else:
@@ -89,14 +91,13 @@ class snapshotsView(Gtk.Widget):
def on_description_edited(self, widget, treepath, text):
snapshot_row = self._TreeView.get_model()[treepath]
snapshot_num = snapshot_row[0]
- snapshot_info = snapper.GetSnapshot(self.config,snapshot_num)
- snapper.SetSnapshot(self.config,snapshot_info[0],text,snapshot_info[6],snapshot_info[7])
+ snapshot_info = snapper.GetSnapshot(self.config, snapshot_num)
+ snapper.SetSnapshot(self.config, snapshot_info[0], text, snapshot_info[6], snapshot_info[7])
snapshot_row[5] = text
-
def on_cleanup_edited(self, widget, treepath, text):
snapshot_row = self._TreeView.get_model()[treepath]
snapshot_num = snapshot_row[0]
- snapshot_info = snapper.GetSnapshot(self.config,snapshot_num)
- snapper.SetSnapshot(self.config,snapshot_info[0],snapshot_info[5],text,snapshot_info[7])
+ snapshot_info = snapper.GetSnapshot(self.config, snapshot_num)
+ snapper.SetSnapshot(self.config, snapshot_info[0], snapshot_info[5], text, snapshot_info[7])
snapshot_row[6] = text
Debdiff
File lists identical (after any substitutions)
No differences were encountered in the control files