From 11f1eb42ec74d46b5a06fea440d8ec3e820ff71f Mon Sep 17 00:00:00 2001
From: "DESKTOP-P98C1VA\\MAINGEAR" <lkruel@gmail.com>
Date: Thu, 14 Jun 2018 14:01:13 -0400
Subject: [PATCH] Updating the uploader to work with the daily builds

---
 .../game_development_toolset_updater.shelf    | 665 ++++++++++--------
 1 file changed, 369 insertions(+), 296 deletions(-)

diff --git a/toolbar/game_development_toolset_updater.shelf b/toolbar/game_development_toolset_updater.shelf
index 62608778..4b5fc6c0 100644
--- a/toolbar/game_development_toolset_updater.shelf
+++ b/toolbar/game_development_toolset_updater.shelf
@@ -1,296 +1,369 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shelfDocument>
-  <!-- This file contains definitions of shelves, toolbars, and tools.
- It should not be hand-edited when it is being used by the application.
- Note, that two definitions of the same element are not allowed in
- a single file. -->
-
-  <tool name="update_toolset" label="Update Toolset" icon="CHOP_joystick">
-    <helpURL>tool:update_toolset</helpURL>
-    <script scriptType="python"><![CDATA[import os, shutil, urllib, json, zipfile, platform, hou
-
-from PySide2.QtCore import *
-from PySide2.QtGui import *
-from PySide2.QtWidgets import *
-
-REPO_URL = 'https://api.github.com/repos/sideeffects/GameDevelopmentToolset'
-BRANCHES = ["Stable", "Development"]
-
-SETTINGS_FILE = os.path.join(os.getenv("HOUDINI_USER_PREF_DIR"), "gamedevtoolset.json")
-HOUDINI_ENV = os.path.join(os.getenv("HOUDINI_USER_PREF_DIR"), "houdini.env")
-
-if platform.system() == "Windows":
-    HOU_TEMP_PATH = os.path.join(os.getenv("APPDATA"), "SideFX", "GameDevToolset")
-    HOU_TEMP_PATH_STR = "$APPDATA\\SideFX\\GameDevToolset"
-else:
-    HOU_TEMP_PATH = os.path.join(os.getenv("HOUDINI_USER_PREF_DIR"), "GameDevToolset")
-    HOU_TEMP_PATH_STR = HOU_TEMP_PATH
-
-class UpdateDialog(QDialog):
-
-    def __init__(self, parent, updater_object):
-        super(UpdateDialog, self).__init__(parent)
-        self.setWindowTitle("Game Development Toolset")
-        self.updater_object = updater_object
-
-        self.current_version = None
-        self.current_branch = None
-
-        if self.updater_object.current_version:
-            self.current_version = self.updater_object.current_version
-        if self.updater_object.current_branch:
-            self.current_branch = self.updater_object.current_branch
-
-        self.build_ui()
-
-    def build_ui(self):
-        installed_group = QGroupBox("Installed Version")
-        change_group = QGroupBox("Change To")
-        spacer = QLabel("")
-
-        # Current Version
-        current_version_layout = QHBoxLayout()
-        current_version_lbl = QLabel("Release: ")
-        current_version = self.current_version
-        if not current_version:
-            current_version = "Unknown"
-
-        current_version_value_lbl = QLabel(current_version)
-
-        current_version_layout.addWidget(current_version_lbl)
-        current_version_layout.addWidget(current_version_value_lbl)
-
-        # Current Branch
-        current_branch_layout = QHBoxLayout()
-        current_branch_lbl = QLabel("Branch: ")
-        current_branch = self.current_branch
-        if not current_branch:
-            current_branch = "Unknown"
-        current_branch_value_lbl = QLabel(current_branch)
-
-        current_branch_layout.addWidget(current_branch_lbl)
-        current_branch_layout.addWidget(current_branch_value_lbl)
-
-        installedgroup_layout = QVBoxLayout(installed_group)
-
-        installedgroup_layout.addLayout(current_version_layout)
-        installedgroup_layout.addLayout(current_branch_layout)
-
-        # Update
-        version_layout = QHBoxLayout()
-        update_version_label = QLabel("Release:")
-
-        self.version_combo = QComboBox(self)
-        for release in self.updater_object.releases[-10:]:
-            self.version_combo.addItem(release)
-
-        version_layout.addWidget(update_version_label)
-        version_layout.addWidget(self.version_combo)
-
-        branch_layout = QHBoxLayout()
-        update_branch_label = QLabel("Branch:")
-        self.branch_combo = QComboBox(self)
-        for branch in BRANCHES:
-            self.branch_combo.addItem(branch)
-
-        if self.current_branch:
-            current_index = BRANCHES.index(self.current_branch)
-            self.branch_combo.setCurrentIndex(current_index)
-
-        changedgroup_layout = QVBoxLayout(change_group)
-
-        branch_layout.addWidget(update_branch_label)
-        branch_layout.addWidget(self.branch_combo)
-
-        changedgroup_layout.addLayout(version_layout)
-        changedgroup_layout.addLayout(branch_layout)
-
-        self.button = QPushButton("Update")
-        self.uninstallButton = QPushButton("Uninstall")
-
-        self.button.clicked.connect(self.on_updatebtn_press)
-        self.uninstallButton.clicked.connect(self.on_uninstallbtn_press)
-        layout = QVBoxLayout()
-
-        layout.addWidget(installed_group)        
-        layout.addWidget(change_group)
-
-        layout.addWidget(spacer)
-        layout.addWidget(self.button)
-        layout.addWidget(self.uninstallButton)
-        self.setLayout(layout)
-
-    def on_updatebtn_press(self):
-        version = self.version_combo.currentText()
-        branch = self.branch_combo.currentText()
-        self.updater_object.on_dialog_close(version, branch, "change")
-        self.close()
-
-    def on_uninstallbtn_press(self):
-        version = self.version_combo.currentText()
-        branch = self.branch_combo.currentText()
-        self.updater_object.on_dialog_close(version, branch, "uninstall")
-        self.close()
-
-
-class GameDevelopmentUpdater(object):
-
-    def __init__(self):
-        self.releases = []
-        self.desired_version = None
-        self.desired_branch = None
-       
-        self.cleanup_old_installs()
-        self.load_settings()
-        self.get_releases()
-        self.show_dialog()
-
-    def cleanup_old_installs(self):
-        houdini_pref_dir = os.getenv("HOUDINI_USER_PREF_DIR")
-       
-        otl = os.path.join(houdini_pref_dir, "otls", "SideFX_GameDevelopmentToolset.hda")
-        desktop = os.path.join(houdini_pref_dir, "desktop", "Games_Minimal.desk")
-        toolbar = os.path.join(houdini_pref_dir, "toolbar", "game_development_toolset.shelf")
-        script = os.path.join(houdini_pref_dir, "scripts", "python", "hou_settings.py")
-       
-        to_delete = [otl, desktop, toolbar, script]
-        for filename in to_delete:
-            if os.path.exists(filename):
-                os.remove(filename)
-       
-    def get_releases(self):
-        response = urllib.urlopen(REPO_URL + "/releases")
-        data = response.read()
-        if ( data == "" ):
-            raise ValueError("Unable to get the release list")
-        j_data = json.loads(data.decode('utf-8'))
-        for release in j_data:
-            self.releases.append(release["tag_name"])
-
-    def show_dialog(self):
-        dialog = UpdateDialog(hou.ui.mainQtWindow(), self)
-        dialog.show()
-
-    def download_url(self, url):
-        filename = os.path.basename(url)
-        local_path = os.path.join(HOU_TEMP_PATH, filename)
-        if not os.path.exists(os.path.dirname(local_path)):
-            os.makedirs(os.path.dirname(local_path))
-        urllib.urlretrieve(url, local_path)
-        return local_path
-
-    def get_download_path(self, version, branch):
-        response = urllib.urlopen(REPO_URL + "/releases/tags/" + version)
-        data = response.read()
-        if ( data == "" ):
-            raise ValueError("Unable to get the release tags")
-        j_data = json.loads(data.decode('utf-8'))
-        for asset in j_data["assets"]:
-            if branch in os.path.basename(asset["browser_download_url"]):
-                return asset["browser_download_url"]
-       
-    def unzip_file(self, zip_file, destination_path):
-        zipf = zipfile.ZipFile(zip_file, 'r', zipfile.ZIP_DEFLATED)
-        zipf.extractall(destination_path)
-
-    def load_settings(self):
-        try:
-            with open(SETTINGS_FILE, 'r') as fp:
-                settings = json.load(fp)
-                self.current_version = settings["current_version"]
-                self.current_branch = settings["current_branch"]
-        except:
-            self.current_version = None
-            self.current_branch = None
-
-    def store_settings(self):
-        settings = {"current_version": self.desired_version,
-                    "current_branch": self.desired_branch}
-
-        with open(SETTINGS_FILE, 'w') as fp:
-            json.dump(settings, fp)
-
-    def show_success_dialog(self, mode):
-        msg = QMessageBox()
-        msg.setIcon(QMessageBox.Information)
-
-        if mode == "change":
-            msg.setText("Game Development Toolset Updated Successfully")
-            msg.setInformativeText("Please Restart Houdini to load all of the new tools")
-            msg.setWindowTitle("Success")
-        elif mode == "uninstall":
-            msg.setText("Game Development Toolset Uninstalled Successfully")
-            msg.setInformativeText("Please Restart Houdini for changes to take effect")
-            msg.setWindowTitle("Success")
-        retval = msg.exec_()
-
-    def on_dialog_close(self, version, branch, mode):
-        self.desired_version = version
-        self.desired_branch = branch
-
-        if mode == "change":  
-            download_url = self.get_download_path(version, branch)
-            if not download_url:
-                hou.ui.displayMessage("Package not Available for this branch", severity=hou.severityType.Error)
-                return
-               
-            local_path = self.download_url(download_url)
-            self.unzip_file(local_path, os.path.join(HOU_TEMP_PATH, version, branch))
-            os.remove(local_path)
-            self.patch_houdini_env(version, branch, "change")
-            self.store_settings()
-            self.show_success_dialog("change")
-
-        elif mode == "uninstall":
-            #Patch ENV var
-            self.patch_houdini_env(version, branch, "uninstall")
-            self.desired_branch = None
-            self.desired_version = None
-            self.store_settings()
-
-            #Delete Installed Files
-            removedir = os.path.join(HOU_TEMP_PATH, version)
-            if os.path.exists(removedir):
-                shutil.rmtree(removedir, ignore_errors=True)
-            
-            self.show_success_dialog("uninstall")
-
-    def patch_houdini_env(self, version, branch, mode):
-        filepath = HOUDINI_ENV
-        if platform.system() == "Windows":
-            sep = ";"
-            quote_char = ""
-        else:
-            sep = ":"
-            quote_char = "\""
-
-        to_write = []
-        with open(filepath, "r") as fp:
-            for line in fp.readlines():
-                if "# GAME DEVELOPMENT TOOLSET" in line:
-                    continue
-
-                if HOU_TEMP_PATH_STR in line:
-                    continue
-
-                to_write.append(line)
-
-        if to_write[-1] != "\n":
-            to_write.append("\n")
-
-        if mode == "change":
-            to_write.append("# GAME DEVELOPMENT TOOLSET\n")
-
-            entry = "HOUDINI_PATH = "
-            entry += quote_char + HOU_TEMP_PATH_STR + "\\"
-            entry += version + "\\" + branch
-            entry += sep + "&" + quote_char + "\n"
-            to_write.append(entry)
-
-        with open(filepath, "w") as fp:
-            for line in to_write:
-                fp.write(line)
-
-GameDevelopmentUpdater()]]></script>
-  </tool>
-</shelfDocument>
+<?xml version="1.0" encoding="UTF-8"?>
+<shelfDocument>
+  <!-- This file contains definitions of shelves, toolbars, and tools.
+ It should not be hand-edited when it is being used by the application.
+ Note, that two definitions of the same element are not allowed in
+ a single file. -->
+
+  <tool name="update_toolset" label="Update Toolset" icon="CHOP_joystick">
+    <helpURL>tool:update_toolset</helpURL>
+    <script scriptType="python"><![CDATA[import os
+import shutil
+import urllib
+import json
+import zipfile
+import platform
+import hou
+
+from hutil.Qt.QtCore import *
+from hutil.Qt.QtGui import *
+from hutil.Qt.QtWidgets import *
+
+########################################################################################################################
+# GLOBAL VARIABLES #####################################################################################################
+
+REPO_URL = 'https://api.github.com/repos/sideeffects/GameDevelopmentToolset'
+
+BRANCHES = ["Development"]
+TOOLS_VERSION = 1
+
+# store the major and minor version of Houdini (aka 16.5)
+APP_VERSION = ".".join(map(str, hou.applicationVersion()[:2]))
+
+SETTINGS_FILE = os.path.join(os.getenv("HOUDINI_USER_PREF_DIR"), "gamedevtoolset.json")
+HOUDINI_ENV = os.path.join(os.getenv("HOUDINI_USER_PREF_DIR"), "houdini.env")
+
+if platform.system() == "Windows":
+    HOU_TEMP_PATH = os.path.join(os.getenv("APPDATA"), "SideFX", "GameDevToolset")
+    HOU_TEMP_PATH_STR = "$APPDATA\\SideFX\\GameDevToolset"
+else:
+    HOU_TEMP_PATH = os.path.join(os.getenv("HOUDINI_USER_PREF_DIR"), "GameDevToolset")
+    HOU_TEMP_PATH_STR = HOU_TEMP_PATH
+
+
+# UPDATE DIALOG ########################################################################################################
+class UpdateDialog(QDialog):
+    def __init__(self, parent, updater_object):
+        super(UpdateDialog, self).__init__(parent)
+        self.setWindowTitle("Game Development Toolset")
+        self.updater_object = updater_object
+
+        self.current_version = None
+
+        if self.updater_object.current_version:
+            self.current_version = self.updater_object.current_version
+
+        self.build_ui()
+
+    def build_ui(self):
+        installed_group = QGroupBox("Installed Version")
+        change_group = QGroupBox("Change To")
+        spacer = QLabel("")
+
+        # Current Version
+        current_version_layout = QHBoxLayout()
+        current_version_lbl = QLabel("Release: ")
+        current_version = self.current_version
+        if not current_version:
+            current_version = "Unknown"
+
+        current_version_value_lbl = QLabel(current_version)
+
+        current_version_layout.addWidget(current_version_lbl)
+        current_version_layout.addWidget(current_version_value_lbl)
+
+        installedgroup_layout = QVBoxLayout(installed_group)
+
+        installedgroup_layout.addLayout(current_version_layout)
+
+        # Update
+        version_layout = QHBoxLayout()
+        update_version_label = QLabel("Release:")
+
+        self.version_combo = QComboBox(self)
+        for release in self.updater_object.production_releases[-10:]:
+            self.version_combo.addItem(release)
+
+        self.production_builds_check = QCheckBox("Production Builds Only")
+        self.production_builds_check.setChecked(True)
+        self.production_builds_check.stateChanged.connect(self.on_production_check)
+
+        version_layout.addWidget(update_version_label)
+        version_layout.addWidget(self.version_combo)
+        version_layout.addWidget(self.production_builds_check)
+
+        changedgroup_layout = QVBoxLayout(change_group)
+
+        changedgroup_layout.addLayout(version_layout)
+
+        self.button = QPushButton("Update")
+        self.uninstallButton = QPushButton("Uninstall")
+
+        self.button.clicked.connect(self.on_updatebtn_press)
+        self.uninstallButton.clicked.connect(self.on_uninstallbtn_press)
+        layout = QVBoxLayout()
+
+        layout.addWidget(installed_group)
+        layout.addWidget(change_group)
+
+        layout.addWidget(spacer)
+        layout.addWidget(self.button)
+        layout.addWidget(self.uninstallButton)
+        self.setLayout(layout)
+
+    def on_production_check(self, state=None):
+        self.version_combo.clear()
+        if self.production_builds_check.isChecked():
+            for release in self.updater_object.production_releases[-10:]:
+                self.version_combo.addItem(release)
+        else:
+            for release in self.updater_object.releases[-10:]:
+                self.version_combo.addItem(release)
+
+    def on_updatebtn_press(self):
+        version = self.version_combo.currentText()
+        self.updater_object.on_dialog_close(version, "change")
+        self.close()
+
+    def on_uninstallbtn_press(self):
+        version = self.version_combo.currentText()
+        self.updater_object.on_dialog_close(version, "uninstall")
+        self.close()
+
+
+# UPDATER ##############################################################################################################
+class GameDevelopmentUpdater(object):
+    """
+        Main updater object, gets called with the shelf button press
+
+
+    """
+
+    def __init__(self):
+
+        # Store Releases and Production Releases
+        self.releases = []
+        self.production_releases = []
+
+        self.desired_version = None
+
+        self.cleanup_old_installs()
+        self.load_settings()
+        self.get_releases()
+        self.show_dialog()
+
+    def cleanup_old_installs(self):
+        """ In an older version we left some stuff on the user's folders, we need to clean those out just in case """
+
+        houdini_pref_dir = os.getenv("HOUDINI_USER_PREF_DIR")
+
+        otl = os.path.join(houdini_pref_dir, "otls", "SideFX_GameDevelopmentToolset.hda")
+        desktop = os.path.join(houdini_pref_dir, "desktop", "Games_Minimal.desk")
+        toolbar = os.path.join(houdini_pref_dir, "toolbar", "game_development_toolset.shelf")
+        script = os.path.join(houdini_pref_dir, "scripts", "python", "hou_settings.py")
+
+        to_delete = [otl, desktop, toolbar, script]
+        for filename in to_delete:
+            if os.path.exists(filename):
+                os.remove(filename)
+
+    def get_releases(self):
+
+        # Attempt to download things from github
+        try:
+            response = urllib.urlopen(REPO_URL + "/releases")
+            data = response.read()
+            if data == "":
+                raise ValueError("Unable to get the release list")
+        except:
+            raise ValueError("Unable to connect to GitHub and download the Release List")
+            return
+
+        # Parse the data and filter out versions we don't care about
+        j_data = json.loads(data.decode('utf-8'))
+        for release in j_data:
+
+            # Check for the tools version for when we bump to 2.0 or 3.0
+            if release["tag_name"].split(".")[0] == str(TOOLS_VERSION):
+
+                # we use gitHub's prerelase flag to determine which releases are production builds
+                if not release["prerelease"]:
+                    self.production_releases.append(release["tag_name"])
+
+                self.releases.append(release["tag_name"])
+
+    def show_dialog(self):
+        dialog = UpdateDialog(hou.ui.mainQtWindow(), self)
+        dialog.show()
+
+    def download_url(self, url):
+        """
+            Download the zip file from github
+        :param url:
+        :return:
+        """
+
+        filename = os.path.basename(url)
+        local_path = os.path.join(HOU_TEMP_PATH, filename)
+
+        if not os.path.exists(os.path.dirname(local_path)):
+            os.makedirs(os.path.dirname(local_path))
+
+        try:
+            urllib.urlretrieve(url, local_path)
+        except:
+            raise ValueError("Unable to download the package file :" + url)
+            return
+
+        return local_path
+
+    def get_download_path(self, version):
+        """
+            Get the asset list for the version and isolate which file we want (the Zip file)
+            With some logic built in if they select older versions
+
+        :param version:
+        :return:
+        """
+        try:
+            response = urllib.urlopen(REPO_URL + "/releases/tags/" + version)
+            data = response.read()
+            if data == "":
+                raise ValueError("Unable to get the release tags")
+        except:
+            raise ValueError("Unable to reach Github and get the release tags")
+
+        backup = None
+
+        j_data = json.loads(data.decode('utf-8'))
+        for asset in j_data["assets"]:
+
+            url = os.path.basename(asset["browser_download_url"])
+
+            # If we find something named HoudiniXX.X-Y.YY.zip that's the one we want
+            if ("Houdini" + APP_VERSION) in url and "zip" in url:
+                return asset["browser_download_url"]
+
+            # For older versions we want to grab the Development branch of that version by default
+            if "Development" in url and "zip" in url:
+                backup = url
+
+        return backup
+
+    def unzip_file(self, zip_file, destination_path):
+        zipf = zipfile.ZipFile(zip_file, 'r', zipfile.ZIP_DEFLATED)
+        zipf.extractall(destination_path)
+
+    def load_settings(self):
+        try:
+            with open(SETTINGS_FILE, 'r') as fp:
+                settings = json.load(fp)
+                self.current_version = settings["current_version"]
+        except:
+            self.current_version = None
+
+    def store_settings(self):
+        settings = {"current_version": self.desired_version, "current_branch":"Development"}
+
+        with open(SETTINGS_FILE, 'w') as fp:
+            json.dump(settings, fp)
+
+    def show_success_dialog(self, mode):
+        msg = QMessageBox()
+        msg.setIcon(QMessageBox.Information)
+
+        if mode == "change":
+            msg.setText("Game Development Toolset Updated Successfully")
+            msg.setInformativeText("Please Restart Houdini to load all of the new tools")
+            msg.setWindowTitle("Success")
+
+        elif mode == "uninstall":
+            msg.setText("Game Development Toolset Uninstalled Successfully")
+            msg.setInformativeText("Please Restart Houdini for changes to take effect")
+            msg.setWindowTitle("Success")
+
+        retval = msg.exec_()
+
+    def on_dialog_close(self, version, mode):
+        """ Call back from the Updater Dialog """
+        self.desired_version = version
+
+        if mode == "change":
+            download_url = self.get_download_path(version)
+            if not download_url:
+                hou.ui.displayMessage("Package not Available for this Version", severity=hou.severityType.Error)
+                return
+
+            local_path = self.download_url(download_url)
+            self.unzip_file(local_path, os.path.join(HOU_TEMP_PATH, APP_VERSION, version))
+
+            os.remove(local_path)
+
+            self.patch_houdini_env(version, "change")
+            self.store_settings()
+            self.show_success_dialog("change")
+
+        elif mode == "uninstall":
+            # Patch ENV var
+            self.patch_houdini_env(version, "uninstall")
+            self.desired_version = None
+            self.store_settings()
+
+            # Delete Installed Files
+            removedir = os.path.join(HOU_TEMP_PATH, version)
+            if os.path.exists(removedir):
+                shutil.rmtree(removedir, ignore_errors=True)
+
+            self.show_success_dialog("uninstall")
+
+    def patch_houdini_env(self, version, mode):
+
+        filepath = HOUDINI_ENV
+        if platform.system() == "Windows":
+            sep = ";"
+            quote_char = ""
+        else:
+            sep = ":"
+            quote_char = "\""
+
+        to_write = []
+        has_houdini_path_defined = False
+
+        with open(filepath, "r") as fp:
+            for line in fp.readlines():
+                if "# GAME DEVELOPMENT TOOLSET" in line:
+                    continue
+
+                if HOU_TEMP_PATH_STR in line:
+                    continue
+
+                if "HOUDINI_PATH" in line:
+                    has_houdini_path_defined = True
+
+                to_write.append(line)
+
+        if to_write[-1] != "\n":
+            to_write.append("\n")
+
+        if mode == "change":
+            to_write.append("# GAME DEVELOPMENT TOOLSET\n")
+
+            entry = "HOUDINI_PATH = "
+            entry += quote_char + HOU_TEMP_PATH_STR + "\\"
+            entry += APP_VERSION + "\\" + version
+            if has_houdini_path_defined:
+                entry += sep + "$HOUDINI_PATH" + quote_char + "\n"
+            else:
+                entry += sep + "&" + quote_char + "\n"
+
+            to_write.append(entry)
+
+        with open(filepath, "w") as fp:
+            for line in to_write:
+                fp.write(line)
+
+
+GameDevelopmentUpdater()
+]]></script>
+  </tool>
+</shelfDocument>