EXtremeZip 2022.1.15 → 2022.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19b030c24fbd796b5f9ea2681973bf10c7afc763a5e2d5e9c7f5937a1daf950d
-  data.tar.gz: 761d719cf3873320fe0742be3be5fc44b72bfd00029ad86bbc7ac87d8b31590c
+  metadata.gz: d368c2ced983111e5abca75f712fd09f01f9a3c308860782ce9d17850aa84b9d
+  data.tar.gz: 8d9c5b14cd143fec9be4a4149b4ba191665bbdaab6e30c3de9492eb3183c5839
 SHA512:
-  metadata.gz: 2e2b943aacc965d09995eb9ca824ac4bb3d01ebe99d224fff0899fcfb6973a4afd936f234231416fb47a84445983b37de5d13953474b459a2bb9b7b1a83273f5
-  data.tar.gz: 0c4c3d9ca686dd8a32d338879c8048cb661ea6315fc533727e6a7093a14fd718ea37bf2554f1d0522c2a3a3afdd45b6a9878f5844f0134ff76b0a09fb227c5ed
+  metadata.gz: 249baeec68ad080d1d4fbd7f158d11b794aeff51c4e429d447cea91c9e9cb925a0c487506b9112e1cccf530bfe325f1dd5c74b1914d63a53a972a592acbf00a2
+  data.tar.gz: 229d12c536bc4ecec1253e62bb98db4a9cba42f0808904bd36ad9460dcb801ad949dc33c2ac39ac4c0982d37d2248d28d73e1a0943a3d61ad1547238cdc21187

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

@@ -48,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 # 加入基本文件信息
 
     # 压缩
@@ -72,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)
@@ -92,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 # 子进程计数
@@ -112,7 +168,7 @@ class ExtremeZip
 
         currentBlockFile.close # 关闭文件
 
-        #File.delete(currentBlockFile) # 删除数据块文件
+        File.delete(currentBlockFile) # 删除数据块文件
 
         currentBlockData
     end
@@ -121,11 +177,8 @@ class ExtremeZip
     def schedule1Block(filePartCounter)
         currentBlockData = readBlockFile(filePartCounter) # 读取块文件内容
 
-        # currentTaskPipe = Cod.pipe # 任务分配管道
         currentResponsePipe = Cod.pipe # 任务回复管道
 
-        puts("forking sub process, file part counter: #{filePartCounter}") # Debug.
-
         p1 = fork do # 复制出子进程
             compressInSubProcess(currentBlockData, currentResponsePipe) # 在子进程中具体执行的压缩代码
         end # p1 = fork do #复制出子进程
@@ -146,11 +199,8 @@ class ExtremeZip
 
     # 启动子进程。
     def launchSubProcesses
-
-        #while ((@filePartCounter < @filePartAmount) && (true)) # 未处理完毕，并且未达到最大子进程个数
         while ((@filePartCounter < @filePartAmount) && (@filePartCounter<@maxSubProcessAmount)) # 未处理完毕，并且未达到最大子进程个数
             currentResponsePipe, p1 = schedule1Block(@filePartCounter) # 计划一个块的压缩计算
-
         end # while processDataLength < victoriaFreshData.byte_size do #未处理完毕
 
         [@processIdList, @responsePipeList]
@@ -168,7 +218,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.15
+  version: 2022.2.6
 platform: ruby
 authors:
 - Hxcan Cai
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-15 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.15
+        version: 2022.1.27
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2022.1.15
+        version: 2022.1.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2022.1.15
+        version: 2022.1.27
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2022.1.15
+        version: 2022.1.27
 - !ruby/object:Gem::Dependency
   name: hx_cbor
   requirement: !ruby/object:Gem::Requirement