diff options
| -rw-r--r-- | CHANGELOG | 15 | ||||
| -rw-r--r-- | mageiaSync/mageiaSyncExt.py | 20 | ||||
| -rw-r--r-- | mageiaSync/mageiaSyncUI.py | 7 | ||||
| -rw-r--r-- | mageiaSync/mageiaSyncUI.ui | 4 | ||||
| -rw-r--r-- | mageiaSync/mageiasync.py | 3 | ||||
| -rw-r--r-- | setup.py | 2 |
6 files changed, 36 insertions, 15 deletions
@@ -1,4 +1,19 @@ The modifications are: +mageiasync 0.3.0 +---------------- + - Add signature checking + - Manage the default value for release and destination directory. + - Keep the current directory in filepicker and in prefs dialog box for destination + - Define the tab order in prefs dialog box + - Set the prefs dialog box stretchable + - Set the rename dialog box stretchable + - Suppress unuseful printed file name + - Set tab order in Rename dialog box + - Add the count of renamed files and directories. + - List only directories in release dropdown (preferences). + - Get remote directories also when updating preferences (was only at first setting) + - The import function are yet working also locally + - Add Lithunian and Albanian translations mageiasync 0.2.1 ---------------- diff --git a/mageiaSync/mageiaSyncExt.py b/mageiaSync/mageiaSyncExt.py index 0d30b43..5c7f053 100644 --- a/mageiaSync/mageiaSyncExt.py +++ b/mageiaSync/mageiaSyncExt.py @@ -5,7 +5,7 @@ Created on Sat Jul 12 21:42:56 2014 @author: yves """ -import re, os +import re, os, gnupg from subprocess import Popen, PIPE from PyQt5.QtCore import QDir, QFileInfo,pyqtSignal,QThread @@ -26,6 +26,20 @@ class checkThread(QThread): hashfunc = hashlib.sha512() if sumType=='md5': hashfunc = hashlib.md5() + # Check if the sum file has a valid signature + gpg = gnupg.GPG() + gpg.encoding = 'utf-8' + gpg.recv_keys('pgp.mit.edu', 'EDCA7A90') + sig_file = self.destination+'/'+self.path+'/'+self.name+'.'+sumType+'.gpg' + try: + with open(sig_file, 'rb') as g: + verified = gpg.verify_file(g) + if not verified.valid: + print('Signature not OK') + return False + except: + print('Signature file %s not found'%sig_file) + return False try: with open(self.destination+'/'+self.path+'/'+self.name, 'rb') as f: while True: @@ -87,10 +101,6 @@ class checkThread(QThread): self.checkStartSignal.emit(signal) checkSha=self.processSum('sha512') self.sha1Signal.emit(self.isoIndex+128*checkSha) -# signal=300+self.isoIndex -# self.checkStartSignal.emit(signal) -# checkDate=self.processDate() -# self.dateSignal.emit(self.isoIndex+128*checkDate) self.quit() diff --git a/mageiaSync/mageiaSyncUI.py b/mageiaSync/mageiaSyncUI.py index ea9c55b..46bc12c 100644 --- a/mageiaSync/mageiaSyncUI.py +++ b/mageiaSync/mageiaSyncUI.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'mageiaSyncUI.ui' # -# Created: Sat Sep 26 09:34:01 2015 -# by: PyQt5 UI code generator 5.4 +# Created by: PyQt5 UI code generator 5.4.2 # # WARNING! All changes made in this file will be lost! @@ -13,9 +12,9 @@ class Ui_mainWindow(object): def setupUi(self, mainWindow): mainWindow.setObjectName("mainWindow") mainWindow.resize(820, 627) - mainWindow.setWindowTitle("mageiaSync v0.2.1") + mainWindow.setWindowTitle("mageiaSync v0.3.0") icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap("/usr/share/icons/hicolor/scalable/apps/mageiasync.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon.addPixmap(QtGui.QPixmap("../../../../usr/share/icons/hicolor/scalable/apps/mageiasync.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off) mainWindow.setWindowIcon(icon) mainWindow.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) self.centralwidget = QtWidgets.QWidget(mainWindow) diff --git a/mageiaSync/mageiaSyncUI.ui b/mageiaSync/mageiaSyncUI.ui index 227169f..58f9b5b 100644 --- a/mageiaSync/mageiaSyncUI.ui +++ b/mageiaSync/mageiaSyncUI.ui @@ -11,11 +11,11 @@ </rect> </property> <property name="windowTitle"> - <string notr="true">mageiaSync v0.2.1</string> + <string notr="true">mageiaSync v0.3.0</string> </property> <property name="windowIcon"> <iconset> - <normaloff>/usr/share/icons/hicolor/scalable/apps/mageiasync.svg</normaloff>/usr/share/icons/hicolor/scalable/apps/mageiasync.svg</iconset> + <normaloff>../../../../usr/share/icons/hicolor/scalable/apps/mageiasync.svg</normaloff>../../../../usr/share/icons/hicolor/scalable/apps/mageiasync.svg</iconset> </property> <property name="locale"> <locale language="English" country="UnitedStates"/> diff --git a/mageiaSync/mageiasync.py b/mageiaSync/mageiasync.py index d5fd11f..cc060d9 100644 --- a/mageiaSync/mageiasync.py +++ b/mageiaSync/mageiasync.py @@ -223,7 +223,6 @@ class IsosViewer(QMainWindow, mageiaSyncUI.Ui_mainWindow): remoteRow = isoIndex.row() path = self.modelRemote.data(self.modelRemote.index(remoteRow,0)) name = self.modelRemote.data(self.modelRemote.index(remoteRow,1)) - print(remoteRow,path,name) try: # Look for ISO in local list item=self.model.findItems(name,QtCore.Qt.MatchExactly,1)[0] @@ -234,7 +233,6 @@ class IsosViewer(QMainWindow, mageiaSyncUI.Ui_mainWindow): basedir.mkdir(path) item=self.model.findItems(name,QtCore.Qt.MatchExactly,1)[0] row=self.model.indexFromItem(item).row() - print(self.model.data(self.model.index(row,0)), row) self.checks(row) def checks(self,isoIndex): @@ -362,7 +360,6 @@ class IsosViewer(QMainWindow, mageiaSyncUI.Ui_mainWindow): params.setValue("bwl",str(self.bwl)) else: pass -# answer=QDialogButtonBox(QDialogButtonBox.Ok) print(self.tr("the user must set values or default values")) self.pd.close() else: @@ -16,7 +16,7 @@ data_files = [("share/applications/", ["share/applications/mageiasync.desktop"]) setup( name = 'mageiasync', - version = '0.2.1', + version = '0.3', packages = ['mageiaSync'], scripts = ['mageiasync'], license = 'GNU General Public License v3 (GPLv3)', |