fix for #13 on windows

Author: pichillilorenzo

node/installer.py

@@ -2,9 +2,10 @@
 import traceback
 import threading
 import os
-import tarfile
+import tarfile, zipfile
 import urllib
 import json
+import shutil
 import node_variables
 from animation_loader import AnimationLoader
 from repeated_timer import RepeatedTimer
@@ -13,7 +14,8 @@
 class DownloadNodeJS(object):
   def __init__(self, node_version):
     self.NODE_JS_VERSION = node_version
-    self.NODE_JS_BINARY_URL = "https://nodejs.org/dist/"+self.NODE_JS_VERSION+"/node-"+self.NODE_JS_VERSION+"-"+node_variables.NODE_JS_OS+"-"+node_variables.NODE_JS_ARCHITECTURE+".tar.gz"
+    self.NODE_JS_TAR_EXTENSION = ".zip" if node_variables.NODE_JS_OS == "win" else ".tar.gz"
+    self.NODE_JS_BINARY_URL = "https://nodejs.org/dist/"+self.NODE_JS_VERSION+"/node-"+self.NODE_JS_VERSION+"-"+node_variables.NODE_JS_OS+"-"+node_variables.NODE_JS_ARCHITECTURE+self.NODE_JS_TAR_EXTENSION
     self.NODE_JS_BINARY_TARFILE_NAME = self.NODE_JS_BINARY_URL.split('/')[-1]
     self.NODE_JS_BINARY_TARFILE_FULL_PATH = os.path.join(node_variables.NODE_JS_BINARIES_FOLDER_PLATFORM, self.NODE_JS_BINARY_TARFILE_NAME)
     self.animation_loader = AnimationLoader(["[=     ]", "[ =    ]", "[   =  ]", "[    = ]", "[     =]", "[    = ]", "[   =  ]", "[ =    ]"], 0.067, "Downloading: "+self.NODE_JS_BINARY_URL+" ")
@@ -23,7 +25,10 @@ def __init__(self, node_version):
       os.makedirs(node_variables.NODE_JS_BINARIES_FOLDER_PLATFORM)
   def download(self):
     try :
-      urllib.request.urlretrieve(self.NODE_JS_BINARY_URL, self.NODE_JS_BINARY_TARFILE_FULL_PATH)
+      request = urllib.request.Request(self.NODE_JS_BINARY_URL)
+      request.add_header('User-agent', r'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.1 (KHTML, like Gecko) Chrome/22.0.1207.1 Safari/537.1')
+      with urllib.request.urlopen(request) as response, open(self.NODE_JS_BINARY_TARFILE_FULL_PATH, 'wb') as out_file:
+        shutil.copyfileobj(response, out_file)
     except Exception as err :
       traceback.print_exc()
       self.on_error(err)
@@ -37,12 +42,22 @@ def start(self):
     if self.animation_loader :
       self.interval_animation = RepeatedTimer(self.animation_loader.sec, self.animation_loader.animate)
   def extract(self):
-    with tarfile.open(self.NODE_JS_BINARY_TARFILE_FULL_PATH, "r:gz") as tar :
-      for member in tar.getmembers() :
-        if(member.name.endswith("/bin/node")) :
-          member.name = node_variables.NODE_JS_PATH_EXECUTABLE
-          tar.extract(member, node_variables.NODE_JS_BINARIES_FOLDER_PLATFORM)
-          break
+    if self.NODE_JS_TAR_EXTENSION != ".zip" :
+      with tarfile.open(self.NODE_JS_BINARY_TARFILE_FULL_PATH, "r:gz") as tar :
+        for member in tar.getmembers() :
+          if member.name.endswith("/bin/node") :
+            member.name = node_variables.NODE_JS_PATH_EXECUTABLE
+            tar.extract(member, node_variables.NODE_JS_BINARIES_FOLDER_PLATFORM)
+            break
+    else :
+      with zipfile.ZipFile(self.NODE_JS_BINARY_TARFILE_FULL_PATH, "r") as zip_file :
+        for member in zip_file.namelist() :
+          if member.endswith("/node.exe") :
+            with zip_file.open(member) as node_file:
+              with open(os.path.join(node_variables.NODE_JS_BINARIES_FOLDER_PLATFORM, "node.exe"), "wb") as target :
+                shutil.copyfileobj(node_file, target)
+                break
+
   def on_error(self, err):
     self.animation_loader.on_complete()
     self.interval_animation.stop()
@@ -93,9 +108,10 @@ def install(node_version=""):
     if node_version != node_js.getCurrentNodeJSVersion() :
       DownloadNodeJS( node_version ).start()
 
-  for thread in threading.enumerate() :
-    if thread.getName() == "checkUpgradeNodeJS" and thread.is_alive() :
-      return
-  thread = threading.Thread(target=checkUpgrade, name="checkUpgradeNodeJS")
-  thread.setDaemon(True)
-  thread.start()
+  if nodejs_already_installed :
+    for thread in threading.enumerate() :
+      if thread.getName() == "checkUpgradeNodeJS" and thread.is_alive() :
+        return
+    thread = threading.Thread(target=checkUpgrade, name="checkUpgradeNodeJS")
+    thread.setDaemon(True)
+    thread.start()