TDE
/
tdeio-appinfo
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeio-appinfo
0
0
Fork 0
Code Issues Releases Wiki Activity

Added XDG config folder.

Browse Source 
Fixed up folder/file lookup for TDE config.
Removed unused code.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
r14.0.x
Michele Calgaro 2 years ago
parent ffa531ae90
commit 7d244de215
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 80 additions and 87 deletions
Show Stats Download Patch File Download Diff File

161
src/appimpl.cpp
Unescape View File

@ -23,8 +23,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <tqapplication.h>
#include <tqeventloop.h>
#include <tqmap.h> #include <tqmap.h>
#include <kdebug.h> #include <kdebug.h>
@ -105,26 +103,11 @@ bool AppImpl::parseURL(const KURL &url, TQString &name, TQString &path) const
return !name.isEmpty(); return !name.isEmpty();
} }
bool AppImpl::realURL(const TQString &name, const TQString &path, KURL &url) const
{
url = findBaseURL(name);
if (!url.isValid())
{
return false;
}
url.addPath(path);
return true;
}
bool AppImpl::statByName(const TQString &filename, TDEIO::UDSEntry &entry) bool AppImpl::statByName(const TQString &filename, TDEIO::UDSEntry &entry)
{ {
kdDebug() << "AppImpl::statByName" << endl; kdDebug() << "AppImpl::statByName" << endl;
TQStringList dirList; TQStringList dirList = TQStringList::split(":", getenv("PATH"));
dirList << "/usr/bin/";
dirList << "/usr/local/bin/";
dirList << "/opt/trinity/bin/";
TQStringList names_found; TQStringList names_found;
for (const TQString &dirname : dirList) for (const TQString &dirname : dirList)
@ -149,41 +132,6 @@ bool AppImpl::statByName(const TQString &filename, TDEIO::UDSEntry &entry)
return false; return false;
} }
KURL AppImpl::findBaseURL(const TQString &filename) const
{
kdDebug() << "AppImpl::findBaseURL" << endl;
TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries");
for (const TQString &dirname : dirList)
{
TQDir dir(dirname);
if (!dir.exists())
{
continue;
}
TQStringList filenames = dir.entryList(TQDir::Files | TQDir::Readable);
TDEIO::UDSEntry entry;
for (const TQString &fname : filenames)
{
if (fname == filename + ".desktop")
{
KDesktopFile desktop(dirname + fname, true);
if (desktop.readURL().isEmpty())
{
KURL url;
url.setPath(desktop.readPath());
return url;
}
return desktop.readURL();
}
}
}
return KURL();
}
static void addAtom(TDEIO::UDSEntry &entry, unsigned int ID, long l, static void addAtom(TDEIO::UDSEntry &entry, unsigned int ID, long l,
const TQString &s = TQString::null) const TQString &s = TQString::null)
{ {
@ -330,7 +278,6 @@ void AppImpl::createStandardDataDirEntry(TQValueList<TDEIO::UDSEntry> &list,
TQStringList dirList; TQStringList dirList;
dirList << "/usr/share/"; dirList << "/usr/share/";
dirList << "/usr/local/share/"; dirList << "/usr/local/share/";
dirList << "/opt/trinity/share/";
TQStringList StandardDataDir = getFullLocation(dirList, shortname, TQStringList StandardDataDir = getFullLocation(dirList, shortname,
TQDir::FilterSpec(TQDir::Files | TQDir::Dirs | TQDir::Readable), true, false); TQDir::FilterSpec(TQDir::Files | TQDir::Dirs | TQDir::Readable), true, false);
if (StandardDataDir.isEmpty()) if (StandardDataDir.isEmpty())
@ -359,13 +306,33 @@ void AppImpl::createStandardDataDirEntry(TQValueList<TDEIO::UDSEntry> &list,
void AppImpl::createTDEConfigEntry(TQValueList<TDEIO::UDSEntry> &list, void AppImpl::createTDEConfigEntry(TQValueList<TDEIO::UDSEntry> &list,
TDEIO::UDSEntry &entry, const TQString &shortname) TDEIO::UDSEntry &entry, const TQString &shortname)
{ {
// Global TDE config
TQStringList dirList;
dirList << "/etc/trinity/";
TQStringList TDEConfigFiles = getFullLocation(dirList, shortname + "rc",
TQDir::FilterSpec(TQDir::Files | TQDir::Dirs | TQDir::Readable), false, true);
for (const TQString &filename : TDEConfigFiles)
{
if (!filename.isEmpty())
{
entry.clear();
addAtom(entry, TDEIO::UDS_NAME, 0, i18n("Config File (%1)").arg(filename));
addAtom(entry, TDEIO::UDS_URL, 0, filename);
addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFREG);
addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "text/plain");
addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "configure");
list.append(entry);
}
}
// Resource file
TQString TDEDataDir = locate("config", shortname + "rc"); TQString TDEDataDir = locate("config", shortname + "rc");
kdDebug() << "TDEDataDir: " << TDEDataDir << endl; kdDebug() << "TDEDataDir: " << TDEDataDir << endl;
if (TDEDataDir.isEmpty()) if (TDEDataDir.isEmpty())
{ {
return; return;
} }
entry.clear(); entry.clear();
addAtom(entry, TDEIO::UDS_NAME, 0, i18n("Config File (%1)").arg(TDEDataDir)); addAtom(entry, TDEIO::UDS_NAME, 0, i18n("Config File (%1)").arg(TDEDataDir));
addAtom(entry, TDEIO::UDS_URL, 0, TDEDataDir); addAtom(entry, TDEIO::UDS_URL, 0, TDEDataDir);
@ -382,7 +349,6 @@ void AppImpl::createStandardConfigEntry(TQValueList<TDEIO::UDSEntry> &list, TDEI
dirList << "/etc/"; dirList << "/etc/";
dirList << "/usr/etc/"; dirList << "/usr/etc/";
dirList << "/usr/local/etc/"; dirList << "/usr/local/etc/";
dirList << "/opt/trinity/etc/";
TQStringList StandardConfigFile = getFullLocation(dirList,shortname, TQStringList StandardConfigFile = getFullLocation(dirList,shortname,
TQDir::FilterSpec(TQDir::Files | TQDir::Dirs | TQDir::Readable), true, false); TQDir::FilterSpec(TQDir::Files | TQDir::Dirs | TQDir::Readable), true, false);
if (StandardConfigFile.isEmpty()) if (StandardConfigFile.isEmpty())
@ -414,7 +380,7 @@ void AppImpl::createStandardConfigEntry(TQValueList<TDEIO::UDSEntry> &list, TDEI
addAtom(entry, TDEIO::UDS_NAME, 0, i18n("Config Data(%1)").arg(fname)); addAtom(entry, TDEIO::UDS_NAME, 0, i18n("Config Data(%1)").arg(fname));
addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR); addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory"); addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory");
addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "configfolder"); addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "folder");
} }
else else
{ {
@ -475,19 +441,48 @@ void AppImpl::createTmpDirEntry(TQValueList<TDEIO::UDSEntry> &list, TDEIO::UDSEn
} }
} }
void AppImpl::slotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &list) void AppImpl::createXDGDirEntry(TQValueList<TDEIO::UDSEntry> &list, TDEIO::UDSEntry &entry,
const TQString &shortname)
{ {
if (list.size() > 0) TQStringList dirList;
dirList << TQString("%1/.config/").arg(getenv("HOME"));
TQStringList xdgDir = getFullLocation(dirList, shortname,
TQDir::FilterSpec(TQDir::Files | TQDir::Dirs | TQDir::Readable), false, true);
for (const TQString &filename : xdgDir)
{ {
job->kill(true); if (filename.isEmpty())
m_lastListingEmpty = false; {
tqApp->eventLoop()->exitLoop(); continue;
} }
}
void AppImpl::slotResult(TDEIO::Job *) entry.clear();
{ bool isFolder = false;
tqApp->eventLoop()->exitLoop(); TQFileInfo fi(filename);
if (fi.isDir())
{
isFolder = true;
}
kdDebug() << "createXdgDirEntry: " << filename << endl;
addAtom(entry, TDEIO::UDS_URL, 0, filename);
if (isFolder)
{
addAtom(entry, TDEIO::UDS_NAME, 0, i18n("XDG Config Data (%1)").arg(filename));
addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory");
addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "folder");
}
else
{
addAtom(entry, TDEIO::UDS_NAME, 0, i18n("XDG Cconfig File (%1)").arg(filename));
addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFREG);
addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "text/plain");
addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "eraser");
}
list.append(entry);
}
} }
bool AppImpl::listAppContents(const TQString &name, TQValueList<TDEIO::UDSEntry> &list) bool AppImpl::listAppContents(const TQString &name, TQValueList<TDEIO::UDSEntry> &list)
@ -499,16 +494,16 @@ bool AppImpl::listAppContents(const TQString &name, TQValueList<TDEIO::UDSEntry>
// Create entry for binary file // Create entry for binary file
createExeEntry(list, entry, name, getAppAddress(name)); createExeEntry(list, entry, name, getAppAddress(name));
// Create entry for man page // Create entry for data folder in home dir
entry.clear();
// Create entry for apps data folder in home dir
createHomeDirEntry(list, entry, name); createHomeDirEntry(list, entry, name);
// Create entry for standard config and data folders // Create entry for standard config and data folders
createStandardConfigEntry(list, entry, name); createStandardConfigEntry(list, entry, name);
createStandardDataDirEntry(list, entry, name); createStandardDataDirEntry(list, entry, name);
//Create entry for app XDF config folder in home dir
createXDGDirEntry(list, entry, name);
// Create entry for TDE config and data folders // Create entry for TDE config and data folders
createTDEConfigEntry(list, entry, name); createTDEConfigEntry(list, entry, name);
createTDEDataDirEntry(list, entry, name); createTDEDataDirEntry(list, entry, name);
@ -516,7 +511,7 @@ bool AppImpl::listAppContents(const TQString &name, TQValueList<TDEIO::UDSEntry>
// Create entry for manual // Create entry for manual
createManPageEntry(list, entry, name); createManPageEntry(list, entry, name);
//Create entry for apps folder in home dir //Create entry for folders in tmp dir
createTmpDirEntry(list, entry, name); createTmpDirEntry(list, entry, name);
return true; return true;
@ -534,9 +529,9 @@ TQStringList AppImpl::getFullLocation(const TQStringList &dirList, const TQStrin
{ {
TQMap<TQString, bool> knownApps; TQMap<TQString, bool> knownApps;
TQStringList finds; TQStringList finds;
for (const TQString &dirpath : dirList) for (const TQString &dirname : dirList)
{ {
TQDir dir = dirpath; TQDir dir = dirname;
if (!dir.exists()) if (!dir.exists())
{ {
continue; continue;
@ -547,21 +542,21 @@ TQStringList AppImpl::getFullLocation(const TQStringList &dirList, const TQStrin
{ {
if (recursive && filename != ".." && filename != ".") if (recursive && filename != ".." && filename != ".")
{ {
TQFileInfo fi(dirpath + filename); TQFileInfo fi(dirname + filename);
if (fi.isDir()) if (fi.isDir())
{ {
TQStringList recurfinds; TQStringList recurfinds;
recurfinds = getFullLocation(TQStringList(dirpath + filename + "/"), recurfinds = getFullLocation(TQStringList(dirname + filename + "/"),
name, filter, beginswith, recursive); name, filter, beginswith, recursive);
if (!recurfinds.isEmpty()) if (!recurfinds.isEmpty())
{ {
for (const TQString &recurFilename : recurfinds) for (const TQString &recurFullname : recurfinds)
{ {
if (recurFilename.isEmpty()) if (!knownApps.contains(recurFullname))
{ {
continue; knownApps[recurFullname] = true;
} finds << recurFullname;
finds << recurFilename; }
} }
} }
} }
@ -569,7 +564,7 @@ TQStringList AppImpl::getFullLocation(const TQStringList &dirList, const TQStrin
if (name == filename || (beginswith && filename.startsWith(name))) if (name == filename || (beginswith && filename.startsWith(name)))
{ {
TQString fullname = dirpath + filename; TQString fullname = dirname + filename;
if (!knownApps.contains(fullname)) if (!knownApps.contains(fullname))
{ {
knownApps[fullname] = true; knownApps[fullname] = true;

6
src/appimpl.h
Unescape View File

@ -50,15 +50,11 @@ public:
bool listAppContents(const TQString &name, TQValueList<TDEIO::UDSEntry> &list); bool listAppContents(const TQString &name, TQValueList<TDEIO::UDSEntry> &list);
bool parseURL(const KURL &url, TQString &name, TQString &path) const; bool parseURL(const KURL &url, TQString &name, TQString &path) const;
bool realURL(const TQString &name, const TQString &path, KURL &url) const;
int lastErrorCode() const { return m_lastErrorCode; } int lastErrorCode() const { return m_lastErrorCode; }
TQString lastErrorMessage() const { return m_lastErrorMessage; } TQString lastErrorMessage() const { return m_lastErrorMessage; }
private slots: private slots:
KURL findBaseURL(const TQString &filename) const;
void slotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &list);
void slotResult(TDEIO::Job *job);
void createManPageEntry(TQValueList<TDEIO::UDSEntry> &list, TDEIO::UDSEntry &entry, void createManPageEntry(TQValueList<TDEIO::UDSEntry> &list, TDEIO::UDSEntry &entry,
const TQString &shortname); const TQString &shortname);
void createExeEntry(TQValueList<TDEIO::UDSEntry> &list, TDEIO::UDSEntry &entry, void createExeEntry(TQValueList<TDEIO::UDSEntry> &list, TDEIO::UDSEntry &entry,
@ -75,6 +71,8 @@ private slots:
const TQString &shortname); const TQString &shortname);
void createTmpDirEntry(TQValueList<TDEIO::UDSEntry> &list, TDEIO::UDSEntry &entry, void createTmpDirEntry(TQValueList<TDEIO::UDSEntry> &list, TDEIO::UDSEntry &entry,
const TQString &shortname); const TQString &shortname);
void createXDGDirEntry(TQValueList<TDEIO::UDSEntry> &list, TDEIO::UDSEntry &entry,
const TQString &shortname);
TQStringList getAppAddress(const TQString &name); TQStringList getAppAddress(const TQString &name);
TQStringList getFullLocation(const TQStringList &dirList, const TQString &name, TQStringList getFullLocation(const TQStringList &dirList, const TQString &name,

Write Preview
Loading…
Cancel
Save