EXtremeZip 2024.9.16 → 2025.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adb5cd625ffdf5c3ff750d21814371a76d3d8f2145f3599fd509c853e8717b95
-  data.tar.gz: 0ab97f34a65cbee3094194069e8f9ee9b061c4126ba97d03d162bd47f750077e
+  metadata.gz: 19f16e0b5768588a6951f5e5b3680434dc15ac57a470ac6c67d1d7bb86ad6906
+  data.tar.gz: 0c3add42a4070d440fd3563fc10851a95e0cdc921f1265310b4fc5a171aff65e
 SHA512:
-  metadata.gz: 534f2d961176fdba3adbc3f59b4a9ac8bd3582095803586c0d5c06ac5de9a1635f817376cf45bb16db27477c3adf422d4c5ba81715764e6f917e32627c6fb952
-  data.tar.gz: b4d1b622ea5a3d7d8f0fa112318d63cb884bab8114ae8b8b822a5230eab5d6c465269f2eb05b388dc3319fbb7a13b4a349715108c9d6fe47c8a43ea7ca998fe2
+  metadata.gz: c8f9e5d07d15db0b05c3339e0b935e500009e0e70a2e3ee0ec92f8ddcda25fb4a9a9716fecd0f86c422051b6bb1aa9153f7edd6fc10938ab313f05eabc834e4d
+  data.tar.gz: 94e4c72ae99a0cb7189664198325468faad6fb0f595759b0da5851a83f7efb1e24bb55aa3b662261213aeb273701de95bc1b03c05dd0cb958c54ae9143273774

data/bin/exuz

@@ -4,17 +4,17 @@ require 'extremeunzip.zzaqsu'
 
 if ARGV.empty? # 未指定命令行参数。
 else # 指定了命令行参数。
-    returnCode = 0 # 失败
-    $rootPath = ARGV[0] # 记录要打包的目录树的根目录。
+  returnCode = 0 # 失败
+  $rootPath = ARGV[0] # 记录要打包的目录树的根目录。
 
-    exuzObject = ExtremeUnZip.new # 解压对象
+  exuzObject = ExtremeUnZip.new # 解压对象
 
-    result = exuzObject.exuz($rootPath) # 解压
+  result = exuzObject.exuz($rootPath) # 解压
     
-    if result # 解压成功
-    else # 解压失败
-        returnCode = 1 # 失败
-    end #if result # 解压成功
+  if result # 解压成功
+  else # 解压失败
+    returnCode = 1 # 失败
+  end #if result # 解压成功
     
-    exit returnCode # 退出
+  exit returnCode # 退出
 end

data/lib/extremeunzip.zzaqsu.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'victoriafresh'
 require 'cbor'
 require 'lzma'
@@ -7,131 +5,152 @@ require 'get_process_mem'
 
 def checkMemoryUsage(lineNumber)
   mem = GetProcessMem.new
-
-  puts("#{lineNumber} ,  Memory: #{mem.mb}"); # Debug
-end # def checkMemoryUsage
+  puts("#{lineNumber} ,  Memory: #{mem.mb}") # Debug
+end
 
 class ExtremeUnZip
-  # 根据偏移值来读取压缩块数据列表。
+  def initialize
+    # 移除 StreamDecoder 初始化，改为直接调用 LZMA.decompress
+  end
+
   def readVfsDataList(wholeCbor) 
-    compressedVfsDataList = [] # 获取压缩后的数据块列表
-    startIndix=wholeCbor['vfsDataListStart'] # 初始起始位置。
-    
-    puts "whole length: #{@wholeFileContent.length}, list conent: #{wholeCbor['vfsDataList']}" # Debug
-    
+    compressedVfsDataList = []
+    startIndix = wholeCbor['vfsDataListStart']
+
+    puts "whole length: #{@wholeFileContent.length}, list content: #{wholeCbor['vfsDataList']}" # Debug
     
-    wholeCbor['vfsDataList'].each do |currentBlockInfo| # 一个个块地处理
-      length=currentBlockInfo['length'] # 获取长度。
+    expected_block_length = nil
+
+    wholeCbor['vfsDataList'].each do |currentBlockInfo|
+      length = currentBlockInfo['length']
       
-      currentBlock=@wholeFileContent[startIndix, length] # 读取内容
+      if expected_block_length.nil?
+        expected_block_length = length
+      elsif length != expected_block_length
+        puts "Warning: unexpected block length detected. Expected: #{expected_block_length}, got: #{length}"
+      end
       
-      compressedVfsDataList << currentBlock # 加入当前块
+      currentBlock = @wholeFileContent[startIndix, length]
       
-      startIndix+=length # 位移。
+      compressedVfsDataList << currentBlock
+      
+      startIndix += length
     end
-    
-    compressedVfsDataList # 返回 内容
+
+    compressedVfsDataList
   end
   
-  # 根据版本号，提取VFS数据内容
   def extractVfsDataWithVersionExternalFile(wholeCbor, fileVersion)
-    victoriaFreshData = '' # 解压后的数据块整体
-    dataFileName = 'victoriafreshdata.w' # 数据文件名
-    dataFile = {} # 数据文件对象
-
-    if (fileVersion == 14) # 14版本
-        compressedVfsData = wholeCbor['vfsData'] # 获取压缩后的数据内容
-
-        victoriaFreshData = LZMA.decompress(compressedVfsData) # 解压缩数据内容
-
-        dataFile = File.open(dataFileName, 'wb') # 打开文件
-
-        dataFile.syswrite(victoriaFreshData) # 写入内容
-
-        dataFile.close # 关闭文件
-    elsif (fileVersion >= 30) # 30以上版本
-        compressedVfsDataList = wholeCbor['vfsDataList'] # 获取压缩后的数据块列表
+    dataFileName = 'victoriafreshdata.w'
+    expected_block_length = nil
+
+    if (fileVersion == 14)
+        compressedVfsData = wholeCbor['vfsData']
+        victoriaFreshData = LZMA.decompress(compressedVfsData)
+
+        File.open(dataFileName, 'wb') do |dataFile|
+            dataFile.syswrite(victoriaFreshData)
+            puts "After writing initial block, raw data file size: #{File.size(dataFileName)}"
+        end
+    elsif (fileVersion >= 30)
+        compressedVfsDataList = wholeCbor['vfsDataList']
         
-        if (fileVersion>=251) # 251 以上版本。要按照偏移值来读取压缩数据块列表。
-          compressedVfsDataList=readVfsDataList(wholeCbor) # 根据偏移值来读取压缩块数据列表。
-        end # if (fileVersion>=251) # 251 以上版本
+        if (fileVersion >= 251)
+          compressedVfsDataList = readVfsDataList(wholeCbor)
+        end 
 
-        puts("data block amont: #{compressedVfsDataList.length}") # Debug
+        puts("data block amount: #{compressedVfsDataList.length}")
 
-        dataBlockCounter = 0 # Data block counter
+        dataBlockCounter = 0
+        previous_block_length = nil
 
-        dataFile = File.open(dataFileName, 'wb') # 打开文件
+        File.open(dataFileName, 'wb') do |dataFile|
+compressedVfsDataList.each_with_index do |currentCompressed, index|
+  puts("data block counter: #{dataBlockCounter}")
+  checkMemoryUsage(34)
 
-        compressedVfsDataList.each do |currentCompressed| # 一块块地解压
-            puts("data block counter: #{dataBlockCounter}") # Debug
-            checkMemoryUsage(34)
-
-            begin # 解压
-              currentRawData = LZMA.decompress(currentCompressed) # 解压这一块
-
-              dataFile.syswrite(currentRawData) # 写入内容
-            rescue RuntimeError => e # 解压失败
-              puts "Warning: the exz file may be incomplete." # 报告错误。文件可能不完整。
-            end # begin # 解压
-
-            dataBlockCounter += 1 # count
-        end # compressedVfsDataList.each do |currentCompressed|
+  begin
+    currentRawData = LZMA.decompress(currentCompressed)
+    
+    if previous_block_length.nil?
+      previous_block_length = currentRawData.length
+      expected_block_length ||= previous_block_length
+    elsif currentRawData.length != previous_block_length || currentRawData.length == 0
+      if currentRawData.length == 0
+        puts "Warning: decompressed block length is zero at block #{index}. Generating fake data of expected length."
+        # 如果当前解压数据长度为0，则创建一个指定长度的伪造数据块
+        currentRawData = "\x00" * expected_block_length
+      else
+        puts "Warning: unexpected decompressed block length detected at block #{index}. Previous length: #{previous_block_length}, current length: #{currentRawData.length}"
+      end
+    end
+    
+    dataFile.syswrite(currentRawData)
+    puts "After writing block #{index}, raw data file size: #{File.size(dataFileName)}"
+  rescue RuntimeError => e
+    puts "Warning: the exz file may be incomplete at block #{index}. Error: #{e.message}"
+    
+    # 创建一个填充用的假数据块
+    fake_data_block = "\x00" * expected_block_length
+    dataFile.syswrite(fake_data_block)
+    puts "After writing fake block #{index}, raw data file size: #{File.size(dataFileName)}"
+    next
+  end
 
-        dataFile.close # 关闭文件
-    end # if (fileVersion==14) #14版本
+  dataBlockCounter += 1
+end
+        end
+    end
 
-    dataFileName # 返回解压后的数据块整体
-  end # def extractVfsDataWithVersionExternalFile(wholeCbor, fileVersion) #根据版本号，提取VFS数据内容
+    dataFileName
+  end
 
-  # 解压
   def exuz(rootPath)
-    result = true # 解压结果
-
-    currentBlockFile = File.new(rootPath, 'rb') # 打开文件
-
-    @wholeFileContent = currentBlockFile.read # 读取全部内容
+    result = true
 
-    currentBlockFile.close # 关闭文件
+    begin
+        currentBlockFile = File.new(rootPath, 'rb')
+        @wholeFileContent = currentBlockFile.read
+        currentBlockFile.close
 
-    checkMemoryUsage(60)
+        checkMemoryUsage(60)
 
-    wholeCborByteArray = @wholeFileContent[4..-1] # 从第5个到末尾
+        wholeCborByteArray = @wholeFileContent[4..-1]
 
-    begin # 可能出错。
-      options = {:tolerant => true}
-
-      wholeCbor = CBOR.decode(wholeCborByteArray, options) # 解码
+        options = {:tolerant => true}
+        wholeCbor = CBOR.decode(wholeCborByteArray, options)
             
-      fileVersion = wholeCbor['version'] # 获取版本号
+        fileVersion = wholeCbor['version']
             
-      if (fileVersion < 14) # 版本号过小
-        checkMemoryUsage(85)
-        puts 'file version too old' # 报告错误
-      else # 版本号够大
-        compressedVfsMenu = wholeCbor['vfsMenu'] # 获取压缩后的目录内容
-        puts "compressed vfs menu size: #{compressedVfsMenu.size}" # D3bug
-                
-        checkMemoryUsage(90)
-        replyByteArray = LZMA.decompress(compressedVfsMenu) # 解码目录VFS字节数组内容
+        if (fileVersion < 14)
+            checkMemoryUsage(85)
+            puts 'file version too old'
+        else
+            compressedVfsMenu = wholeCbor['vfsMenu']
+            puts "compressed vfs menu size: #{compressedVfsMenu.size}"
+
+            checkMemoryUsage(90)
+            replyByteArray = LZMA.decompress(compressedVfsMenu)
           
-        checkMemoryUsage(95)
+            checkMemoryUsage(95)
 
-        victoriaFreshDataFile = extractVfsDataWithVersionExternalFile(wholeCbor, fileVersion) # 根据版本号，提取VFS数据内容
+            victoriaFreshDataFile = extractVfsDataWithVersionExternalFile(wholeCbor, fileVersion)
           
-        checkMemoryUsage(100)
-        $clipDownloader = VictoriaFresh.new # 创建下载器。
+            checkMemoryUsage(100)
+            $clipDownloader = VictoriaFresh.new
           
-        $clipDownloader.releaseFilesExternalDataFile(replyByteArray, victoriaFreshDataFile) # 释放各个文件
+            $clipDownloader.releaseFilesExternalDataFile(replyByteArray, victoriaFreshDataFile)
           
-        fileToRemove = File.new(victoriaFreshDataFile) # 要删除的文件
-        File.delete(fileToRemove) # 删除文件
-      end # if (fileVersion<14) #版本号过小
-            
-      result =true # 解压成功
-    rescue EOFError => e # 文件内容提前到末尾。一般是压缩包文件未传输完全 。
-      puts "Error: the exz file may be incomplete." # 报告错误。文件可能不完整。
+            File.delete(victoriaFreshDataFile)
+        end
             
-      result = false # 失败
-    end #begin # 可能出错。
-  end # def exuz(rootPath)
-end # class ExtremeUnZip
+        result = true
+    rescue EOFError => e
+        puts "Error: the exz file may be incomplete. Error: #{e.message}"
+        result = false
+    rescue => e
+        puts "Unexpected error: #{e.message}"
+        result = false
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: EXtremeZip
 version: !ruby/object:Gem::Version
-  version: 2024.9.16
+  version: 2025.1.28
 platform: ruby
 authors:
 - Hxcan Cai
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-15 00:00:00.000000000 Z
+date: 2025-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cod
@@ -86,20 +86,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2024.9.16
+        version: 2024.9.17
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2024.9.16
+        version: 2024.9.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2024.9.16
+        version: 2024.9.17
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2024.9.16
+        version: 2024.9.17
 - !ruby/object:Gem::Dependency
   name: hx_cbor
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: EXtremeZip