The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-27 21:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

- added option to use multiple homebrew plugins each with it's own romdir=. first six characters of magic# must be 484252. the last to can be random.

Browse Source
This commit is contained in:
Fledge68 2019-02-07 18:34:30 -06:00
parent bdefd48cbb
commit 7924720c1e
5 changed files with 43 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
out/bins/ext_booter.bin
View File

Binary file not shown.

BIN
out/boot.dol
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 MiB

After

Width:  |  Height:  |  Size: 3.3 MiB

4
source/defines.h
View File

@ -6,7 +6,7 @@
#else #else
#define APP_NAME "WiiFlow Lite" #define APP_NAME "WiiFlow Lite"
#endif #endif
#define APP_VERSION "5.1.0" #define APP_VERSION "5.2.0"
#define APP_DATA_DIR "wiiflow" #define APP_DATA_DIR "wiiflow"
#ifdef APP_WIIFLOW #ifdef APP_WIIFLOW
@ -17,7 +17,7 @@
//#define EMU_NANDS_DIR "nands" //#define EMU_NANDS_DIR "nands"
#define GAMES_DIR "%s:/wbfs" #define GAMES_DIR "%s:/wbfs"
#define HOMEBREW_DIR "%s:/apps" #define HOMEBREW_DIR "apps"
#define DF_GC_GAMES_DIR "%s:/games" #define DF_GC_GAMES_DIR "%s:/games"
#define CFG_FILENAME "wiiflow_lite.ini" #define CFG_FILENAME "wiiflow_lite.ini"
#define CAT_FILENAME "categories_lite.ini" #define CAT_FILENAME "categories_lite.ini"

101
source/menu/menu.cpp
View File

@ -2236,7 +2236,7 @@ bool CMenu::_loadList(void)
} }
if(m_current_view == COVERFLOW_HOMEBREW) if(m_current_view == COVERFLOW_HOMEBREW)
{ {
_loadHomebrewList(); _loadHomebrewList(HOMEBREW_DIR);
gprintf("Apps found: %i\n", m_gameList.size()); gprintf("Apps found: %i\n", m_gameList.size());
m_cacheList.Clear(); m_cacheList.Clear();
return m_gameList.size() > 0 ? true : false; return m_gameList.size() > 0 ? true : false;
@ -2281,14 +2281,14 @@ bool CMenu::_loadWiiList(void)
return true; return true;
} }
bool CMenu::_loadHomebrewList() bool CMenu::_loadHomebrewList(const char *HB_Dir)
{ {
currentPartition = m_cfg.getInt(HOMEBREW_DOMAIN, "partition", SD); currentPartition = m_cfg.getInt(HOMEBREW_DOMAIN, "partition", SD);
if(!DeviceHandle.IsInserted(currentPartition)) if(!DeviceHandle.IsInserted(currentPartition))
return false; return false;
gprintf("Adding homebrew list\n"); gprintf("Adding homebrew list\n");
string gameDir(fmt(HOMEBREW_DIR, DeviceName[currentPartition])); string gameDir(fmt("%s:/%s", DeviceName[currentPartition], HB_Dir));
m_cacheList.CreateList(COVERFLOW_HOMEBREW, currentPartition, gameDir, stringToVector(".dol|.elf", '|'), std::string(), false); m_cacheList.CreateList(COVERFLOW_HOMEBREW, currentPartition, gameDir, stringToVector(".dol|.elf", '|'), std::string(), false);
for(vector<dir_discHdr>::iterator tmp_itr = m_cacheList.begin(); tmp_itr != m_cacheList.end(); tmp_itr++) for(vector<dir_discHdr>::iterator tmp_itr = m_cacheList.begin(); tmp_itr != m_cacheList.end(); tmp_itr++)
m_gameList.push_back(*tmp_itr); m_gameList.push_back(*tmp_itr);
@ -2354,12 +2354,8 @@ bool CMenu::_loadChannelList(void)
bool CMenu::_loadPluginList() bool CMenu::_loadPluginList()
{ {
bool addHomebrew = false;
bool addGamecube = false;
bool addWii = false;
bool addChannel = false;
bool updateCache = m_cfg.getBool(PLUGIN_DOMAIN, "update_cache"); bool updateCache = m_cfg.getBool(PLUGIN_DOMAIN, "update_cache");
int channels_type = m_cfg.getInt(CHANNEL_DOMAIN, "channels_type", CHANNELS_REAL);
gprintf("Adding plugins list\n"); gprintf("Adding plugins list\n");
for(u8 i = 0; m_plugin.PluginExist(i); ++i) for(u8 i = 0; m_plugin.PluginExist(i); ++i)
{ {
@ -2375,41 +2371,51 @@ bool CMenu::_loadPluginList()
const char *romDir = m_plugin.GetRomDir(i); const char *romDir = m_plugin.GetRomDir(i);
if(strcasecmp(romDir, "scummvm.ini") != 0) if(strcasecmp(romDir, "scummvm.ini") != 0)
{ {
if(strncasecmp(m_plugin.PluginMagicWord, "48425257", 8) == 0)//HBRW if(strncasecmp(m_plugin.PluginMagicWord, "484252", 6) == 0)//HBRW
{ {
addHomebrew = true; if(updateCache)
continue; m_cfg.setBool(HOMEBREW_DOMAIN, "update_cache", true);
_loadHomebrewList(romDir);
} }
if(strncasecmp(m_plugin.PluginMagicWord, "4E47434D", 8) == 0)//NGCM else if(strncasecmp(m_plugin.PluginMagicWord, "4E47434D", 8) == 0)//NGCM
{ {
addGamecube = true; if(updateCache)
continue; m_cfg.setBool(GC_DOMAIN, "update_cache", true);
_loadGamecubeList();
} }
if(strncasecmp(m_plugin.PluginMagicWord, "4E574949", 8) == 0)//NWII else if(strncasecmp(m_plugin.PluginMagicWord, "4E574949", 8) == 0)//NWII
{ {
addWii = true; if(updateCache)
continue; m_cfg.setBool(WII_DOMAIN, "update_cache", true);
_loadWiiList();
} }
if(strncasecmp(m_plugin.PluginMagicWord, "4E414E44", 8) == 0)//NAND else if(strncasecmp(m_plugin.PluginMagicWord, "4E414E44", 8) == 0)//NAND
{ {
addChannel = true; //addChannel = CHANNELS_REAL; if(updateCache)
continue; m_cfg.setBool(CHANNEL_DOMAIN, "update_cache", true);
m_cfg.setInt(CHANNEL_DOMAIN, "channels_type", CHANNELS_REAL);
_loadChannelList();
} }
if(strncasecmp(m_plugin.PluginMagicWord, "454E414E", 8) == 0)//ENAN else if(strncasecmp(m_plugin.PluginMagicWord, "454E414E", 8) == 0)//ENAN
{ {
addChannel = true; //addEmuChannel = CHANNELS_EMU; if(updateCache)
continue; m_cfg.setBool(CHANNEL_DOMAIN, "update_cache", true);
m_cfg.setInt(CHANNEL_DOMAIN, "channels_type", CHANNELS_EMU);
_loadChannelList();
}
else
{
string gameDir(fmt("%s:/%s", DeviceName[currentPartition], romDir));
string cacheDir(fmt("%s/%s_%s.db", m_listCacheDir.c_str(), DeviceName[currentPartition], m_plugin.PluginMagicWord));
if(updateCache || !fsop_FileExist(cacheDir.c_str()))
cacheCovers = true;
vector<string> FileTypes = stringToVector(m_plugin.GetFileTypes(i), '|');
m_cacheList.Color = m_plugin.GetCaseColor(i);
m_cacheList.Magic = Magic;
m_cacheList.CreateList(COVERFLOW_PLUGIN, currentPartition, gameDir, FileTypes, cacheDir, updateCache);
for(vector<dir_discHdr>::iterator tmp_itr = m_cacheList.begin(); tmp_itr != m_cacheList.end(); tmp_itr++)
m_gameList.push_back(*tmp_itr);
} }
string gameDir(fmt("%s:/%s", DeviceName[currentPartition], romDir));
string cacheDir(fmt("%s/%s_%s.db", m_listCacheDir.c_str(), DeviceName[currentPartition], m_plugin.PluginMagicWord));
if(updateCache || !fsop_FileExist(cacheDir.c_str()))
cacheCovers = true;
vector<string> FileTypes = stringToVector(m_plugin.GetFileTypes(i), '|');
m_cacheList.Color = m_plugin.GetCaseColor(i);
m_cacheList.Magic = Magic;
m_cacheList.CreateList(COVERFLOW_PLUGIN, currentPartition, gameDir, FileTypes, cacheDir, updateCache);
for(vector<dir_discHdr>::iterator tmp_itr = m_cacheList.begin(); tmp_itr != m_cacheList.end(); tmp_itr++)
m_gameList.push_back(*tmp_itr);
} }
else else
{ {
@ -2423,35 +2429,8 @@ bool CMenu::_loadPluginList()
vector<dir_discHdr>().swap(scummvmList); vector<dir_discHdr>().swap(scummvmList);
} }
} }
if(addHomebrew)
{
if(updateCache)
m_cfg.setBool(HOMEBREW_DOMAIN, "update_cache", true);
_loadHomebrewList();
}
if(addGamecube)
{
if(updateCache)
m_cfg.setBool(GC_DOMAIN, "update_cache", true);
_loadGamecubeList();
}
if(addWii)
{
if(updateCache)
m_cfg.setBool(WII_DOMAIN, "update_cache", true);
_loadWiiList();
}
if(addChannel)
{
if(updateCache)
m_cfg.setBool(CHANNEL_DOMAIN, "update_cache", true);
_loadChannelList();
}
m_cfg.remove(PLUGIN_DOMAIN, "update_cache"); m_cfg.remove(PLUGIN_DOMAIN, "update_cache");
m_cfg.setInt(CHANNEL_DOMAIN, "channels_type", channels_type);
return true; return true;
} }

2
source/menu/menu.hpp
View File

@ -879,7 +879,7 @@ private:
bool _loadGamecubeList(void); bool _loadGamecubeList(void);
bool _loadChannelList(void); bool _loadChannelList(void);
bool _loadPluginList(void); bool _loadPluginList(void);
bool _loadHomebrewList(void); bool _loadHomebrewList(const char *HB_Dir);
void _initCF(void); void _initCF(void);
// //
void _initBoot(void); void _initBoot(void);