Merge branch 'dhkatz:master' into master

VERSION

@@ -1 +1 @@
-548.2
+548.8

setup.py

@@ -8,9 +8,16 @@
 with open(os.path.join(HERE, 'README.md')) as f:
     README = f.read()
 
+execfile('t5de/version.py')
+
+# noinspection PyUnresolvedReferences
+version = __version__
+
+print('Running T5DE patcher setup v%s' % version)
+
 setup(
     name='T5DE',
-    version=os.getenv('T5DE_VERSION', '1.0.0'),
+    version=version,
     description='A modified IMVU client that unlocks useful features.',
     long_description=README,
     long_description_content_type='text/markdown',

t5de/__init__.py

@@ -1,2 +1,3 @@
+from .version import __version__
 from Client import Client
 from Context import Context

t5de/__main__.py

@@ -5,25 +5,13 @@
 import dotenv
 import argparse
 
+from .version import __version__
 from .patchers import InterfacePatcher, PythonPatcher, ChecksumPatcher
 from .diff import InterfaceDiff, PythonDiff
 from . import Client
 
 
 def main():
-    imvu_version = os.getenv('IMVU_VERSION')
-    t5de_version = os.getenv('T5DE_VERSION')
-
-    if not imvu_version:
-        print('IMVU_VERSION environment variable not set')
-        return 1
-
-    if not t5de_version:
-        print('T5DE_VERSION environment variable not set')
-        return 1
-
-    print('Running T5DE patcher v%s for IMVU v%s' % (t5de_version, imvu_version))
-
     parser = argparse.ArgumentParser(prog='t5de', description='The T5DE patcher for IMVU')
     parser.add_argument('--dry-run', action='store_true', help='Perform a dry run')
     parser.add_argument('--diff', help='Generate a diff between two IMVU versions', const='latest', nargs='?', type=str)
@@ -32,17 +20,32 @@ def main():
 
     args = parser.parse_args()
 
+    imvu_version = args.version or os.getenv('IMVU_VERSION')
+    t5de_version = os.getenv('T5DE_VERSION') or __version__
+
+    if not t5de_version:
+        print('T5DE_VERSION environment variable not set')
+        return 1
+
+    print('Running T5DE patcher v%s' % t5de_version)
+
     if args.diff:
+        if not imvu_version:
+            print('IMVU_VERSION environment variable not set')
+            return 1
         version = None if args.diff == 'latest' else args.diff
-        with Client(args.version or imvu_version) as client:
+        with Client(imvu_version) as client:
             client.diff(generators=[InterfaceDiff, PythonDiff], version=version)
 
     if args.patch:
-        with Client(args.version or imvu_version) as patcher:
+        if not imvu_version:
+            print('IMVU_VERSION environment variable not set')
+            return 1
+        with Client(imvu_version) as patcher:
             patcher.download()
             patcher.install()
             patcher.copy()
-            patcher.patch(patchers=[InterfacePatcher, PythonPatcher, ChecksumPatcher], dry_run=False)
+            patcher.patch(patchers=[InterfacePatcher, PythonPatcher, ChecksumPatcher], dry_run=args.dry_run)
 
     return 0
 

t5de/version.py

@@ -0,0 +1 @@
+__version__ = '1.2.5'