fix merge conflict

xiaoyifang · Jun 1, 2022 · 077d139 · 077d139
2 parents 530591f + 8acec2e
commit 077d139
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 21 deletions.
diff --git a/goldendict.pro b/goldendict.pro
@@ -24,6 +24,15 @@ else{
 
 system(echo $${VERSION}.$${GIT_HASH} on $${DATE} > version.txt)
 
+!CONFIG( verbose_build_output ) {
+  !win32|*-msvc* {
+    # Reduce build log verbosity except for MinGW builds (mingw-make cannot
+    # execute "@echo ..." commands inserted by qmake).
+    CONFIG += silent
+  }
+}
+
+
 # DEPENDPATH += . generators
 INCLUDEPATH += .
 

diff --git a/zim.cc b/zim.cc
@@ -126,7 +126,7 @@ __attribute__((packed))
 enum
 {
   Signature = 0x584D495A, // ZIMX on little-endian, XMIZ on big-endian
-  CurrentFormatVersion = 2 + BtreeIndexing::FormatVersion + Folding::Version
+  CurrentFormatVersion = 3 + BtreeIndexing::FormatVersion + Folding::Version
 };
 
 struct IdxHeader
@@ -159,13 +159,15 @@ struct Cache
   quint32 clusterNumber;
   int stamp;
   int count, size;
+  unsigned blobs_offset_size;
 
   Cache() :
     data( 0 ),
     clusterNumber( 0 ),
     stamp( -1 ),
     count( 0 ),
-    size( 0 )
+    size( 0 ),
+    blobs_offset_size( 0 )
   {}
 };
 
@@ -186,14 +188,14 @@ class ZimFile : public SplitFile::SplitFile
   const ZIM_header & header() const
   { return zimHeader; }
 
-  string getClusterData( quint32 cluster_nom );
+  string getClusterData( quint32 cluster_nom, unsigned & blob_offset_size );
 
   const QString getMimeType( quint16 nom )
   { return mimeTypes.value( nom ); }
 
   bool isArticleMime( quint16 mime_type )
-  { return getMimeType( mime_type ).compare( "text/html", Qt::CaseInsensitive ) == 0
-           || getMimeType( mime_type ).compare( "text/plain", Qt::CaseInsensitive ) == 0; }
+  { return getMimeType( mime_type ).startsWith( "text/html", Qt::CaseInsensitive )
+           || getMimeType( mime_type ).startsWith( "text/plain", Qt::CaseInsensitive ); }
 
 
   quint16 redirectedMimeType( RedirectEntry const & redEntry );
@@ -330,7 +332,7 @@ bool ZimFile::open()
   return true;
 }
 
-string ZimFile::getClusterData( quint32 cluster_nom )
+string ZimFile::getClusterData( quint32 cluster_nom, unsigned & blobs_offset_size )
 {
   // Check cache
   int target = 0;
@@ -364,6 +366,7 @@ string ZimFile::getClusterData( quint32 cluster_nom )
   if( found )
   {
     // Cache hit
+    blobs_offset_size = cache[ target ].blobs_offset_size;
     return string( cache[ target ].data, cache[ target ].count );
   }
 
@@ -389,9 +392,11 @@ string ZimFile::getClusterData( quint32 cluster_nom )
 
   seek( clusterOffsets.at( nom ).first );
 
-  char compressionType;
-  if( !getChar( &compressionType ) )
+  char compressionType, cluster_info;
+  if( !getChar( &cluster_info ) )
     return string();
+  compressionType = cluster_info & 0x0F;
+  blobs_offset_size = cluster_info & 0x10 && zimHeader.majorVersion >= 6 ? 8 : 4;
 
   string decompressedData;
 
@@ -420,9 +425,16 @@ string ZimFile::getClusterData( quint32 cluster_nom )
   // Check BLOBs number in the cluster
   // We cache multi-element clusters only
 
-  quint32 firstOffset;
-  memcpy( &firstOffset, decompressedData.data(), sizeof(firstOffset) );
-  quint32 blobCount = ( firstOffset - 4 ) / 4;
+  quint32 firstOffset32;
+  quint64 firstOffset;
+  if( blobs_offset_size == 8 )
+    memcpy( &firstOffset, decompressedData.data(), sizeof(firstOffset) );
+  else
+  {
+    memcpy( &firstOffset32, decompressedData.data(), sizeof(firstOffset32) );
+    firstOffset = firstOffset32;
+  }
+  quint32 blobCount = ( firstOffset - blobs_offset_size ) / blobs_offset_size;
 
   if( blobCount > 1 )
   {
@@ -446,6 +458,7 @@ string ZimFile::getClusterData( quint32 cluster_nom )
       memcpy( cache[ target ].data, decompressedData.c_str(), size );
       cache[ target ].count = size;
       cache[ target ].clusterNumber = cluster_nom;
+      cache[ target ].blobs_offset_size = blobs_offset_size;
     }
   }
 
@@ -591,23 +604,42 @@ quint32 readArticle( ZimFile & file, quint32 articleNumber, string & result,
 
     // Read cluster data
 
-    string decompressedData = file.getClusterData( artEntry.clusterNumber );
+    unsigned offset_size = 0;
+    string decompressedData = file.getClusterData( artEntry.clusterNumber, offset_size );
     if( decompressedData.empty() )
       break;
 
     // Take article data from cluster
 
-    quint32 firstOffset;
-    memcpy( &firstOffset, decompressedData.data(), sizeof(firstOffset) );
-    quint32 blobCount = ( firstOffset - 4 ) / 4;
+    quint32 firstOffset32;
+    quint64 firstOffset;
+
+    if( offset_size == 8 )
+      memcpy( &firstOffset, decompressedData.data(), sizeof(firstOffset) );
+    else
+    {
+      memcpy( &firstOffset32, decompressedData.data(), sizeof(firstOffset32) );
+      firstOffset = firstOffset32;
+    }
+    quint32 blobCount = ( firstOffset - offset_size ) / offset_size;
     if( artEntry.blobNumber > blobCount )
       break;
 
-    quint32 offsets[ 2 ];
-    memcpy( offsets, decompressedData.data() + artEntry.blobNumber * 4, sizeof(offsets) );
-    quint32 size = offsets[ 1 ] - offsets[ 0 ];
-
-    result.append( decompressedData, offsets[ 0 ], size );
+    quint32 size;
+    if( offset_size == 8 )
+    {
+      quint64 offsets[ 2 ];
+      memcpy( offsets, decompressedData.data() + artEntry.blobNumber * 8, sizeof(offsets) );
+      size = offsets[ 1 ] - offsets[ 0 ];
+      result.append( decompressedData, offsets[ 0 ], size );
+    }
+    else
+    {
+      quint32 offsets[ 2 ];
+      memcpy( offsets, decompressedData.data() + artEntry.blobNumber * 4, sizeof(offsets) );
+      size = offsets[ 1 ] - offsets[ 0 ];
+      result.append( decompressedData, offsets[ 0 ], size );
+    }
 
     return articleNumber;
   }
@@ -1549,7 +1581,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
           }
 
           const quint64 * ptr;
-          quint16 mimetype, redirected_mime;
+          quint16 mimetype, redirected_mime = 0xFFFF;
           ArticleEntry artEntry;
           RedirectEntry redEntry;
           string url, title;