Fix email package import for py2exe build

Added error message and halting of torrent download when too many hash failures occur

SDM.py

@@ -209,14 +209,29 @@ def torrentFinished():
          self.launchBitcoindAndGuardian()
 
       #####
-      def torrentFailed():
+      def warnUserHashFail():
+         from PyQt4.QtGui import QMessageBox
+         QMessageBox.warning(self, tr('Hash Failure'), tr("""The torrent download 
+            is currently encountering too many packet hash failures to allow it to 
+            progress properly. As a result, the torrent engine has been halted. You 
+            should report this incident to the Armory team and turn off this feature 
+            until further notice."""), QMessageBox.Ok)      
+
+      #####
+      def torrentFailed(errMsg=''):
          # Not sure there's actually anything we need to do here...
+         if errMsg == 'hashFail':
+            warnUserHashFail()
+
          bootsz = '<Unknown>'
          if os.path.exists(bootfile):
             bootsz = bytesToHumanSize(os.path.getsize(bootfile))
 
          LOGERROR('Torrent failed; size of %s is %s', torrentPath, bootsz)
          self.launchBitcoindAndGuardian()
+
+
+
 
       TheTDM.setSecondsBetweenUpdates(90)
       TheTDM.setCallback('displayFunc',  torrentLogToFile)

armoryengine/torrentDL.py

@@ -57,8 +57,9 @@ def __init__(self, torrentFile=None, savePath=None, doDisable=False):
       self.torrentName   = None
       self.savePath      = None
       self.savePath_temp = None
-
-
+
+      self.nHashFailures = 0
+      self.killAfterNHashFails = 100
 
 
    #############################################################################
@@ -296,6 +297,9 @@ def failedFunc(self, msg=''):
    #############################################################################
    def errorFunc(self, errMsg):
       # Use caller-set function if it exists
+      if 'failed hash check, re-downloading it' in errMsg:
+         self.nHashFailures = self.nHashFailures +1
+
       if self.hasCustomFunc('errorFunc'):
          self.customCallbacks['errorFunc'](errMsg)
          return
@@ -323,6 +327,9 @@ def chooseFileFunc(self, default, fsize, saveas, thedir):
 
    #############################################################################
    def getTDMState(self):
+      if self.nHashFailures >= self.killAfterNHashFails:
+         return 'HashFailures'
+
       if self.disabled:
          return 'Disabled'
 
@@ -447,6 +454,10 @@ def doTheDownloadThing(self):
             self.bt1dow.shutdown()
             break
 
+         if self.nHashFailures >= self.killAfterNHashFails:
+            self.bt1dow.shutdown()
+            self.customCallbacks['errorFunc']('hashFail')
+            break
 
          self.bt1dow.startRerequester()
          self.bt1dow.autoStats()

setup.py

@@ -4,7 +4,8 @@
 
 
 opts = {"py2exe":{
-    "dll_excludes":["MSWSOCK.dll", "IPHLPAPI.dll", "MSWSOCK.dll", "WINNSI.dll", "WTSAPI32.dll"]
+    "dll_excludes":["MSWSOCK.dll", "IPHLPAPI.dll", "MSWSOCK.dll", "WINNSI.dll", "WTSAPI32.dll"],
+    "packages":["email"]
     }}
 
 setup( options = opts, windows = [