Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 20:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Empty media directories are now removed when clearing or deleting games.

Browse source
This commit is contained in:
Leon Styhre 2021-01-31 19:56:55 +01:00
parent c63fc39e8d
commit 392627f1fe
2 changed files with 124 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
es-app/src/views/gamelist/BasicGameListView.cpp
View file

@ -230,27 +230,75 @@ void BasicGameListView::remove(FileData* game, bool deleteFile)
void BasicGameListView::removeMedia(FileData* game) void BasicGameListView::removeMedia(FileData* game)
{ {
std::string systemMediaDir = FileData::getMediaDirectory() + game->getSystem()->getName();
std::string mediaType;
std::string path;
// If there are no media files left in the directory after the deletion, then remove
// the directory too. Remove any empty parent directories as well.
auto removeEmptyDirFunc = []
(std::string systemMediaDir, std::string mediaType, std::string path) {
std::string parentPath = Utils::FileSystem::getParent(path);
while (parentPath != systemMediaDir + "/" + mediaType) {
if (Utils::FileSystem::getDirContent(parentPath).size() == 0) {
Utils::FileSystem::removeDirectory(parentPath);
parentPath = Utils::FileSystem::getParent(parentPath);
}
else {
break;
}
}
};
// Remove all game media files on the filesystem. // Remove all game media files on the filesystem.
if (Utils::FileSystem::exists(game->getVideoPath())) if (Utils::FileSystem::exists(game->getVideoPath())) {
Utils::FileSystem::removeFile(game->getVideoPath()); mediaType = "videos";
path = game->getVideoPath();
Utils::FileSystem::removeFile(path);
removeEmptyDirFunc(systemMediaDir, mediaType, path);
}
if (Utils::FileSystem::exists(game->getMiximagePath())) if (Utils::FileSystem::exists(game->getMiximagePath())) {
Utils::FileSystem::removeFile(game->getMiximagePath()); mediaType = "miximages";
path = game->getMiximagePath();
Utils::FileSystem::removeFile(path);
removeEmptyDirFunc(systemMediaDir, mediaType, path);
}
if (Utils::FileSystem::exists(game->getScreenshotPath())) if (Utils::FileSystem::exists(game->getScreenshotPath())) {
Utils::FileSystem::removeFile(game->getScreenshotPath()); mediaType = "screenshots";
path = game->getScreenshotPath();
Utils::FileSystem::removeFile(path);
removeEmptyDirFunc(systemMediaDir, mediaType, path);
}
if (Utils::FileSystem::exists(game->getCoverPath())) if (Utils::FileSystem::exists(game->getCoverPath())) {
Utils::FileSystem::removeFile(game->getCoverPath()); mediaType = "covers";
path = game->getCoverPath();
Utils::FileSystem::removeFile(path);
removeEmptyDirFunc(systemMediaDir, mediaType, path);
}
if (Utils::FileSystem::exists(game->getMarqueePath())) if (Utils::FileSystem::exists(game->getMarqueePath())) {
Utils::FileSystem::removeFile(game->getMarqueePath()); mediaType = "marquees";
path = game->getMarqueePath();
Utils::FileSystem::removeFile(path);
removeEmptyDirFunc(systemMediaDir, mediaType, path);
}
if (Utils::FileSystem::exists(game->get3DBoxPath())) if (Utils::FileSystem::exists(game->get3DBoxPath())) {
Utils::FileSystem::removeFile(game->get3DBoxPath()); mediaType = "3dboxes";
path = game->get3DBoxPath();
Utils::FileSystem::removeFile(path);
removeEmptyDirFunc(systemMediaDir, mediaType, path);
}
if (Utils::FileSystem::exists(game->getThumbnailPath())) if (Utils::FileSystem::exists(game->getThumbnailPath())) {
Utils::FileSystem::removeFile(game->getThumbnailPath()); mediaType = "thumbnails";
path = game->getThumbnailPath();
Utils::FileSystem::removeFile(path);
removeEmptyDirFunc(systemMediaDir, mediaType, path);
}
} }
std::vector<HelpPrompt> BasicGameListView::getHelpPrompts() std::vector<HelpPrompt> BasicGameListView::getHelpPrompts()

76
es-app/src/views/gamelist/GridGameListView.cpp
View file

@ -574,27 +574,75 @@ void GridGameListView::remove(FileData* game, bool deleteFile)
void GridGameListView::removeMedia(FileData* game) void GridGameListView::removeMedia(FileData* game)
{ {
std::string systemMediaDir = FileData::getMediaDirectory() + game->getSystem()->getName();
std::string mediaType;
std::string path;
// If there are no media files left in the directory after the deletion, then remove
// the directory too. Remove any empty parent directories as well.
auto removeEmptyDirFunc = []
(std::string systemMediaDir, std::string mediaType, std::string path) {
std::string parentPath = Utils::FileSystem::getParent(path);
while (parentPath != systemMediaDir + "/" + mediaType) {
if (Utils::FileSystem::getDirContent(parentPath).size() == 0) {
Utils::FileSystem::removeDirectory(parentPath);
parentPath = Utils::FileSystem::getParent(parentPath);
}
else {
break;
}
}
};
// Remove all game media files on the filesystem. // Remove all game media files on the filesystem.
if (Utils::FileSystem::exists(game->getVideoPath())) if (Utils::FileSystem::exists(game->getVideoPath())) {
Utils::FileSystem::removeFile(game->getVideoPath()); mediaType = "videos";
path = game->getVideoPath();
Utils::FileSystem::removeFile(path);
removeEmptyDirFunc(systemMediaDir, mediaType, path);
}
if (Utils::FileSystem::exists(game->getMiximagePath())) if (Utils::FileSystem::exists(game->getMiximagePath())) {
Utils::FileSystem::removeFile(game->getMiximagePath()); mediaType = "miximages";
path = game->getMiximagePath();
Utils::FileSystem::removeFile(path);
removeEmptyDirFunc(systemMediaDir, mediaType, path);
}
if (Utils::FileSystem::exists(game->getScreenshotPath())) if (Utils::FileSystem::exists(game->getScreenshotPath())) {
Utils::FileSystem::removeFile(game->getScreenshotPath()); mediaType = "screenshots";
path = game->getScreenshotPath();
Utils::FileSystem::removeFile(path);
removeEmptyDirFunc(systemMediaDir, mediaType, path);
}
if (Utils::FileSystem::exists(game->getCoverPath())) if (Utils::FileSystem::exists(game->getCoverPath())) {
Utils::FileSystem::removeFile(game->getCoverPath()); mediaType = "covers";
path = game->getCoverPath();
Utils::FileSystem::removeFile(path);
removeEmptyDirFunc(systemMediaDir, mediaType, path);
}
if (Utils::FileSystem::exists(game->getMarqueePath())) if (Utils::FileSystem::exists(game->getMarqueePath())) {
Utils::FileSystem::removeFile(game->getMarqueePath()); mediaType = "marquees";
path = game->getMarqueePath();
Utils::FileSystem::removeFile(path);
removeEmptyDirFunc(systemMediaDir, mediaType, path);
}
if (Utils::FileSystem::exists(game->get3DBoxPath())) if (Utils::FileSystem::exists(game->get3DBoxPath())) {
Utils::FileSystem::removeFile(game->get3DBoxPath()); mediaType = "3dboxes";
path = game->get3DBoxPath();
Utils::FileSystem::removeFile(path);
removeEmptyDirFunc(systemMediaDir, mediaType, path);
}
if (Utils::FileSystem::exists(game->getThumbnailPath())) if (Utils::FileSystem::exists(game->getThumbnailPath())) {
Utils::FileSystem::removeFile(game->getThumbnailPath()); mediaType = "thumbnails";
path = game->getThumbnailPath();
Utils::FileSystem::removeFile(path);
removeEmptyDirFunc(systemMediaDir, mediaType, path);
}
} }
std::vector<TextComponent*> GridGameListView::getMDLabels() std::vector<TextComponent*> GridGameListView::getMDLabels()