From 012da0082123453737bc575a38bc3f58c89963a1 Mon Sep 17 00:00:00 2001
From: 2Shirt <1923621+2Shirt@users.noreply.github.com>
Date: Sun, 28 Jan 2018 17:55:40 -0700
Subject: [PATCH] Removed ClientInfo upload code

---
 .bin/Scripts/functions/common.py   | 54 ------------------------------
 .bin/Scripts/system_checklist.py   |  8 -----
 .bin/Scripts/system_diagnostics.py |  8 -----
 3 files changed, 70 deletions(-)

diff --git a/.bin/Scripts/functions/common.py b/.bin/Scripts/functions/common.py
index f668306b..195b57c4 100644
--- a/.bin/Scripts/functions/common.py
+++ b/.bin/Scripts/functions/common.py
@@ -563,60 +563,6 @@ global_vars: {}'''.format(f.read(), sys.argv, global_vars)
         # No LogFile defined (or invalid LogFile)
         raise GenericError
 
-
-def upload_data(path, file):
-    """Add CLIENT_INFO_SERVER to authorized connections and upload file."""
-    if not ENABLED_UPLOAD_DATA:
-        raise GenericError('Feature disabled.')
-    
-    extract_item('PuTTY', filter='wizkit.ppk psftp.exe', silent=True)
-
-    # Authorize connection to the server
-    winreg.CreateKey(HKCU, r'Software\SimonTatham\PuTTY\SshHostKeys')
-    with winreg.OpenKey(HKCU, r'Software\SimonTatham\PuTTY\SshHostKeys',
-        access=winreg.KEY_WRITE) as key:
-        winreg.SetValueEx(key,
-            'rsa2@22:{IP}'.format(**CLIENT_INFO_SERVER), 0,
-            winreg.REG_SZ, CLIENT_INFO_SERVER['RegEntry'])
-
-    # Write batch file
-    with open(r'{}\psftp.batch'.format(global_vars['TmpDir']),
-        'w', encoding='ascii') as f:
-        f.write('lcd "{path}"\n'.format(path=path))
-        f.write('cd "{Share}"\n'.format(**CLIENT_INFO_SERVER))
-        f.write('mkdir {TicketNumber}\n'.format(**global_vars))
-        f.write('cd {TicketNumber}\n'.format(**global_vars))
-        f.write('put "{file}"\n'.format(file=file))
-
-    # Upload Info
-    cmd = [
-        global_vars['Tools']['PuTTY-PSFTP'],
-        '-noagent',
-        '-i', r'{BinDir}\PuTTY\wizkit.ppk'.format(**global_vars),
-        '{User}@{IP}'.format(**CLIENT_INFO_SERVER),
-        '-b', r'{TmpDir}\psftp.batch'.format(**global_vars)]
-    run_program(cmd)
-
-def upload_info():
-    """Upload compressed Info file to the NAS as set in settings.main.py."""
-    if not ENABLED_UPLOAD_DATA:
-        raise GenericError('Feature disabled.')
-    
-    path = '{ClientDir}'.format(**global_vars)
-    file = 'Info_{Date-Time}.7z'.format(**global_vars)
-    upload_data(path, file)
-
-def compress_info():
-    """Compress ClientDir info folders with 7-Zip for upload_info()."""
-    path = '{ClientDir}'.format(**global_vars)
-    file = 'Info_{Date-Time}.7z'.format(**global_vars)
-    _cmd = [
-        global_vars['Tools']['SevenZip'],
-        'a', '-t7z', '-mx=9', '-bso0', '-bse0',
-        r'{}\{}'.format(path, file),
-        r'{ClientDir}\Info'.format(**global_vars)]
-    run_program(_cmd)
-
 def wait_for_process(name, poll_rate=3):
     """Wait for process by name."""
     running = True
diff --git a/.bin/Scripts/system_checklist.py b/.bin/Scripts/system_checklist.py
index 4d4d34f8..9de65c8a 100644
--- a/.bin/Scripts/system_checklist.py
+++ b/.bin/Scripts/system_checklist.py
@@ -80,14 +80,6 @@ if __name__ == '__main__':
         try_and_print(message='Installed RAM:',
             function=show_installed_ram, ns='Unknown', silent_function=False)
 
-        # Upload info
-        if ENABLED_UPLOAD_DATA:
-            print_info('Finalizing')
-            try_and_print(message='Compressing Info...',
-                function=compress_info, cs='Done')
-            try_and_print(message='Uploading to NAS...',
-                function=upload_info, cs='Done')
-
         # Play audio, show devices, open Windows updates, and open Activation
         popen_program(['mmc', 'devmgmt.msc'])
         run_hwinfo_sensors()
diff --git a/.bin/Scripts/system_diagnostics.py b/.bin/Scripts/system_diagnostics.py
index ad4b423e..0d10f144 100644
--- a/.bin/Scripts/system_diagnostics.py
+++ b/.bin/Scripts/system_diagnostics.py
@@ -106,14 +106,6 @@ if __name__ == '__main__':
         except Exception:
             print_error('    Unknown error.')
         
-        # Upload info
-        if ENABLED_UPLOAD_DATA:
-            print_info('Finalizing')
-            try_and_print(message='Compressing Info...',
-                function=compress_info, cs='Done')
-            try_and_print(message='Uploading to NAS...',
-                function=upload_info, cs='Done')
-        
         # Done
         print_standard('\nDone.')
         pause('Press Enter to exit...')