krusader-commits Mailing List for Krusader (Page 203)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/krusader/krusader_kde3/krArc
In directory sc8-pr-cvs1:/tmp/cvs-serv26667/krArc

Modified Files:
	krarc.cpp 
Log Message:
RAR support

Index: krarc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krArc/krarc.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** krarc.cpp	16 Aug 2003 14:20:35 -0000	1.5
--- krarc.cpp	24 Aug 2003 19:53:27 -0000	1.6
***************
*** 226,233 ****
  		return;
  	}
! 	
  	QString file = url.path().mid(arcFile->url().path().length()+1);
! 	if( !isFile && file.right(1) != "/" ) file = file + "/";
! 	KShellProcess proc;
  	proc << delCmd << "\""+arcFile->url().path()+"\" " << "\""+file+"\"";
  	infoMessage(i18n("Deleting %1 ...").arg( url.fileName() ) );
--- 226,235 ----
  		return;
  	}
! 
  	QString file = url.path().mid(arcFile->url().path().length()+1);
!  if( !isFile && file.right(1) != "/" ) {
!     if(arcType == "zip") file = file + "/";
!   }
!   KShellProcess proc;
  	proc << delCmd << "\""+arcFile->url().path()+"\" " << "\""+file+"\"";
  	infoMessage(i18n("Deleting %1 ...").arg( url.fileName() ) );
***************
*** 395,401 ****
  
  	int lineNo = 0;
  	while(temp.file()->readLine(buf,1000) != -1){
  		line = QString::fromLocal8Bit(buf);
! 		parseLine(lineNo++,line.stripWhiteSpace(),temp.file());
  	}
    // close and delete our file
--- 397,418 ----
  
  	int lineNo = 0;
+   // the rar list is started with a ------ line.
+   if(arcType == "rar"){
+     while(temp.file()->readLine(buf,1000) != -1){
+       line = QString::fromLocal8Bit(buf);
+       if( line.startsWith("-----------") ) break;
+     }
+   } 
  	while(temp.file()->readLine(buf,1000) != -1){
  		line = QString::fromLocal8Bit(buf);
!     if( arcType == "rar" ) {
!        // the rar list is ended with a ------ line.
!        if( line.startsWith("-----------") ) break;
!        else{
!          temp.file()->readLine(buf,1000);
!          line = line+QString::fromLocal8Bit(buf);
!        }
!     }
!     parseLine(lineNo++,line.stripWhiteSpace(),temp.file());
  	}
    // close and delete our file
***************
*** 541,545 ****
    
    
!   if(arcType == "zip"){  
      // permissions
      perm = nextWord(line);
--- 558,562 ----
    
    
!   if(arcType == "zip"){
      // permissions
      perm = nextWord(line);
***************
*** 560,563 ****
--- 577,599 ----
      fullName = nextWord(line,'\n');
    }
+   if(arcType == "rar"){
+     // full name
+     fullName = nextWord(line,'\n');
+     // size
+     size = nextWord(line).toLong();
+     // ignore the next 2 fields
+     nextWord(line); nextWord(line);
+     // date & time
+     QString d = nextWord(line);
+     QDate qdate(d.mid(6,2).toInt(),d.mid(3,2).toInt(),d.mid(0,2).toInt());
+     if( qdate.year() < 1930 ) qdate.addYears(100);
+     QString t = nextWord(line);
+     QTime qtime(t.mid(0,2).toInt(),t.mid(4,2).toInt(),0);
+     time = QDateTime(qdate,qtime).toTime_t();    
+     // permissions
+     perm = nextWord(line);
+     if(perm.length() != 10) perm = (perm.at(0)=='d')? "drwxr-xr-x" : "-rw-r--r--" ;
+     mode = parsePermString(perm);
+   }
  
    if( fullName.right(1) == "/" ) fullName = fullName.left(fullName.length()-1);
***************
*** 589,599 ****
    entry.append( atom );
  
-   dir->append(entry);
    if(perm[0] == 'd'){
      fullName=fullName+"/";
!     if(dirDict.find(fullName) == 0){
        dirDict.insert(fullName,new UDSEntryList());
!     }
    }
  }
  
--- 625,637 ----
    entry.append( atom );
  
    if(perm[0] == 'd'){
      fullName=fullName+"/";
!     if(dirDict.find(fullName) == 0)
        dirDict.insert(fullName,new UDSEntryList());
!     else
!       return; // there is alreay an entry for this directory
    }
+   
+   dir->append(entry);
  }
  
***************
*** 605,608 ****
--- 643,652 ----
      delCmd  = "zip -d ";
      putCmd  = "zip -ry ";
+   } else if (arcType == "rar"){
+     cmd = "unrar" ;
+     listCmd = "unrar -c- v ";
+     getCmd  = "unrar x -y ";
+     delCmd  = "rar d ";
+     putCmd  = "rar -r a ";
    } else {
      cmd     = QString::null;
***************
*** 614,620 ****
  
    if( KStandardDirs::findExe(cmd).isEmpty() ){
!     error(ERR_SLAVE_DEFINED,QString("I Love you !\n") );//ERR_UNSUPPORTED_PROTOCOL,
!       //i18n("%1 archives are not supported").arg(arcType) );
!      return false;
    }
    return true;
--- 658,665 ----
  
    if( KStandardDirs::findExe(cmd).isEmpty() ){
!     error( KIO::ERR_CANNOT_LAUNCH_PROCESS,
!     cmd+
!     i18n("\nMake sure that the %1 binary are installed properly on your system.").arg(cmd));
!     return false;
    }
    return true;

2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (98)	Sep (138)	Oct (100)	Nov (49)	Dec (131)
2004	Jan (94)	Feb (65)	Mar (100)	Apr (83)	May (72)	Jun (29)	Jul (167)	Aug (127)	Sep (131)	Oct (269)	Nov (122)	Dec (100)
2005	Jan (228)	Feb (266)	Mar (63)	Apr (135)	May (157)	Jun (52)	Jul (25)	Aug (49)	Sep (184)	Oct (159)	Nov (75)	Dec (37)
2006	Jan (60)	Feb (129)	Mar (110)	Apr (34)	May (31)	Jun (42)	Jul (72)	Aug (90)	Sep (57)	Oct (66)	Nov (42)	Dec (90)
2007	Jan (106)	Feb (54)	Mar (93)	Apr (27)	May (21)	Jun (17)	Jul (19)	Aug (22)	Sep (25)	Oct (2)	Nov (1)	Dec (1)
2008	Jan (65)	Feb (70)	Mar (29)	Apr (45)	May (91)	Jun (20)	Jul (11)	Aug (24)	Sep (23)	Oct (13)	Nov (23)	Dec (39)
2009	Jan (23)	Feb (39)	Mar (15)	Apr (56)	May (5)	Jun	Jul	Aug	Sep	Oct	Nov	Dec