alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add absolute file support to PackageStructure::load

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=838909
This commit is contained in:
Joseph Burns 2008-07-29 02:23:14 +00:00
parent 11951249b0
commit cf1d001296
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packagestructure.cpp
View File

@ -24,6 +24,10 @@
#include <KConfigGroup>
#include <KStandardDirs>
#include <KServiceTypeTrader>
#include <KUrl>
#include <KTemporaryFile>
#include <kio/netaccess.h>
#include <kio/job.h>
#include "package.h"
@ -119,6 +123,26 @@ PackageStructure::Ptr PackageStructure::load(const QString &packageFormat)
KConfig config(configPath);
structure->read(&config);
PackageStructurePrivate::structures[packageFormat] = structure;
return structure;
}
// try to load from absolute file path
KUrl url(packageFormat);
if (url.isLocalFile()) {
KConfig config(KIO::NetAccess::mostLocalUrl(url, NULL).path(), KConfig::SimpleConfig);
structure->read(&config);
PackageStructurePrivate::structures[structure->type()] = structure;
} else {
KTemporaryFile tmp;
if (tmp.open()) {
KIO::Job *job = KIO::file_copy(url, KUrl(tmp.fileName()),
-1, KIO::Overwrite | KIO::HideProgressInfo);
if (job->exec()) {
KConfig config(tmp.fileName(), KConfig::SimpleConfig);
structure->read(&config);
PackageStructurePrivate::structures[structure->type()] = structure;
}
}
}
return structure;