Update files to version 8.1.0

Author: mbusb

.gitignore

@@ -90,4 +90,11 @@ ENV/
 .ropeproject
 
 # Created by PyCharm
-.idea
+.idea
+
+# Source file
+multibootusb*.tar.gz
+
+# Setup file
+
+multibootusb*.exe

CHANGELOG

@@ -1,3 +1,14 @@
+Version - 8.1.0
+---------------
+* Fix for debain package bug which does not pull in dependency packages
+* In cluded 7zip for extracting ISO files (including UDF)
+* Fix for windows installer
+* Added Comodo Rescue Disk ISO
+* Fix for kaspersky rescue disk
+* Generic fix for distros using isolinux version 3
+* A new installer/setup executable for windows
+* Fix for random crash when trying to detect syslinux version
+
 Version - 8.0.0
 ---------------
 * This version is written in python 3

LICENSE.txt

@@ -25,15 +25,13 @@ import platform
 ####################################################################################################
 #  Change the below variables to suit your needs.
 if platform.system() == "Windows":
-    # pyinstaller_path = "F:\Documents\PyInstaller-3.2\pyinstaller.py"
-    # pyinstaller_path = "I:\home\sundar\Documents\pyInstaller\pyinstaller.py"
     pyinstaller_path = 'D:\multibootusb\pyinstaller\pyinstaller.py'
-    # release_dir = os.path.join("D:", "multibootusb", "release")
     release_dir = 'D:\\multibootusb\\release'
 else:
     from os.path import expanduser
     home = expanduser("~")
-    pyinstaller_path = "/home/sundar/Documents/pyInstaller/pyinstaller.py"
+    # pyinstaller_path = "/home/sundar/Documents/pyInstaller/pyinstaller.py"
+    pyinstaller_path = "/media/sundar/Data/multibootusb/pyinstaller/pyinstaller.py"
     release_dir = "/media/sundar/Data/multibootusb/release"
 sourceforge_release_path = "[email protected]:/home/frs/project/multibootusb/"
 ####################################################################################################
@@ -65,13 +63,14 @@ class pkg():
             os.mkdir(os.path.join(self.release_upload_dir, "Source"))
         if self.pkg_name == "deb":
             print("Ensure thta you have python-stdeb package installed!")
-            stdcfg = ("[DEFAULT]\n"
-                      "Package: multibootusb\n"
-                      "Depends: python3-pyqt5, parted, util-linux, mtools, python-dbus, pkexec\n"
-                      "Build-Depends: python3-all\n"
-                      "Section: system\n"
-                      "XS-Python-Version: = 3.5\n"
-                      "Debian-Version: 1")
+            stdcfg = """[DEFAULT]
+                      Package: multibootusb
+                      Depends3: python3-pyqt5, parted, util-linux, mtools, python3-dbus, p7zip-full
+                      Build-Depends: python3-all
+                      Section: system
+                      XS-Python-Version: = 3.5
+                      Debian-Version: 1"""
+
             with open("stdeb.cfg", "w") as f:
                 f.write(stdcfg)
             if subprocess.call('python3 setup.py --command-packages=stdeb.command bdist_deb', shell=True) == 0 and \
@@ -89,9 +88,9 @@ class pkg():
                 result = True
         elif self.pkg_name == 'rpm' or self.pkg_name == 'suse' or self.pkg_name == 'mageia':
             if self.pkg_name == 'suse' or self.pkg_name == 'mageia':
-                require = "python3-qt5, parted, util-linux, pkexec, mtools"
+                require = "python3-qt5, parted, util-linux, mtools, python3-dbus, p7zip, p7zip-plugins"
             else:
-                require = "PyQt5, parted, util-linux, mtools"
+                require = "PyQt5, parted, util-linux, mtools, python3-dbus, p7zip, p7zip-plugins"
             setup_cfg = ("[bdist_rpm]\n"
                          "Group = Applications/System\n"
                          "Vendor = Sundar <[email protected]>\n"
@@ -125,7 +124,7 @@ class pkg():
             else:
                 # subprocess.call('python ' + pyinstaller_path + ' --upx-dir C:\\upx multibootusb.spec', shell=True) == 0 and \
                 #        os.path.exists(os.path.join("dist", 'multibootusb-' + self.version + ".exe")):
-                if subprocess.call('python ' + pyinstaller_path + ' --windowed multibootusb.spec', shell=True) == 0 and \
+                if subprocess.call('python ' + pyinstaller_path + ' --onefile onefile-multibootusb.spec', shell=True) == 0 and \
                         os.path.exists(os.path.join("dist", 'multibootusb-' + self.version + ".exe")):
                     shutil.copy2(os.path.join("dist", 'multibootusb-' + self.version + ".exe"),
                                               os.path.join(self.release_upload_dir, "Windows"))

build_pkg

@@ -1 +1 @@
-8.0.0
+8.1.0

data/tools/7zip/7z.dll

@@ -78,23 +78,23 @@ def supported_pac_manager(self):
     def install_dependency_package(self):
         if subprocess.call("which pacman", shell=True) == 0:
             subprocess.call("pacman -Sy --noconfirm", shell=True)
-            if subprocess.call("pacman -S --needed --noconfirm python-pyqt5 pkexec mtools parted util-linux python-dbus") == 0:  # Thank you Neitsab for "--needed"  argument.
+            if subprocess.call("pacman -S --needed --noconfirm p7zip python-pyqt5 mtools parted util-linux python-dbus") == 0:  # Thank you Neitsab for "--needed"  argument.
                 result = True
         elif subprocess.call("which yum", shell=True) == 0:
             subprocess.call("yum check-update", shell=True)
-            if subprocess.call("yum install mtools PyQt5 pkexec util-linux parted python3-dbus -y", shell=True) == 0:
+            if subprocess.call("yum install mtools PyQt5 pkexec util-linux parted p7zip p7zip-plugins python3-dbus -y", shell=True) == 0:
                 result = True
         elif subprocess.call("which apt-get", shell=True) == 0:
             subprocess.call("apt-get -q update", shell=True)
-            if subprocess.call("apt-get -q -y install python3-pyqt5 pkexec parted util-linux mtools python3-dbus", shell=True) == 0:
+            if subprocess.call("apt-get -q -y install python3-pyqt5 p7zip-full parted util-linux mtools python3-dbus", shell=True) == 0:
                 result = True
         elif subprocess.call("which zypper", shell=True) == 0:
             subprocess.call("zypper refresh", shell=True)
-            if subprocess.call("zypper install -y mtools python3-qt5 pkexec util-linux parted", shell=True) == 0:
+            if subprocess.call("zypper install -y mtools python3-qt5 p7zip p7zip-plugins util-linux parted", shell=True) == 0:
                 result = True
         elif subprocess.call("which urpmi", shell=True) == 0:
             subprocess.call("urpmi.update -a", shell=True)
-            if subprocess.call("urpmi install -auto mtools util-linux pkexec parted python3-qt5", shell=True) == 0:
+            if subprocess.call("urpmi install -auto mtools util-linux p7zip p7zip-plugins parted python3-qt5", shell=True) == 0:
                 result = True
 
         if result is not True:

data/tools/7zip/7z.exe

@@ -0,0 +1,83 @@
+;--------------------------------
+;NSIS script for creating multibootusb setup file
+
+Name "multibootusb 8.1.0"
+OutFile "multibootusb-8.1.0-setup.exe"
+
+SetCompressor lzma
+
+;--------------------------------
+;!Include Modern UI
+!include "MUI2.nsh"
+;--------------------------------
+
+
+;--------------------------------
+;	Pages
+  !insertmacro MUI_PAGE_LICENSE "LICENSE.txt"
+  !insertmacro MUI_PAGE_DIRECTORY
+  !insertmacro MUI_PAGE_INSTFILES
+  
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
+  !insertmacro MUI_LANGUAGE "English"
+
+;--------------------------------
+
+
+InstallDir "$PROGRAMFILES\multibootusb"
+InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\multibootusb" ""
+
+DirText $(s_InstallHere)
+
+Icon data\tools\multibootusb.ico
+
+Section "Dummy Section" SecDummy
+
+	; Install files.
+	SetOverwrite on
+
+	SetOutPath "$INSTDIR"
+	File /r "dist\multibootusb\*"
+	
+	SetOutPath "$INSTDIR\data"
+	File /r "data\*"
+	
+	; Create shortcut.
+	SetOutPath -
+	CreateDirectory "$SMPROGRAMS\multibootusb"
+	CreateShortCut "$SMPROGRAMS\multibootusb\multibootusb.lnk" "$INSTDIR\multibootusb.exe"
+	CreateShortCut "$SMPROGRAMS\multibootusb\Uninstall multibootusb.lnk" "$INSTDIR\uninst.exe" "" "$INSTDIR\uninst.exe" 0
+
+	; Optionally start program.
+	MessageBox MB_YESNO|MB_ICONQUESTION "Do you want to run multibootusb now?" IDNO SkipRunProgram
+	Exec "$INSTDIR\multibootusb.exe"
+SkipRunProgram:
+
+	; Create uninstaller.
+	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\multibootusb" "" "$INSTDIR"
+	WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\multibootusb" "DisplayName" "multibootusb (remove only)"
+	WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\multibootusb" "UninstallString" '"$INSTDIR\uninst.exe"'
+	WriteUninstaller "$INSTDIR\uninst.exe"
+
+SectionEnd
+
+UninstallText $(s_UnInstall)
+
+Section Uninstall
+
+	; Delete shortcuts.
+	Delete "$SMPROGRAMS\multibootusb\multibootusb.lnk"
+	Delete "$SMPROGRAMS\multibootusb\Uninstall multibootusb.lnk"
+	RMDir "$SMPROGRAMS\multibootusb"
+	Delete "$DESKTOP\multibootusb.lnk"
+
+	; Delete registry keys.
+	Delete "$INSTDIR\uninst.exe"
+	DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\multibootusb"
+	DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\multibootusb"
+
+	; Remove the installation directories.
+	RMDir /R "$INSTDIR"
+
+SectionEnd

data/tools/syslinux/syslinux_modules.zip

@@ -0,0 +1,130 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# Name:     7zip.py
+# Purpose:  Wrapper module to list and extract ISO files using 7zip
+# Authors:  Sundar
+# Licence:  This file is a part of multibootusb package. You can redistribute it or modify
+# under the terms of GNU General Public License, v.2 or above
+
+import os
+import platform
+import subprocess
+from . import config
+from . import gen
+
+if platform.system() == 'Windows':
+    _7zip = gen.quote(gen.resource_path(os.path.join('data', 'tools', '7zip', '7z.exe')))
+else:
+    _7zip = '7z'
+
+
+def extract_iso(src, dst, pattern=None, suppress_out=True):
+    """
+    Simple wrapper function to extract ISO file to destination
+    :param src: Path to ISO file
+    :param dst: Path to directory where the files are to be extracted
+    :param patter: The pattern to match the files to be extracted
+    :return:
+    """
+    # 7z x -y -oC:\path_to_directory X:\path_to_iso_file.iso
+    # 7z e archive.zip -oC:\path_to_directory *.cfg *.bin -r
+    if platform.system() == 'Windows':
+        cli_option = ' -bb1'  # Linux does not accept this option (may be due to version diff).
+        if suppress_out != '':
+            # suppress_out = ' 2> nul'
+            suppress_out = ''
+    else:
+        cli_option = ''
+        if suppress_out != '':
+            suppress_out = ' 2> /dev/null'
+
+    if not os.path.exists(src):
+        print('ISO file could not be found on the location specified.')
+        return False
+    if not os.path.exists(dst):
+        os.makedirs(dst, exist_ok=True)
+
+    if pattern is None:
+        _cmd = _7zip + cli_option + ' x -y -o' + gen.quote(dst) + ' ' + gen.quote(src) + suppress_out
+    else:
+        _cmd = _7zip + ' -y x ' + gen.quote(src) + ' -o' + dst + ' ' + gen.quote(pattern) + ' -r' + suppress_out
+    # print('Executing', _cmd)
+    _7zip_process = subprocess.Popen(_cmd, universal_newlines=True, stdin=subprocess.PIPE, stderr=subprocess.PIPE,
+                                     stdout=subprocess.PIPE, shell=True)
+    config.status_text = 'Extracting ' + os.path.basename(src)
+    while True:
+        line = _7zip_process.stdout.readline()
+        # print(line)
+        if line.startswith('- '):
+            config.status_text = 'Extracting ' + line[2:]
+        elif platform.system() == 'Linux': # line.startswith('Extracting'):  # Under Linux it prints directly all the process (may be due to version diff).
+            config.status_text = line
+        if line == '' and _7zip_process.poll() != None:
+            break
+
+
+def list_iso(iso_link, suppress_out=True):
+    if platform.system() == 'Windows':
+        if suppress_out is True:
+            suppress_out = ' 2> nul'
+    else:
+        if suppress_out is True:
+            suppress_out = ' 2> /dev/null'
+    if not os.path.exists(iso_link):
+        print('Path to ISO link does not exist.')
+        return False
+    else:
+        file_list = []
+        _cmd = _7zip + ' l ' + gen.quote(iso_link) + suppress_out
+        # print('Executing', _cmd)
+        _cmd_out = subprocess.check_output(_cmd, universal_newlines=True, stderr=subprocess.PIPE, shell=True).splitlines()
+        for line in _cmd_out:
+            line = line.split()
+            if '.....' in line:
+                file_list.append(line[-1])
+
+        return file_list
+
+
+def test_iso(iso_link, suppress_out=True):
+    """
+    Function to test if ISO file is corrupted. Relying only on 7zip.
+    :param iso_link: Path to ISO file
+    :return: True if test is positive
+    """
+    # 7z t /path/to/iso/file.iso
+    # return value : 0 No error
+    # return value : 1 Warning (Non fatal error(s))
+    # return value : 2 Fatal error
+    # return value : 7 Command line error
+    # return value : 8 Not enough memory for operation
+    # return value : 255 User stopped the process
+
+    if platform.system() == 'Windows':
+        if suppress_out is True:
+            suppress_out = ' > nul'
+    else:
+        if suppress_out is True:
+            suppress_out = ' > /dev/null'
+
+    _cmd = _7zip + ' t ' + iso_link + suppress_out
+
+    # print('Executing', _cmd)
+
+    rc = subprocess.call(_cmd, shell=True)
+
+    if rc == 0 or rc == 1:
+        return True
+    else:
+        return False
+
+
+if __name__ == '__main__':
+    # slitaz-4.0.iso
+    # ubuntu-16.04-desktop-amd64.iso
+    # avg_arl_cdi_all_120_160420a12074.iso
+    # haiku-nightly.iso
+    # Hiren_BootCD.iso
+    file_list = list_iso('../../ubuntu_14_04_backup/Downloads/clonezilla-live-2.4.2-32-amd64.iso')
+    for f in file_list:
+        print(f)

data/version.txt

@@ -103,7 +103,7 @@ def runAsAdmin(cmdLine=None, wait=True):
         #showCmd = win32con.SW_HIDE
         lpVerb = 'runas'  # causes UAC elevation prompt.
 
-        # print "Running", cmd, params
+        #print("Running", cmd, params)
 
         # ShellExecute() doesn't seem to allow us to fetch the PID or handle
         # of the process, so we can't get anything useful from it. Therefore

install.py

@@ -16,7 +16,6 @@
 from . import config
 
 
-
 def distro(iso_cfg_ext_dir, iso_link):
     """
     Detect if distro is supported by multibootusb.
@@ -40,7 +39,7 @@ def distro(iso_cfg_ext_dir, iso_link):
                         if re.search(r'ubcd', string, re.I):
                             return "ubcd"
                         elif re.search(r'Super Grub Disk', string, re.I):
-                            return None
+                            return "sgrubd2"
                         elif re.search(r'hbcd', string, re.I):
                             return "hbcd"
                         elif re.search(r'systemrescuecd', string, re.I):
@@ -136,13 +135,12 @@ def distro(iso_cfg_ext_dir, iso_link):
 def detect_iso_from_file_list(iso_link):
     """
     Fallback detection script from the content of an ISO.
-    :return:
+    :return: supported distro as string
     """
+    from . import _7zip
     if os.path.exists(iso_link):
-        iso9660fs = ISO9660(iso_link)
-        iso_file_list = iso9660fs.readDir("/")
-        print(iso_file_list)
-        if any("sources" in s.lower() for s in iso_file_list):
+        iso_file_list = _7zip.list_iso(iso_link)
+        if any("sources" in s.lower() for s in iso_file_list) and any("boot.wim" in s.lower() for s in iso_file_list):
             return "Windows"
         elif any("config.isoclient" in s.lower() for s in iso_file_list):
             return "opensuse"