MCE v1.0.3 & DB r4

v1.0.3

Added ability to type input filename or filepath at Intro
Improved handling of non-standard filename characters
Improved handling of file errors during Mass scan
Updated Microcode Repository Database to r4

r4

cpu000406C4_plat01_ver0000040C_date18-04-2016
cpu000406C4_plat01_ver0000040B_date22-03-2016
cpu00030672_plat0C_ver00000213_date13-06-2013
cpu000206A6_plat12_ver90030028_date24-09-2010
cpu000106C2_plat04_ver00000203_date24-01-2008
cpu000106C1_plat01_ver00000108_date01-11-2007
cpu00000F32_plat0D_ver00000006_date09-10-2003
cpu00000F25_plat02_ver0000000B_date27-05-2003
cpu000F0F00_nb00000000_sb00000000_rev0000_ver00000005_date21-06-2002
cpu00000F11_nb00000000_sb00000000_rev0000_ver00000015_date21-06-2002

Author: platomav

Changelog DB.txt

@@ -1,3 +1,16 @@
+r4
+
+cpu000406C4_plat01_ver0000040C_date18-04-2016
+cpu000406C4_plat01_ver0000040B_date22-03-2016
+cpu00030672_plat0C_ver00000213_date13-06-2013
+cpu000206A6_plat12_ver90030028_date24-09-2010
+cpu000106C2_plat04_ver00000203_date24-01-2008
+cpu000106C1_plat01_ver00000108_date01-11-2007
+cpu00000F32_plat0D_ver00000006_date09-10-2003
+cpu00000F25_plat02_ver0000000B_date27-05-2003
+cpu000F0F00_nb00000000_sb00000000_rev0000_ver00000005_date21-06-2002
+cpu00000F11_nb00000000_sb00000000_rev0000_ver00000015_date21-06-2002
+
 r3
 
 cpu000506C9_plat01_ver0000001C_date28-07-2016

Changelog MCE.txt

@@ -1,3 +1,10 @@
+v1.0.3
+
+Added ability to type input filename or filepath at Intro
+Improved handling of non-standard filename characters
+Improved handling of file errors during Mass scan
+Updated Microcode Repository Database to r4
+
 v1.0.2
 
 Fixed issue that caused no deletion of temporary files

MCE.dat

@@ -1,10 +1,18 @@
 ***	MC Extractor Microcode Repository Database ***
-***	Revision r3 (05/09/2016 , 20:30) ***
+***	Revision r4 (11/09/2016 , 00:31) ***
 
-*** INTEL (1309) ***
+*** INTEL (1317) ***
 
 CPUID + PLATFORM + VERSION + MMDDYYYY + SIZE + CHECKSUM
 
+00000F25000000020000000B0527200300000800367A0C30
+00000F320000000D00000006100920030000080027C250C9
+000106C100000001000001081101200700001400CA586D26
+000106C2000000040000020301242008000014001D0E372A
+000206A60000001290030028092420100000280061B02B84
+000306720000000C00000213061320130000CC00D5669609
+000406C4000000010000040C0418201600010C008BDA20BB
+000406C4000000010000040B0322201600010C00C59B7D0B
 000506E300000036000000A20727201600017C0040CCCB9A
 000806E9000000C00000002A06062016000174007980EED7
 000506C9000000010000001A0630201600003C0081ACE854
@@ -1315,10 +1323,12 @@ CPUID + PLATFORM + VERSION + MMDDYYYY + SIZE + CHECKSUM
 0002065500000092000000030901201100000800C50ABFD4
 00000F6500000004000000070426200600000400B1D162E2
 
-*** AMD (154) ***
+*** AMD (156) ***
 
 CPUID + NBDEVID + SBDEVID + NBSBREV + VERSION + MMDDYYYY + SIZE + CHKBODY + CHKMC
 
+00000F110000000000000000000000000000001506212002000003C067A0BB83439C20EB
+000F0F000000000000000000000000000000000506212002000003C0CA0CEC4F25F61C56
 00700F000000000000000000000000000700002A1218201200000D600000000000F61E8F
 00700F010000000000000000000000000700010B0709201300000D6000000000E325D033
 00700F010000000000000000000000000700010F0219201400000D6000000000EBB9EFA6

MCE.py

@@ -1,10 +1,10 @@
 '''
-MC Extractor v1.0.2.0
+MC Extractor v1.0.3.0
 Copyright (C) 2016 Plato Mavropoulos
 Based on UEFIStrip v7.8.2 by Lordkag
 '''
 
-title = 'MC Extractor v1.0.2'
+title = 'MC Extractor v1.0.3'
 
 import sys
 import re
@@ -447,20 +447,30 @@ def mce_hdr() :
 
 def init_file(in_file,orig_file,temp) :
 	mc_file_name = ''
+	
 	if not os.path.isfile(in_file) :
 		if any(p in in_file for p in param.all) : return ('continue','continue')
-		print(col_red + "\nError" + col_end + ", file %s was not found!\n" % in_file)
-		mce_exit(1)
+		
+		print(col_red + "\nError" + col_end + ", file %s was not found!\n" % ascii(in_file))
+		
+		if not param.mass_scan : mce_exit(1)
+		else : return ('continue','continue')
 
 	with open(in_file, 'rb') as work_file : reading = work_file.read()
 
 	if not temp :
-		if not param.mce_extr : print("\nFile: %s\n" % os.path.basename(in_file))
+		if not param.mce_extr : print("\nFile: %s\n" % ascii(os.path.basename(in_file)))
 		if param.print_file : mc_file_name = '__%s' % os.path.basename(in_file)
 	else :
 		if param.print_file : mc_file_name = '__%s' % os.path.basename(orig_file)
 
 	return (reading,mc_file_name)
+
+# Force string to be printed as ASCII, ignore errors
+def ascii(string) :
+	# Input string is bare and only for printing (no open(), no Colorama etc)
+	ascii_str = (str((string).encode('ascii', 'ignore'))).strip("b'")
+	return ascii_str
 
 def mass_scan(f_path) :
 	mass_files = []
@@ -490,18 +500,36 @@ def mass_scan(f_path) :
 if not param.skip_intro :
 	mce_hdr()
 
-	print("\nWelcome to Intel, AMD & VIA Microcode Extractor\n\nPress Enter to skip or input -? to list options\n")
+	print("\nWelcome to Intel, AMD & VIA Microcode Extractor\n")
 
 	arg_num = len(sys.argv)
 
-	if arg_num == 2 : print("\nFile:       " + col_green + "%s" % os.path.basename(sys.argv[1]) + col_end)
-	elif arg_num > 2 : print("\nFiles:       " + col_yellow + "Multiple" + col_end)
-	else : print("\nFile:       " + col_magenta + "None" + col_end)
+	if arg_num == 2 :
+		print("Press Enter to skip or input -? to list options\n")
+		print("\nFile:       " + col_green + "%s" % ascii(os.path.basename(sys.argv[1])) + col_end)
+	elif arg_num > 2 :
+		print("Press Enter to skip or input -? to list options\n")
+		print("\nFiles:       " + col_yellow + "Multiple" + col_end)
+	else :
+		print('Input a filename or "filepath" or press Enter to list options\n')
+		print("\nFile:       " + col_magenta + "None" + col_end)
 
 	input_var = input('\nOption(s):  ')
 
+	# Anything quoted ("") is taken as one (file paths etc)
+	input_var = re.split(''' (?=(?:[^'"]|'[^']*'|"[^"]*")*$)''', input_var.strip())
+	
 	# Get MCE Parameters based on given Options
-	param = MCE_Param(input_var.strip().split())
+	param = MCE_Param(input_var)
+	
+	# Non valid parameters are treated as files
+	if input_var[0] != "" :
+		for i in input_var:
+			if i not in param.all :
+				(sys.argv).append(i.strip('"'))
+	
+	# Re-enumerate parameter input
+	arg_num = len(sys.argv)
 
 	os.system('cls')
 
@@ -518,7 +546,7 @@ def mass_scan(f_path) :
 	in_path = input('\nType the full folder path : ')
 	source = mass_scan(in_path)
 else :
-	source = sys.argv[1:]
+	source = sys.argv[1:] # Skip script/executable
 
 # Check if DB exists
 if not os.path.isfile(db_path) :