@ -30,6 +30,8 @@
# include <string> # include <string>
// QT includes
// QT includes
# include <tqstring.h>
# include <tqregexp.h>
# include <tqfile.h> # include <tqfile.h>
# include <tqdir.h> # include <tqdir.h>
# include <tqtextcodec.h> # include <tqtextcodec.h>
@ -39,6 +41,7 @@
# include <tdeglobal.h> # include <tdeglobal.h>
# include <tdelocale.h> # include <tdelocale.h>
# include <tdemessagebox.h> # include <tdemessagebox.h>
# include <kmimetype.h>
# include <kpassdlg.h> # include <kpassdlg.h>
# include <kprocess.h> # include <kprocess.h>
# include <kstandarddirs.h> # include <kstandarddirs.h>
@ -83,94 +86,96 @@ RarArch::RarArch( ArkWidget *_gui, const TQString & _fileName )
verifyUncompressUtilityIsAvailable ( m_unarchiver_program ) ;
verifyUncompressUtilityIsAvailable ( m_unarchiver_program ) ;
setReadOnly ( true ) ;
setReadOnly ( true ) ;
}
}
m_headerString = " " ;
} }
bool RarArch : : processLine ( const TQCString & line ) bool RarArch : : processLine ( const TQCString & line )
{ {
TQString unicode_line ;
TQString uline = TQTextCodec : : codecForLocale ( ) - > toUnicode ( line ) ;
TQTextCodec * codec = TQTextCodec : : codecForLocale ( ) ;
unicode_line = codec - > toUnicode ( line ) ;
// Look for rar/unrar version first
// Look for rar/unrar version first
if ( ! m_version )
if ( ! m_version )
{
{
if ( line . left ( 3 ) = = " RAR " )
TQRegExp versionRegExp ( TQString : : fromLatin1 ( " RAR \\ s( \\ d+) \ \ . ( \ \ S + ) \ \ s . * " )) ;
{
bool ok_flag = false ;
if ( versionRegExp . exactMatch ( uline ) )
short version = line . mid ( 4 , 1 ) . toShort ( & ok_flag ) ;
if ( ok_flag )
{
m_version = version ;
if ( m_version < VERSION_5 )
{
{
m_version = versionRegExp . capturedTexts ( ) [ 1 ] . toShort ( ) ;
if ( m_version < VERSION_5 ) {
m_headerString = " ------------------------------------------------------------------------------- " ;
m_headerString = " ------------------------------------------------------------------------------- " ;
m_isFirstLine = true ;
m_isFirstLine = true ;
}
} else {
else
{
m_headerString = " ----------- --------- -------- ----- ---------- ----- -------- ---- " ;
m_headerString = " ----------- --------- -------- ----- ---------- ----- -------- ---- " ;
}
}
setHeaders ( ) ; setHeaders ( ) ; //< Note: header order for version 5 is different, but keep the old one for consistency
return true ;
return true ;
}
}
}
return false ;
return false ;
}
}
if ( m_version < VERSION_5 & & m_isFirstLine )
TQStringList entry ;
TQStringList parsedData = TQStringList : : split ( QChar ( ' ' ) , uline ) ;
if ( m_version < VERSION_5 ) {
if ( m_isFirstLine )
{
{
m_entryFilename = TQString : : fromLocal8Bit ( line ) ;
m_entryFilename = uline . remove ( 0 , 1 ) ;
m_entryFilename . remove ( 0 , 1 ) ;
m_isFirstLine = false ;
m_isFirstLine = false ;
return true ;
return true ;
}
}
TQStringList list ;
if ( parsedData . size ( ) < 9 ) {
TQStringList l2 = TQStringList : : split ( ' ' , line ) ;
kdError ( 1601 ) < < " Failed to parse rar<5 output string: \" " < < uline < < " \" " < < endl ;
}
if ( m_version < VERSION_5 )
entry < < m_entryFilename ; // filename
{
entry < < parsedData [ 0 ] ; // size
list < < m_entryFilename ; // filename
entry < < parsedData [ 1 ] ; // packed
list < < l2 [ 0 ] ; // size
entry < < parsedData [ 2 ] ; // ratio
list < < l2 [ 1 ] ; // packed
list < < l2 [ 2 ] ; // ratio
TQStringList date = TQStringList : : split ( ' - ' , l2 [ 3 ] ) ; TQStringList date = TQStringList : : split ( ' - ' , parsedData [ 3 ] ) ;
list < < ArkUtils : : fixYear ( date [ 2 ] . latin1 ( ) ) + ' - ' + date [ 1 ] + ' - ' + date [ 0 ] + ' ' + l2 [ 4 ] ; // date
entry < < ArkUtils : : fixYear ( date [ 2 ] . latin1 ( ) ) + ' - ' + date [ 1 ] + ' - ' + date [ 0 ] + ' ' + parsedData [ 4 ] ; // date
list < < l2 [ 5 ] ; // attributes
entry < < parsedData [ 5 ] ; // attributes
list < < l2 [ 6 ] ; // crc
entry < < parsedData [ 6 ] ; // crc
list < < l2 [ 7 ] ; // method
entry < < parsedData [ 7 ] ; // method
list < < l2 [ 8 ] ; // Version
entry < < parsedData [ 8 ] ; // Version
m_isFirstLine = true ;
m_isFirstLine = true ;
}
}
else
else
{
{
m_entryFilename = line . mid ( line . find ( l2 [ 7 ] ) ) ;
// Note: don't use parsedData for names due to they may contain trailing spaces
list < < m_entryFilename ; // filename
TQRegExp nameRegExp ( TQString : : fromLatin1 ( " \\ s*( \\ S+ \\ s+) { 6 } \ \ S + ( . * ) " ));
list < < l2 [ 1 ] ; // size
list < < l2 [ 2 ] ; // packed
list < < l2 [ 3 ] ; // ratio
TQStringList date = TQStringList : : split ( ' - ' , l2 [ 4 ] ) ;
if ( parsedData . size ( ) > = 8 & & nameRegExp . exactMatch ( uline ) ) {
list < < l2 [ 4 ] + " " + l2 [ 5 ] ; // date and time
m_entryFilename = nameRegExp . capturedTexts ( ) [ 2 ] ;
list < < l2 [ 0 ] ; // attributes
list < < l2 [ 6 ] ; // crc
entry < < m_entryFilename ; // filename
entry < < parsedData [ 1 ] ; // size
entry < < parsedData [ 2 ] ; // packed
entry < < parsedData [ 3 ] ; // ratio
entry < < parsedData [ 4 ] + " " + parsedData [ 5 ] ; // date and time
entry < < parsedData [ 0 ] ; // attributes
entry < < parsedData [ 6 ] ; // crc
} else {
kdError ( 1601 ) < < " Failed to parse rar-5+ output string: \" " < < uline < < " \" " < < endl ;
return false ;
}
}
}
// send to GUI
// send to GUI
if ( l2 [ 6 ] = = " 00000000 " )
// Use addOrUpdateItem() rather than addItem() due to recent RAR version
{
// place directories in archive after their content.
// folders have CRC equal to 00000000
FileLVI * item = m_gui - > fileList ( ) - > addOrUpdateItem ( entry ) ;
// RAR utilities show the folders at the end of the listing so the folders
// have been already added to the listview at this point without specifying
// But archives packaged with older versions of ark may have directories
// all the columns but the name. Update the item with the missing info
// entries first, so make sure they will get an appropriate icon
m_gui - > fileList ( ) - > updateItem ( list ) ;
if ( item & & entry [ 5 ] . find ( ' d ' , 0 , false ) ! = - 1 ) {
// check attr's for d (case insensitive to handle windows archives)
item - > setPixmap ( 0 , KMimeType : : mimeType ( " inode/directory " ) - > pixmap ( TDEIcon : : Small ) ) ;
}
}
else
m_gui - > fileList ( ) - > addItem ( list ) ;
return true ;
return true ;
} }
Alexander Golubev
