From 0f9f7378308345ccb4afb170a9013e040419450a Mon Sep 17 00:00:00 2001
From: cyan06 <cyan06@users.noreply.github.com>
Date: Tue, 17 Nov 2015 14:41:27 +0000
Subject: [PATCH] * Rename meta.xml to lower case. * Updated game's region
 detection and use "Region Free"   instead of PAL as default value. * Added
 RU/FI/SE cover download if EN is not found on gametdb. * Remove outdated
 fileden.com specific code in image downloader functions. * Set default scroll
 direction to "system menu" for natural behavior. * Force a game's title
 reload when selecting a different EmuNAND path.

---
 HBC/meta.xml                            |  4 +--
 source/menu/GameBrowseMenu.cpp          | 26 ++++++++---------
 source/network/ImageDownloader.cpp      | 38 +++++++++++++++++++++++--
 source/settings/CSettings.cpp           |  2 +-
 source/settings/menus/CustomPathsSM.cpp |  2 ++
 svnrev.sh                               |  2 +-
 6 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/HBC/meta.xml b/HBC/meta.xml
index f5faf381..e905814f 100644
--- a/HBC/meta.xml
+++ b/HBC/meta.xml
@@ -2,8 +2,8 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>3.0 r1256</version>
-		<release_date>20150815150707</release_date>
+		<version>3.0 r1259</version>
+		<release_date>20151117142425</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>
diff --git a/source/menu/GameBrowseMenu.cpp b/source/menu/GameBrowseMenu.cpp
index 1621029a..1c167cf8 100644
--- a/source/menu/GameBrowseMenu.cpp
+++ b/source/menu/GameBrowseMenu.cpp
@@ -1468,31 +1468,29 @@ void GameBrowseMenu::UpdateGameInfoText(const u8 * gameId)
 
 	switch (IDfull[3])
 	{
+		case 'A':
+		case 'B':
+		case 'U':
+		case 'X':
+			strcpy(gameregion, tr("Region Free"));
+			break;
 		case 'E':
+		case 'N':
 			strcpy(gameregion, "NTSC U");
 			break;
 		case 'J':
 			strcpy(gameregion, "NTSC J");
 			break;
+		case 'K':
+		case 'Q':
+		case 'T':
+			strcpy(gameregion, "NTSC K");
+			break; 
 		case 'W':
 			strcpy(gameregion, "NTSC T");
 			break;
 		default:
-		case 'K':
-			strcpy(gameregion, "NTSC K");
-			break;
-		case 'P':
-		case 'D':
-		case 'F':
-		case 'I':
-		case 'S':
-		case 'H':
-		case 'U':
-		case 'X':
-		case 'Y':
-		case 'Z':
 			strcpy(gameregion, "  PAL ");
-			break;
 	}
 
 	HaltGui();
diff --git a/source/network/ImageDownloader.cpp b/source/network/ImageDownloader.cpp
index 18f5c11b..a6fe2288 100644
--- a/source/network/ImageDownloader.cpp
+++ b/source/network/ImageDownloader.cpp
@@ -239,13 +239,12 @@ struct block ImageDownloader::DownloadImage(const char * url, const char * gameI
 	char downloadURL[512];
 	bool PAL = false;
 
-	//Download Custom banners for GameCube games first because fileden.com is sending a 404 picture instead of real 404 code.
 	if(strcmp(fileExt, ".bnr") == 0)
 	{
 		snprintf(downloadURL, sizeof(downloadURL), "%s%s.bnr", url, gameID);
 		gprintf("%s", downloadURL);
 		struct block file = downloadfile(downloadURL);
-		if(file.size > 14517 && IsValidBanner(file.data)) //14517 = 404.gif file size from fileden.com
+		if(IsValidBanner(file.data))
 			return file;
 
 		free(file.data);
@@ -253,7 +252,7 @@ struct block ImageDownloader::DownloadImage(const char * url, const char * gameI
 		snprintf(downloadURL, sizeof(downloadURL), "%s%.3s.bnr", url, gameID);
 		gprintf(" - Not found. trying ID3:\n%s", downloadURL);
 		file = downloadfile(downloadURL);
-		if(file.size > 14517 && IsValidBanner(file.data))
+		if(IsValidBanner(file.data))
 			return file;
 
 		gprintf(" - Not found.\n");
@@ -337,6 +336,39 @@ struct block ImageDownloader::DownloadImage(const char * url, const char * gameI
 		file = downloadfile(downloadURL);
 		if(VALID_IMAGE(file))
 			return file;
+		
+		if(gameID[3] == 'R') // no english cover found, try russian
+		{
+			lang = "RU";
+			free(file.data);
+			
+			snprintf(downloadURL, sizeof(downloadURL), "%s%s/%s.png", url, lang, gameID);
+			gprintf(" - Not found.\n%s", downloadURL);
+			file = downloadfile(downloadURL);
+			if(VALID_IMAGE(file))
+				return file;
+		}
+		
+		if(gameID[3] == 'V') // no English cover found, try Finnish and Swedish
+		{
+			lang = "FI";
+			free(file.data);
+			
+			snprintf(downloadURL, sizeof(downloadURL), "%s%s/%s.png", url, lang, gameID);
+			gprintf(" - Not found.\n%s", downloadURL);
+			file = downloadfile(downloadURL);
+			if(VALID_IMAGE(file))
+				return file;
+			
+			lang = "SE";
+			free(file.data);
+			
+			snprintf(downloadURL, sizeof(downloadURL), "%s%s/%s.png", url, lang, gameID);
+			gprintf(" - Not found.\n%s", downloadURL);
+			file = downloadfile(downloadURL);
+			if(VALID_IMAGE(file))
+				return file;
+		}
 	}
 
 	gprintf(" - Not found.\n");
diff --git a/source/settings/CSettings.cpp b/source/settings/CSettings.cpp
index 13a61d76..5b6f9614 100644
--- a/source/settings/CSettings.cpp
+++ b/source/settings/CSettings.cpp
@@ -112,7 +112,7 @@ void CSettings::SetDefault()
 	partition = 0;
 	discart = DISCARTS_ORIGINALS_CUSTOMS;
 	coversfull = COVERSFULL_HQ;
-	xflip = XFLIP_NO;
+	xflip = XFLIP_SYSMENU;
 	quickboot = OFF;
 	wiilight = WIILIGHT_ON;
 	autonetwork = OFF;
diff --git a/source/settings/menus/CustomPathsSM.cpp b/source/settings/menus/CustomPathsSM.cpp
index 32e6bf2d..cd76f992 100644
--- a/source/settings/menus/CustomPathsSM.cpp
+++ b/source/settings/menus/CustomPathsSM.cpp
@@ -29,6 +29,7 @@
 #include "settings/SettingsPrompts.h"
 #include "settings/CSettings.h"
 #include "settings/SettingsEnums.h"
+#include "settings/GameTitles.h"
 #include "prompts/PromptWindows.h"
 #include "prompts/ProgressWindow.h"
 #include "language/gettext.h"
@@ -311,6 +312,7 @@ int CustomPathsSM::GetMenuInternal()
 		else if(result == 1)
 		{
 			Channels::Instance()->GetEmuChannelList();
+			GameTitles.LoadTitlesFromGameTDB(Settings.titlestxt_path, false);
 		}
 	}
 
diff --git a/svnrev.sh b/svnrev.sh
index dfb6e206..e7adc3fa 100644
--- a/svnrev.sh
+++ b/svnrev.sh
@@ -40,7 +40,7 @@ fi
 rev_new=`expr $rev_new + 1`
 rev_date=`date -u +%Y%m%d%H%M%S`
 
-cat <<EOF > ./HBC/META.XML
+cat <<EOF > ./HBC/meta.xml
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 	<app version="1">
 		<name> USB Loader GX</name>