webMAN MOD 1.47.47h

- Bumped version to "h"
- Fixed bug building XML filled with nulls at the end of the file
- Refactored wm_proxy: moved mount functions to mount.h
- wm_proxy: Added direct mount of PS2 Classics and PS1 with cuesheet
- Updated README.md for wm_proxy

Author: aldostools

_Projects_/updater/pkgfiles/USRDIR/res/wm_proxy.sprx

@@ -21,8 +21,27 @@ The plugin receives the web command through the `module_action` parameter from t
 a GET request is constructed and the http request is sent to webMAN's web server using the 
 loopback IP address 127.0.0.1 on port 80.
 
-If webMAN's web server is not running, the message "webMAN not ready!" is displayed.
-
+If webMAN's web server is not running, the proxy tries to mount the file using Cobra commands.
+Only certain file types are supported. Other the message "webMAN not ready!" is displayed.
+
+Type file types that can be mounted directly by the proxy:
+- Games if JB folder format (GAMES and GAMEZ)
+- PS3ISO (non-split)
+- PS2ISO (non-split)
+- PS2 Classics
+- PSXISO
+- BDISO
+- DVDISO
+- ROMS
+
+Type file types that CANNOT be mounted directly by the proxy are:
+- Remote network files (ps3netsrv)
+- External ISO stored in exFAT / NTFS /ext2/3/4
+- multi-part ISOs
+- PSPISO
+- GAMEI
+- Auto-CONFIG for PS2ISO and PS2 Classics
+- PS2 Cue/CCD and PS1 CCD cuesheets are not supported
 
 ## Credits
 

_Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx

@@ -864,38 +864,42 @@ int cobra_mount_bd_disc_image(char *files[], unsigned int num)
 	return sys_storage_ext_mount_bd_discfile(num, files);
 }
 
-static void init_tracks(int num_tracks, ScsiTrackDescriptor *scsi_tracks)
+static void init_tracks(int num_tracks, TrackDef *tracks, ScsiTrackDescriptor *scsi_tracks)
 {
 	memset(scsi_tracks, 0, num_tracks * sizeof(ScsiTrackDescriptor));
 
 	for (int i = 0; i < num_tracks; i++)
 	{
-		scsi_tracks[i].adr_control = i ? 0x10 : 0x14;
+		scsi_tracks[i].adr_control = (tracks[i].is_audio) ? 0x10 : 0x14;
 		scsi_tracks[i].track_number = i + 1;
-		scsi_tracks[i].track_start_addr = 0;
+		scsi_tracks[i].track_start_addr = tracks[i].lba;
 	}
 }
 
-int cobra_mount_psx_disc_image(char *file)
+int cobra_mount_psx_disc_image(char *file, TrackDef *tracks, unsigned int num_tracks)
 {
 	if (!file) return EINVAL;
 
-	ScsiTrackDescriptor scsi_tracks[1];
-	init_tracks(1, scsi_tracks);
+	num_tracks = RANGE(num_tracks, 1, MAX_TRACKS);
 
-	return sys_storage_ext_mount_psx_discfile(file, 1, scsi_tracks);
+	ScsiTrackDescriptor scsi_tracks[num_tracks];
+	init_tracks(num_tracks, tracks, scsi_tracks);
+
+	return sys_storage_ext_mount_psx_discfile(file, num_tracks, scsi_tracks);
 }
 
-int cobra_mount_ps2_disc_image(char *files[], int num)
+int cobra_mount_ps2_disc_image(char *files[], int num, TrackDef *tracks, unsigned int num_tracks)
 {
-	if (!files) return EINVAL;
+	if (!files || !tracks) return EINVAL;
+
+	num_tracks = RANGE(num_tracks, 1, MAX_TRACKS);
 
-	ScsiTrackDescriptor scsi_tracks[1];
-	init_tracks(1, scsi_tracks);
+	ScsiTrackDescriptor scsi_tracks[num_tracks];
+	init_tracks(num_tracks, tracks, scsi_tracks);
 
 	num = RANGE(num, 1, 32);
 
-	return sys_storage_ext_mount_ps2_discfile(num, files, 1, scsi_tracks);
+	return sys_storage_ext_mount_ps2_discfile(num, files, num_tracks, scsi_tracks);
 }
 
 int cobra_umount_disc_image(void)

_Projects_/updater/pkgfiles/USRDIR/webftp_server_lite.sprx

@@ -22,8 +22,6 @@ enum DiscEmu
 	EMU_GAMEI, // not a DiscEmu
 };
 
-#ifdef COBRA_ONLY
-
 enum DiscType
 {
 	DISC_TYPE_NONE, /* No disc inserted */
@@ -132,7 +130,7 @@ typedef struct
 	u8 reserved1 : 7;
 } __attribute__((packed)) DiscPhysInfo;
 */
-
+/*
 typedef struct
 {
 	u16 size;
@@ -161,7 +159,7 @@ typedef struct
 	u8 auto_earth;			// deprecated
 	u8 auto_dev_blind;		// 1 = Allow auto-mount /dev_blind   | 0 = Does not allow auto-mount /dev_blind
 } __attribute__((packed)) CobraConfig;
-
+*/
 
 /*
  * Inits the cobra library. Call this function before any other
@@ -228,7 +226,7 @@ int cobra_get_disc_type(unsigned int *real_disctype, unsigned int *effective_dis
  *
  * Remarks: call this function only when necessary, e.g. when you detect a disc change.
  */
-int cobra_disc_auth(void);
+//int cobra_disc_auth(void);
 
 
 /*
@@ -370,7 +368,7 @@ int cobra_mount_bd_disc_image(char *files[], unsigned int num);
  * See readme about how to properly mount an iso and specific details about psx.
  */
 //int cobra_mount_psx_disc_image_iso(char *file, TrackDef *tracks, unsigned int num_tracks);
-int cobra_mount_psx_disc_image(char *file);
+int cobra_mount_psx_disc_image(char *file, TrackDef *tracks, unsigned int num_tracks);
 
 
 /*
@@ -395,7 +393,7 @@ int cobra_mount_psx_disc_image(char *file);
  *
  * See readme about how to properly mount an iso.
  */
-int cobra_mount_ps2_disc_image(char *files[], int num);
+int cobra_mount_ps2_disc_image(char *files[], int num, TrackDef *tracks, unsigned int num_tracks);
 
 
 /*
@@ -633,7 +631,7 @@ int cobra_map_game(const char *path, const char *title_id, int use_app_home);
  * Upon success, the file in icon_save_path will have the psp icon and the icon of psp launcher is mapped to it.
  * This function allocates temporally a 512 KB buffer, so at least that memory should be available
  */
-int cobra_set_psp_umd(char *path, char *umd_root, char *icon_save_path);
+//int cobra_set_psp_umd(char *path, char *umd_root, char *icon_save_path);
 
 /*
  * Sets the umd iso for psp emulation and sets the apropiated emulation parameters.
@@ -673,7 +671,7 @@ int cobra_set_psp_umd(char *path, char *umd_root, char *icon_save_path);
  *
  * Additional info: the function succeeds even if there is no psp iso set.
  */
-int cobra_unset_psp_umd(void);
+//int cobra_unset_psp_umd(void);
 
 
 /*
@@ -697,7 +695,7 @@ int cobra_unset_psp_umd(void);
  * >= 0 -> the emu type, one of PS2EmuType
  * Other -> error from the kernel
  */
-int cobra_get_ps2_emu_type(void);
+//int cobra_get_ps2_emu_type(void);
 
 
 /*
@@ -711,7 +709,7 @@ int cobra_get_ps2_emu_type(void);
  * ENOSYS -> not in cobra
  */
 //int cobra_get_version(u16 *cobra_version, u16 *ps3_version);
-int sys_get_version2(u16 *version);
+//int sys_get_version2(u16 *version);
 
 /*
  * Reads the cobra configuration from RAM cache.
@@ -725,7 +723,7 @@ int sys_get_version2(u16 *version);
  *
  * Additional info: this function succeeds regardless of cobra device being present or not.
  */
-int cobra_read_config(CobraConfig *cfg);
+//int cobra_read_config(CobraConfig *cfg);
 
 
 /*
@@ -739,7 +737,7 @@ int cobra_read_config(CobraConfig *cfg);
  *
  * Additional info: currently, none of the config fields requires a ps3 reboot to be effective.
  */
-int cobra_write_config(CobraConfig *cfg);
+//int cobra_write_config(CobraConfig *cfg);
 
 
 /*
@@ -787,7 +785,7 @@ int cobra_write_config(CobraConfig *cfg);
  * EKRESOURCE -> a module is already loaded at that slot
  * Other -> error from kernel (invalid prx, etc)
  */
-int cobra_load_vsh_plugin(unsigned int slot, const char *path, void *arg, u32 arg_size);
+//int cobra_load_vsh_plugin(unsigned int slot, const char *path, void *arg, u32 arg_size);
 
 
 /*
@@ -801,9 +799,9 @@ int cobra_load_vsh_plugin(unsigned int slot, const char *path, void *arg, u32 ar
  * EINVAL -> invalid slot
  * ENOENT -> there is no module loaded in that slot.
  */
-int cobra_unload_vsh_plugin(unsigned int slot);
+//int cobra_unload_vsh_plugin(unsigned int slot);
 
-void map_app_home(const char *path);
+//void map_app_home(const char *path);
 
 #define MAX_TRACKS	98 // game with most tracks (97) is SLUS-01208 - Sabrina the Teenage Witch: A Twitch in Time!
 
@@ -812,5 +810,3 @@ void map_app_home(const char *path);
 #endif
 
 #endif /* _COBRA_H */
-
-#endif //#ifdef COBRA_ONLY

_Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx

@@ -0,0 +1,121 @@
+#define NONE -1
+#define MIN(a, b)			((a) <= (b) ? (a) : (b))
+#define MAX_LINE_LEN	640 // html games
+
+extern char *stdc_73EAE03D(const char *s, int c);										// strrchr()
+char* strrchr(const char *s, int c) {if(!s) return NULL; return stdc_73EAE03D(s, c);}
+
+static int parse_lba(const char *templn, int ret_value)
+{
+	char *time = strrchr(templn, ' '); if(!time) return ret_value;
+	char tcode[10]; // mm:ss:ff
+
+	memcpy(tcode, time + 1, 8); tcode[8] = '\0';
+	if(tcode[2]!=':' || tcode[5]!=':') return ret_value;
+
+	unsigned int tmin, tsec, tfrm;
+	tmin = (tcode[0] & 0x0F)*10 + (tcode[1] & 0x0F); // 0-98
+	tsec = (tcode[3] & 0x0F)*10 + (tcode[4] & 0x0F); // 0-59
+	tfrm = (tcode[6] & 0x0F)*10 + (tcode[7] & 0x0F); // 0-74
+
+	return ((((tmin * 60) + tsec) * 75) + tfrm); // msf_to_lba
+}
+
+static int get_line(char *templn, const char *cue_buf, const int buf_size, const int start)
+{
+	int l = 0;
+	int len = MIN(buf_size, MAX_LINE_LEN);
+
+	int lp = start;
+	bool eol = false;
+
+	for(; lp < buf_size; lp++)
+	{
+		if(!cue_buf[lp]) break;
+
+		if(cue_buf[lp] != '\n' && cue_buf[lp] != '\r')
+		{
+			if(eol) break;
+			if(l < len) templn[l++] = cue_buf[lp];
+		}
+		else
+			eol = true;
+	}
+
+	templn[l] = '\0';
+
+	if(l) return lp;
+
+	return NONE;
+}
+
+static unsigned int parse_cue(char *templn, const char *cue_buf, const int cue_size, TrackDef *tracks)
+{
+	if(!cue_buf || !templn || !tracks) return 1; // default 1 track
+
+	unsigned int num_tracks = 0;
+
+	tracks[0].lba = 0;
+	tracks[0].is_audio = 0;
+
+	if(cue_size > 16)
+	{
+		int lba, lp = 0, off = 0, len;
+
+		int pregap = 0;
+
+		while(lp < cue_size)
+		{
+			lp = get_line(templn, cue_buf, cue_size, lp);
+
+			if(lp < 1) break;
+			if(*templn == NULL) continue;
+
+			lba = NONE;
+
+			//if(strstr(templn, "INDEX 1=")) lba = get_valuen32(templn, "INDEX 1="); else // ccd frames
+			if(strstr(templn, "INDEX 01") || strstr(templn, "INDEX 1 "))
+			{
+				len = lba = parse_lba(templn, -1); // cue msf
+				if((lba < off) || !num_tracks)
+					lba = off + pregap; // INDEX 01 is a track length, instead of lba in msf
+				else
+					len = 0;			// INDEX 01 is absolute LBA in MSF
+				off = lba + len;
+			}
+
+			if(lba < 0) continue;
+
+			if(num_tracks)
+			{
+				tracks[num_tracks].lba = lba;
+				tracks[num_tracks].is_audio = 1;
+			}
+
+			pregap = 150; // (2 * 75) -> 2 secs * 75 frames/sec
+
+			num_tracks++; if(num_tracks >= MAX_TRACKS) break;
+		}
+	}
+
+	if(!num_tracks) num_tracks++;
+
+	return num_tracks;
+}
+
+static int read_cue(char *path, TrackDef *tracks)
+{
+	char cue_buf[4096];
+	u64 cue_size = 0;
+
+	int fd;
+	if(cellFsOpen(path, CELL_FS_O_RDONLY, &fd, NULL, 0) == CELL_FS_SUCCEEDED)
+	{
+		if(cellFsRead(fd, (void *)cue_buf, 4096, &cue_size) != CELL_FS_SUCCEEDED) cue_size = 0;
+		cellFsClose(fd);
+
+		return parse_cue(path, cue_buf, cue_size, tracks);
+	}
+	else
+		return 0;
+}