sanguinews 0.62 → 0.62.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a07e61c925070d018d579a856c137b846c731e6c
-  data.tar.gz: e7a3c111b7073f2c4521aaa2d61e8359f59a1237
+  metadata.gz: 55d9dec66992a07b25961e5b54b801d50540eca2
+  data.tar.gz: f644862561feb4db752484335d365255594befad
 SHA512:
-  metadata.gz: 3c5da17e11518f47a90931e941a0304c5dbf992f6457a0c407b602fc0cb4d5594bad0798bb445fbde0f0467d7fa9d313c653f5ae30e297b1e957bd2df7aef22a
-  data.tar.gz: e7af4ec66b501eb5852202cbd5f20a09c507c4562be01c7379e7b10d54c03ac42aaf8024f4b4919f91c5586b7ec0723fe4b9d3b94e6e3d16379c5c5335719679
+  metadata.gz: bfc6823e311f763c1e6bd4bc78d7a286edbe6cfab7313f0eed3a2e4f62b21f0a67a0a2de8beef7763cbf7a0d48b2997b8682eb7b0f74d59a853900eb0e2a8e38
+  data.tar.gz: c1fdac5f87a68fc1b7fff70ab829139ff24c9d1811273676f36bd039ff96ba10a7ccd254150ef0218a56ca96588f58818fa7cf6316fa8b4815660dfbd07d9571

data/lib/sanguinews.rb

@@ -139,6 +139,51 @@ module Sanguinews
     end
   end
 
+  def create_upload_list(info_lock)
+    files = @config.files
+
+    # skip hidden files
+    if !@config.filemode && Dir.exists?(@config.directory)
+      Dir.foreach(@config.directory) do |item|
+        next if item.start_with?('.')
+        files << @config.directory+item
+      end
+    end
+
+    files_to_process = []
+    informed = {}
+    unprocessed = 0
+    current_file = 1
+    # "max" is needed only in dirmode
+    max = files.length
+
+    files.each do |file|
+      next if !File.file?(file)
+
+      informed[file.to_sym] = false
+      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
+      )
+      @s.to_upload += file.size
+
+      info_lock.synchronize do
+        unprocessed += file.chunks
+      end
+
+      files_to_process << file
+      current_file += 1
+    end
+
+    if files_to_process.empty?
+      puts "Upload list is empty! Make sure that you spelled file/directory name(s) correctly!"
+      exit 1
+    end
+    return files_to_process, informed, unprocessed
+  end
+
+
   def process_and_upload(queue, nntp_pool, info_lock, informed)
     stuff = queue.pop
     queue.synchronize do
@@ -196,26 +241,10 @@ module Sanguinews
 
   def run!
     @config = Config.new(ARGV)
-    files = @config.files
-
-    # skip hidden files
-    if !@config.filemode
-      Dir.foreach(@config.directory) do |item|
-        next if item.start_with?('.')
-        files << @config.directory+item
-      end
-    end
-
-    # "max" is needed only in dirmode
-    max = files.length
-    current_file = 1
-
-    unprocessed = 0
     info_lock=Mutex.new
     messages = Queue.new
     messages.extend(MonitorMixin)
     @cond = messages.new_cond
-    files_to_process = []
     @s = Speedometer.new(units: "KB", progressbar: true)
     @s.uploaded = 0
 
@@ -228,26 +257,8 @@ module Sanguinews
     }
 
     thread_pool = Pool.new(@config.connections)
-    informed = {}
 
-    files.each do |file|
-      next if !File.file?(file)
-
-      informed[file.to_sym] = false
-      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
-      )
-      @s.to_upload += file.size
-
-      info_lock.synchronize do
-        unprocessed += file.chunks
-      end
-
-      files_to_process << file
-      current_file += 1
-    end
+    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 {

data/lib/sanguinews/version.rb

@@ -1,3 +1,3 @@
 module Sanguinews
-    VERSION = "0.62"
+    VERSION = "0.62.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sanguinews
 version: !ruby/object:Gem::Version
-  version: '0.62'
+  version: 0.62.1
 platform: ruby
 authors:
 - Tadeus Dobrovolskij
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: speedometer