-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 67 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 149 |
2 files changed, 89 insertions, 127 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index 60558e7..77dca49 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp @@ -120,56 +120,45 @@ void AdvancedFm::populateView() bool isDir=FALSE; const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); QFileInfoListIterator it(*list); QFileInfo *fi; - while ( (fi=it.current()) ) - { - if (fi->isSymLink() ) - { + while ( (fi=it.current()) ) { + if (fi->isSymLink() ) { QString symLink=fi->readLink(); QFileInfo sym( symLink); fileS.sprintf( "%10i", sym.size() ); - fileL.sprintf( "%s -> %s", fi->fileName().data(),sym.filePath().data() ); + fileL = fi->fileName() +" -> " + sym.filePath().data(); fileDate = sym.lastModified().toString(); - } - else - { + } else { fileS.sprintf( "%10i", fi->size() ); - fileL.sprintf( "%s",fi->fileName().data() ); + fileL = fi->fileName(); fileDate= fi->lastModified().toString(); - if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() ) - { + if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() ) { fileL+="/"; isDir=TRUE; } } - QFileInfo fileInfo( path + "/" + fileL); - if(fileL !="./" && fi->exists()) - { + if(fileL !="./" && fi->exists()) { item= new QListViewItem( thisView, fileL, fileS , fileDate); - if(isDir || fileL.find("/",0,TRUE) != -1) - { + if(isDir || fileL.find("/",0,TRUE) != -1) { if( !QDir( fi->filePath() ).isReadable()) //is directory pm = Resource::loadPixmap( "lockedfolder" ); else pm= Resource::loadPixmap( "folder" ); } - else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) - { + else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) { pm = Resource::loadPixmap( "exec"); } else if( (fileInfo.permission( QFileInfo::ExeUser) | fileInfo.permission( QFileInfo::ExeGroup) - | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) - { + | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) { pm = Resource::loadPixmap( "exec"); } - else if( !fi->isReadable() ) - { + else if( !fi->isReadable() ) { pm = Resource::loadPixmap( "locked" ); } else { //everything else goes by mimetype MimeType mt(fi->filePath()); @@ -177,42 +166,39 @@ void AdvancedFm::populateView() if(pm.isNull()) { pm = unknownXpm; } } - if( fi->isSymLink() && fileL.find("->",0,TRUE) != -1) - { - // overlay link image - pm= Resource::loadPixmap( "folder" ); - QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); - QPainter painter( &pm ); - painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); - pm.setMask( pm.createHeuristicMask( FALSE ) ); + if( fi->isSymLink() || fileL.find("->",0,TRUE) != -1) { + // qDebug(" overlay link image"); + pm= Resource::loadPixmap( "advancedfm/symlink" ); + // pm= Resource::loadPixmap( "folder" ); +// QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); +// QPainter painter( &pm ); +// painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk ); +// pm.setMask( pm.createHeuristicMask( FALSE ) ); } item->setPixmap( 0,pm); } isDir=FALSE; ++it; } - if( path.find("dev",0,TRUE) != -1) - { + if( path.find("dev",0,TRUE) != -1) { struct stat buf; dev_t devT; DIR *dir; struct dirent *mydirent; if((dir = opendir( path.latin1())) != NULL) - while ((mydirent = readdir(dir)) != NULL) - { + while ((mydirent = readdir(dir)) != NULL) { lstat( mydirent->d_name, &buf); // qDebug(mydirent->d_name); fileL.sprintf("%s", mydirent->d_name); devT = buf.st_dev; fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF); fileDate.sprintf("%s", ctime( &buf.st_mtime)); - if( fileL.find(".") == -1 ) - { + if( fileL.find(".") == -1 ) { item= new QListViewItem( thisView, fileL, fileS, fileDate); pm = unknownXpm; item->setPixmap( 0,pm); } @@ -679,18 +665,17 @@ void AdvancedFm::addToDocs() { QStringList strListPaths = getPath(); QDir *thisDir = CurrentDir(); - if( strListPaths.count() > 0) - { + if( strListPaths.count() > 0) { QString curFile; - for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) - { + for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) { curFile = thisDir->canonicalPath()+"/"+(*it); // qDebug(curFile); + QFileInfo fi(curFile); DocLnk f; // curFile.replace(QRegExp("\\..*"),""); - f.setName((*it)); + f.setName(fi.baseName() ); f.setFile( curFile); f.writeLink(); } } diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 9f21245..00d0e07 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp @@ -37,15 +37,17 @@ #include <qtabwidget.h> #include <qlineedit.h> #include <qlistview.h> +#include <errno.h> #include <stdlib.h> #include <unistd.h> #include <sys/stat.h> #include <dirent.h> #include <sys/sendfile.h> #include <fcntl.h> + void AdvancedFm::doDirChange() { ListClicked( CurrentView()->currentItem()); } @@ -169,16 +171,13 @@ void AdvancedFm::makeDir() } void AdvancedFm::doDelete() { - QStringList curFileList = getPath(); bool doMsg=true; int count = curFileList.count(); - if( count > 0) - { - if(count > 1 ) - { + if( count > 0) { + if(count > 1 ) { QString msg; msg=tr("Really delete\n%1 files?").arg(count); switch ( QMessageBox::warning(this,tr("Delete"),msg ,tr("Yes"),tr("No"),0,0,1) ) @@ -192,28 +191,24 @@ void AdvancedFm::doDelete() }; } QString myFile; - for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) - { + + for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { myFile = (*it); if( myFile.find(" -> ",0,TRUE) != -1) myFile = myFile.left( myFile.find(" -> ",0,TRUE)); QString f = CurrentDir()->canonicalPath(); if(f.right(1).find("/",0,TRUE) == -1) f += "/"; f += myFile; - if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) //if file is a directory - { + if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) { + //if file is a directory + switch ( QMessageBox::warning( this, tr("Delete Directory?"), tr("Really delete %1\nand all it's contents ?" ).arg( f ) , - tr("Yes"), - tr("No"), - 0, - 0, - 1) ) - { + tr("Yes"), tr("No"), 0, 0, 1) ) { case 0: { f=f.left(f.length()-1); QString cmd="rm -rf "+f; @@ -228,26 +223,29 @@ void AdvancedFm::doDelete() } else { if(doMsg) { switch ( QMessageBox::warning(this,tr("Delete"), - tr("Really delete\n%1?").arg( f ), - tr("Yes"), - tr("No"), - 0, - 0, - 1) ) { + tr("Really delete\n%1?").arg( myFile ), + tr("Yes"), tr("No"), 0, 0, 1) ) { case 1: return; break; }; } + QString cmd="rm "+f; QFile file(f); - if(QFileInfo(myFile).fileName().find("../",0,TRUE)==-1) { - qDebug("remove link files "+f); -// AppLnk lnk(f); -// qDebug(lnk.linkFile()); -// lnk.removeLinkFile(); + QFileInfo fi(myFile); + if( fi.fileName().find("../",0,TRUE)==-1) { + qDebug("remove link files "+myFile); + +// DocLnk lnk(f); + DocLnk *lnk; + lnk = new DocLnk(f); + qDebug("Deleting doclnk " + lnk->linkFile()); + if(lnk->isValid()) + lnk->removeLinkFile(); + // delete lnk; file.remove(); } } } @@ -366,10 +364,9 @@ void AdvancedFm::copy() } f.remove(); } - if( !copyFile( curFile, destFile) ) - { + if( !copyFile( curFile, destFile) ) { QMessageBox::message("AdvancedFm", tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) ); return; } @@ -419,10 +416,9 @@ void AdvancedFm::copyAs() return; break; }; } - if( !copyFile( curFile, destFile) ) - { + if( !copyFile( curFile, destFile) ) { QMessageBox::message("AdvancedFm",tr("Could not copy\n") +curFile +tr("to\n")+destFile); return; } @@ -472,10 +468,9 @@ void AdvancedFm::copySameDir() return; break; }; } - if(!copyFile( curFile,destFile) ) - { + if(!copyFile( curFile,destFile) ) { QMessageBox::message("AdvancedFm",tr("Could not copy\n") +curFile +tr("to\n")+destFile); return; } @@ -515,10 +510,9 @@ void AdvancedFm::move() qDebug("CurrentFile file is " + curFile); QFile f( curFile); if( f.exists()) { - if( !copyFile( curFile, destFile) ) - { + if( !copyFile( curFile, destFile) ) { QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile); return; } else QFile::remove(curFile); @@ -532,62 +526,52 @@ void AdvancedFm::move() } bool AdvancedFm::copyFile( const QString & src, const QString & dest ) { -// char bf[ 50000 ]; -// int bytesRead; bool success = true; struct stat status; - -// QFile s( src ); -// QFile d( dest ); - + QFile srcFile(src); + QFile destFile(dest); + int err=0; int read_fd=0; int write_fd=0; struct stat stat_buf; off_t offset = 0; - read_fd = ::open(src.latin1(), O_RDONLY); + if(!srcFile.open( IO_ReadOnly|IO_Raw)) { + qWarning("open failed"); + return success = false; + } + read_fd = srcFile.handle(); if(read_fd != -1) { fstat (read_fd, &stat_buf); - write_fd = ::open(dest.latin1(), O_WRONLY | O_CREAT, stat_buf.st_mode); + if( !destFile.open( IO_WriteOnly|IO_Raw ) ) { + qWarning("destfile open failed"); + return success = false; + } + write_fd = destFile.handle(); if(write_fd != -1) { - if(sendfile(write_fd, read_fd, &offset, stat_buf.st_size) == -1) { + err =sendfile(write_fd, read_fd, &offset, stat_buf.st_size); + if( err == -1) { + QString msg; + switch(err) { + case EBADF : msg = "The input file was not opened for reading or the output file was not opened for writing. "; + case EINVAL: msg = "Descriptor is not valid or locked. "; + case ENOMEM: msg = "Insufficient memory to read from in_fd."; + case EIO: msg = "Unspecified error while reading from in_fd."; + }; success = false; + qWarning(msg); } } else { success = false; } } else { success = false; } - - ::close (read_fd); - ::close (write_fd); - - -// if( s.open( IO_ReadOnly | IO_Raw ) && d.open( IO_WriteOnly | IO_Raw ) ) -// { -// while( (bytesRead = s.readBlock( bf, sizeof( bf ) )) == sizeof( bf ) ) -// { -// if( d.writeBlock( bf, sizeof( bf ) ) != sizeof( bf ) ){ -// success = FALSE; -// break; -// } -// } -// if( success && (bytesRead > 0) ) -// { -// d.writeBlock( bf, bytesRead ); -// } - -// } -// else -// { -// success = FALSE; -// } - + srcFile.close(); + destFile.close(); // Set file permissions - if( stat( (const char *) src, &status ) == 0 ) - { + if( stat( (const char *) src, &status ) == 0 ) { chmod( (const char *) dest, status.st_mode ); } return success; @@ -712,31 +696,24 @@ void AdvancedFm::mkSym() void AdvancedFm::doBeam() { Ir ir; - if(!ir.supported()) - { - } - else - { + if(!ir.supported()) { + } else { QStringList curFileList = getPath(); - if( curFileList.count() > 0) - { - for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) - { - - QString curFile = CurrentDir()->canonicalPath()+"/"+(*it); - if( curFile.right(1) == "/") - { - curFile = curFile.left( curFile.length() -1); + if( curFileList.count() > 0) { + for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { + QString curFile = (*it); + QString curFilePath = CurrentDir()->canonicalPath()+"/"+curFile; + if( curFilePath.right(1) == "/") { + curFilePath = curFilePath.left( curFilePath.length() -1); } Ir *file = new Ir(this, "IR"); connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * ))); - file->send( curFile, curFile ); + file->send( curFilePath, curFile ); } } } - } void AdvancedFm::fileBeamFinished( Ir *) { |