misc patches for deepin and elementary os

README.md

@@ -1,20 +1,19 @@
-# Resetter 0.2.4-rc1
+# Resetter 0.2.5-rc2
 ![alt tag](https://github.com/gaining/Resetter/blob/master/Resetter/resetter-screenshot.png)
 
 It is an application built with python and pyqt that will help to reset an Ubuntu or Linux-Mint system to stock, as if it's been just installed without having to manually re-install by using a live cd/dvd image. It will detect packages that have been installed after the initial system install. 
 
 # Status
-- The first release candidate has been released! 
-- Release candidate 0.2.4 contains new looks, tons of new useful features, and more. 
+- Release candidate 0.2.5 contains new looks, tons of new useful features, and more. 
 - Feedback will be greatly appreciated.
-- current version is 0.2.4-rc1
+- current version is 0.2.5-rc2
 - Please check the changelog for more details.
 - If you find a bug, please create an issue on github. 
 - If you do not have a github account please send your bug report at [email protected].
 
 
 # How to install
-Install via deb file found ![here](https://github.com/gaining/Resetter/releases/tag/v0.2.4-rc). PPA will be created soon.
+Install via deb file found ![here](https://github.com/gaining/Resetter/releases/tag/v0.2.5-rc2). PPA will be created soon.
 It is easier to install any deb files via gdebi, especially on elementary os with no graphical way of installing a deb file. 
 On the terminal, run `sudo apt install gdebi`.
 - Linux deepin users must first fetch the python-evdev module 

Resetter/DEBIAN/control

@@ -1,12 +1,12 @@
 Package: resetter
-Version: 0.2.4-rc1
+Version: 0.2.5-rc2
 Installed-Size: 1224
 Maintainer: gaining <[email protected]>
 Section: python
 Homepage: https://github.com/gaining/resetter
 Architecture: all
 Priority: optional
-Depends: python-qt4 (>=4.10), python-apt (>=0.9.3), coreutils (>=7.0), python-evdev (>=0.4), python-mechanize (>=1:0.2.5), python-bs4 (>=4.2)
+Depends: python-qt4 (>=4.10), python-apt (>=0.9.3), coreutils (>=7.0), python-evdev (>=0.4), python-mechanize (>=1:0.2.5), python-bs4 (>=4.2), add-apt-key (>=1.0)
 Pre-Depends: python (>=2.7.5), policykit-1 (>=0.105)
 Description: Resets Ubuntu/Linux-Mint to stock
  Resetter is an easy way to reset your debian based linux back to stock. It also has other useful tools such as a ppa manager, an installer and a way to install ppa's straight from launchpad.net.

Resetter/TODO.txt

@@ -1,7 +1,5 @@
-add install option for reading packages from generated list (backup) #due for next release.
-upgrade  to python3 and pyqt5
-support more debian based linux distributions
 create better launcher icon
+upgrade  to python3 and pyqt5
 add command line options
 
 

Resetter/usr/lib/resetter/AboutPage.py

@@ -36,7 +36,7 @@ def __init__(self, parent=None):
         cr_text = "Copyright (c) 2017 all rights reserved"
         desc_text = "Built With PyQt\n\n " \
                     "This is a great utility software that will help you reset your linux installation its stock state"
-        version_text = "Version: 0.2.4-beta"
+        version_text = "Version: 0.2.5-rc2"
         donate_text = 'If you liked my project, please ' \
                       '<a href="https://github.com/gaining/Resetter/blob/master/DONATE.md">Donate </a>'
         more_text = 'To find out more about this project, please visit my github:' \

Resetter/usr/lib/resetter/EasyInstall.py

@@ -7,7 +7,6 @@
 import textwrap
 from PyQt4 import QtCore, QtGui
 
-
 class EasyInstaller(QtGui.QDialog):
     def __init__(self):
         super(EasyInstaller, self).__init__()
@@ -117,7 +116,8 @@ def selectAll(self):
 
     def openBackup(self):
         try:
-            backup = QtGui.QFileDialog.getOpenFileName(self, 'Choose Backup', 'Backup', "(*.rbf)")
+            dpath = os.path.abspath(os.path.join("Backup", "../../../"))
+            backup = QtGui.QFileDialog.getOpenFileName(self, 'Choose Backup', dpath, "(*.rbf)")
             if os.path.isfile(backup):
                 with open(backup, "r") as bk:
                     for line in bk:
@@ -162,6 +162,8 @@ def installPackages(self):
         self.install = Install("install", "Installing packages", True)
         self.install.show()
         self.install.exec_()
+        self.removeItems()
+        print "Done"
 
     def closeview(self):
         self.cache.close()
@@ -187,7 +189,7 @@ def showMessage(self, package):
         msg.setIcon(QtGui.QMessageBox.Information)
         msg.setText("The package that you've tried to add is not found in the cache")
         msg.setDetailedText("If you've recently added a ppa containing this package, "
-                            "please use <b>EasyPPA - refresh sources</b> feature, "
+                            "please use [EasyPPA - refresh sources] feature, "
                             "then try adding the package again.")
         msg.exec_()
 

Resetter/usr/lib/resetter/EasyRepo.py

@@ -178,9 +178,10 @@ def isThereInternet(self):
             return False
 
     def codeName(self):
+        xenial_fam = (['serena', 'sarah', 'loki'])
         if self.os_info['CODENAME'] == 'rosa':
             return "trusty"
-        elif self.os_info['CODENAME'] == 'sarah' or 'loki' or 'serena':
+        elif self.os_info['CODENAME'] in xenial_fam:
             return "xenial"
         else:
             return self.os_info['CODENAME']
@@ -210,20 +211,21 @@ def addPPA(self, ppa):
                 QtGui.QApplication.setOverrideCursor(QtCore.Qt.WaitCursor)
                 x = str(ppa[index.row()])
                 y = str(x[7:]).split(' ', 1)[0]
-                repo = ('deb', y, self.codeName(), ['main'])
-                print repo, ppa[index.row()][2]
-
                 entry = self.sources.add('deb', y, self.codeName(), ['main'])
                 entry.set_enabled(True)
                 self.sources.save()
-                p = subprocess.Popen(['apt-key', 'adv', '--keyserver keyserver.ubuntu.com', '--recv-keys',
-                                      ppa[index.row()][2]], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                p.wait()
-
+                p = subprocess.check_output(['apt-key', 'adv', '--keyserver', 'keyserver.ubuntu.com', '--recv-keys',
+                                      ppa[index.row()][2]])
+                print p
                 QtGui.QApplication.restoreOverrideCursor()
             except Exception as e:
-                print "failed {}".format(e)
-            self.successMessage()
+                QtGui.QApplication.restoreOverrideCursor()
+                self.error_msg.setIcon(QtGui.QMessageBox.Critical)
+                self.error_msg.setText("Unable fetch PPA key")
+                self.error_msg.setDetailedText("Error: {}".format(e))
+                self.error_msg.exec_()
+            else:
+                self.successMessage()
         else:
             self.showMessage()
 

Resetter/usr/lib/resetter/Resetter.py

@@ -333,7 +333,7 @@ def save(self):
         time = strftime("%Y-%m-%d %H:%M:%S", gmtime())
         name = "snapshot - {}".format(time)
         filename, extension = QtGui.QFileDialog.getSaveFileNameAndFilter(
-            self, 'Save Backup file', name, filter=self.tr(".rbf"))
+            self, 'Save Backup file', '/home/{}/{}'.format(self.user, name), filter=self.tr(".rbf"))
         try:
             with open("installed", 'r') as inst, open(filename + extension, "w") as backup:
                 for line in inst:

Resetter/usr/lib/resetter/Sources.py

@@ -68,18 +68,21 @@ def editSources(self, title, tip):
         self.btnEnable.setVisible(True)
 
         for dirpath, dirs, files in os.walk('/etc/apt/'):
+            word = 'deb'
             for filename in fnmatch.filter(files, "*.list"):
                 source_list = os.path.join(dirpath, filename)
                 self.sourceslists.append(source_list)
                 with open(source_list, "r") as sources:
                     for line in sources:
-                        if line.startswith('deb') or line.startswith('#'):
-                            self.item = QtGui.QStandardItem(line)
-                            self.item.setCheckable(True)
-                            self.item.setCheckState(QtCore.Qt.Unchecked)
-                            self.model.appendRow(self.item)
+                        if line.startswith(word) or line.startswith('#') \
+                                and line[2:].split(' ')[0][:3] == word:
+                                self.item = QtGui.QStandardItem(line)
+                                self.item.setCheckable(True)
+                                self.item.setCheckState(QtCore.Qt.Unchecked)
+                                self.model.appendRow(self.item)
                     self.list_view.setModel(self.model)
 
+
     def setItems(self, item):
         if item.checkState() == QtCore.Qt.Checked:
             self.items.append(item.text())

changelog

@@ -1,3 +1,12 @@
+resetter (0.2.5-rc2) trusty; urgency=low
+  * Added dependency add-apt-key as it isn't included in some distros by default
+  * Fixed easy ppa for elementary os
+  * PPA manager improvements
+  * Easy PPA misc improvements
+
+ -- gaining <[email protected]>  Sun, 30 Apr 2017 17:25:27 -0400
+
+
 resetter (0.2.4-rc1) trusty; urgency=medium
 
   * Release Candidate 1