Try to handle RAM storage for documents

4 files changed, 16 insertions, 11 deletions

diff --git a/library/applnk.cpp b/library/applnk.cpp
index 5185b5f..778ccab 100644
--- a/library/applnk.cpp
+++ b/library/applnk.cpp
@@ -331,25 +331,25 @@ QString AppLnk::file() const
 /*!
   Returns the desktop file coresponding to this AppLnk.
 
   \sa file(), exec()
 */
 QString AppLnk::linkFile() const
 {
     if ( mLinkFile.isNull() ) {
 	AppLnk* that = (AppLnk*)this;
 	if ( type().contains('/') ) {
 	    StorageInfo storage;
 	    const FileSystem *fs = storage.fileSystemOf( that->mFile );
-	    if ( fs && fs->isRemovable() ) {
+	    if ( fs && ( fs->isRemovable() || fs->disk() == "/dev/mtdblock6" || fs->disk() == "tmpfs" ) ) {
 		that->mLinkFile = fs->path();
 	    } else
 		that->mLinkFile = getenv( "HOME" );
 	    that->mLinkFile += "/Documents/"+type()+"/"+safeFileName(that->mName);
 	    if ( QFile::exists(that->mLinkFile+".desktop") ) { // ok the file exists lets check if we point to the same file
 		int n=1;
 		QString nn;
 		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++;
diff --git a/library/global.cpp b/library/global.cpp
index edb7b85..ab27b3f 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -672,24 +672,28 @@ void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter)
      */
     StorageInfo storage;
     const QList<FileSystem> &fs = storage.fileSystems();
     QListIterator<FileSystem> it ( fs );
     for ( ; it.current(); ++it ) {
       if ( (*it)->isRemovable() ) { // let's find out  if we should search on it
 	// this is a candidate look at the cf and see if we should search on it 
 	QString path = (*it)->path();
 	if( !checkStorage((*it)->path() + "/.opiestorage.cf" ) )
 	  continue;
 	DocLnkSet ide( path, mimefilter );
 	folder->appendFrom(ide);
+      } else if ( (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) {
+	QString path = (*it)->path() + "/Documents";
+	DocLnkSet ide( path, mimefilter );
+	folder->appendFrom(ide);
       }
     }
 }
 
 QStringList Global::languageList()
 {
     QString lang = getenv("LANG");
     QStringList langs;
     langs.append(lang);
     int i  = lang.find(".");
     if ( i > 0 )
 	lang = lang.left( i );
diff --git a/library/lnkproperties.cpp b/library/lnkproperties.cpp
index e8baca6..c020328 100644
--- a/library/lnkproperties.cpp
+++ b/library/lnkproperties.cpp
@@ -164,33 +164,34 @@ void LnkProperties::setupLocations()
     QListIterator<FileSystem> it ( fs );
     QString s;
     QString homeDir = getenv("HOME");
     QString hardDiskHome;
     QString hardDiskPath;
     int index = 0;
     currentLocation = -1;
     for ( ; it.current(); ++it ) {
   // we add 10k to the file size so we are sure we can also save the desktop file
   if ( (*it)->availBlocks() * (*it)->blockSize() > fileSize + 10000 ) {
       if ( (*it)->isRemovable() ||
      (*it)->disk() == "/dev/mtdblock1" ||
-     (*it)->disk() == "/dev/mtdblock/1" || (*it)->disk().left(13) == "/dev/mtdblock" ) {
+     (*it)->disk() == "/dev/mtdblock/1" || (*it)->disk().left(13) == "/dev/mtdblock" ||
+     (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) {
     d->locationCombo->insertItem( (*it)->name(), index );
-    locations.append( ((*it)->isRemovable() ? (*it)->path() : homeDir) );
+    locations.append( ((*it)->isRemovable() || (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ? (*it)->path() : homeDir) );
     if ( lnk->file().contains( (*it)->path() ) ) {
          d->locationCombo->setCurrentItem( index );
          currentLocation = index;
     }
     index++;
-      } else if ( (*it)->name().contains( "Hard Disk") &&
+      } else if ( (*it)->name().contains( tr("Hard Disk") ) &&
       homeDir.contains( (*it)->path() ) &&
       (*it)->path().length() > hardDiskHome.length() ) {
     hardDiskHome = (*it)->name();
     hardDiskPath = (*it)->path();
       }
   }
     }
     if ( !hardDiskHome.isEmpty() ) {
   d->locationCombo->insertItem( hardDiskHome );
   locations.append( hardDiskPath );
   if ( currentLocation == -1 ) { // assume it's the hard disk
       d->locationCombo->setCurrentItem( index );
diff --git a/library/storage.cpp b/library/storage.cpp
index 2d996fa..13639fe 100644
--- a/library/storage.cpp
+++ b/library/storage.cpp
@@ -96,25 +96,25 @@ void StorageInfo::update()
     FILE *mntfp = setmntent( "/etc/mtab", "r" );
 
     QStringList curdisks;
     QStringList curopts;
     QStringList curfs;
     bool rebuild = FALSE;
     int n=0;
     if ( mntfp ) {
   while ( (me = getmntent( mntfp )) != 0 ) {
       QString fs = me->mnt_fsname;
       if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd"
         || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd"
-        ||  fs.left(8)=="/dev/ram" || fs.left(5)=="tmpfs" )
+        || fs.left(5)=="tmpfs" )
       {
     n++;
     curdisks.append(fs);
     curopts.append( me->mnt_opts );
     //qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts );
     curfs.append( me->mnt_dir );
     bool found = FALSE;
     for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) {
         if ( (*i)->disk() == fs ) {
       found = TRUE;
       break;
         }
@@ -136,37 +136,37 @@ void StorageInfo::update()
       QString disk = *it; 
       QString humanname;
       bool removable = FALSE;
       if ( isCF(disk) ) {
     humanname = tr("CF Card");
     removable = TRUE;
       } else if ( disk == "/dev/hda1" ) {
     humanname = tr("Hard Disk");
       } else if ( disk.left(9) == "/dev/mmcd" ) {
     humanname = tr("SD Card");
     removable = TRUE;
       } else if ( disk.left(7) == "/dev/hd" )
-    humanname = tr("Hard Disk") + " " + humanname.mid(7);
+    humanname = tr("Hard Disk") + " " + disk.mid(7);
       else if ( disk.left(7) == "/dev/sd" )
-    humanname = tr("SCSI Hard Disk") + " " + humanname.mid(7);
+    humanname = tr("SCSI Hard Disk") + " " + disk.mid(7);
       else if ( disk.left(14) == "/dev/mtdblock6" ) //openzaurus ramfs
-    humanname = tr("Ram FS") + " " + humanname.mid(14);
+    humanname = tr("Internal Memory");
       else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" )
     humanname = tr("Internal Storage");
       else if ( disk.left(14) == "/dev/mtdblock/" )
-    humanname = tr("Internal Storage") + " " + humanname.mid(14);
+    humanname = tr("Internal Storage") + " " + disk.mid(14);
       else if ( disk.left(13) == "/dev/mtdblock" )
-    humanname = tr("Internal Storage") + " " + humanname.mid(13);
+    humanname = tr("Internal Storage") + " " + disk.mid(13);
       else if ( disk.left(5) == "tmpfs" ) //ipaqs /mnt/ramfs
-    humanname = tr("Ram FS") + " " + humanname.mid(5);
+    humanname = tr("Internal Memory");
       FileSystem *fs = new FileSystem( disk, *fsit, humanname, removable, opts );
       mFileSystems.append( fs );
   }
   emit disksChanged();
     } else {
   // just update them
   for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i)
       i.current()->update();
     }
 #endif
 }