sanguinews 0.64 → 0.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b26b178a10c633dba392219f40f91dbf6f1869a5
-  data.tar.gz: 9f6f39fd2343af67c0c0323529e602a4f33068cf
+  metadata.gz: be67fcb820039d30493c8255ba1decd0f1c115bf
+  data.tar.gz: f0eac690d332fe41d9baf96ed2a01dce20370aaa
 SHA512:
-  metadata.gz: afb36351cf44ca9b4254e6855d008b4799b5a9c573b02a756fd0783848ac292e0147b6de80fefd08cdbe3537db942dacc22aabd2d52e337c67ed8d5f5eeb7074
-  data.tar.gz: ae02784a767ac8014925fd4e80d1cddb0f5dc339314a2008a9164ad3b478158f0fd10caf7f6611e26d326a6b458730a1c42a345c5f04c1413a679a2edc337d7c
+  metadata.gz: f81ce4b9b6f57db3b75c4cd28e3e7fe99f57fffcb4f9a72c42b8c47dbc7e975c183984fa337e597bcd17a054fafee20e65e4a28bb78f088a5adcf95423b362c1
+  data.tar.gz: d7bb9a2ec530a79045ba59daba1f10043ddd41f6808ebbe9042fb12d623737a3d4e30fdb8b08764857762591abdd22d8f2a329ffc2e3131469a7dcfd518fed93

data/lib/sanguinews/file_to_upload.rb

@@ -15,16 +15,12 @@
 # with this library; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 ########################################################################
-require 'nzb'
-require 'vmstat'
 
 module Sanguinews
   class FileToUpload < File
-    attr_accessor :name, :chunks, :subject
+    attr_accessor :name, :chunks, :subject, :messages
     attr_reader :crc32, :nzb, :dir_prefix, :cname
   
-    @@max_mem = nil
-    
     def initialize(var)
       @dir_prefix = ''
   
@@ -35,12 +31,17 @@ module Sanguinews
       @name = File.basename(var[:name])
       chunk_amount(var[:chunk_length])
       common_name(var)
-      max_mem
       if var[:nzb]
         @from = var[:from]
         @groups = var[:groups]
         nzb_init
       end
+      @messages = []
+      @chunks.times do |x|
+	subject = "#{var[:prefix]}#{@dir_prefix}\"#{@name}\" yEnc (#{x+1}/#{@chunks})"
+	@messages[x] = NntpMsg.new(@from, @groups, subject)
+	@messages[x].xna = var[:xna]
+      end
       return @name
     end
   
@@ -59,15 +60,12 @@ module Sanguinews
     end
   
     def file_crc32
-      @crc32 ||= begin
-        fcrc32 = 0
-        until self.eof?
-          f = self.read(@@max_mem)
-          fcrc32 = Crc32.calculate(f, f.size, fcrc32)
-        end
-        self.rewind
-        fcrc32.to_s(16)
+      fcrc32 = false
+      @messages.each do |message|
+	fcrc32 &&= Zlib.crc32_combine(fcrc32, message.part_crc32.to_i(16), message.length)
+	fcrc32 ||= message.part_crc32.to_i(16)
       end
+      @crc32 = fcrc32.to_s(16)
     end
   
     private
@@ -92,12 +90,5 @@ module Sanguinews
       @nzb.write_header
     end
   
-    def max_mem
-      @@max_mem ||= begin
-        memory = Vmstat.memory
-        @@max_mem = (memory[:free] * memory[:pagesize] * 0.1).floor
-      end
-      @@max_mem
-    end
   end
 end

data/lib/sanguinews/nntp.rb

@@ -399,9 +399,6 @@ module Net  #:nodoc:
 
       else
         socket = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
-        @socket = InternetMessageIO.new(socket)
-        @socket.read_timeout = @read_timeout
-        @socket.debug_output = @debug_output
         # Use OpenSSL to wrap socket
         # Introduced by: Tadeus Dobrovolskij
 	if method == :tls
@@ -410,9 +407,11 @@ module Net  #:nodoc:
 	  ssl.sync_close = true
 	  ssl.connect
           @socket = InternetMessageIO.new(ssl)
-	  @socket.read_timeout = @read_timeout
-	  @socket.debug_output = @debug_output
-	end
+        else
+          @socket = InternetMessageIO.new(socket)
+        end
+	@socket.read_timeout = @read_timeout
+	@socket.debug_output = @debug_output
       end
 
       check_response(critical { recv_response() })

data/lib/sanguinews/nntp_msg.rb

@@ -20,7 +20,7 @@ require 'date'
 
 module Sanguinews
   class NntpMsg
-    attr_accessor :message, :from, :groups, :subject, :poster, :date, :xna
+    attr_accessor :message, :from, :groups, :subject, :poster, :date, :xna, :crc32, :part_crc32, :length
   
     def initialize(from, groups, subject, message='', **opts)
       @from = from
@@ -29,7 +29,7 @@ module Sanguinews
       @message = message
       @date = opts[:date] if opts[:date]
       @date ||= DateTime.now().strftime('%a, %d %b %Y %T %z')
-      @poster = opts[:poster] if opts[:poster]
+      @poster = "sanguinews v#{Sanguinews::VERSION} (ruby #{RUBY_VERSION}) - https://github.com/tdobrovolskij/sanguinews"
     end
   
     def create_header
@@ -46,19 +46,19 @@ module Sanguinews
       return header
     end
   
-    def yenc_body(current_part, parts, crc32, pcrc32, part_size, file_size, filename)
-      chunk_start = ((current_part - 1) * part_size) + 1
-      chunk_end = current_part * part_size
+    def yenc_body(current_part, parts, file_size, filename)
+      chunk_start = ((current_part - 1) * @length) + 1
+      chunk_end = current_part * @length
       if (parts==1)
         headerline = "=ybegin line=128 size=#{file_size} name=#{filename}"
-        trailer = "=yend size=#{file_size} crc32=#{crc32}"
+        trailer = "=yend size=#{file_size} crc32=#{@crc32}"
       else
         headerline = "=ybegin part=#{current_part} total=#{parts} line=128 size=#{file_size} name=#{filename}\n=ypart begin=#{chunk_start} end=#{chunk_end}"
         # last part
         if (current_part == parts)
-          trailer = "=yend size=#{part_size} part=#{current_part} pcrc32=#{pcrc32} crc32=#{crc32}"
+          trailer = "=yend size=#{@length} part=#{current_part} pcrc32=#{@part_crc32} crc32=#{@crc32}"
         else
-          trailer = "=yend size=#{part_size} part=#{current_part} pcrc32=#{pcrc32}"
+          trailer = "=yend size=#{@length} part=#{current_part} pcrc32=#{@part_crc32}"
         end
       end
       headerline << "\n#{@message}\n"
@@ -74,5 +74,14 @@ module Sanguinews
     def size
       return @message.length
     end
+
+    def unset
+      @from = nil
+      @groups = nil
+      @subject = nil
+      @poster = nil
+      @date = nil
+      @message = nil
+    end
   end
 end

data/lib/sanguinews/version.rb

@@ -1,3 +1,3 @@
 module Sanguinews
-    VERSION = "0.64"
+    VERSION = "0.70"
 end

data/lib/sanguinews.rb

@@ -22,10 +22,11 @@ require 'optparse'
 require 'monitor'
 require 'date'
 require 'tempfile'
+require 'zlib'
 # Following non-standard gems are needed
 require 'parseconfig'
 require 'speedometer'
-require 'crc32'
+require 'nzb'
 # Our library
 require_relative 'sanguinews/thread-pool'
 require_relative 'sanguinews/nntp'
@@ -52,39 +53,21 @@ module Sanguinews
         final_data = []
         len = bindata.length
         yencoded = Yencoded::Data.yenc(bindata, len)
-        data[:crc32] = yencoded[1].to_s(16)
-        data[:yenc] = yencoded[0]
-        data[:length] = len
-        data[:chunk] = chunk
-        data[:file] = file
-        final_data[0] = form_message(data)
+        msg = file.messages[chunk-1]
+        msg.message = yencoded[0].force_encoding('ASCII-8BIT')
+        msg.part_crc32 = yencoded[1].to_s(16)
+        msg.length = len
+        msg.crc32 = file.file_crc32 if chunk == file.chunks
+        msg.yenc_body(chunk, file.chunks, file.size, file.name)
+        final_data[0] = { message: msg.return_self, filename: file.name, chunk: chunk, length: len }
         final_data[1] = file
         queue.push(final_data)
+        # we do care about user's memory
+        msg.unset
         chunk += 1
      end
   end
 
-  def form_message(data)
-    message = data[:yenc]
-    length = data[:length]
-    pcrc32 = data[:crc32]
-    file = data[:file]
-    chunk = data[:chunk]
-    crc32 = file.crc32
-    fsize = file.size
-    chunks = file.chunks
-    basename = file.name
-    # usenet works with ASCII
-    subject="#{@config.prefix}#{file.dir_prefix}\"#{basename}\" yEnc (#{chunk}/#{chunks})"
-    msg = NntpMsg.new(@config.from, @config.groups, subject)
-    msg.poster = "sanguinews v#{Sanguinews::VERSION} (ruby #{RUBY_VERSION}) - https://github.com/tdobrovolskij/sanguinews"
-    msg.xna = @config.xna
-    msg.message = message.force_encoding('ASCII-8BIT')
-    msg.yenc_body(chunk, chunks, crc32, pcrc32, length, fsize, basename)
-    msg = msg.return_self
-    { message: msg, filename: basename, chunk: chunk, length: length }
-  end
-
   def connect(conn_nr)
     begin
       nntp = Net::NNTP.start(
@@ -164,7 +147,8 @@ module Sanguinews
       file = FileToUpload.new(
         name: file, chunk_length: @config.article_size, prefix: @config.prefix,
 	current: current_file, last: max, filemode: @config.filemode,
-	from: @config.from, groups: @config.groups, nzb: @config.nzb
+	from: @config.from, groups: @config.groups, nzb: @config.nzb,
+	prefix: @config.prefix, xna: @config.xna
       )
       @s.to_upload += file.size
 
@@ -263,8 +247,6 @@ module Sanguinews
     # let's give a little bit higher priority for file processing thread
     @file_proc_thread = Thread.new {
       files_to_process.each do |file|
-        @s.log("Calculating CRC32 value for #{file.name}\n", stderr: true) if @verbose
-        file.file_crc32
         @s.log("Encoding #{file.name}\n")
         yencode(file, @config.article_size, messages)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sanguinews
 version: !ruby/object:Gem::Version
-  version: '0.64'
+  version: '0.70'
 platform: ruby
 authors:
 - Tadeus Dobrovolskij
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: speedometer
@@ -50,20 +50,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
-- !ruby/object:Gem::Dependency
-  name: vmstat
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: parseconfig
   requirement: !ruby/object:Gem::Requirement
@@ -78,20 +64,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: crc32
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement