Procházet zdrojové kódy

Some log to file fixes and log improvements

Cammy před 7 roky
rodič
revize
251cbbaee3
3 změnil soubory, kde provedl 34 přidání a 27 odebrání
  1. 2 0
      .gitignore
  2. 4 2
      pyinstalive/auth.py
  3. 28 25
      pyinstalive/initialize.py

+ 2 - 0
.gitignore

@@ -36,3 +36,5 @@ downloaded/
 requirements\.txt
 
 *.lock
+
+*.log

+ 4 - 2
pyinstalive/auth.py

@@ -79,11 +79,13 @@ def login(username, password, show_cookie_expiry, ignore_existing_cookie):
 			on_login=lambda x: onlogin_callback(x, settings_file))
 
 	except ClientLoginError as e:
-		log('[E] ClientLoginError: {0!s}\n\n(Code: {1:d}, Response: {2!s})\n'.format(e.msg, e.code, e.error_response), "RED")
+		seperator("GREEN")
+		log('[E] Could not login: {:s}.\n[E] {:s}\n\n{:s}'.format(json.loads(e.error_response).get("error_title", "Error title not available."), json.loads(e.error_response).get("message", "Not available"), e.error_response), "RED")
 		seperator("GREEN")
 		sys.exit(9)
 	except ClientError as e:
-		log('[E] ClientError: {0!s}\n\n(Code: {1:d}, Response: {2!s})\n'.format(e.msg, e.code, e.error_response), "RED")
+		seperator("GREEN")
+		log('[E] Client Error: {0!s}\n[E] Message: {1!s}\n[E] Code: {2:d}\n\n[E] Full response:\n{3!s}\n'.format(e.msg, json.loads(e.error_response).get("message", "Additional error information not available."), e.code, e.error_response), "RED")
 		seperator("GREEN")
 		sys.exit(9)
 	except Exception as e:

+ 28 - 25
pyinstalive/initialize.py

@@ -75,12 +75,12 @@ def check_config_validity(config):
 		try:
 			settings.log_to_file = config.get('pyinstalive', 'log_to_file').title()
 			if not settings.log_to_file in bool_values:
-				log("[W] Invalid or missing setting detected for 'log_to_file', using default value (True)", "YELLOW")
-				settings.log_to_file = 'true'
+				log("[W] Invalid or missing setting detected for 'log_to_file', using default value (False)", "YELLOW")
+				settings.log_to_file = 'False'
 				has_thrown_errors = True
 		except:
-			log("[W] Invalid or missing setting detected for 'log_to_file', using default value (True)", "YELLOW")
-			settings.log_to_file = 'true'
+			log("[W] Invalid or missing setting detected for 'log_to_file', using default value (False)", "YELLOW")
+			settings.log_to_file = 'False'
 			has_thrown_errors = True
 
 
@@ -186,9 +186,9 @@ def show_info(config):
 		log("[I] FFmpeg framework:       	Available", "GREEN")
 
 	if (len(cookie_from_config) > 0):
-		log("[I] Cookie files:            	{:d} ({:s} matches config user)".format(str(len(cookie_files)), cookie_from_config), "GREEN")
+		log("[I] Cookie files:            	{:s} ({:s} matches config user)".format(str(len(cookie_files)), cookie_from_config), "GREEN")
 	elif len(cookie_files) > 0:
-		log("[I] Cookie files:            	{:d}".format(str(len(cookie_files))), "GREEN")
+		log("[I] Cookie files:            	{:s}".format(str(len(cookie_files))), "GREEN")
 	else:
 		log("[W] Cookie files:            	None found", "YELLOW")
 
@@ -326,29 +326,32 @@ def run():
 
 	args, unknown = parser.parse_known_args()
 
-	if args.record:
-		settings.user_to_record = args.record
-		try:
-			config.read('pyinstalive.ini')
-			settings.log_to_file = config.get('pyinstalive', 'log_to_file').title()
-			if not settings.log_to_file in bool_values:
-				settings.log_to_file = 'false'
-			elif settings.log_to_file == "True":
-				try:
-					with open("pyinstalive_{:s}.log".format(args.record),"a+") as f:
-						f.write("\n")
-						f.close()
-				except:
-					pass
-		except Exception as e:
-			settings.log_to_file = 'false'
-			print(str(e))
-			pass # Pretend nothing happened
+
+	try:
+		config.read('pyinstalive.ini')
+		settings.log_to_file = config.get('pyinstalive', 'log_to_file').title()
+		if not settings.log_to_file in bool_values:
+			settings.log_to_file = 'False'
+		elif settings.log_to_file == "True":
+			if args.record:
+				settings.user_to_record = args.record
+			else:
+				settings.user_to_record = "log"
+			try:
+				with open("pyinstalive_{:s}.log".format(settings.user_to_record),"a+") as f:
+					f.write("\n")
+					f.close()
+			except:
+				pass
+	except Exception as e:
+		print(str(e))
+		settings.log_to_file = 'False'
+		pass # Pretend nothing happened
 
 	seperator("GREEN")
 	log('PYINSTALIVE (SCRIPT V{:s} - PYTHON V{:s}) - {:s}'.format(script_version, python_version, time.strftime('%I:%M:%S %p')), "GREEN")
 	seperator("GREEN")
-	
+
 	if unknown:
 		log("[E] The following invalid argument(s) were provided: ", "RED") 
 		log('', "GREEN")