Jelajahi Sumber

Improved formatting

Cammy 7 tahun lalu
induk
melakukan
6038482854
5 mengubah file dengan 17 tambahan dan 17 penghapusan
  1. 7 6
      pyinstalive/auth.py
  2. 6 7
      pyinstalive/downloader.py
  3. 3 2
      pyinstalive/initialize.py
  4. 1 1
      pyinstalive/logger.py
  5. 0 1
      setup.py

+ 7 - 6
pyinstalive/auth.py

@@ -1,21 +1,22 @@
 import codecs
+import datetime
 import json
 import os.path
-import datetime
+
 import logger
 
+
+
 try:
 	from instagram_private_api import (
 		Client, ClientError, ClientLoginError,
-		ClientCookieExpiredError, ClientLoginRequiredError,
-		__version__ as client_version)
+		ClientCookieExpiredError, ClientLoginRequiredError)
 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)
+		ClientCookieExpiredError, ClientLoginRequiredError)
 
 
 def to_json(python_object):
@@ -70,7 +71,7 @@ def login(username, password, show_cookie_expiry):
 		api = Client(
 			username, password,
 			device_id=device_id,
-			on_login=lambda x: onlogin_callback(x, settings))
+			on_login=lambda x: onlogin_callback(x, settings_file))
 
 	except ClientLoginError as e:
 		logger.log('[E] ClientLoginError: {0!s}'.format(e), "RED")

+ 6 - 7
pyinstalive/downloader.py

@@ -1,11 +1,11 @@
-import codecs
-import logging
-import sys, time
-from socket import timeout
+import sys
+import time
+
 from instagram_private_api_extensions import live
 
 import logger
 
+
 class NoBroadcastException(Exception):
 	pass
 
@@ -28,17 +28,16 @@ def record_stream(broadcast):
 	try:
 		def check_status():
 			print_status()
-			return heartbeat_info['broadcast_status'] not in ['active', 'interrupted']
 
 		mpd_url = (broadcast.get('dash_manifest')
 				   or broadcast.get('dash_abr_playback_url')
 				   or broadcast['dash_playback_url'])
 
-		outputDir = save_path + '{}_{}_{}_{}_downloads'.format(current_date, record, broadcast['id'], current_time)
+		output_dir = save_path + '{}_{}_{}_{}_downloads'.format(current_date, record, broadcast['id'], current_time)
 
 		dl = live.Downloader(
 			mpd=mpd_url,
-			output_dir=outputDir,
+			output_dir=output_dir,
 			user_agent=api.user_agent,
 			max_connection_error_retry=2,
 			duplicate_etag_retry=60,

+ 3 - 2
pyinstalive/initialize.py

@@ -1,8 +1,9 @@
 import argparse
+import configparser
 import logging
 import os.path
-import configparser
 import sys
+
 import auth, downloader, logger
 
 
@@ -19,7 +20,7 @@ def run():
 	if os.path.exists('pyinstalive.ini'):
 		try:
 			config.read('pyinstalive.ini')
-		except Exception as e:
+		except Exception:
 			logger.log("[E] Could not read configuration file! Try passing the required arguments manually.", "RED")
 			logger.seperator("GREEN")
 	else:

+ 1 - 1
pyinstalive/logger.py

@@ -1,5 +1,5 @@
-import sys
 import os
+import sys
 
 def colors(state):
 	color = ''

+ 0 - 1
setup.py

@@ -1,6 +1,5 @@
 from setuptools import setup
 
-
 __author__ = 'notcammy'
 __email__ = 'neus2benen@gmail.com'
 __version__ = '2.1.6'