webMAN MOD 1.47.45

- [Feature Request] Detect PS2 ISOs in DVD/CD folder additionally #1028

_Projects_/tools/PS3 Patches.txt

@@ -109,7 +109,7 @@ disable start up sound while turning on
 File: custom_render_plugin.sprx (4.83)
 - Offset: 0x15F30
 - Patch: 0x38000000
-- Original: 0x881C0000 with 
+- Original: 0x881C0000
 
 
 ----------------------------------------------

include/init/language.h

@@ -169,6 +169,9 @@ static char STR_HOME[8] = "Home";
 
 #define COVERS_PATH		"http://raw.githubusercontent.com/aldostools/resources/master/COV/%s.JPG"
 
+#define CUSTOM_PATH1	"DVD"
+#define CUSTOM_PATH2	"CD"
+
 #else
 static int fh;
 
@@ -247,6 +250,9 @@ static char STR_NOTFOUND[40];//		= "Not found!";
 
 static char COVERS_PATH[100];//		= "";
 
+static char CUSTOM_PATH1[16];//		= "";
+static char CUSTOM_PATH2[16];//		= "";
+
 #define STR_DISCOBRA	"COBRA TOGGLE"
 #define STR_RBGMODE		"RBG MODE TOGGLE"
 #define STR_RBGNORM		"NORM MODE TOGGLE"
@@ -515,6 +521,9 @@ static void update_language(void)
 		language("IP_ADDRESS", local_ip, local_ip);
 		language("SEARCH_URL", search_url, "http://google.com/search?q=");
 
+		language("CUSTOM_PATH1", CUSTOM_PATH1, "CD");
+		language("CUSTOM_PATH2", CUSTOM_PATH2, "DVD");
+
 /*
 #ifdef COBRA_ONLY
 		language("STR_DISCOBRA", STR_DISCOBRA);

include/scan/games_html.h

@@ -33,6 +33,7 @@ enum paths_ids
 #define IS_PS2ISO        (f1==id_PS2ISO)
 #define IS_PSXISO       ((f1==id_PSXISO) || (f1==id_PSXGAMES))
 #define IS_PSPISO       ((f1==id_PSPISO) || (f1==id_ISO))
+#define IS_ISO_DIR       (f1==id_ISO)
 #define IS_VIDEO_FOLDER  (f1==id_VIDEO)
 #define IS_GAMEI_FOLDER  (f1==id_GAMEI)
 #define IS_ROMS_FOLDER   (f1==id_ROMS)
@@ -215,6 +216,8 @@ static void add_query_html(char *buffer, const char *param)
 
 static int check_drive(u8 f0)
 {
+	if(f0 >= MAX_DRIVES) return FAILED;
+
 	if(!webman_config->usb0 && (f0 == 1)) return FAILED;
 	if(!webman_config->usb1 && (f0 == 2)) return FAILED;
 	if(!webman_config->usb2 && (f0 == 3)) return FAILED;
@@ -432,6 +435,7 @@ static bool game_listing(char *buffer, char *templn, char *param, char *tempstr,
 	struct CellFsStat buf;
 	int fd;
 
+	u8 _f1_;
 	u8 mobile_mode = mode, launchpad_mode = (mode == LAUNCHPAD_MODE);
 
 	#ifdef LAUNCHPAD
@@ -701,15 +705,18 @@ static bool game_listing(char *buffer, char *templn, char *param, char *tempstr,
 			{
 				if(!loading_games) break;
 
+				_f1_ = f1;
+
 				if(idx >= max_entries || tlen >= BUFFER_MAXSIZE) break;
 				#ifndef COBRA_ONLY
 				if(IS_ISO_FOLDER && !(IS_PS2ISO)) continue; // 0="GAMES", 1="GAMEZ", 5="PS2ISO", 10="video"
 				#endif
 
 				//if(IS_PS2ISO && f0>0)  continue; // PS2ISO is supported only from /dev_hdd0
 				if(IS_GAMEI_FOLDER) {if((!webman_config->gamei) || (IS_HDD0) || (IS_NTFS)) continue;}
-				if(IS_VIDEO_FOLDER) {if(is_net) continue; else strcpy(paths[id_VIDEO], (IS_HDD0) ? "video" : "GAMES_DUP");}
-				if(IS_NTFS)  {if(f1 >= id_ISO) break; else if(IS_JB_FOLDER || (f1 == id_PSXGAMES)) continue;} // 0="GAMES", 1="GAMEZ", 7="PSXGAMES", 9="ISO", 10="video", 11="GAMEI", 12="ROMS"
+				if(IS_ISO_DIR     ) {if(is_net) continue; else {sprintf(param, "%s/%s", drives[f0], CUSTOM_PATH1); if(isDir(param)) _f1_ = id_PS2ISO; strcpy(paths[id_ISO], (_f1_ == id_PS2ISO) ? CUSTOM_PATH1 : "ISO");}}
+				if(IS_VIDEO_FOLDER) {if(is_net) continue; else if(IS_HDD0) strcpy(paths[id_VIDEO], "video"); else {sprintf(param, "%s/%s", drives[f0], CUSTOM_PATH2); if(isDir(param)) _f1_ = id_PS2ISO; strcpy(paths[id_VIDEO], (_f1_ == id_PS2ISO) ? CUSTOM_PATH2 : "GAMES_DUP");}}
+				if(IS_NTFS) {if(f1 >= id_ISO) break; else if(IS_JB_FOLDER || (f1 == id_PSXGAMES)) continue;} // 0="GAMES", 1="GAMEZ", 7="PSXGAMES", 9="ISO", 10="video", 11="GAMEI", 12="ROMS"
 
 #ifdef NET_SUPPORT
 				if(is_net)
@@ -720,7 +727,7 @@ static bool game_listing(char *buffer, char *templn, char *param, char *tempstr,
 				if(b0) {if((b0 == 2) && (f0 < NET)); else if((b0 == 3) && (!IS_NTFS)); else if(filter0 != f0) continue;}
 				if(b1) {if((b1 >= 2) && ((f1 < b1) || IS_JB_FOLDER) && (filter1 < 3)); else if(filter1 != f1) continue;}
 				else
-					if(check_content_type(f1)) continue;
+					if(check_content_type(_f1_)) continue;
 
 				#ifdef NET_SUPPORT
 				#ifdef USE_INTERNAL_NET_PLUGIN

include/scan/games_xml.h

@@ -746,6 +746,7 @@ static bool scan_mygames_xml(u64 conn_s_p)
 	}
 	#endif
 
+	u8 _f1_;
 	u16 key;
 	int fdxml; char *xml_file = (char*)MY_GAMES_XML;
 
@@ -892,6 +893,8 @@ static bool scan_mygames_xml(u64 conn_s_p)
 		{
 			if(!refreshing_xml) break;
 
+			_f1_ = f1;
+
 			if(scanning_roms)
 			{
 				f1 = id_ROMS;
@@ -906,7 +909,8 @@ static bool scan_mygames_xml(u64 conn_s_p)
 
 				//if(IS_PS2ISO && f0>0)  continue; // PS2ISO is supported only from /dev_hdd0
 				if(IS_GAMEI_FOLDER) {if((!webman_config->gamei) || (IS_HDD0) || (IS_NTFS)) continue;}
-				if(IS_VIDEO_FOLDER) {if(is_net) continue; else strcpy(paths[id_VIDEO], (IS_HDD0) ? "video" : "GAMES_DUP");}
+				if(IS_ISO_DIR     ) {if(is_net) continue; else {sprintf(param, "%s/%s", drives[f0], CUSTOM_PATH1); if(isDir(param)) _f1_ = id_PS2ISO; strcpy(paths[id_ISO], (_f1_ == id_PS2ISO) ? CUSTOM_PATH1 : "ISO");}}
+				if(IS_VIDEO_FOLDER) {if(is_net) continue; else if(IS_HDD0) strcpy(paths[id_VIDEO], "video"); else {sprintf(param, "%s/%s", drives[f0], CUSTOM_PATH2); if(isDir(param)) _f1_ = id_PS2ISO; strcpy(paths[id_VIDEO], (_f1_ == id_PS2ISO) ? CUSTOM_PATH2 : "GAMES_DUP");}}
 				if(IS_NTFS)  {if(f1 >= id_ISO) break; else if(IS_JB_FOLDER || (f1 == id_PSXGAMES)) continue;} // 0="GAMES", 1="GAMEZ", 7="PSXGAMES", 9="ISO", 10="video", 11="GAMEI", 12="ROMS"
 
 				#ifdef NET_SUPPORT
@@ -915,7 +919,7 @@ static bool scan_mygames_xml(u64 conn_s_p)
 					if(f1 >= id_ISO) f1 = id_GAMEI; // ignore 9="ISO", 10="video"
 				}
 				#endif
-				if(check_content_type(f1)) continue;
+				if(check_content_type(_f1_)) continue;
 			}
 
 			#ifdef NET_SUPPORT
@@ -1173,7 +1177,7 @@ static bool scan_mygames_xml(u64 conn_s_p)
 
 							add_info(tempstr + read_e, folder_name, roms_index, enc_dir_name, title_id, f0, is_game_dir ? id_NPDRM : f1, 5);
 
-							if(add_xmb_entry(f0, f1, tempstr, templn, skey[key].value, key, &myxml_ps3, &myxml_ps2, &myxml_psx, &myxml_psp, &myxml_dvd, entry.entry_name.d_name, subfolder)) key++;
+							if(add_xmb_entry(f0, _f1_, tempstr, templn, skey[key].value, key, &myxml_ps3, &myxml_ps2, &myxml_psx, &myxml_psp, &myxml_dvd, entry.entry_name.d_name, subfolder)) key++;
 						}
 						//////////////////////////////
 						if(subfolder) goto next_xml_entry;