EXtremeZip 2022.1.10 → 2022.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e95d136f6b500f21919530563bb68a39d1bf931517503e040e515f4931d4e4d2
-  data.tar.gz: 01e73443dac1d6421f82224c7c32d083bceec3d8aa2d924be8a41e9ce087ebc8
+  metadata.gz: 8a901704ebb0119ce33eb6456905840c2b4dc6c0b5b59fef45412a1503bf71b9
+  data.tar.gz: 7b848ffaf0a33ae060d77f13c12f45b4c686a155d2fca7a86b69bb816d2e3dc3
 SHA512:
-  metadata.gz: 1bb94c733314f90974a7633b11fcb29fdebc1da243fd914215d7f94055878edf8892c382db5525a2c8b788f12d3781bf295ec018caea9d7e88b9e8030c2375b6
-  data.tar.gz: efcb570636ff01c3810ac1634ecae62390b8231b8d6567ddf7de5b4a084a4f6973a5fc32d70ab34f849559ff429e3c33575c722b7e96ebb5c023456f9655c8a1
+  metadata.gz: 38a3aa8e8679c4d065df2b21af79c0808f69e6e7756efd4bc68cbdf35d519c5eff0219e3d2541671ff1fe69f5d1688836f27a53c00ed56ce4d417852613609d0
+  data.tar.gz: 90b04389278faddbc27977f5e86c8ce468ffbf85aa95177c48a6630eb29e14f3ca540850b84e4cb95617bf487a54fa5566e9e330f309132249953cae7752c12d

data/lib/extremeunzip.zzaqsu.rb

@@ -1,20 +1,47 @@
 #!/usr/bin/env ruby
 
-# require 'pathname'
-# require File.dirname(__FILE__)+'/filemessage.pb.rb'
 require 'victoriafresh'
 require 'cbor'
 require 'lzma'
 require 'get_process_mem'
 
 def checkMemoryUsage(lineNumber)
-            mem = GetProcessMem.new
+  mem = GetProcessMem.new
 
-            puts("#{lineNumber} ,  Memory: #{mem.mb}"); # Debug
+  puts("#{lineNumber} ,  Memory: #{mem.mb}"); # Debug
 end # def checkMemoryUsage
 
-# 根据版本号，提取VFS数据内容
-def extractVfsDataWithVersionExternalFile(wholeCbor, fileVersion)
+
+
+
+class ExtremeUnZip
+  # 根据偏移值来读取压缩块数据列表。
+def readVfsDataList(wholeCbor) 
+        compressedVfsDataList = [] # 获取压缩后的数据块列表
+        startIndix=wholeCbor['vfsDataListStart'] # 初始起始位置。
+        
+        puts "whole length: #{@wholeFileContent.length}, list conent: #{wholeCbor['vfsDataList']}" # Debug
+        
+        
+        wholeCbor['vfsDataList'].each do |currentBlockInfo| # 一个个块地处理
+          length=currentBlockInfo['length'] # 获取长度。
+          
+          currentBlock=@wholeFileContent[startIndix, length] # 读取内容
+          
+          puts "start index: #{startIndix}, length: #{length}, content length: #{currentBlock.length}" # Debug
+          
+          compressedVfsDataList << currentBlock # 加入当前块
+          
+          startIndix+=length # 位移。
+        end
+  
+        compressedVfsDataList # 返回 内容
+end
+  
+  # 根据版本号，提取VFS数据内容
+
+  
+  def extractVfsDataWithVersionExternalFile(wholeCbor, fileVersion)
     victoriaFreshData = '' # 解压后的数据块整体
     dataFileName = 'victoriafreshdata.w' # 数据文件名
     dataFile = {} # 数据文件对象
@@ -31,6 +58,10 @@ def extractVfsDataWithVersionExternalFile(wholeCbor, fileVersion)
         dataFile.close # 关闭文件
     elsif (fileVersion >= 30) # 30以上版本
         compressedVfsDataList = wholeCbor['vfsDataList'] # 获取压缩后的数据块列表
+        
+        if (fileVersion>=251) # 251 以上版本。要按照偏移值来读取压缩数据块列表。
+          compressedVfsDataList=readVfsDataList(wholeCbor) # 根据偏移值来读取压缩块数据列表。
+        end # if (fileVersion>=251) # 251 以上版本
 
         puts("data block amont: #{compressedVfsDataList.length}") # Debug
 
@@ -44,18 +75,12 @@ def extractVfsDataWithVersionExternalFile(wholeCbor, fileVersion)
 
             begin # 解压
                 currentRawData = LZMA.decompress(currentCompressed) # 解压这一块
-                
 
                 dataFile.syswrite(currentRawData) # 写入内容
             rescue RuntimeError => e # 解压失败
                 puts "Warning: the exz file may be incomplete." # 报告错误。文件可能不完整。
             end # begin # 解压
 
-            #             victoriaFreshData=victoriaFreshData+currentRawData #追加
-            #             victoriaFreshData << currentRawData #追加
-
-            #puts("byte size: #{victoriaFreshData.bytesize}") # debug.
-
             dataBlockCounter += 1 # count
         end # compressedVfsDataList.each do |currentCompressed|
 
@@ -65,54 +90,21 @@ def extractVfsDataWithVersionExternalFile(wholeCbor, fileVersion)
     dataFileName # 返回解压后的数据块整体
 end # def extractVfsDataWithVersionExternalFile(wholeCbor, fileVersion) #根据版本号，提取VFS数据内容
 
-def extractVfsDataWithVersion(wholeCbor, fileVersion) # 根据版本号，提取VFS数据内容
-    victoriaFreshData = '' # 解压后的数据块整体
-
-    if (fileVersion == 14) # 14版本
-        compressedVfsData = wholeCbor['vfsData'] # 获取压缩后的数据内容
-
-        victoriaFreshData = LZMA.decompress(compressedVfsData) # 解压缩数据内容
-    elsif (fileVersion >= 30) # 30以上版本
-        compressedVfsDataList = wholeCbor['vfsDataList'] # 获取压缩后的数据块列表
-
-        puts("data block amont: #{compressedVfsDataList.length}") # Debug
-
-        dataBlockCounter = 0 # Data block counter
-
-        compressedVfsDataList.each do |currentCompressed| # 一块块地解压
-            puts("data block counter: #{dataBlockCounter}") # Debug
-            checkMemoryUsage(34)
-
-            currentRawData = LZMA.decompress(currentCompressed) # 解压这一块
-
-            #             victoriaFreshData=victoriaFreshData+currentRawData #追加
-            victoriaFreshData << currentRawData # 追加
-
-            puts("byte size: #{victoriaFreshData.bytesize}") # debug.
-
-            dataBlockCounter += 1 # count
-        end # compressedVfsDataList.each do |currentCompressed|
-    end # if (fileVersion==14) #14版本
-
-    victoriaFreshData # 返回解压后的数据块整体
-end #        extractVfsDataWithVersion(wholeCbor, fileVersion) #根据版本号，提取VFS数据内容
-
-class ExtremeUnZip
-    # 解压
+  # 解压
     def exuz(rootPath)
         result = true # 解压结果
         
-        wholeFileContent = File.read(rootPath) # 最终文件内容
+        currentBlockFile = File.new(rootPath, 'rb') # 打开文件
 
-        checkMemoryUsage(60)
+        @wholeFileContent = currentBlockFile.read # 读取全部内容
 
-        puts wholeFileContent.class # debug
+        currentBlockFile.close # 关闭文件
 
-        wholeCborByteArray = wholeFileContent[4..-1] # 从第5个到末尾
+        #@wholeFileContent = File.read(rootPath) # 最终文件内容
 
-        #     puts wholeCborByteArray #Debug.
+        checkMemoryUsage(60)
 
-        #/usr/local/share/gems/gems/EXtremeZip-2021.7.8/lib/extremeunzip.zzaqsu.rb:110:in `decode': end of buffer reached (EOFError)
+        wholeCborByteArray = @wholeFileContent[4..-1] # 从第5个到末尾
 
         begin # 可能出错。
             options = {:tolerant => true}
@@ -130,23 +122,16 @@ class ExtremeUnZip
                 checkMemoryUsage(90)
                 replyByteArray = LZMA.decompress(compressedVfsMenu) # 解码目录VFS字节数组内容
                 
-                #         puts replyByteArray #Debug
-                
                 checkMemoryUsage(95)
-                #         victoriaFreshData=extractVfsDataWithVersion(wholeCbor, fileVersion) #根据版本号，提取VFS数据内容
+
                 victoriaFreshDataFile = extractVfsDataWithVersionExternalFile(wholeCbor, fileVersion) # 根据版本号，提取VFS数据内容
                 
-                #         puts victoriaFreshData #Debug
-                
                 checkMemoryUsage(100)
                 $clipDownloader = VictoriaFresh.new # 创建下载器。
                 
                 $clipDownloader.releaseFilesExternalDataFile(replyByteArray, victoriaFreshDataFile) # 释放各个文件
                 
                 fileToRemove = File.new(victoriaFreshDataFile) # 要删除的文件
-                
-                #File.delete(fileToRemove) # 删除文件
-                
             end # if (fileVersion<14) #版本号过小
             
             result =true # 解压成功

data/lib/extremezip.zzaqsv.rb

@@ -33,6 +33,7 @@ class ExtremeZip
         @clipDownloader.diskMultiFile = true # 写多个磁盘文件
         @clipDownloader.diskFileName = 'victoriafreshdata.v.' # 磁盘文件名前缀
         @clipDownloader.diskFlushSize = @dataBlockLength # 磁盘文件大小
+        @clipDownloader.ignoreFileName= '.exzignore' # 设置用于指定忽略文件列表的文件名。
     end # def initialize
 
     # 压缩目录数据。
@@ -47,10 +48,14 @@ class ExtremeZip
 
     # 加入基本文件信息
     def addBasicFileInformation
-        @wholeCbor['version'] = 233 # 文件格式版本号
+        @wholeCbor['version'] = 251 # 文件格式版本号
 
         uuid = UUID.new # 获取生成器
         @wholeCbor['uuid'] = uuid.generate # 指定本个压缩包的唯一编号
+        
+        @wholeCbor['website']='https://rubygems.org/gems/EXtremeZip' # 加入网站地址
+        
+        @wholeCbor['vfsDataListStart']=198910 # 压缩 VFS 数据列表起始位置。
     end # addBasicFileInformation # 加入基本文件信息
 
     # 压缩
@@ -71,10 +76,54 @@ class ExtremeZip
         @wholeCbor['vfsDataList'] = @vfsDataList # 加入数据
 
         wholeFileContent = 'exz' + "\0" + @wholeCbor.to_cbor # 追加CBOR字节数组
+        
+        vfsDataListStart=wholeFileContent.length # 按照现在的序列化情况，计算出来的起始位置。
+        
+        while (vfsDataListStart!=@wholeCbor['vfsDataListStart']) # 计算出的偏移不一致
+          @wholeCbor['vfsDataListStart']=vfsDataListStart # 使用新的值
+          wholeFileContent = 'exz' + "\0" + @wholeCbor.to_cbor # 追加CBOR字节数组
+          vfsDataListStart=wholeFileContent.length # 按照现在的序列化情况，计算出来的起始位置。          
+        end
 
         # 写入文件：
         writeFile(wholeFileContent, victoriaFresh) # 写入文件内容
+        
+        appendVfsDataList victoriaFresh # 追加压缩块列表数据。
     end # def exz(rootPath)
+    
+    # 写入压缩块文件
+    def writeCompressBlock(compressed, processCounter) 
+        extremeZipOutputFile = File.new("comressed.#{processCounter}.cex", 'wb') # 创建文件
+        extremeZipOutputFile.syswrite(compressed) # 写入文件
+        extremeZipOutputFile.close # 关闭文件
+    end
+    
+    # 追加压缩块列表数据。
+    def appendVfsDataList (victoriaFresh)
+        extremeZipOutputFile = File.new("#{victoriaFresh['name']}.exz", 'ab') # 打开文件
+        
+        processCounter=0 # 块计数器。
+        
+        @wholeCbor['vfsDataList'].each do
+        #extremeZipOutputFile = File.new("comressed.#{processCounter}.cex", 'wb') # 创建文件
+
+        currentBlockFile = File.new("comressed.#{processCounter}.cex", 'rb') # 打开文件
+
+        wholeFileContent = currentBlockFile.read # 读取全部内容
+
+        currentBlockFile.close # 关闭文件
+
+          #wholeFileContent=File.read("comressed.#{processCounter}.cex", 'rb') # 读取压缩块。
+          
+          puts "wirte file contetn length: #{wholeFileContent.length}" # Debghu
+          
+          extremeZipOutputFile.syswrite(wholeFileContent) # 写入文件
+          
+          processCounter += 1 # 计数
+        end
+        
+        extremeZipOutputFile.close # 关闭文件
+    end
 
     # 写入文件内容
     def writeFile(wholeFileContent, victoriaFresh)
@@ -91,8 +140,16 @@ class ExtremeZip
             currentSubProcess=processIdList[processCounter] # 获取子进程对象
         #processIdList.each do |currentSubProcess|
             compressed = receiveFromSubProcess(currentSubProcess, responsePipeList, processCounter) # 从子进程中读取数据，并终止子进程
+            
+            #写入当前压缩块到文件系统中去作为缓存。陈欣
+            writeCompressBlock(compressed, processCounter) # 写入压缩块文件
+            
+            blockInfo={} # 块信息
+            blockInfo['length']=compressed.length # 记录长度
+            
+            puts "block length: #{blockInfo['length']}" # Debug
 
-            @vfsDataList << compressed # 加入数据块列表中
+            @vfsDataList << blockInfo # 加入数据块列表中
             checkMemoryUsage(150)
 
             processCounter += 1 # 子进程计数
@@ -167,7 +224,6 @@ class ExtremeZip
 
         currentResponsePipe.put currentCompressedVfsData # 将压缩后的数据块写入到回复管道中
 
-        checkMemoryUsage(125)
         puts("finished #{Process.pid}") # Debug
     end # compressInSubProcess(currentBlockData, currentResponsePipe)  # 在子进程中具体执行的压缩代码
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: EXtremeZip
 version: !ruby/object:Gem::Version
-  version: 2022.1.10
+  version: 2022.2.5
 platform: ruby
 authors:
 - Hxcan Cai
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cod
@@ -86,20 +86,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2022.1.11
+        version: 2022.1.27
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2022.1.11
+        version: 2022.1.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2022.1.11
+        version: 2022.1.27
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2022.1.11
+        version: 2022.1.27
 - !ruby/object:Gem::Dependency
   name: hx_cbor
   requirement: !ruby/object:Gem::Requirement