2.1.0.1

* Corrected : - SSH command will work now (I hope :S). - Some Translation refresh. * Added : - Japanese translation in beta (Thank you yorn.jp) - SSH Timeout
Universal-Rom-Tools · Dec 31, 2016 · efb393d · efb393d
1 parent ab69e01
commit efb393d
Show file tree

Hide file tree

Showing 18 changed files with 206 additions and 150 deletions.
diff --git a/Include/_MyFunction.au3 b/Include/_MyFunction.au3
@@ -205,7 +205,7 @@ Func _MultiLang_LoadLangDef($iLangPath, $vUserLang)
 	; [n][0] = Display Name in Local Language (Used for Select Function)
 	; [n][1] = Language File (Full path.  In this case we used a $iLangPath
 	; [n][2] = [Space delimited] Character codes as used by @OS_LANG (used to select correct lang file)
-	Local $aLangFiles[7][3]
+	Local $aLangFiles[8][3]
 
 	$aLangFiles[0][0] = "English (US)" ;
 	$aLangFiles[0][1] = $iLangPath & "\UXS-ENGLISH.XML"
@@ -279,6 +279,10 @@ Func _MultiLang_LoadLangDef($iLangPath, $vUserLang)
 	$aLangFiles[6][2] = "0413 " & _ ;Dutch - Netherlands
 			"0813 " ;Dutch - Belgium
 
+	$aLangFiles[7][0] = "Japanese" ; Japanese
+	$aLangFiles[7][1] = $iLangPath & "\UXS-JAPANESE.XML"
+	$aLangFiles[7][2] = "0411 " ;Japanese - Japan
+
 	;Set the available language files, names, and codes.
 	_MultiLang_SetFileInfo($aLangFiles)
 	If @error Then
@@ -1341,6 +1345,7 @@ Func _XML_Read($iXpath, $iXMLType = 0, $iXMLPath = "", $oXMLDoc = "")
 				Return -1
 			EndIf
 			If IsArray($iXMLValue) And UBound($iXMLValue) - 1 > 0 Then
+;~ 				_LOG('_XML_GetValue (' & $iXpath & ') = ' &$iXMLValue[1], 1, $iLOGPath)
 				Return $iXMLValue[1]
 			Else
 				_LOG('_XML_GetValue (' & $iXpath & ') is not an Array', 2, $iLOGPath)

diff --git a/LanguageFiles/UXS-JAPANESE.XML b/LanguageFiles/UXS-JAPANESE.XML
diff --git a/ProfilsFiles/RecalboxV3 (MIX).xml b/ProfilsFiles/RecalboxV3 (MIX).xml
@@ -33,7 +33,7 @@
 		<Target_Value>game</Target_Value>
 	</Game>
 	<Country>
-		<Source_Value>Data/jeu/regionshortname</Source_Value>
+		<Source_Value>Data/jeu/regionshortnames/regionshortname</Source_Value>
 	</Country>
 	<Element Type="Id">
 		<Source_Type>XML_Value</Source_Type>

diff --git a/ProfilsFiles/RecalboxV3.xml b/ProfilsFiles/RecalboxV3.xml
@@ -34,7 +34,7 @@
 		<Target_Value>game</Target_Value>
 	</Game>
 	<Country>
-		<Source_Value>Data/jeu/regionshortname</Source_Value>
+		<Source_Value>Data/jeu/regionshortnames/regionshortname</Source_Value>
 	</Country>
 	<Element Type="Id">
 		<Source_Type>XML_Value</Source_Type>

diff --git a/ProfilsFiles/RecalboxV4 (MIX).xml b/ProfilsFiles/RecalboxV4 (MIX).xml
@@ -32,7 +32,7 @@
 		<Target_Value>game</Target_Value>
 	</Game>
 	<Country>
-		<Source_Value>Data/jeu/regionshortname</Source_Value>
+		<Source_Value>Data/jeu/regionshortnames/regionshortname</Source_Value>
 	</Country>
 	<Element Type="Id">
 		<Source_Type>XML_Value</Source_Type>

diff --git a/ProfilsFiles/RecalboxV4 [SCUMMVM] (MIX).xml b/ProfilsFiles/RecalboxV4 [SCUMMVM] (MIX).xml
@@ -37,7 +37,7 @@
 		<Target_Value>folder</Target_Value>
 	</FolderRoot>
 	<Country>
-		<Source_Value>Data/jeu/regionshortname</Source_Value>
+		<Source_Value>Data/jeu/regionshortnames/regionshortname</Source_Value>
 	</Country>
 	<Element Type="Id">
 		<Source_Type>XML_Value</Source_Type>

diff --git a/ProfilsFiles/RecalboxV4.xml b/ProfilsFiles/RecalboxV4.xml
@@ -34,7 +34,7 @@
 		<Target_Value>game</Target_Value>
 	</Game>
 	<Country>
-		<Source_Value>Data/jeu/regionshortname</Source_Value>
+		<Source_Value>Data/jeu/regionshortnames/regionshortname</Source_Value>
 	</Country>
 	<Element Type="Id">
 		<Source_Type>XML_Value</Source_Type>

diff --git a/ProfilsFiles/Retropie (MIX)(Video).xml b/ProfilsFiles/Retropie (MIX)(Video).xml
@@ -32,7 +32,7 @@
 		<Target_Value>game</Target_Value>
 	</Game>
 	<Country>
-		<Source_Value>Data/jeu/regionshortname</Source_Value>
+		<Source_Value>Data/jeu/regionshortnames/regionshortname</Source_Value>
 	</Country>
 	<Element Type="Id">
 		<Source_Type>XML_Value</Source_Type>

diff --git a/ProfilsFiles/Retropie (MIX).xml b/ProfilsFiles/Retropie (MIX).xml
@@ -32,7 +32,7 @@
 		<Target_Value>game</Target_Value>
 	</Game>
 	<Country>
-		<Source_Value>Data/jeu/regionshortname</Source_Value>
+		<Source_Value>Data/jeu/regionshortnames/regionshortname</Source_Value>
 	</Country>
 	<Element Type="Id">
 		<Source_Type>XML_Value</Source_Type>

diff --git a/ProfilsFiles/Retropie (Video).xml b/ProfilsFiles/Retropie (Video).xml
@@ -34,7 +34,7 @@
 		<Target_Value>game</Target_Value>
 	</Game>
 	<Country>
-		<Source_Value>Data/jeu/regionshortname</Source_Value>
+		<Source_Value>Data/jeu/regionshortnames/regionshortname</Source_Value>
 	</Country>
 	<Element Type="Id">
 		<Source_Type>XML_Value</Source_Type>

diff --git a/ProfilsFiles/Retropie [Rom folder] (MIX).xml b/ProfilsFiles/Retropie [Rom folder] (MIX).xml
@@ -32,7 +32,7 @@
 		<Target_Value>game</Target_Value>
 	</Game>
 	<Country>
-		<Source_Value>Data/jeu/regionshortname</Source_Value>
+		<Source_Value>Data/jeu/regionshortnames/regionshortname</Source_Value>
 	</Country>
 	<Element Type="Id">
 		<Source_Type>XML_Value</Source_Type>

diff --git a/ProfilsFiles/Retropie [Rom folder].xml b/ProfilsFiles/Retropie [Rom folder].xml
@@ -34,7 +34,7 @@
 		<Target_Value>game</Target_Value>
 	</Game>
 	<Country>
-		<Source_Value>Data/jeu/regionshortname</Source_Value>
+		<Source_Value>Data/jeu/regionshortnames/regionshortname</Source_Value>
 	</Country>
 	<Element Type="Id">
 		<Source_Type>XML_Value</Source_Type>

diff --git a/ProfilsFiles/Retropie.xml b/ProfilsFiles/Retropie.xml
@@ -34,7 +34,7 @@
 		<Target_Value>game</Target_Value>
 	</Game>
 	<Country>
-		<Source_Value>Data/jeu/regionshortname</Source_Value>
+		<Source_Value>Data/jeu/regionshortnames/regionshortname</Source_Value>
 	</Country>
 	<Element Type="Id">
 		<Source_Type>XML_Value</Source_Type>

diff --git a/Ressources/UXS.psd b/Ressources/UXS.psd
diff --git a/UXS-config.ini b/UXS-config.ini
@@ -1,4 +1,4 @@
 [GENERAL]
-$verINI='2.1.0.0'
+$verINI='2.1.0.1'
 $vVerbose=2
 [LAST_USE]
diff --git a/Universal XML Scraper.au3 b/Universal XML Scraper.au3
@@ -5,7 +5,7 @@
 #AutoIt3Wrapper_Compile_Both=y
 #AutoIt3Wrapper_UseX64=y
 #AutoIt3Wrapper_Res_Description=Scraper XML Universel
-#AutoIt3Wrapper_Res_Fileversion=2.1.0.1
+#AutoIt3Wrapper_Res_Fileversion=2.1.0.2
 #AutoIt3Wrapper_Res_Fileversion_AutoIncrement=p
 #AutoIt3Wrapper_Res_LegalCopyright=LEGRAS David
 #AutoIt3Wrapper_Res_Language=1036
@@ -683,8 +683,15 @@ Func _Plink($oXMLProfil, $vPlinkCommand, $vSilentPlink = 0) ;Send a Command via
 		If MsgBox($MB_OKCANCEL, $vPlinkCommand, _MultiLang_GetText("mess_ssh_" & $vPlinkCommand)) = $IDOK Then
 			_LOG("SSH : " & $aPlink_Command, 0, $iLOGPath)
 			$sRun = $iScriptPath & "\Ressources\plink.exe " & $vPlink_Ip & " -ssh -l " & $vPlink_Root & " -pw " & $vPlink_Pswd & " " & $aPlink_Command
-			$iPid = Run($sRun, '', @SW_HIDE, $STDIN_CHILD + $STDERR_CHILD + $STDOUT_CHILD) ;@ComSpec & " /c " &
+			$iPid = Run($sRun, '', @SW_HIDE, $STDERR_CHILD + $STDOUT_CHILD) ;@ComSpec & " /c " &
+			$PlinkTimeout = TimerInit()
 			While ProcessExists($iPid)
+				If TimerDiff($PlinkTimeout) > 5000 Then
+					MsgBox($MB_ICONERROR, _MultiLang_GetText("err_title"), _MultiLang_GetText("err_PlinkGlobal") & @CRLF & "(Timeout)")
+					_LOG("TimeOut with Plink (" & $vPlink_Root & ":" & $vPlink_Pswd & "@" & $vPlink_Ip & ")", 2, $iLOGPath)
+					StdioClose($iPid)
+					Return -1
+				EndIf
 				$_StderrRead = StderrRead($iPid)
 				If Not @error And $_StderrRead <> '' Then
 					If StringInStr($_StderrRead, 'Unable to open connection') Then
@@ -702,7 +709,14 @@ Func _Plink($oXMLProfil, $vPlinkCommand, $vSilentPlink = 0) ;Send a Command via
 		$sRun = $iScriptPath & "\Ressources\plink.exe " & $vPlink_Ip & " -ssh -l " & $vPlink_Root & " -pw " & $vPlink_Pswd & " " & $vPlinkCommand
 		_LOG("SSH : " & $sRun, 1, $iLOGPath)
 		$iPid = Run(@ComSpec & " /c " & $sRun, '', @SW_HIDE, $STDIN_CHILD + $STDERR_CHILD + $STDOUT_CHILD) ;@ComSpec & " /c " &
+		$PlinkTimeout = TimerInit()
 		While ProcessExists($iPid)
+			If TimerDiff($PlinkTimeout) > 5000 Then
+				MsgBox($MB_ICONERROR, _MultiLang_GetText("err_title"), _MultiLang_GetText("err_PlinkGlobal") & @CRLF & "(Timeout)")
+				_LOG("TimeOut with Plink (" & $vPlink_Root & ":" & $vPlink_Pswd & "@" & $vPlink_Ip & ")", 2, $iLOGPath)
+				StdioClose($iPid)
+				Return -1
+			EndIf
 			$_StderrRead = StderrRead($iPid)
 			If Not @error And $_StderrRead <> '' Then
 				If StringInStr($_StderrRead, 'Unable to open connection') Then
@@ -1453,6 +1467,7 @@ Func _GUI_Refresh($oXMLProfil = -1, $ScrapIP = 0, $vScrapeOK = 0) ;Refresh GUI
 			GUICtrlSetData($MC_config_Option, _MultiLang_GetText("mnu_cfg_config_Option"))
 			GUICtrlSetData($MC_config_PIC, _MultiLang_GetText("mnu_cfg_config_PIC"))
 			GUICtrlSetData($MC_config_MISC, _MultiLang_GetText("mnu_cfg_config_MISC"))
+			GUICtrlSetData($MC_MixDownload, _MultiLang_GetText("mnu_cfg_download_miximage"))
 
 			GUICtrlSetData($MC_Profil, _MultiLang_GetText("mnu_cfg_profil"))
 			GUICtrlSetData($MC_Miximage, _MultiLang_GetText("mnu_cfg_miximage"))
@@ -1497,6 +1512,9 @@ Func _GUI_Refresh($oXMLProfil = -1, $ScrapIP = 0, $vScrapeOK = 0) ;Refresh GUI
 			GUICtrlSetState($MH, $GUI_ENABLE)
 			GUICtrlSetData($MH, _MultiLang_GetText("mnu_help"))
 			GUICtrlSetData($MH_About, _MultiLang_GetText("mnu_help_about"))
+			GUICtrlSetData($MH_Help, _MultiLang_GetText("mnu_help_wiki"))
+			GUICtrlSetData($MH_Support, _MultiLang_GetText("mnu_help_support"))
+			GUICtrlSetData($MH_Link, _MultiLang_GetText("mnu_help_link"))
 
 			GUICtrlSetData($B_SCRAPE, _MultiLang_GetText("scrap_button"))
 			_GUICtrlStatusBar_SetText($L_SCRAPE, "")
@@ -1992,7 +2010,7 @@ Func _Results($aRomList, $vNbThread, $vFullTimer, $vFullScrape = 0)
 		$vTitle = $vTitle[UBound($vTitle) - 1]
 	EndIf
 
-	If $vScrapeCancelled = 1 Then $vTitle = $vTitle & " ("&_MultiLang_GetText("scrap_cancel_button")&")"
+	If $vScrapeCancelled = 1 Then $vTitle = $vTitle & " (" & _MultiLang_GetText("scrap_cancel_button") & ")"
 
 	#Region ### START Koda GUI section ### Form=
 	$F_Results = GUICreate(_MultiLang_GetText("win_Results_Title"), 538, 403, -1, -1, BitOR($WS_EX_TOPMOST, $WS_EX_WINDOWEDGE))

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,12 @@
+2.1.0.1
+* Corrected :
+ - SSH command will work now (I hope :S).
+ - Some Translation refresh.
+ - Some problem on country preference (when you choose a 2D Box for exemple)
+* Added :
+ - Japanese translation in beta (Thank you yorn.jp)
+ - SSH Timeout
+
 2.1.0.0
 * Corrected :
  - SSH command will work now.

diff --git a/changelog_next.txt b/changelog_next.txt
@@ -1,3 +1,12 @@
+2.1.0.1
+* Corrected :
+ - SSH command will work now (I hope :S).
+ - Some Translation refresh.
+ - Some problem on country preference (when you choose a 2D Box for exemple)
+* Added :
+ - Japanese translation in beta (Thank you yorn.jp)
+ - SSH Timeout
+
 2.1.0.0
 * Corrected :
  - SSH command will work now.