From ce1453a2d844bede7404578585eadf853986abad Mon Sep 17 00:00:00 2001
From: TiberiumFusion <6332277+TiberiumFusion@users.noreply.github.com>
Date: Tue, 12 Nov 2019 22:38:42 -0500
Subject: [PATCH] Removed updater, changed versioning
---
io_scene_valvesource.pyproj | 1 -
io_scene_valvesource/GUI.py | 2 +-
io_scene_valvesource/__init__.py | 6 +--
io_scene_valvesource/update.py | 89 --------------------------------
4 files changed, 4 insertions(+), 94 deletions(-)
delete mode 100644 io_scene_valvesource/update.py
diff --git a/io_scene_valvesource.pyproj b/io_scene_valvesource.pyproj
index aa73e0c..13869a0 100644
--- a/io_scene_valvesource.pyproj
+++ b/io_scene_valvesource.pyproj
@@ -35,7 +35,6 @@
-
diff --git a/io_scene_valvesource/GUI.py b/io_scene_valvesource/GUI.py
index d6bb972..dbe0401 100644
--- a/io_scene_valvesource/GUI.py
+++ b/io_scene_valvesource/GUI.py
@@ -21,7 +21,7 @@
import bpy
from .utils import *
from .export_smd import SmdExporter, SMD_OT_Compile
-from .update import SmdToolsUpdate # comment this line if you make third-party changes
+#from .update import SmdToolsUpdate # comment this line if you make third-party changes
from .flex import *
global p_cache
diff --git a/io_scene_valvesource/__init__.py b/io_scene_valvesource/__init__.py
index 86e4475..778e5b6 100644
--- a/io_scene_valvesource/__init__.py
+++ b/io_scene_valvesource/__init__.py
@@ -19,9 +19,9 @@
# ##### END GPL LICENSE BLOCK #####
bl_info = {
- "name": "Blender Source Tools",
- "author": "Tom Edwards (translators: Grigory Revzin)",
- "version": (2, 10, 2),
+ "name": "Blender Source Tools (BST-Fix-279)",
+ "author": "Tom Edwards (translators: Grigory Revzin), modified by TF",
+ "version": (2, 10, 2, 999, 1),
"blender": (2, 74, 0),
"category": "Import-Export",
"location": "File > Import/Export, Scene properties",
diff --git a/io_scene_valvesource/update.py b/io_scene_valvesource/update.py
deleted file mode 100644
index dd568cc..0000000
--- a/io_scene_valvesource/update.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright (c) 2014 Tom Edwards contact@steamreview.org
-#
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-import bpy, io
-from .utils import *
-
-class SMD_MT_Updated(bpy.types.Menu):
- bl_label = get_id("offerchangelog_title")
- def draw(self,context):
- self.layout.operator("wm.url_open",text=get_id("offerchangelog_offer"),icon='TEXT').url = "http://steamcommunity.com/groups/BlenderSourceTools#announcements"
-
-updater_supported = True
-try:
- import urllib.request, urllib.error, zipfile
-except:
- updater_supported = False
-
-class SmdToolsUpdate(bpy.types.Operator):
- bl_idname = "script.update_smd"
- bl_label = get_id("updater_title")
- bl_description = get_id("updater_title_tip")
-
- @classmethod
- def poll(self,context):
- return updater_supported
-
- def execute(self,context):
- print("Source Tools update...")
-
- import sys
- cur_version = sys.modules.get(__name__.split(".")[0]).bl_info['version']
-
- try:
- data = urllib.request.urlopen("http://steamreview.org/BlenderSourceTools/latest.php").read().decode('ASCII').split("\n")
- remote_ver = data[0].strip().split(".")
- remote_bpy = data[1].strip().split(".")
- download_url = "http://steamreview.org/BlenderSourceTools/" + data[2].strip()
-
- for i in range(min( len(remote_bpy), len(bpy.app.version) )):
- if int(remote_bpy[i]) > bpy.app.version[i]:
- self.report({'ERROR'},get_id("update_err_outdated", True).format( PrintVer(remote_bpy) ))
- return {'FINISHED'}
-
- for i in range(min( len(remote_ver), len(cur_version) )):
- try:
- diff = int(remote_ver[i]) - int(cur_version[i])
- except ValueError:
- continue
- if diff > 0:
- print("Found new version {}, downloading from {}...".format(PrintVer(remote_ver), download_url))
-
- zip = zipfile.ZipFile( io.BytesIO(urllib.request.urlopen(download_url).read()))
- zip.extractall(path=os.path.join(os.path.dirname( os.path.abspath( __file__ ) ),".."))
-
- self.report({'INFO'},get_id("update_done", True).format(PrintVer(remote_ver)))
- bpy.ops.wm.call_menu(name="SMD_MT_Updated")
- return {'FINISHED'}
- elif diff < 0:
- break
-
- self.report({'INFO'},get_id("update_alreadylatest", True).format( PrintVer(cur_version) ))
- return {'FINISHED'}
-
- except urllib.error.URLError as err:
- self.report({'ERROR'}," ".join([get_id("update_err_downloadfailed") + str(err)]))
- return {'CANCELLED'}
- except zipfile.BadZipfile:
- self.report({'ERROR'},get_id("update_err_corruption"))
- return {'CANCELLED'}
- except IOError as err:
- self.report({'ERROR'}," ".join([get_id("update_err_unknown"), str(err)]))
- return {'CANCELLED'}