pixelflut 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b29b8ce88df1c1d08de27f9c87fae728d58d25759cbfc88c2f0c62865492f054
-  data.tar.gz: 55311c23772975543c15e74741a5bbb452e4a48eb0e4af4d351d28e9ed5cbfa3
+  metadata.gz: 2e00558ad6f4afeeda5a86d00ee8fcbfffc09bf3978aa02b7997c69541b4ec71
+  data.tar.gz: fb2ec338298452be18a2a9c5352b49100628efb5234b94ee0d25f2f57e759607
 SHA512:
-  metadata.gz: c078c2eb4b3dfe4c4faf5d0c3b9bc652c90d3b602c0166b89bcc5f6ccfe8c01e02e9ade0098d5b951f82beab9ef165a8e0bb9363542ebf93264f73d45985ef7e
-  data.tar.gz: 244d2e819a90182daf2883c49a73454e0367dc098a3ed3f50748846efec8605e14f34dff346f347f7df453d977de9e5b1bc1b9bf2eefbaf4bd36a24aea52d094
+  metadata.gz: aa654604990a4af74b65d074a65635ba04d302b4974b37d68fe1a2d155a9dbc4495e62c5422b2c1ce55b9dfbd63b0ca208111ddbe26cf3426ffaf26a55d03573
+  data.tar.gz: '099c5c9b3d013d26eb19616e0cef6a7fb2a1a391ddd4bae4e5ce77d263eee1ffcf5cb0311a868a7ab7656eb3cbb621ba7ab02d9e83cc19b3722ca16da9ec6b7c'

data/bin/pxf

@@ -13,8 +13,8 @@ def err(msg, code = 1)
 end
 
 OPTS = Struct
-  .new(:host, :port, :count, :x, :y, :scale, :image)
-  .new('127.0.0.1', 1234, 4, 0, 0)
+  .new(:host, :port, :count, :x, :y, :mode, :scale, :image)
+  .new('127.0.0.1', 1234, 4, 0, 0, :rgbx)
 
 def parse(args)
   OptionParser.new do |parser|
@@ -40,6 +40,11 @@ def parse(args)
     parser.on(
       '-s', '--scale FACTOR', OptionParser::DecimalNumeric, 'scale image by FACTOR'
     ){ |v| OPTS.scale = v }
+    parser.on(
+      '-m', '--pixel MODE',
+      {'RGBX' => :rgbx, 'RGBA' => :rgba, 'RGB' => :rgb},
+      'select pixel coding (RGBX | RGBA | RGB)'
+    ){ |v| OPTS.mode = v }
     parser.separator(nil)
     parser.on('-h', '--help', 'print this help') do
       exit(!puts(parser))
@@ -63,15 +68,16 @@ begin
     count: OPTS.count,
     x: OPTS.x,
     y: OPTS.y,
-    scale: OPTS.scale
+    scale: OPTS.scale,
+    mode: OPTS.mode
   )
   slices.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.run
+    puts("#{$name}: run - #{sender.size} bytes")
+    sender.run{ puts("#{$name}: sent partly") }
   end
 rescue SocketError => e
   err(e, 3)

data/bin/pxf-info

@@ -0,0 +1,32 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = '--help' ]
+then
+  echo "Usage: ${0##*/} [-p|--port PORT] ADDRESS
+
+Requests screen size of Pixelflut server at ADDRESS.
+"
+  exit 0
+fi
+
+PORT="1234"
+ADDRESS=""
+
+while [ $# -gt 0 ]
+do
+  key="$1"
+  case $key in
+  -p|--port)
+    PORT="$2"
+    shift; shift
+    ;;
+  *)
+    ADDRESS="$key"
+    shift
+    ;;
+  esac
+done
+
+echo "SIZE\nQUIT\n" | nc "$ADDRESS" "$PORT"

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)
+  def self.as_slices(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, count)
+    Convert.as_slices(image, x, y, mode, count)
   end
 end

data/lib/pixelflut/convert.rb

@@ -1,28 +1,41 @@
+require 'rmagick'
+
 module Pixelflut
   module Convert
-    def self.each_line0(image)
-      return to_enum(__method__, image) unless block_given?
-      image.each_pixel do |x, y, px|
-        px = px.to_color(Magick::AllCompliance, true, 8, true)[
-          1, 255 == px.alpha ? 6 : 8
-        ]
-        yield("PX #{x} #{y} #{px}\n")
+    MODE = {
+      rgb: lambda do |pixel|
+        pixel.to_color(Magick::AllCompliance, false, 8, true)[1, 6]
+      end,
+      rgba: lambda do |pixel|
+        pixel.to_color(Magick::AllCompliance, true, 8, true)[1, 8]
+      end,
+      rgbx: lambda do |pixel|
+        if pixel.alpha >= 65535
+          pixel.to_color(Magick::AllCompliance, false, 8, true)[1, 6]
+        else
+          pixel.to_color(Magick::AllCompliance, true, 8, true)[1, 8]
+        end
       end
-    end
+    }.freeze
 
-    def self.each_line(image, dx, dy)
-      return to_enum(__method__, image, dx, dy) unless block_given?
+    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|
-        px = px.to_color(Magick::AllCompliance, true, 8, true)[
-          1, 255 == px.alpha ? 6 : 8
-        ]
-        yield("PX #{x + dx} #{y + dy} #{px}\n")
+        yield("PX #{x + dx} #{y + dy} #{mode.call(px)}\n")
       end
     end
 
-    def self.as_slices(image, dx, dy, count)
-      ret = each_line(image, dx, dy).to_a.shuffle!
-      ret.each_slice(ret.size / count).to_a
+    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

@@ -12,34 +12,29 @@ module Pixelflut
       @socket = configure(Socket.new(address.ipv6? ? :INET6 : :INET, :STREAM))
     end
 
-    def run
-      connect
-      send(@socket, @data)
+    def size
+      @data.bytesize
+    end
+
+    def run(&block)
+      @socket.connect(@addr)
+      send(@socket, @data, @data.bytesize, &block)
       @socket.close
     end
 
     private
 
-    def send(socket, data)
-      curr = String.new(data)
+    def send(socket, data, bytesize)
+      index, curr, size = 0, data, bytesize
       loop do
         written = socket.write(curr)
-        curr =
-          if (size = curr.bytesize - written) > 0
-            curr.byteslice(written, size)
-          else
-            String.new(data)
-          end
-      end
-    end
-
-    def connect
-      loop do
-        (
-          :wait_writable == @socket.connect_nonblock(@addr, exception: false)
-        ) and break
+        if (size -= written) > 0
+          yield(self) if block_given?
+          curr = data.byteslice(index += written, size)
+        else
+          index, curr, size = 0, data, bytesize
+        end
       end
-      loop{ @socket.wait_writable(10) and break }
     end
 
     def configure(socket)

data/lib/pixelflut/version.rb

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

data/pixelflut.gemspec

@@ -29,10 +29,7 @@ GemSpec = Gem::Specification.new do |spec|
 
   spec.require_paths = %w[lib]
   spec.bindir = 'bin'
-  spec.executables =
-    Dir
-    .glob(File.expand_path('../bin/*', __FILE__))
-    .map!{ |fn| File.basename(fn) }
+  spec.executables = %w[pxf pxf-info]
 
   all_files = %x(git ls-files -z).split(0.chr)
   spec.test_files = all_files.grep(%r{^(spec|test)/})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelflut
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -58,6 +58,7 @@ description: |
 email: mike.blumtritt@pm.me
 executables:
 - pxf
+- pxf-info
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -65,6 +66,7 @@ files:
 - ".gitignore"
 - README.md
 - bin/pxf
+- bin/pxf-info
 - gems.rb
 - lib/pixelflut.rb
 - lib/pixelflut/convert.rb