pixelflut 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e00558ad6f4afeeda5a86d00ee8fcbfffc09bf3978aa02b7997c69541b4ec71
-  data.tar.gz: fb2ec338298452be18a2a9c5352b49100628efb5234b94ee0d25f2f57e759607
+  metadata.gz: 289cd742f8feabae71182b94738bf9b21246bf1f3afae4a4b2bc1c5b1be87d4c
+  data.tar.gz: 2ba98d609131de67a2be99f55681087b45eeaf4deb6bf488b393894c1b31c6c9
 SHA512:
-  metadata.gz: aa654604990a4af74b65d074a65635ba04d302b4974b37d68fe1a2d155a9dbc4495e62c5422b2c1ce55b9dfbd63b0ca208111ddbe26cf3426ffaf26a55d03573
-  data.tar.gz: '099c5c9b3d013d26eb19616e0cef6a7fb2a1a391ddd4bae4e5ce77d263eee1ffcf5cb0311a868a7ab7656eb3cbb621ba7ab02d9e83cc19b3722ca16da9ec6b7c'
+  metadata.gz: 9a8b53a0309a0c52a8898bab91f9c1ba95bb1622f733fee1236914b036dabae5ad2b375a55b6bb5c5cb3d1d9ba33f9d200cde650d014232e193f598ce8d3de8f
+  data.tar.gz: ba1480300f12b1fae6dba2fcec945537b519dd04fabffd345288a5b3c2c1f1c8e5ae6d9115314663772feeaa6d74c8b8198c8d905f6c8c8e0fab51c27a8594e2

data/bin/pxf

@@ -12,7 +12,8 @@ def err(msg, code = 1)
   exit(code)
 end
 
-OPTS = Struct
+OPTS =
+  Struct
   .new(:host, :port, :count, :x, :y, :mode, :scale, :image)
   .new('127.0.0.1', 1234, 4, 0, 0, :rgbx)
 
@@ -62,8 +63,8 @@ end
 
 begin
   parse(ARGV)
-  addr = Pixelflut::Sender.address(OPTS.host, OPTS.port)
-  slices = Pixelflut.as_slices(
+  address = Pixelflut::Sender.address(OPTS.host, OPTS.port)
+  data = Pixelflut.sliced(
     source: OPTS.image,
     count: OPTS.count,
     x: OPTS.x,
@@ -71,18 +72,19 @@ begin
     scale: OPTS.scale,
     mode: OPTS.mode
   )
-  slices.size.times do |i|
+  data.size.times do |i|
     next unless fork
     Process.setproctitle($name = format('pxf-%02d', i + 1))
-    sender = Pixelflut::Sender.new(addr, slices[i].join)
-    slices.clear
-    puts("#{$name}: run - #{sender.size} bytes")
-    sender.run{ puts("#{$name}: sent partly") }
+    data = data[i].join
+    puts("#{$name}: run - #{data.bytesize} bytes")
+    Pixelflut::Sender.send(address, data)
   end
 rescue SocketError => e
   err(e, 3)
 rescue LoadError => e
   err(e, 4)
+rescue Errno::ECONNREFUSED
+  err('unable to connect', 2)
 rescue Errno::EPIPE
   err('connection lost', 2)
 rescue Interrupt

data/lib/pixelflut.rb

@@ -11,9 +11,9 @@ module Pixelflut
     Convert.each_line(image, x, y)
   end
 
-  def self.as_slices(source:, count: 4, x: 0, y: 0, scale: nil, mode: :rgbx)
+  def self.sliced(source:, count: 4, x: 0, y: 0, scale: nil, mode: :rgbx)
     image = Image.new(source)
     image.scale(scale) if scale
-    Convert.as_slices(image, x, y, mode, count)
+    Convert.random_slices(image, x, y, mode, count)
   end
 end

data/lib/pixelflut/convert.rb

@@ -2,6 +2,16 @@ require 'rmagick'
 
 module Pixelflut
   module Convert
+    def self.random_slices(image, dx, dy, mode, count)
+      mode = MODE.fetch(mode) if Symbol === mode
+      ret, idx = Array.new(count){ [] }, 0
+      image.each_pixel.to_a.shuffle!.each do |x, y, px|
+        ret[idx % count] << "PX #{x + dx} #{y + dy} #{mode.call(px)}\n"
+        idx += 1
+      end
+      ret
+    end
+
     MODE = {
       rgb: lambda do |pixel|
         pixel.to_color(Magick::AllCompliance, false, 8, true)[1, 6]
@@ -17,25 +27,5 @@ module Pixelflut
         end
       end
     }.freeze
-
-    def self.each_line(image, dx, dy, mode)
-      return to_enum(__method__, image, dx, dy, mode) unless block_given?
-      mode = MODE.fetch(mode) if Symbol === mode
-      image.each_pixel do |x, y, px|
-        yield("PX #{x + dx} #{y + dy} #{mode.call(px)}\n")
-      end
-    end
-
-    def self.as_slices(image, dx, dy, mode, count)
-      ret = each_line(image, dx, dy, mode).to_a.shuffle!
-      ret = ret.each_slice(ret.size / (count + 1)).to_a
-      rest = ret.pop
-      i = 0
-      rest.each do |line|
-        ret[i] << line
-        i = 0 if (i+= 1) == ret.size
-      end
-      ret
-    end
   end
 end

data/lib/pixelflut/sender.rb

@@ -1,47 +1,27 @@
 require 'socket'
 
 module Pixelflut
-  class Sender
-    def self.address(host, port)
-      Addrinfo.tcp(host, port)
-    end
-
-    def initialize(address, data)
-      @data = data.freeze
-      @addr = Socket.pack_sockaddr_in(address.ip_port, address.ip_address)
-      @socket = configure(Socket.new(address.ipv6? ? :INET6 : :INET, :STREAM))
-    end
+  module Sender
+    module_function
 
-    def size
-      @data.bytesize
-    end
-
-    def run(&block)
-      @socket.connect(@addr)
-      send(@socket, @data, @data.bytesize, &block)
-      @socket.close
+    def address(host, port)
+      Addrinfo.tcp(host, port)
     end
 
-    private
-
-    def send(socket, data, bytesize)
-      index, curr, size = 0, data, bytesize
-      loop do
-        written = socket.write(curr)
-        if (size -= written) > 0
-          yield(self) if block_given?
-          curr = data.byteslice(index += written, size)
-        else
-          index, curr, size = 0, data, bytesize
-        end
-      end
+    def send(address, data)
+      socket = create_socket(address)
+      loop{ socket.write(data) }
     end
 
-    def configure(socket)
-      socket.sync = true
-      socket.setsockopt(:TCP, :NODELAY, 1)
+    def create_socket(address)
+      socket = Socket.new(address.ipv6? ? :INET6 : :INET, :STREAM)
+      # socket.sync = true
+      # socket.setsockopt(:TCP, :NODELAY, 1)
       socket.setsockopt(:SOCKET, :KEEPALIVE, 0)
       socket.do_not_reverse_lookup = true
+      socket.connect(
+        Socket.pack_sockaddr_in(address.ip_port, address.ip_address)
+      )
       socket
     end
   end

data/lib/pixelflut/version.rb

@@ -1,3 +1,3 @@
 module Pixelflut
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelflut
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2019-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick