summaryrefslogtreecommitdiff
authorzecke <zecke>2002-03-30 01:12:49 (UTC)
committer zecke <zecke>2002-03-30 01:12:49 (UTC)
commit06063167a17f44b51295cf13d5c453b61b2c2a66 (patch) (side-by-side diff)
tree19696543f70aec5f54a89bb5b31980c733eed6aa
parentbe017d10da4ccd54b2b3ce030d2ccdc3d0825d62 (diff)
downloadopie-06063167a17f44b51295cf13d5c453b61b2c2a66.zip
opie-06063167a17f44b51295cf13d5c453b61b2c2a66.tar.gz
opie-06063167a17f44b51295cf13d5c453b61b2c2a66.tar.bz2
*** empty log message ***
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/applnk.cpp83
1 files changed, 56 insertions, 27 deletions
diff --git a/library/applnk.cpp b/library/applnk.cpp
index 2af6cf4..5185b5f 100644
--- a/library/applnk.cpp
+++ b/library/applnk.cpp
@@ -18,6 +18,8 @@
**
**********************************************************************/
+#define QTOPIA_INTERNAL_MIMEEXT
+
#include "applnk.h"
#include <qpe/qpeapplication.h>
@@ -48,13 +50,23 @@ static int bigSize = 32;
static QString safeFileName(const QString& n)
{
QString safename=n;
- safename.replace(QRegExp("[^0-9A-Za-z.]"),"_");
+ safename.replace(QRegExp("[^0-9A-Za-z.]"),"_"); // Njaard says this is broken
safename.replace(QRegExp("^[^A-Za-z]*"),"");
if ( safename.isEmpty() )
safename = "_";
return safename;
}
+static bool prepareDirectories(const QString& lf)
+{
+ if ( !QFile::exists(lf) ) {
+ // May need to create directories
+ QFileInfo fi(lf);
+ if ( system(("mkdir -p "+fi.dirPath(TRUE))) )
+ return FALSE;
+ }
+ return TRUE;
+}
class AppLnkPrivate
{
@@ -283,7 +295,10 @@ QString AppLnk::type() const
QString AppLnk::file() const
{
if ( mFile.isNull() ) {
- AppLnk* that = (AppLnk*)this;
+ AppLnk* that = (AppLnk*)this; // copy?
+ QString ext = MimeType(mType).extension();
+ if ( !ext.isEmpty() )
+ ext = "." + ext;
if ( !mLinkFile.isEmpty() ) {
that->mFile =
mLinkFile.right(8)==".desktop" // 8 = strlen(".desktop")
@@ -291,16 +306,23 @@ QString AppLnk::file() const
} else if ( mType.contains('/') ) {
that->mFile =
QString(getenv("HOME"))+"/Documents/"+mType+"/"+safeFileName(that->mName);
- if ( QFile::exists(that->mFile) || QFile::exists(that->mFile+".desktop") ) {
+ if ( QFile::exists(that->mFile+ext) || QFile::exists(that->mFile+".desktop") ) { // a .desktop with the same name exists
int n=1;
+ qWarning("AppLnk::file() n=1 %s", that->mFile.latin1() );
QString nn;
- while (QFile::exists((nn=(that->mFile+"_"+QString::number(n))))
+ while (QFile::exists((nn=(that->mFile+"_"+QString::number(n)))+ext)
|| QFile::exists(nn+".desktop"))
n++;
that->mFile = nn;
+ qWarning("AppLnl::file() now mFile is %s", that->mFile.latin1() );
}
that->mLinkFile = that->mFile+".desktop";
+ that->mFile += ext;
}
+ prepareDirectories(that->mFile);
+ QFile f(that->mFile);
+ if ( !f.open(IO_WriteOnly) )
+ that->mFile = QString::null;
return that->mFile;
}
return mFile;
@@ -318,24 +340,30 @@ QString AppLnk::linkFile() const
if ( type().contains('/') ) {
StorageInfo storage;
const FileSystem *fs = storage.fileSystemOf( that->mFile );
-// qDebug("creating lnkFile for %s", mFile.latin1() );
-// if ( fs )
-// qDebug("fs is %s", fs->path().latin1() );
if ( fs && fs->isRemovable() ) {
-// qDebug("isRemovable");
that->mLinkFile = fs->path();
} else
that->mLinkFile = getenv( "HOME" );
that->mLinkFile += "/Documents/"+type()+"/"+safeFileName(that->mName);
- if ( QFile::exists(that->mLinkFile+".desktop") ) {
+ if ( QFile::exists(that->mLinkFile+".desktop") ) { // ok the file exists lets check if we point to the same file
int n=1;
QString nn;
- while (QFile::exists((nn=that->mLinkFile+"_"+QString::number(n))+".desktop"))
+ AppLnk lnk( that->mLinkFile+".desktop" );
+ if(that->file() != lnk.file() ){
+ qWarning("AppLnk::linkFile exists %s", that->mLinkFile.latin1() );
+ while (QFile::exists((nn=that->mLinkFile+"_"+QString::number(n))+".desktop")){
n++;
- that->mLinkFile = nn;
+ AppLnk lnk(nn ); // just to be sure
+ if(lnk.file() ==that->file() ){
+ break;
+ }
+ }
+ that->mLinkFile = nn;
+ }
}
that->mLinkFile += ".desktop";
-// qDebug("file is %s", mLinkFile.latin1() );
+ qWarning("AppLnk::linkFile is %s", that->mLinkFile.latin1() );
+ storeLink();
}
return that->mLinkFile;
}
@@ -514,13 +542,7 @@ void AppLnk::setCategories( const QArray<int>& c )
bool AppLnk::ensureLinkExists() const
{
QString lf = linkFile();
- if ( !QFile::exists(lf) ) {
- // May need to create directories
- QFileInfo fi(lf);
- if ( system(("mkdir -p "+fi.dirPath(TRUE))) )
- return FALSE;
- }
- return TRUE;
+ return prepareDirectories(lf);
}
/*!
@@ -535,7 +557,13 @@ bool AppLnk::writeLink() const
QString lf = linkFile();
if ( !ensureLinkExists() )
return FALSE;
- Config config( lf, Config::File );
+ storeLink();
+ return TRUE;
+}
+
+void AppLnk::storeLink() const
+{
+ Config config( mLinkFile, Config::File );
config.setGroup("Desktop Entry");
config.writeEntry("Name",mName);
if ( !mIconFile.isNull() ) config.writeEntry("Icon",mIconFile);
@@ -551,9 +579,7 @@ bool AppLnk::writeLink() const
config.writeEntry( "Categories", sl, ';' );
QCopEnvelope e("QPE/System", "linkChanged(QString)");
- e << lf;
-
- return TRUE;
+ e << mLinkFile;
}
/*!
@@ -586,10 +612,13 @@ QString AppLnk::property(const QString& key) const
void AppLnk::removeFiles()
{
bool valid = isValid();
- if ( !valid || QFile::remove(linkFile()) ) {
+ if ( !valid || !linkFileKnown() || QFile::remove(linkFile()) ) {
if ( QFile::remove(file()) ) {
QCopEnvelope e("QPE/System", "linkChanged(QString)");
- e << linkFile();
+ if ( linkFileKnown() )
+ e << linkFile();
+ else
+ e << file();
} else if ( valid ) {
// restore link
writeLink();
@@ -602,7 +631,7 @@ void AppLnk::removeFiles()
*/
void AppLnk::removeLinkFile()
{
- if ( isValid() && QFile::remove(linkFile()) ) {
+ if ( isValid() && linkFileKnown() && QFile::remove(linkFile()) ) {
QCopEnvelope e("QPE/System", "linkChanged(QString)");
e << linkFile();
}
@@ -1083,7 +1112,7 @@ void DocLnk::invoke(const QStringList& args) const
const AppLnk* app = mt.application();
if ( app ) {
QStringList a = args;
- if ( QFile::exists( linkFile() ) )
+ if ( linkFileKnown() && QFile::exists( linkFile() ) )
a.append(linkFile());
else
a.append(file());