sanguinews 0.71 → 0.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a86f7b09264c0cf751f8cfc1de0b099107e0b129
-  data.tar.gz: 128929c2859816545179090a337f513b3b17b902
+  metadata.gz: 6a95bb5bc8f2a550c7a645e9bb9e8f0db7f3ff75
+  data.tar.gz: 4d52b579688af11de4ec34b74e2eae397b17165c
 SHA512:
-  metadata.gz: b4242b47c83f311d95da4a51f8df096bd0e29e3af2a57153545a6c07930d3baa8fdd667e98122a5312a514d1a4e8aa92254feb09e6c9116f7d56aeec284fe76d
-  data.tar.gz: 342fd681d52f3703d706af11f940ccdfad63f67505adbef3f029e06e3ed38d3bb4a74c689680ad2443be5eeb9d68ef306aa9d4c738e7ed3c53a82d98c7917754
+  metadata.gz: 2e2ea68fb138aac98d5c7343e01123f54b8e9568b41405158f430b35458a673c38feb68bc1723781c58820db5297438f128d3e9b3cb093901c6f3de385d2f6c1
+  data.tar.gz: c0d6e77f384142d11bac652bdd9518254ac8c989676f5eefe35d764fb36ecd2e9eaa1100aa4d3eff4b8bd6acc873b05e6ccdbf60ad2775c94c81f6b24df6587e

data/lib/sanguinews.rb

@@ -34,36 +34,60 @@ require_relative 'sanguinews/yencoded'
 require_relative 'sanguinews/config'
 require_relative 'sanguinews/version'
 
+# lets add additional property to the Thread class
+module SanguinewsThread
+  refine Thread do
+    attr_reader :awoken
+
+    def wakeup
+      @awoken = true
+      super
+    end
+
+    def awoken
+      @awoken = false if @awoken.nil?
+      @awoken
+    end
+  end
+end
+
 module Sanguinews
+  using SanguinewsThread
+
   module_function
   # Method returns yenc encoded string and crc32 value
-  def yencode(file, length, queue)
-     chunk = 1
-     until file.eof?
-        bindata = file.read(length)
-        # We can't take all memory, so we wait
-        queue.synchronize do
-          @cond.wait_while do
-            queue.length > @config.connections * 3
-          end
+  def yencode(file, length, queue, thread)
+    chunk = 1
+    @s.log("Encoding #{file.name}\n") if @config.debug
+    until file.eof?
+      bindata = file.read(length)
+      # We can't take all memory, so we wait
+      queue.synchronize do
+        @cond.wait_while do
+          queue.length > @config.connections * 3
         end
-        data = {}
-        final_data = []
-        len = bindata.length
-        yencoded = Yencoded::Data.yenc(bindata, len)
-        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
+      data = {}
+      final_data = []
+      len = bindata.length
+      yencoded = Yencoded::Data.yenc(bindata, len)
+      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)
+      # start processing next file
+      if file.chunks - chunk <= @config.connections && thread + 1 < @file_proc_threads.size
+        @file_proc_threads[thread+1].wakeup unless @file_proc_threads[thread+1].awoken
+      end
+      # we do care about user's memory
+      msg.unset
+      chunk += 1
+    end
   end
 
   def connect(conn_nr)
@@ -209,9 +233,7 @@ module Sanguinews
       retry
     end
 
-    if @config.verbose
-      @s.log("Uploaded chunk Nr:#{chunk}\n", stderr: true)
-    end
+    @s.log("Uploaded chunk Nr:#{chunk}\n", stderr: true) if @config.verbose
 
     @s.done(length)
     @s.uploaded += full_size
@@ -242,14 +264,15 @@ module Sanguinews
 
     files_to_process, informed, unprocessed = create_upload_list(info_lock)
 
-    # 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("Encoding #{file.name}\n")
-        yencode(file, @config.article_size, messages)
-      end
-    }
-    @file_proc_thread.priority += 2
+    @file_proc_threads = []
+    thread_nr = 0
+    files_to_process.each do |file|
+      @file_proc_threads[thread_nr] = Thread.new(thread_nr) { |x|
+        Thread.stop unless x == 0
+        yencode(file, @config.article_size, messages, x)
+      }
+      thread_nr += 1
+    end
 
     until unprocessed == 0
       thread_pool.schedule do

data/lib/sanguinews/version.rb

@@ -1,3 +1,3 @@
 module Sanguinews
-    VERSION = "0.71"
+    VERSION = "0.80"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sanguinews
 version: !ruby/object:Gem::Version
-  version: '0.71'
+  version: '0.80'
 platform: ruby
 authors:
 - Tadeus Dobrovolskij
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: speedometer
@@ -19,7 +19,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: nzb
   requirement: !ruby/object:Gem::Requirement