Hotfix for indentation error

pyinstalive/auth.py

@@ -5,85 +5,85 @@ import os.path
 import logger
 
 try:
-    from instagram_private_api import (
-        Client, ClientError, ClientLoginError,
-        ClientCookieExpiredError, ClientLoginRequiredError,
-        __version__ as client_version)
+	from instagram_private_api import (
+		Client, ClientError, ClientLoginError,
+		ClientCookieExpiredError, ClientLoginRequiredError,
+		__version__ as client_version)
 except ImportError:
-    import sys
-    sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
-    from instagram_private_api import (
-        Client, ClientError, ClientLoginError,
-        ClientCookieExpiredError, ClientLoginRequiredError,
-        __version__ as client_version)
+	import sys
+	sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+	from instagram_private_api import (
+		Client, ClientError, ClientLoginError,
+		ClientCookieExpiredError, ClientLoginRequiredError,
+		__version__ as client_version)
 
 
 def to_json(python_object):
-    if isinstance(python_object, bytes):
-        return {'__class__': 'bytes',
-                '__value__': codecs.encode(python_object, 'base64').decode()}
-    raise TypeError(repr(python_object) + ' is not JSON serializable')
+	if isinstance(python_object, bytes):
+		return {'__class__': 'bytes',
+				'__value__': codecs.encode(python_object, 'base64').decode()}
+	raise TypeError(repr(python_object) + ' is not JSON serializable')
 
 
 def from_json(json_object):
-    if '__class__' in json_object and json_object['__class__'] == 'bytes':
-        return codecs.decode(json_object['__value__'].encode(), 'base64')
-    return json_object
+	if '__class__' in json_object and json_object['__class__'] == 'bytes':
+		return codecs.decode(json_object['__value__'].encode(), 'base64')
+	return json_object
 
 
 def onlogin_callback(api, settings_file):
-    cache_settings = api.settings
-    with open(settings_file, 'w') as outfile:
-        json.dump(cache_settings, outfile, default=to_json)
-        logger.log('[I] New auth cookie file was made: {0!s}'.format(settings_file), "GREEN")
+	cache_settings = api.settings
+	with open(settings_file, 'w') as outfile:
+		json.dump(cache_settings, outfile, default=to_json)
+		logger.log('[I] New auth cookie file was made: {0!s}'.format(settings_file), "GREEN")
 
 
 def login(username, password):
-    device_id = None
-    try:
-        
-        settings_file = "credentials.json"
-        if not os.path.isfile(settings_file):
-            # settings file does not exist
-            logger.log('[W] Unable to find auth cookie file: {0!s}'.format(settings_file), "YELLOW")
-
-            # login new
-            api = Client(
-                username, password,
-                on_login=lambda x: onlogin_callback(x, settings_file))
-        else:
-            with open(settings_file) as file_data:
-                cached_settings = json.load(file_data, object_hook=from_json)
-            # logger.log('[I] Using settings file: {0!s}'.format(settings_file), "GREEN")
-
-            device_id = cached_settings.get('device_id')
-            # reuse auth settings
-            api = Client(
-                username, password,
-                settings=cached_settings)
-
-    except (ClientCookieExpiredError, ClientLoginRequiredError) as e:
-        logger.log('[E] ClientCookieExpiredError/ClientLoginRequiredError: {0!s}'.format(e), "RED")
-
-        # Login expired
-        # Do relogin but use default ua, keys and such
-        api = Client(
-            username, password,
-            device_id=device_id,
-            on_login=lambda x: onlogin_callback(x, settings))
-
-    except ClientLoginError as e:
-        logger.log('[E] ClientLoginError: {0!s}'.format(e), "RED")
-        sys.exit(9)
-    except ClientError as e:
-        logger.log('[E] ClientError: {0!s}'.format(e), "RED")
-        sys.exit(9)
-    except Exception as e:
-        logger.log('[E] Unexpected Exception: {0!s}'.format(e), "RED")
-        sys.exit(99)
-
-    # Show when login expires
-    # cookie_expiry = api.cookie_jar.expires_earliest
-    # print('[I] Cookie Expiry: {0!s}'.format(datetime.datetime.fromtimestamp(cookie_expiry).strftime('%Y-%m-%dT%H:%M:%S')), "WHITE")
-    logger.log('[I] Login to "' + username + '" OK!', "GREEN")
-    return api
+	device_id = None
+	try:
+		
+		settings_file = "credentials.json"
+		if not os.path.isfile(settings_file):
+			# settings file does not exist
+			logger.log('[W] Unable to find auth cookie file: {0!s}'.format(settings_file), "YELLOW")
+
+			# login new
+			api = Client(
+				username, password,
+				on_login=lambda x: onlogin_callback(x, settings_file))
+		else:
+			with open(settings_file) as file_data:
+				cached_settings = json.load(file_data, object_hook=from_json)
+			# logger.log('[I] Using settings file: {0!s}'.format(settings_file), "GREEN")
+
+			device_id = cached_settings.get('device_id')
+			# reuse auth settings
+			api = Client(
+				username, password,
+				settings=cached_settings)
+
+	except (ClientCookieExpiredError, ClientLoginRequiredError) as e:
+		logger.log('[E] ClientCookieExpiredError/ClientLoginRequiredError: {0!s}'.format(e), "RED")
+
+		# Login expired
+		# Do relogin but use default ua, keys and such
+		api = Client(
+			username, password,
+			device_id=device_id,
+			on_login=lambda x: onlogin_callback(x, settings))
+
+	except ClientLoginError as e:
+		logger.log('[E] ClientLoginError: {0!s}'.format(e), "RED")
+		sys.exit(9)
+	except ClientError as e:
+		logger.log('[E] ClientError: {0!s}'.format(e), "RED")
+		sys.exit(9)
+	except Exception as e:
+		logger.log('[E] Unexpected Exception: {0!s}'.format(e), "RED")
+		sys.exit(99)
+
+	# Show when login expires
+	# cookie_expiry = api.cookie_jar.expires_earliest
+	# print('[I] Cookie Expiry: {0!s}'.format(datetime.datetime.fromtimestamp(cookie_expiry).strftime('%Y-%m-%dT%H:%M:%S')), "WHITE")
+	logger.log('[I] Login to "' + username + '" OK!', "GREEN")
+	return api

pyinstalive/pyinstalive.py

@@ -10,8 +10,8 @@ def run():
 
 	scriptVersion = "2.1.4"
 
-    logger.log('PYINSTALIVE DOWNLOADER (SCRIPT v{0!s})'.format(scriptVersion), "GREEN")
-    logger.seperator("GREEN")
+	logger.log('PYINSTALIVE DOWNLOADER (SCRIPT v{0!s})'.format(scriptVersion), "GREEN")
+	logger.seperator("GREEN")
 
 	logging.disable(logging.CRITICAL)
 	config = configparser.ConfigParser()

setup.py

@@ -11,36 +11,36 @@ _api_extensions_version = '0.3.6'
 long_description = 'This script enables you to record Instagram livestreams. It is based on another script that has now been discontinued.'
 
 setup(
-    name='pyinstalive',
-    version=__version__,
-    author=__author__,
-    author_email=__email__,
-    url='https://github.com/notcammy/PyInstaLive',
-    packages=['pyinstalive'],
-    entry_points={
-        'console_scripts': [
-            'pyinstalive = pyinstalive.main:run',
-        ]
-    },
-    install_requires=[ 
-        'instagram_private_api==%(api)s' % {'api': _api_version},
-        'instagram_private_api_extensions==%(ext)s' % {'ext': _api_extensions_version},
-        'argparse',
-        'configparser'
-    ],
-    dependency_links=[
-        'https://github.com/ping/instagram_private_api/archive/%(api)s.tar.gz'
-        '#egg=instagram_private_api-%(api)s' % {'api': _api_version},
-        'https://github.com/ping/instagram_private_api_extensions/archive/%(ext)s.tar.gz'
-        '#egg=instagram_private_api_extensions-%(ext)s' % {'ext': _api_extensions_version}
-    ],
-    include_package_data=True,
-    platforms='any',
-    long_description=long_description,
-    keywords='instagram livestream downloader pyinstalive',
-    description='This script enables you to record Instagram livestreams.',
-    classifiers=[
-        'Environment :: Console',
-        'Programming Language :: Python :: 2.7',
-    ]
+	name='pyinstalive',
+	version=__version__,
+	author=__author__,
+	author_email=__email__,
+	url='https://github.com/notcammy/PyInstaLive',
+	packages=['pyinstalive'],
+	entry_points={
+		'console_scripts': [
+			'pyinstalive = pyinstalive.main:run',
+		]
+	},
+	install_requires=[ 
+		'instagram_private_api==%(api)s' % {'api': _api_version},
+		'instagram_private_api_extensions==%(ext)s' % {'ext': _api_extensions_version},
+		'argparse',
+		'configparser'
+	],
+	dependency_links=[
+		'https://github.com/ping/instagram_private_api/archive/%(api)s.tar.gz'
+		'#egg=instagram_private_api-%(api)s' % {'api': _api_version},
+		'https://github.com/ping/instagram_private_api_extensions/archive/%(ext)s.tar.gz'
+		'#egg=instagram_private_api_extensions-%(ext)s' % {'ext': _api_extensions_version}
+	],
+	include_package_data=True,
+	platforms='any',
+	long_description=long_description,
+	keywords='instagram livestream downloader pyinstalive',
+	description='This script enables you to record Instagram livestreams.',
+	classifiers=[
+		'Environment :: Console',
+		'Programming Language :: Python :: 2.7',
+	]
 )