Skip to content

Commit

Permalink
webMAN MOD 1.47.47
Browse files Browse the repository at this point in the history
- Fixed duplicated entries for CUE/BIN on ROMS folders
- Now ROMS folders scan can be limited to the folders in roms_paths.txt
- USB6/USB7 now are substituted only if checked on /setup.ps3
- Added file name tags $RND$, $000$, $NEW$
- Minor improvements in core functions
  • Loading branch information
aldostools committed Sep 29, 2024
1 parent 415739e commit 9ba6688
Show file tree
Hide file tree
Showing 47 changed files with 345 additions and 136 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# These are supported funding model platforms

custom: ["https://paypal.me/aldostools", "https://donate.aldostools.org"]
custom: ["https://ko-fi.com/aldostools", "https://paypal.me/aldostools", "https://donate.aldostools.org"]
2 changes: 1 addition & 1 deletion _Make_pkg.bat
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ call make_update.bat
rd custom

set ver=1.47
set rev=46
set rev=47

move webMAN_MOD_%ver%.xx_Updater.pkg ..\..\webMAN_MOD_%ver%.%rev%_Installer.pkg
move webMAN_MOD_%ver%.xx_Updater_rebugification_theme.pkg ..\..\webMAN_MOD_%ver%.%rev%_Installer_rebugification_theme.pkg
Expand Down
2 changes: 1 addition & 1 deletion _Projects_/prepISO/include/exfat.h
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ static int dir_read (char *dpath)
ext_len = 4; if((plen > 6) && wm_path[plen - 6] == '.') ext_len = 6;// multi-part file

// remove file extension
if(!g_mmcm)
if(g_remove_ext)
{
if((plen > ext_len) && wm_path[plen - ext_len] == '.') wm_path[plen - ext_len] = 0;
}
Expand Down
Binary file modified _Projects_/prepISO/pkgfiles/PARAM.SFO
Binary file not shown.
4 changes: 3 additions & 1 deletion _Projects_/prepISO/source/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ static uint32_t num_tracks;
static uint8_t g_profile;
static uint8_t g_mode;
static uint8_t g_mmcm;
static uint8_t g_remove_ext;

static rawseciso_args *p_args;
static int cd_sector_size, cd_sector_size_param;
Expand Down Expand Up @@ -161,6 +162,7 @@ int main(int argc, const char* argv[])
sysFsChmod(path, S_IFDIR | 0777);

g_mmcm = 0;
g_remove_ext = !g_mmcm

if(argc > 0 && argv)
{
Expand Down Expand Up @@ -332,7 +334,7 @@ int main(int argc, const char* argv[])
if( is_iso )
{
size_t path_len;
if(!g_mmcm) filename[flen - ext_len] = '\0';
if(g_remove_ext) filename[flen - ext_len] = '\0';
path_len = snprintf(path, sizeof(path), "%s:/%s%s%s/%s", mounts[i].name, prefix[p], c_path[m], SUFIX(profile), direntry);

//--- PS3ISO: fix game, cache SFO, ICON0 and PIC1 (if mmCM is installed)
Expand Down
2 changes: 1 addition & 1 deletion _Projects_/updater/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ DATA := data
INCLUDES := include
PKGFILES := $(CURDIR)/pkgfiles

TITLE := webMAN MOD 1.47.46 Installer [Hold R1 for VSH Menu, L1 for Full Edition, X for Lite Edition]
TITLE := webMAN MOD 1.47.47 Installer [Hold R1 for VSH Menu, L1 for Full Edition, X for Lite Edition]
APPID := UPDWEBMOD
CONTENTID := EP0001-$(APPID)_00-0000000000000000

Expand Down
Binary file modified _Projects_/updater/pkgfiles/PARAM.SFO
Binary file not shown.
2 changes: 1 addition & 1 deletion _Projects_/updater/pkgfiles/USRDIR/html/fs.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function t2lnks(){
var dev2 =/(\/\b(dev_+.*))/ig;
var htab = txt.innerHTML.indexOf("\t") > 0;
var count = txt.innerHTML.split("\n").length - 1;
txt.innerHTML = "<a href='/'><b>webMAN MOD</b> 1.47.46</a><HR>"+
txt.innerHTML = "<a href='/'><b>webMAN MOD</b> 1.47.47</a><HR>"+
"<style>td+td{width:100px;}</style><table>" +
txt.innerHTML
.replace(url, "<tr><td><a href='$1'>$1</td></tr>")
Expand Down
4 changes: 2 additions & 2 deletions _Projects_/updater/pkgfiles/USRDIR/html/help.html

Large diffs are not rendered by default.

32 changes: 20 additions & 12 deletions _Projects_/updater/pkgfiles/USRDIR/html/links.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
<head>
<title>wMAN MOD 1.47.46</title>
<title>wMAN MOD 1.47.47</title>
<link rel="stylesheet" type="text/css" href="sman.css"/>
<script src="jquery.min.js"></script>
<script src="jquery-ui.min.js"></script>
Expand All @@ -19,6 +19,11 @@
<div id="rhtm"><H1 id="msg2">Loading Games <script>dot();</script></H1></div>
<div id="wmsg"><H1><script>dot();</script></H1></div>

<style>
div h2{line-height: 0.5;}
div li{line-height: 1.6;}
</style>

<script>
function find()
{
Expand Down Expand Up @@ -99,41 +104,44 @@
<H2><ul><li><a href="http://ps3.aldostools.org/webMAN_MOD_latest.pkg">webMAN_MOD_latest.pkg</a> (<a href="http://ps3.aldostools.org/webMAN_MOD_latest.pkg">Update only</a>)<br></H2>
<ul>
<H3>
<li><a href="https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/webMAN_MOD_1.47.46_Installer.pkg">webMAN_MOD_1.47.46_Installer.pkg</a> (<a href="https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/webMAN_MOD_1.47.46_Installer.pkg">full installer</a>)
<li><a href="https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/prepISO_1.33.pkg">prepISO_1.33.pkg</a><br>
<li><a href="https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/PS2CONFIG.pkg">PS2CONFIG.pkg</a><br>
<li><a href="https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/PS2_Classics_Launcher.pkg">PS2_Classics_Launcher.pkg</a><br>
<li><a href="https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/PSP_Minis_Launcher.pkg">PSP_Minis_Launcher.pkg</a><br>
<li><a href="https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/PSP_Remasters_Launcher.pkg">PSP_Remasters_Launcher.pkg</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/download/Launchers/load_wmm.pkg">Load_wMM.pkg</a> - webMAN_MOD from XMB<br>
<li><a href="https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/webMAN_MOD_1.47.47_Installer.pkg">webMAN_MOD_1.47.47_Installer.pkg</a> (<a href="https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/webMAN_MOD_1.47.47_Installer.pkg">full installer</a>)
<li><a href="https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/prepISO_1.33.pkg">prepISO_1.33.pkg</a><br>
<li><a href="https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/PS2CONFIG.pkg">PS2CONFIG.pkg</a><br>
<li><a href="https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/PS2_Classics_Launcher.pkg">PS2_Classics_Launcher.pkg</a><br>
<li><a href="https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/PSP_Minis_Launcher.pkg">PSP_Minis_Launcher.pkg</a><br>
<li><a href="https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/PSP_Remasters_Launcher.pkg">PSP_Remasters_Launcher.pkg</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/download/Launchers/load_wmm.pkg">Load_wMM.pkg</a> - Load webMAN_MOD from XMB<br>

<p>
<H2>Covers</H2>
<li><a href="https://github.com/aldostools/Resources/releases/download/1.0/EP0001-BLES80608_00-COVERS0000000000.pkg">Covers Pack for PS3 Games</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/download/1.0/EP0001-BLES80608_00-COVERS00000RETRO.pkg">Covers Pack for PSX/PS2 Games</a><br>

<H2>Resources</H2>
<li><a href="https://github.com/aldostools/Resources/releases/tag/WebApps">Web Apps</a><br>
<li><a href="https://github.com/aldostools/resources/releases/multiMAN">multiMAN Resources</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/tag/MODS">Custom Firmware MODs</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/tag/Payloads">Mamba + PS3HEN Payloads</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/tag/MODS">Custom Firmware MODs</a><br>

<td valign=top>
<H2>Apps</H2>
<li><a href="https://github.com/aldostools/Resources/releases/download/Addons/movianM7-deank-playstation3.pkg">Movian.pkg</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/download/RetroArch_CE/RetroArch_CE.pkg">RetroArch_CE.pkg</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/download/Addons/movianM7-deank-playstation3.pkg">movianM7.pkg</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/download/Addons/multiMAN.pkg">multiMAN.pkg</a><br>
<li><a href="https://github.com/aldostools/IRISMAN/releases/download/4.91/IRISMAN_4.91.pkg">IRISMAN_4.91.pkg</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/download/Addons/apollo-ps3.pkg">Apollo-PS3.pkg</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/download/Addons/ArtemisPS3-GUI.pkg">ArtemisPS3-GUI.pkg</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/download/Addons/pkgi-ps3.pkg">pkgi-ps3.pkg</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/download/Addons/ps3-ezremote-client.pkg">PS3 ezRemote Client</a><br>
<p>
<li><a href="https://github.com/aldostools/Resources/releases/download/Addons/Simple_File_Manager_MOD.pkg">Simple File Manager MOD</a><br>

<H2>wMM Themes</H2>
<li><a href="https://github.com/aldostools/Resources/releases/download/Themes/wm_theme_colorful.pkg">wm_theme_colorful.pkg</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/download/Themes/wm_theme_OtakuBoy.pkg">wm_theme_OtakuBoy.pkg</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/download/Themes/wm_theme_flowerification.pkg">wm_theme_flowerification.pkg</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/download/Themes/wm_theme_metalification.pkg">wm_theme_metalification.pkg</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/download/Themes/wm_theme_rebugification.pkg">wm_theme_rebugification.pkg</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/download/Themes/wm_theme_standard.pkg">wm_theme_standard.pkg</a><br>

<H2>XMB Mods</H2>
<li><a href="https://github.com/aldostools/Resources/releases/download/XMB_Randomizers/Ultimate_Toolbox_for_4.89-4.91_BETA.pkg">Ultimate_Toolbox_for_4.89-4.91_BETA.pkg</a><br>
<li><a href="https://github.com/aldostools/Resources/releases/download/XMB_Randomizers/Ultimate_Toolbox_v2.03_FULL_version.pkg">Ultimate_Toolbox_v2.03_FULL_version.pkg</a> for 4.84-4.88<br>
Expand Down
2 changes: 1 addition & 1 deletion _Projects_/updater/pkgfiles/USRDIR/html/mobile.html
Original file line number Diff line number Diff line change
Expand Up @@ -1977,7 +1977,7 @@
</div>

<div id="menu" style="display:none;">
<div id="header"><a id="nav-close" href="javascript:void(0)" onclick="hideMenu();"><span style="position:absolute;left:10px">&#9664;</span> webMAN MOD 1.47.46</a></div>
<div id="header"><a id="nav-close" href="javascript:void(0)" onclick="hideMenu();"><span style="position:absolute;left:10px">&#9664;</span> webMAN MOD 1.47.47</a></div>
<div id="wrapper-menu">
<div id="scroller">
<ul id="thelist">
Expand Down
2 changes: 1 addition & 1 deletion _Projects_/updater/pkgfiles/USRDIR/html/sman.htm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
<head>
<title>wMAN MOD 1.47.46</title>
<title>wMAN MOD 1.47.47</title>
<link rel="stylesheet" type="text/css" href="/dev_hdd0/xmlhost/game_plugin/sman.css"/>
<script src="/dev_hdd0/xmlhost/game_plugin/jquery.min.js"></script>
<script src="/dev_hdd0/xmlhost/game_plugin/jquery-ui.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion _Projects_/updater/pkgfiles/USRDIR/res/roms_extensions.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.BIN.ISO.CUE.CCD.IMG.CHD.ZIP.7Z
.CUE.CCD.BIN.ISO.IMG.CHD.ZIP.7Z
.NES.GB.GBC.GBA.SMC.FIG.SFC.FDS.UNF.UNIF
.MD.SMD.GEN.32X.SMS.GG.SG.CGB.SGB.DMG
.IOS.FLAC.NGP.NGC.NGPC.NPC.PCE.SGX.VB.VBOY.WS.WSC.PC2
Expand Down
99 changes: 99 additions & 0 deletions _Projects_/updater/pkgfiles/USRDIR/res/roms_paths.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
2048
CAP32
MAME
MAME2000
MAME2003
MIDWAY
MAMEPLUS
FBA
FBA2012
FBNEO
ATARI
ATARI2600
STELLA
ATARI800
ATARI5200
ATARI7800
JAGUAR
LYNX
HANDY
HATARI
CANNONBALL
NXENGINE
COLECO
AMIGA
CD32
VICE
X64
X64SC
X64DTV
XSCPU64
X128
XCBM2
XCMB25X0
XPET
XPLUS4
XVIC
DOSBOX
GME
GW
DOOM
QUAKE
JAVAME
JUMP
O2EM
INTV
MSX
FMSX
MSX2
BMSX
NEOCD
NEO
NEOGEO
PCE
PCECD
PCFX
SGX
NGP
NGPC
NES
FCEUMM
NESTOPIA
QNES
GB
GBC
GAMBATTE
TGBDUAL
GBA
VBA
MGBA
VBOY
PALM
PSXISO
PS2ISO
PS3ISO
PSPISO
POKEMINI
SCUMMVM
GENESIS
GEN
SEGACD
MEGAD
MEGADRIVE
GG
GEARBOY
MASTER
PICO
SG1000
FUSE
ZX81
SNES
MSNES
SNES9X
SNES9X2005
SNES9X2010
SNES9X_NEXT
THEODORE
VECX
WSWAM
WSWAMC
Binary file modified _Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx
Binary file not shown.
Binary file modified _Projects_/updater/pkgfiles/USRDIR/webftp_server_lite.sprx
Binary file not shown.
Binary file modified _Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx
Binary file not shown.
Binary file not shown.
24 changes: 12 additions & 12 deletions _Projects_/updater/pkgfiles/USRDIR/xml/wm_apps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@
<A>
<T key="pkg_link">
<P key="info"><>net_package_install</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/prepISO_1.33.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/prepISO_1.33.pkg</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/prepISO_1.33.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/prepISO_1.33.pkg</></P>
<P key="content_name"><>msg_install</></P>
<P key="content_id"><>UP0001-BLES80616_00-0000000000000000</></P>
<P key="prod_pict_path"><>/dev_hdd0//game/XMBMANPLS/USRDIR/IMAGES/package.png</></P>
Expand All @@ -141,8 +141,8 @@
<A>
<T key="pkg_link">
<P key="info"><>net_package_install</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/PS2CONFIG.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/PS2CONFIG.pkg</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/PS2CONFIG.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/PS2CONFIG.pkg</></P>
<P key="content_name"><>msg_install</></P>
<P key="content_id"><>CUSTOM-PS2CONFIG_00-0000000000000000</></P>
<P key="prod_pict_path"><>/dev_hdd0//game/XMBMANPLS/USRDIR/IMAGES/package.png</></P>
Expand All @@ -156,8 +156,8 @@
<A>
<T key="pkg_link">
<P key="info"><>net_package_install</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/PS2_Classics_Launcher.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/PS2_Classics_Launcher.pkg</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/PS2_Classics_Launcher.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/PS2_Classics_Launcher.pkg</></P>
<P key="content_name"><>msg_install</></P>
<P key="content_id"><>2P0001-PS2U10000_00-0000111122223333</></P>
<P key="prod_pict_path"><>/dev_hdd0//game/XMBMANPLS/USRDIR/IMAGES/webman.png</></P>
Expand All @@ -171,8 +171,8 @@
<A>
<T key="pkg_link">
<P key="info"><>net_package_install</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/PSP_Minis_Launcher.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/PSP_Minis_Launcher.pkg</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/PSP_Minis_Launcher.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/PSP_Minis_Launcher.pkg</></P>
<P key="content_name"><>msg_install</></P>
<P key="content_id"><>UP0001-PSPM66820_00-0000111122223333</></P>
<P key="prod_pict_path"><>/dev_hdd0//game/XMBMANPLS/USRDIR/IMAGES/package.png</></P>
Expand All @@ -186,8 +186,8 @@
<A>
<T key="pkg_link">
<P key="info"><>net_package_install</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/PSP_Remasters_Launcher.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/PSP_Remasters_Launcher.pkg</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/PSP_Remasters_Launcher.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/PSP_Remasters_Launcher.pkg</></P>
<P key="content_name"><>msg_install</></P>
<P key="content_id"><>UP0001-PSPC66820_00-0000111122223333</></P>
<P key="prod_pict_path"><>/dev_hdd0//game/XMBMANPLS/USRDIR/IMAGES/package.png</></P>
Expand Down Expand Up @@ -411,8 +411,8 @@
<A>
<T key="pkg_link">
<P key="info"><>net_package_install</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/webMAN_MOD_1.47.46_Installer.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.46/webMAN_MOD_1.47.46_Installer.pkg</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/webMAN_MOD_1.47.47_Installer.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.47/webMAN_MOD_1.47.47_Installer.pkg</></P>
<P key="content_name"><>msg_install</></P>
<P key="content_id"><>EP0001-UPDWEBMOD_00-0000000000000000</></P>
<P key="prod_pict_path"><>/dev_hdd0//game/XMBMANPLS/USRDIR/IMAGES/webman.png</></P>
Expand Down
2 changes: 2 additions & 0 deletions _Projects_/updater/source/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,8 @@ int main()
file_copy(APP_USRDIR "/res/wm_ignore.txt", RES_DIR "/wm_ignore.txt");
if(not_exists(RES_DIR "/roms_extensions.txt"))
file_copy(APP_USRDIR "/res/roms_extensions.txt", RES_DIR "/roms_extensions.txt");
if(not_exists(RES_DIR "/roms_paths.txt"))
file_copy(APP_USRDIR "/res/roms_paths.txt", RES_DIR "/roms_paths.txt");
if(not_exists(RES_DIR "/ps1_bios.bin"))
file_copy(APP_USRDIR "/res/ps1_bios.bin", RES_DIR "/ps1_bios.bin");

Expand Down
Loading

0 comments on commit 9ba6688

Please sign in to comment.