First Beta Release

Ratio in full Back Mix - Corrected UPPER letter function - Added UPPER letter in Recalbox Profil - Added Core, Emulator, Thumbnail, Favorite and RomType in Recalbox Profil - Deleted Problem with rom filename with äëïöüÿ - Corrected
Universal-Rom-Tools · Nov 15, 2016 · 093ffa9 · 093ffa9
1 parent 0553071
commit 093ffa9
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 99 deletions.
diff --git a/Include/_GraphGDIPlus.au3 b/Include/_GraphGDIPlus.au3
@@ -624,4 +624,4 @@ _GDIPlus_FontFamilyDispose($hFamily)
 _GDIPlus_StringFormatDispose($hFormat)
 _GDIPlus_BrushDispose($hBrush)
     Return 1
-EndFunc ;==>_GraphGDIPlus_DrawText
+EndFunc ;==>_GraphGDIPlus_DrawText
diff --git a/Include/_MultiLang.au3 b/Include/_MultiLang.au3
@@ -195,4 +195,4 @@ Func _MultiLang_Close()
 	$_gh_aLangFileArray = -1
 	$_gh_sLangFileSelected = -1
 	$_gh_sLangFileData = -1
-EndFunc   ;==>_MultiLang_Close
+EndFunc   ;==>_MultiLang_Close
diff --git a/Include/_MyFunction.au3 b/Include/_MyFunction.au3
@@ -130,7 +130,7 @@ Func _Download($iURL, $iPath, $iTimeOut = "")
 		Return $iPath
 	Else
 		_LOG("Error Downloading File : " & $iPath, 2, $iLOGPath)
-		_LOG("Error Downloading URL : " & $iURL, 2, $iLOGPath)
+;~ 		_LOG("Error Downloading URL : " & $iURL, 2, $iLOGPath)
 		_LOG("Bytes read: " & $aData[$INET_DOWNLOADREAD], 2, $iLOGPath)
 		_LOG("Size: " & $aData[$INET_DOWNLOADSIZE], 2, $iLOGPath)
 		_LOG("Complete: " & $aData[$INET_DOWNLOADCOMPLETE], 2, $iLOGPath)
@@ -575,11 +575,12 @@ Func _GDIPlus_ResizeMax($iPath, $iMAX_Width, $iMAX_Height)
 	$iWidth = _GDIPlus_ImageGetWidth($hImage)
 	If $iWidth = 4294967295 Then $iWidth = 0 ;4294967295 en cas d'erreur.
 	$iHeight = _GDIPlus_ImageGetHeight($hImage)
-	If $iMAX_Width <= 0 Then $iMAX_Width = $iWidth
-	If $iMAX_Height <= 0 Then $iMAX_Height = $iHeight
+	$iRatio = $iHeight / $iWidth
+	If $iMAX_Width <= 0 Then $iMAX_Width = $iHeight/$iRatio
+	If $iMAX_Height <= 0 Then $iMAX_Height = $iWidth*$iRatio
 	$iWidth_New = $iWidth
 	$iHeight_New = $iHeight
-	$iRatio = $iHeight / $iWidth
+
 
 	If $iWidth_New > $iMAX_Width Then
 		$iWidth_New = $iMAX_Width

diff --git a/Include/_XML.au3 b/Include/_XML.au3
@@ -326,7 +326,7 @@
 	. Removed: Function: _XSL_GetDefaultStyleSheet - mLipok
 	.	This was example from:
 	.	http://www.xml.com/lpt/a/1681
-	.	But it is: Copyright © 1998-2006 O'Reilly Media, Inc.
+	.	But it is: Copyright © 1998-2006 O'Reilly Media, Inc.
 	. Renamed: Function: _XMLGetField >> _XML_GetField - mLipok
 	. Renamed: Function: _XMLGetValue >> _XML_GetValue - mLipok
 	. Renamed: Function: _XMLGetAllAttrib >> _XML_GetAllAttrib - mLipok
@@ -408,7 +408,7 @@
 	. TODO: Return SetError($XML_ERR_GENERAL ... should be used only once per function
 	. TODO: Return SetError($XML_ERR_GENERAL ... should be always ONLY as the last Error returned from function
 	. TODO: $XML_ERR_ .... should be reordered it will be SCRIPT BREAKING CHANGES: only if used MAGIC NUMBERS for @error checking
-	. TODO: GMK: What's a better way to insert a node before a specified node object or XPath for _XML_InsertChildNode and _XML_InsertChildWAttr?  Replace $iItem with $oInsertBeforeNode?
+	. TODO: GMK: What's a better way to insert a node before a specified node object or XPath for _XML_InsertChildNode and _XML_InsertChildWAttr?  Replace $iItem with $oInsertBeforeNode?
 	. TODO: GMK: Rename _XML_Transform ==> _XML_TransformNodeToObj (?)
 	. TODO: GMK: Why not combine _XML_UpdateField and _XML_UpdateField2?  Would inputting parameters for a single node XPath not work the same for _XML_UpdateField2 as it would for _XML_UpdateField?
 

diff --git a/Mix/Full Back.zip b/Mix/Full Back.zip
diff --git a/ProfilsFiles/Screenscraper(MIX)-RecalboxV3.xml b/ProfilsFiles/Screenscraper(MIX)-RecalboxV3.xml
@@ -59,12 +59,14 @@
 		<Source_Value>Data/jeu/noms/nom_%COUNTRY%</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/name</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="Description">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/synopsis/synopsis_%LANG%</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/desc</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="Picture">
 		<Source_Type>MIX_Template</Source_Type>
@@ -75,12 +77,6 @@
 		<Target_Path_Type>%XML_Path_File%</Target_Path_Type>
 		<Target_Value>game/image</Target_Value>
 	</Element>
-	<Element Type="Picture">
-		<Source_Type>Fixe_Value</Source_Type>
-		<Source_Value></Source_Value>
-		<Target_Type>XML_Value</Target_Type>
-		<Target_Value>game/thumbnail</Target_Value>
-	</Element>
 	<Element Type="Rating">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/note</Source_Value>
@@ -100,18 +96,21 @@
 		<Source_Value>Data/jeu/developpeur</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/developer</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="Publisher">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/editeur</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/publisher</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="Genre">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/genres/genres_%LANG%/genre_%LANG%</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/genre</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="NbPlayer">
 		<Source_Type>XML_Value</Source_Type>

diff --git a/ProfilsFiles/Screenscraper(MIX)-RecalboxV4.xml b/ProfilsFiles/Screenscraper(MIX)-RecalboxV4.xml
@@ -54,29 +54,19 @@
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/path</Target_Value>
 	</Element>
-	<Element Type="Emulator">
-		<Source_Type>Fixe_Value</Source_Type>
-		<Source_Value></Source_Value>
-		<Target_Type>XML_Value</Target_Type>
-		<Target_Value>game/emulator</Target_Value>
-	</Element>
-	<Element Type="core">
-		<Source_Type>Fixe_Value</Source_Type>
-		<Source_Value></Source_Value>
-		<Target_Type>XML_Value</Target_Type>
-		<Target_Value>game/core</Target_Value>
-	</Element>
 	<Element Type="Name">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/noms/nom_%COUNTRY%</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/name</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="Description">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/synopsis/synopsis_%LANG%</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/desc</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="Picture">
 		<Source_Type>MIX_Template</Source_Type>
@@ -87,12 +77,6 @@
 		<Target_Path_Type>%XML_Path_File%</Target_Path_Type>
 		<Target_Value>game/image</Target_Value>
 	</Element>
-	<Element Type="thumbnail">
-		<Source_Type>Fixe_Value</Source_Type>
-		<Source_Value></Source_Value>
-		<Target_Type>XML_Value</Target_Type>
-		<Target_Value>game/thumbnail</Target_Value>
-	</Element>
 	<Element Type="Rating">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/note</Source_Value>
@@ -112,43 +96,34 @@
 		<Source_Value>Data/jeu/developpeur</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/developer</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="Publisher">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/editeur</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/publisher</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="Genre">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/genres/genres_%LANG%/genre_%LANG%</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/genre</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="NbPlayer">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/joueurs</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/players</Target_Value>
 	</Element>
-	<Element Type="Favorite">
-		<Source_Type>Fixe_Value</Source_Type>
-		<Source_Value></Source_Value>
-		<Target_Type>XML_Value</Target_Type>
-		<Target_Value>game/favorite</Target_Value>
-	</Element>
 	<Element Type="Region">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/region</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/region</Target_Value>
 	</Element>
-	<Element Type="RomType">
-		<Source_Type>Fixe_Value</Source_Type>
-		<Source_Value></Source_Value>
-		<Target_Type>XML_Value</Target_Type>
-		<Target_Value>game/romtype</Target_Value>
-	</Element>
 	<Element Type="RomHidden">
 		<Source_Type>Variable_Value</Source_Type>
 		<Source_Value>%AutoHide%</Source_Value>

diff --git a/ProfilsFiles/Screenscraper-RecalboxV3.xml b/ProfilsFiles/Screenscraper-RecalboxV3.xml
@@ -61,12 +61,14 @@
 		<Source_Value>Data/jeu/noms/nom_%COUNTRY%</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/name</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="Description">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/synopsis/synopsis_%LANG%</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/desc</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="Picture">
 		<Source_Type>XML_Download</Source_Type>
@@ -88,12 +90,6 @@
 		<Target_Path_Type>%XML_Path_File%</Target_Path_Type>
 		<Target_Value>game/image</Target_Value>
 	</Element>
-	<Element Type="thumbnail">
-		<Source_Type>Fixe_Value</Source_Type>
-		<Source_Value></Source_Value>
-		<Target_Type>XML_Value</Target_Type>
-		<Target_Value>game/thumbnail</Target_Value>
-	</Element>
 	<Element Type="Rating">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/note</Source_Value>
@@ -113,18 +109,21 @@
 		<Source_Value>Data/jeu/developpeur</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/developer</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="Publisher">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/editeur</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/publisher</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="Genre">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/genres/genres_%LANG%/genre_%LANG%</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/genre</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="NbPlayer">
 		<Source_Type>XML_Value</Source_Type>

diff --git a/ProfilsFiles/Screenscraper-RecalboxV4.xml b/ProfilsFiles/Screenscraper-RecalboxV4.xml
@@ -56,30 +56,19 @@
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/path</Target_Value>
 	</Element>
-	<Element Type="Emulator">
-		<Source_Type>Fixe_Value</Source_Type>
-		<Source_Value></Source_Value>
-		<Target_Type>XML_Value</Target_Type>
-		<Target_Value>game/emulator</Target_Value>
-	</Element>
-	<Element Type="core">
-		<Source_Type>Fixe_Value</Source_Type>
-		<Source_Value></Source_Value>
-		<Target_Type>XML_Value</Target_Type>
-		<Target_Value>game/core</Target_Value>
-	</Element>
 	<Element Type="Name">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/noms/nom_%COUNTRY%</Source_Value>
 		<Target_Type>XML_Value_FORMAT</Target_Type>
-		<Target_FORMAT>%Filename%</Target_FORMAT>
 		<Target_Value>game/name</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="Description">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/synopsis/synopsis_%LANG%</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/desc</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="Picture">
 		<Source_Type>XML_Download</Source_Type>
@@ -101,12 +90,6 @@
 		<Target_Path_Type>%XML_Path_File%</Target_Path_Type>
 		<Target_Value>game/image</Target_Value>
 	</Element>
-	<Element Type="thumbnail">
-		<Source_Type>Fixe_Value</Source_Type>
-		<Source_Value></Source_Value>
-		<Target_Type>XML_Value</Target_Type>
-		<Target_Value>game/thumbnail</Target_Value>
-	</Element>
 	<Element Type="Rating">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/note</Source_Value>
@@ -126,43 +109,34 @@
 		<Source_Value>Data/jeu/developpeur</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/developer</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="Publisher">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/editeur</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/publisher</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="Genre">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/genres/genres_%LANG%/genre_%LANG%</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/genre</Target_Value>
+		<Target_Maj>True</Target_Maj>
 	</Element>
 	<Element Type="NbPlayer">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/joueurs</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/players</Target_Value>
 	</Element>
-	<Element Type="Favorite">
-		<Source_Type>Fixe_Value</Source_Type>
-		<Source_Value></Source_Value>
-		<Target_Type>XML_Value</Target_Type>
-		<Target_Value>game/favorite</Target_Value>
-	</Element>
 	<Element Type="Region">
 		<Source_Type>XML_Value</Source_Type>
 		<Source_Value>Data/jeu/region</Source_Value>
 		<Target_Type>XML_Value</Target_Type>
 		<Target_Value>game/region</Target_Value>
 	</Element>
-	<Element Type="RomType">
-		<Source_Type>Fixe_Value</Source_Type>
-		<Source_Value></Source_Value>
-		<Target_Type>XML_Value</Target_Type>
-		<Target_Value>game/romtype</Target_Value>
-	</Element>
 	<Element Type="RomHidden">
 		<Source_Type>Variable_Value</Source_Type>
 		<Source_Value>%AutoHide%</Source_Value>

diff --git a/Ressources/SSCheck.xml b/Ressources/SSCheck.xml
diff --git a/Scraper.au3 b/Scraper.au3
@@ -2,10 +2,11 @@
 #AutoIt3Wrapper_Icon=Ressources\Scraper.ico
 #AutoIt3Wrapper_Outfile=.\Scraper.exe
 #AutoIt3Wrapper_Outfile_x64=.\Scraper64.exe
+#AutoIt3Wrapper_UseUpx=n
 #AutoIt3Wrapper_Compile_Both=y
 #AutoIt3Wrapper_UseX64=y
 #AutoIt3Wrapper_Res_Description=Scraper
-#AutoIt3Wrapper_Res_Fileversion=1.0.0.18
+#AutoIt3Wrapper_Res_Fileversion=1.0.0.0
 #AutoIt3Wrapper_Res_Fileversion_AutoIncrement=p
 #AutoIt3Wrapper_Res_LegalCopyright=LEGRAS David
 #AutoIt3Wrapper_Res_Language=1036
@@ -147,12 +148,14 @@ Func _Game_Make($aRomList, $vBoucle, $aConfig, $oXMLProfil)
 			Case "XML_Value"
 				$vValue = _XML_Read_Source($aRomList, $vBoucle, $aConfig, $oXMLProfil, $vWhile)
 				$vNode = _XML_Read("/Profil/Element[" & $vWhile & "]/Target_Value", 0, "", $oXMLProfil)
+				If StringLower(_XML_Read("/Profil/Element[" & $vWhile & "]/Target_Maj", 0, "", $oXMLProfil)) = "true" Then $vValue = StringUpper($vValue)
 				_LOG($vNode & " <-- " & $vValue, 1, $iLOGPath)
 				_XML_WriteValue($vNode, $vValue, "", $aConfig[8])
 			Case "XML_Attribute"
 				$vValue = _XML_Read_Source($aRomList, $vBoucle, $aConfig, $oXMLProfil, $vWhile)
 				$vAttributeName = _XML_Read("/Profil/Element[" & $vWhile & "]/Target_Attribute_Name", 0, "", $oXMLProfil)
 				$vNode = _XML_Read("/Profil/Element[" & $vWhile & "]/Target_Value", 0, "", $oXMLProfil)
+				If StringLower(_XML_Read("/Profil/Element[" & $vWhile & "]/Target_Maj", 0, "", $oXMLProfil)) = "true" Then $vValue = StringUpper($vValue)
 				_LOG($vNode & " <-- " & $vValue, 1, $iLOGPath)
 				_XML_WriteAttributs($vNode, $vAttributeName, $vValue, "", $aConfig[8])
 			Case "XML_Path"
@@ -179,6 +182,7 @@ Func _Game_Make($aRomList, $vBoucle, $aConfig, $oXMLProfil)
 						$vValue = $vValue & " (" & $vCountry & ")"
 				EndSwitch
 				$vNode = _XML_Read("/Profil/Element[" & $vWhile & "]/Target_Value", 0, "", $oXMLProfil)
+				If StringLower(_XML_Read("/Profil/Element[" & $vWhile & "]/Target_Maj", 0, "", $oXMLProfil)) = "true" Then $vValue = StringUpper($vValue)
 				_LOG($vNode & " <-- " & $vValue, 1, $iLOGPath)
 				_XML_WriteValue($vNode, $vValue, "", $aConfig[8])
 			Case Else