From 9dc2ce2a8ed52381e283933ed873c7bd9dbeb81f Mon Sep 17 00:00:00 2001 From: gm10 <13855078+gm10@users.noreply.github.com> Date: Wed, 16 Jan 2019 10:47:42 +0100 Subject: [PATCH] Automatically generate list of manually installed packages if possible --- debian/control | 1 + generate_desktop_files | 4 +--- usr/lib/linuxmint/mintbackup/mintbackup.py | 25 ++++++++++++++++------ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/debian/control b/debian/control index 39109fb..7429495 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Depends: python3 (>= 3), python3-setproctitle, aptitude, gir1.2-xapp-1.0, + mint-common (>= 2), ${misc:Depends} Description: Home Directory Backup Tool Easily backup and restore your personal data and your software selection. diff --git a/generate_desktop_files b/generate_desktop_files index 30370de..385a11c 100755 --- a/generate_desktop_files +++ b/generate_desktop_files @@ -5,9 +5,7 @@ PATH = "/usr/share/linuxmint/locale" import os import gettext -import sys -sys.path.append('/usr/lib/linuxmint/common') -import additionalfiles +import mintcommon.additionalfiles as additionalfiles os.environ['LANGUAGE'] = "en_US.UTF-8" gettext.install(DOMAIN, PATH) diff --git a/usr/lib/linuxmint/mintbackup/mintbackup.py b/usr/lib/linuxmint/mintbackup/mintbackup.py index 1d880c1..e27bf58 100755 --- a/usr/lib/linuxmint/mintbackup/mintbackup.py +++ b/usr/lib/linuxmint/mintbackup/mintbackup.py @@ -1,24 +1,27 @@ #!/usr/bin/python3 -import apt import gettext -import gi import hashlib import locale import os import stat -import subprocess import sys import tarfile import threading import time + +import gi gi.require_version("Gtk", "3.0") gi.require_version("XApp", "1.0") from gi.repository import Gtk, GdkPixbuf, Gio, GLib, XApp +import apt import aptdaemon.client -from aptdaemon.enums import * -from aptdaemon.gtk3widgets import AptErrorDialog, AptConfirmDialog, AptProgressDialog, AptStatusIcon import aptdaemon.errors +from aptdaemon.enums import * +from aptdaemon.gtk3widgets import (AptConfirmDialog, AptErrorDialog, + AptProgressDialog, AptStatusIcon) + +from mintcommon.installer.cache import PkgCache import setproctitle setproctitle.setproctitle("mintbackup") @@ -679,9 +682,17 @@ def backup_pkg_load_from_mintinstall(self, button): model = Gtk.ListStore(bool, str, str) model.set_sort_column_id(1, Gtk.SortType.ASCENDING) + pkgcache = PkgCache() + installed_packages = pkgcache.get_manually_installed_packages() + if not installed_packages: + settings = Gio.Settings("com.linuxmint.install") + installed_packages = settings.get_strv("installed-apps") + else: + self.builder.get_object("label_caption_software_backup2").set_text(_("The list below shows the applications you installed.")) + cache = apt.Cache() - settings = Gio.Settings("com.linuxmint.install") - for item in settings.get_strv("installed-apps"): + + for item in installed_packages: try: if item.startswith(("apt:", "fp:")): # Split package hash at first ':' since some packages have ':i386' suffixes