From 45318f36c12a5dfef144d4b67de293cd25476157 Mon Sep 17 00:00:00 2001
From: Fierelier <fierelier@gmail.com>
Date: Wed, 16 Aug 2017 15:09:53 +0200
Subject: [PATCH] User friendly(-ish) error-handling

- Completely changed exception handling to be more user-friendly (Note:
This broke error-logging, possible Python-related issue.)
---
 UniversalModloader.py | 86 ++++++++++++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 33 deletions(-)

diff --git a/UniversalModloader.py b/UniversalModloader.py
index a07dc7d..1b27328 100644
--- a/UniversalModloader.py
+++ b/UniversalModloader.py
@@ -65,45 +65,65 @@ def exceptionCleanup():
 	if success == False:
 		logtext = logtext + "\nCleanup not fully successful. Please review the errors, and go to X for a guide on how to reset your game manually. Sorry for the inconvenience, I tried :("
 	
-	return logtext
+	return success,logtext
 	
+def logError(logFilePath,textList):
+	logFile = False
 	
+	try:
+		logFile = open(logFilePath,"w")
+	except:
+		return False
+	
+	try:
+		for line in textList:
+			logFile.write(line + "\n")
+	except:
+		logFile.close()
+		return False
+	
+	logFile.close()
+	return True
+
 def exceptionHandler(exc_type, exc_value, tb):
 	import traceback
-	while True:
-		clear()
-		print("An exception has occurred:")
-		traceback.print_exception(exc_type, exc_value, tb)
-		cleanupLog = exceptionCleanup()
-		print("\n" +cleanupLog)
-		choice = input("\nWould you like to log this exception? (y/n)\n")
-		if choice.lower() == "y":
-			success = False
-			fileCreated = False
-			errorFilePath = os.path.join(scriptPath,"error.log")
-			try:
-				errorFile = open(errorFilePath,"w")
-				fileCreated = True
-				
-				try:
-					traceback.print_exception(exc_type, exc_value, tb, None, errorFile)
-					errorFile.write("\n" +cleanupLog)
-					success = True
-				except:
-					input("Writing to errorlog-file failed. Press ENTER to continue.")
-			except:
-				input("Creating errorlog-file failed. Press ENTER to continue.")
+	clear()
+	
+	print("An error occurred, trying to revert everything...")
+	
+	cleanupSuccess,cleanupLog = exceptionCleanup()
+	logFile = os.path.join(scriptPath,"error.log")
+	logSuccess = logError(logFile,[
+		"An exception has occurred:",
+		traceback.format_exc(),
+		"",
+		cleanupLog
+	])
+	
+	if cleanupSuccess == True:
+		while True:
+			clear()
+			print("An error occured, game has been reset to default.")
+			print("C) Continue")
+			if logSuccess == True: print("S) Show more info")
+			choice = input("Choice: ")
 			
-			if fileCreated: errorFile.close()
-			if success:
-				try:
-					openFileWithStandardApp(errorFilePath)
-				except:
-					input("Opening errorlog-file failed. You can find it at '" +errorFilePath+ "'. Press ENTER to continue.")
-		elif choice.lower() != "n":
-			continue
+			if choice.lower() == "c": return
+			if logSuccess == True:
+				if choice.lower() == "s": openFileWithStandardApp(logFile)
+	else:
+		clear()
+		print("An error occured and error-correction failed. This is a major exception.\n")
 		
-		sys.exit(-1)
+		if logSuccess == True:
+			print("You might need to reset some stuff by yourself; we printed a report into '" +logFile+ "' which will help you resolve this issue, this file will be opened for you automagically after you exit.")
+			input("\nPress ENTER to exit.")
+			openFileWithStandardApp(logFile)
+			sys.exit(-1)
+		else:
+			print("You might need to reset some stuff by yourself; we tried printing a report, but failed. Please check out X for help, we will open that website for you automagically after you exit.")
+			input("\nPress ENTER to exit.")
+			sys.exit(-1)
 		
 sys.excepthook = exceptionHandler