qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-22 06:07:30 +02:00
Code

Create section directory just before writing files to it

Browse Source 
Previously, section directories would be created when the section was
added.
This commit is contained in:
Maarten ter Huurne 2015-04-22 18:46:03 +02:00
parent 9ac3351aa5
commit 08ecd7d8d9
3 changed files with 71 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gmenu2x.cpp
View File

@ -1026,13 +1026,10 @@ void GMenu2X::deleteLink() {
void GMenu2X::addSection() {
InputDialog id(*this, input, ts, tr["Insert a name for the new section"]);
if (id.exec()) {
//only if a section with the same name does not exist
if (find(menu->getSections().begin(), menu->getSections().end(), id.getInput())
== menu->getSections().end()) {
//section directory doesn't exists
if (menu->addSection(id.getInput()))
menu->setSectionIndex( menu->getSections().size()-1 ); //switch to the new section
}
// Look up section; create if it doesn't exist yet.
auto idx = menu->sectionNamed(id.getInput());
// Switch to the new section.
menu->setSectionIndex(idx);
}
}

90
src/menu.cpp
View File

@ -28,6 +28,8 @@
#include <unistd.h>
#include <ini.h>
#include <cassert>
#include <cerrno>
#include <cstring>
#ifdef HAVE_LIBOPK
#include <opk.h>
@ -129,6 +131,23 @@ void Menu::readSections(std::string parentDir)
closedir(dirp);
}
string Menu::createSectionDir(string const& sectionName)
{
string parentDir = GMenu2X::getHome() + "/sections";
if (mkdir(parentDir.c_str(), 0755) && errno != EEXIST) {
WARNING("Failed to create parent sections dir: %s\n", strerror(errno));
return "";
}
string childDir = parentDir + "/" + sectionName;
if (mkdir(parentDir.c_str(), 0755) && errno != EEXIST) {
WARNING("Failed to create child section dir: %s\n", strerror(errno));
return "";
}
return childDir;
}
void Menu::skinUpdated() {
ConfIntHash &skinConfInt = gmenu2x.skinConfInt;
@ -404,12 +423,13 @@ void Menu::addActionLink(uint section, const string &title, Action action, const
links[section].push_back(link);
}
bool Menu::addLink(string path, string file, string section) {
if (section.empty()) {
section = selSection();
} else if (find(sections.begin(),sections.end(),section)==sections.end()) {
//section directory doesn't exists
if (!addSection(section))
bool Menu::addLink(string path, string file, string sectionName) {
if (sectionName.empty()) {
sectionName = selSection();
}
string sectionDir = createSectionDir(sectionName);
if (sectionDir.empty()) {
return false;
}
@ -422,25 +442,14 @@ bool Menu::addLink(string path, string file, string section) {
title = title.substr(0, pos);
}
string linkpath = GMenu2X::getHome() + "/sections";
if (!fileExists(linkpath))
mkdir(linkpath.c_str(), 0755);
linkpath = GMenu2X::getHome() + "/sections/" + section;
if (!fileExists(linkpath))
mkdir(linkpath.c_str(), 0755);
linkpath += "/" + title;
string linkpath = sectionDir + "/" + title;
int x = 2;
while (fileExists(linkpath)) {
stringstream ss;
linkpath = "";
ss << x;
ss << sectionDir << '/' << title << x;
ss >> linkpath;
linkpath = GMenu2X::getHome()+"/sections/"+section+"/"+title+linkpath;
x++;
}
INFO("Adding link: '%s'\n", linkpath.c_str());
if (path[path.length()-1]!='/') path += "/";
@ -490,15 +499,11 @@ bool Menu::addLink(string path, string file, string section) {
if (!manual.empty()) f << "manual=" << manual << endl;
f.close();
sync();
int isection = find(sections.begin(),sections.end(),section) - sections.begin();
if (isection>=0 && isection<(int)sections.size()) {
INFO("Section: '%s(%i)'\n", sections[isection].c_str(), isection);
LinkApp* link = new LinkApp(gmenu2x, linkpath, true);
auto idx = sectionNamed(sectionName);
auto link = new LinkApp(gmenu2x, linkpath, true);
link->setSize(gmenu2x.skinConfInt["linkWidth"], gmenu2x.skinConfInt["linkHeight"]);
links[isection].push_back( link );
}
links[idx].push_back(link);
} else {
ERROR("Error while opening the file '%s' for write.\n", linkpath.c_str());
@ -509,19 +514,15 @@ bool Menu::addLink(string path, string file, string section) {
return true;
}
bool Menu::addSection(const string &sectionName) {
string sectiondir = GMenu2X::getHome() + "/sections";
if (!fileExists(sectiondir))
mkdir(sectiondir.c_str(), 0755);
sectiondir = sectiondir + "/" + sectionName;
if (mkdir(sectiondir.c_str(), 0755) == 0) {
sections.push_back(sectionName);
vector<Link*> ll;
links.push_back(ll);
return true;
int Menu::sectionNamed(const char *sectionName)
{
auto it = find(sections.begin(), sections.end(), sectionName);
int idx = it - sections.begin();
if (it == sections.end()) {
sections.emplace_back(sectionName);
links.emplace_back();
}
return false;
return idx;
}
void Menu::deleteSelectedLink()
@ -669,10 +670,8 @@ void Menu::openPackage(std::string path, bool order)
}
for (;;) {
unsigned int i;
bool has_metadata = false;
const char *name;
LinkApp *link;
for (;;) {
string::size_type pos;
@ -704,16 +703,11 @@ void Menu::openPackage(std::string path, bool order)
// Note: OPK links can only be deleted by removing the OPK itself,
// but that is not something we want to do in the menu,
// so consider this link undeletable.
link = new LinkApp(gmenu2x, path, false, opk, name);
auto link = new LinkApp(gmenu2x, path, false, opk, name);
link->setSize(gmenu2x.skinConfInt["linkWidth"], gmenu2x.skinConfInt["linkHeight"]);
addSection(link->getCategory());
for (i = 0; i < sections.size(); i++) {
if (sections[i] == link->getCategory()) {
links[i].push_back(link);
break;
}
}
auto idx = sectionNamed(link->getCategory());
links[idx].push_back(link);
}
opk_close(opk);

24
src/menu.h
View File

@ -92,6 +92,13 @@ private:
void readLinksOfSection(std::vector<Link*>& links,
std::string const& path, bool deletable);
/**
* Attempts to creates a section directory if it does not exist yet.
* @return The full path of the section directory, or the empty string
* if the directory could not be created.
*/
std::string createSectionDir(std::string const& sectionName);
void decSectionIndex();
void incSectionIndex();
void linkLeft();
@ -120,8 +127,21 @@ public:
void addActionLink(uint section, const std::string &title,
Action action, const std::string &description="",
const std::string &icon="");
bool addLink(std::string path, std::string file, std::string section="");
bool addSection(const std::string &sectionName);
bool addLink(std::string path, std::string file, std::string sectionName="");
/**
* Looks up a section by name, adding it if it doesn't exist yet.
* @return The index of the section.
*/
int sectionNamed(const char *sectionName);
/**
* Looks up a section by name, adding it if it doesn't exist yet.
* @return The index of the section.
*/
int sectionNamed(const std::string &sectionName) {
return sectionNamed(sectionName.c_str());
}
void deleteSelectedLink();
void deleteSelectedSection();