pixelflut 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbd5e580104dccc3e1a1123ccc063dde0ae530d7443129bc044e9b73a9c71293
-  data.tar.gz: 6590f3d4f9491a10aec353701cde1f53a26158ba8c655be0952ea3be0129d500
+  metadata.gz: 62efcd05717e96f42f60e21cbc7a569277fed6bb2e56d24d57d3fe11ff37cb1b
+  data.tar.gz: 7c8fd4eb2542668dd25abd6b5cccc12818c790cf111f1b2a8e38bbda44527f4d
 SHA512:
-  metadata.gz: ac78e76fc92be0e1891012cd1d1fe5b0cb5f388f736f75c2a4a193a294ce339cd1763ce2d1dcc055fa997b6feed20a0fba30d57447695cf8512db229fdcd6306
-  data.tar.gz: 20efde215a0528fc028980fa8edc3c8d40a3acff446aeb3f3599ca7cbd69a87dcc1eac135a5d844e2746a58651c011f8f64a38b2c35733029d382d5c832fe8a0
+  metadata.gz: 94241373ff17f9e0cbbc1b1b2e51f55db1da4beb032c18f4985590e6c50a1ba1bd9313fc7858caa9be76f84593b8fc7374337226afc72641a1c40f767b7fa66a
+  data.tar.gz: 00f6b49748585411187665ef9c2c3a519ca77641c7a3c7aa281b65f37a0c5b8fea7e53df82b49b58cc88401b72698f551b6752915c9d7177c9de5d2b1be9f3f3

data/README.md

@@ -29,6 +29,7 @@ $ pxf
 usage: pxf command [options]
 
 valid commands:
+convert    Convert given IMAGE file to Pixelflut format.
 generate   Execute given generator FILEs.
 help       Print help for given COMMAND.
 server     Start Pixelflut server.
@@ -54,3 +55,33 @@ With these options you can configure the server:
 -h, --height HEIGHT      set canvas height (default: 600)
 -f, --[no-]fullscreen    run in fullscreen mode
 ```
+
+### Convert an image
+
+There is a conversion command which can be used to convert a given image to the Pixelflut text format:
+
+```bash
+$ pxf convert image.png
+```
+
+The result can directly send to a running server (sample assumes the server runs on localhost port 1234):
+
+```bash
+$ pxf convert image.png | netcat localhost 1234
+```
+
+The converter can help you to resize and positioning the image and the servers canvas. These options are avail:
+
+```
+-x, --transpose-x X   transpose image X pixels
+-y, --transpose-y Y   transpose image Y pixels
+-w, --width WIDTH     resize the image to given WIDTH
+-h, --height HEIGHT   resize the image to given HEIGHT
+```
+
+It maybe faster to pre-process your image(s) and send later:
+
+```bash
+$ pxf convert -x 50 -y 100 --width 640 image.png > image.px
+$ cat image.px | netcat localhost 1234
+```

data/TODO.md

@@ -5,5 +5,5 @@
 - [x] limit connections _per IP_
 - [x] allow 10 (pixel-)actions per client
 - [ ] extend `pxf generate`
-- [ ] add a pre-processor for images
+- [x] add a pre-processor for images
 - [ ] mention the Gosu gem in the README

data/bin/pxf-convert

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+def options(cfg)
+  require 'optparse'
+  OptionParser.new do |opts|
+    opts.summary_indent = '  '
+    opts.banner = 'usage: pxf convert [options] IMAGE'
+    opts.separator(nil)
+    opts.separator('valid options:')
+    opts.on('-x', '--transpose-x X', Integer, 'transpose image X pixels'){ |v| cfg[:x_offset] = v }
+    opts.on('-y', '--transpose-y Y', Integer, 'transpose image Y pixels'){ |v| cfg[:y_offset] = v }
+    opts.on('-w', '--width WIDTH', Integer, 'resize the image to given WIDTH'){ |v| cfg[:width] = v }
+    opts.on('-h', '--height HEIGHT', Integer, 'resize the image to given HEIGHT'){ |v| cfg[:height] = v }
+  end
+end
+
+def help(short)
+  puts(options(nil), nil) unless short
+  puts('Convert given IMAGE file to Pixelflut format.')
+  exit
+end
+
+def err(msg, code = 1)
+  $stderr.puts("pxf: #{msg}")
+  exit(code)
+end
+
+def create_options
+  cfg = {}
+  options(cfg).parse!
+  cfg
+rescue OptionParser::ParseError => e
+  err(e)
+end
+
+help(false) if '--help' == ARGV[0]
+help(true) if '--short-help' == ARGV[0]
+err('too few arguments') if ARGV.empty?
+options = create_options
+require File.realdirpath('../../lib/pixelflut/converter.rb', __FILE__)
+begin
+  ARGV.each do |file_name|
+    cvt = Pixelflut::Converter.new(file_name)
+    cvt.x_offset = options[:x_offset] if options[:x_offset]
+    cvt.y_offset = options[:y_offset] if options[:y_offset]
+    cvt.resize_to(options[:width], options[:height]) if options[:width]
+    cvt.each_line{ |line| puts(line) }
+  end
+rescue Pixelflut::Converter::Error => e
+  err(e.message, 2)
+rescue Interrupt
+  exit
+end

data/bin/pxf-help

@@ -8,7 +8,7 @@ end
 
 def err(msg)
   $stderr.puts("pxf: #{msg}")
-  exit 1
+  exit(1)
 end
 
 case ARGV[0]

data/bin/pxf-server

@@ -20,7 +20,7 @@ def options(cfg)
     opts.on('-r', '--read_buffer SIZE', Integer, 'set read buffer size (default: 1024)') do |v|
       cfg.server.read_buffer_size = v
     end
-    opts.on('-l', '--peer-limit NUMBER', Integer, 'limit number connections per peer (default: 8)') do |v|
+    opts.on('-l', '--peer-limit NUMBER', Integer, 'limit number of connections per peer (default: 8)') do |v|
       cfg.server.peer_limit = v
     end
     opts.on('-c', '--command-limit NUMBER', Integer, 'limit of continious processed commands (default: 10)') do |v|
@@ -53,11 +53,10 @@ def create_configuration
   cfg
 rescue OptionParser::ParseError => e
   $stderr.puts("pxf: #{e}")
-  exit 1
+  exit(1)
 end
 
 begin
-  require 'optparse'
   require File.realdirpath('../../lib/pixelflut.rb', __FILE__)
   Pixelflut::App.run(create_configuration)
 rescue Interrupt

data/lib/pixelflut/converter.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Pixelflut
+  class Converter
+    Error = Class.new(RuntimeError)
+
+    attr_accessor :x_offset, :y_offset
+
+    def initialize(file_name)
+      load_rmagick
+      @images = load_image(file_name)
+      @x_offset = @y_offset = 0
+    end
+
+    def resize_to(width, height = nil)
+      @images.each{ |image| image.resize_to_fit!(width, height) }
+    end
+
+    def each_pixel
+      return to_enum(__method__) unless block_given?
+      @images.each do |image|
+        image.each_pixel do |color, x, y|
+          yield(
+            x + @x_offset,
+            y + @y_offset,
+            color.to_color(Magick::AllCompliance, true, 8, true)[1, 8]
+          ) unless 0xffff == color.opacity
+        end
+      end
+    end
+
+    def each_line
+      return to_enum(__method__) unless block_given?
+      each_pixel{ |x, y, rgba| yield "PX #{x} #{y} #{rgba}" }
+    end
+
+    private
+
+    def load_image(file_name)
+      Magick::ImageList.new(file_name)
+    rescue Magick::ImageMagickError => e
+      raise(Error, e.message)
+    end
+
+    def load_rmagick
+      require 'rmagick'
+    rescue LoadError
+      raise(Error, 'unable to load gem - "RMagick" not installed')
+    end
+
+  end
+end

data/lib/pixelflut/server.rb

@@ -1,30 +1,11 @@
 # frozen_string_literal: true
 
 require 'socket'
+require_relative 'server/connection'
+require_relative 'server/configuration'
 
 module Pixelflut
   class Server
-    Configuration = Struct.new(
-      :host,
-      :port,
-      :keep_alive_time,
-      :read_buffer_size,
-      :command_limit,
-      :peer_limit
-    ) do
-      def self.default
-        new(nil, 1234, 1, 1024, 10, 8)
-      end
-
-      def to_s
-        "bind: #{host}:#{port}"\
-          ", keep-alive-time: #{keep_alive_time}"\
-          ", read-buffer-size: #{read_buffer_size}"\
-          ", command-limit: #{command_limit}"\
-          ", peer-limit: #{peer_limit}"
-      end
-    end
-
     attr_reader :config
 
     def initialize(canvas, config = Configuration.default)
@@ -73,92 +54,5 @@ module Pixelflut
       @socket = @config.host ? TCPServer.new(@config.host, @config.port) : TCPServer.new(@config.port)
       @socket.listen(255)
     end
-
-    class Connection
-      Configuration = Struct.new(
-        :keep_alive_time,
-        :read_buffer_size,
-        :command_limit,
-        :canvas,
-        :size_result,
-        :on_end,
-        keyword_init: true
-      )
-
-      attr_reader :peeraddr
-
-      def initialize(socket, peeraddr, config)
-        @socket, @peeraddr, @config = socket, peeraddr, config
-        @last_tm, @buffer = Time.now.to_f, ''
-      end
-
-      def close(_reason)
-        socket, @socket = @socket, nil
-        return unless socket
-        socket.close
-        @config.on_end.call(self)
-        false
-      end
-
-      def update
-        index = @buffer.index("\n")
-        return process_loop(index) if index
-        read_size = @config.read_buffer_size - @buffer.size
-        return close(:buffer_exceeded) if read_size <= 0
-        str = @socket.recv_nonblock(read_size, exception: false)
-        now = Time.now.to_f
-        return (now - @last_tm > @config.keep_alive_time ? close(:timeout) : nil) if Symbol === str
-        return close(:closed_by_peer) if 0 == str.size
-        @buffer += str
-        @last_tm = now
-      end
-
-      private
-
-      def next_command(index)
-        @buffer = @buffer[index, @buffer.size - index]
-        @last_tm = Time.now.to_f
-        true
-      end
-
-      def command_size(index)
-        @socket.sendmsg_nonblock(@config.size_result)
-        next_command(index)
-      end
-
-      def command_px(command, index)
-        _, x, y, color = command.split(' ', 4)
-        return close(:color_expected) unless color
-        @config.canvas[x.to_i, y.to_i] = color
-        next_command(index)
-      end
-
-      def command_rc(command, index)
-        _, x1, y1, x2, y2, color = command.split(' ', 6)
-        return close(:color_expected) unless color
-        @config.canvas.draw_rect(x1.to_i, y1.to_i, x2.to_i, y2.to_i, color)
-        next_command(index)
-      end
-
-      def process_loop(index)
-        command_count = @config.command_limit
-        while process_buffer(index)
-          index = @buffer.index("\n") or return
-          command_count -= 1
-          break if command_count <= 0
-        end
-      end
-
-      def process_buffer(index)
-        return close(:max_command_size_exceeded) if index > 31 # 'RC 9999 9999 9999 9999 RRGGBBAA'.size
-        command = @buffer[0, index]
-        index += 1
-        return command_px(command, index) if command.start_with?('PX ')
-        return command_rc(command, index) if command.start_with?('RC ')
-        return close(:quit) if command == 'QUIT'
-        return command_size(index) if command == 'SIZE'
-        close(:bad_command)
-      end
-    end
   end
 end

data/lib/pixelflut/server/configuration.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Pixelflut
+  class Server
+    Configuration = Struct.new(
+      :host,
+      :port,
+      :keep_alive_time,
+      :read_buffer_size,
+      :command_limit,
+      :peer_limit
+    ) do
+      def self.default
+        new(nil, 1234, 1, 1024, 10, 8)
+      end
+
+      def to_s
+        "bind: #{host}:#{port}"\
+          ", keep-alive-time: #{keep_alive_time}"\
+          ", read-buffer-size: #{read_buffer_size}"\
+          ", command-limit: #{command_limit}"\
+          ", peer-limit: #{peer_limit}"
+      end
+    end
+  end
+end

data/lib/pixelflut/server/connection.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+module Pixelflut
+  class Server
+    class Connection
+      Configuration = Struct.new(
+        :keep_alive_time,
+        :read_buffer_size,
+        :command_limit,
+        :canvas,
+        :size_result,
+        :on_end,
+        keyword_init: true
+      )
+
+      attr_reader :peeraddr
+
+      def initialize(socket, peeraddr, config)
+        @socket, @peeraddr, @config = socket, peeraddr, config
+        @last_tm, @buffer = Time.now.to_f, ''
+      end
+
+      def close(_reason)
+        socket, @socket = @socket, nil
+        return unless socket
+        socket.close
+        @config.on_end.call(self)
+        false
+      end
+
+      def update
+        index = @buffer.index("\n")
+        return process_loop(index) if index
+        read_size = @config.read_buffer_size - @buffer.size
+        return close(:buffer_exceeded) if read_size <= 0
+        str = @socket.recv_nonblock(read_size, exception: false)
+        now = Time.now.to_f
+        return (now - @last_tm > @config.keep_alive_time ? close(:timeout) : nil) if Symbol === str
+        return close(:closed_by_peer) if 0 == str.size
+        @buffer += str
+        @last_tm = now
+      rescue Errno::ECONNRESET
+        close(:closed_by_peer)
+      end
+
+      private
+
+      def next_command(index)
+        @buffer = @buffer[index, @buffer.size - index]
+        @last_tm = Time.now.to_f
+        true
+      end
+
+      def command_size(index)
+        @socket.sendmsg_nonblock(@config.size_result)
+        next_command(index)
+      end
+
+      def command_px(command, index)
+        _, x, y, color = command.split(' ', 4)
+        return close(:color_expected) unless color
+        @config.canvas[x.to_i, y.to_i] = color
+        next_command(index)
+      end
+
+      def command_rc(command, index)
+        _, x1, y1, x2, y2, color = command.split(' ', 6)
+        return close(:color_expected) unless color
+        @config.canvas.draw_rect(x1.to_i, y1.to_i, x2.to_i, y2.to_i, color)
+        next_command(index)
+      end
+
+      def process_loop(index)
+        command_count = @config.command_limit
+        while process_buffer(index)
+          index = @buffer.index("\n") or return
+          command_count -= 1
+          break if command_count <= 0
+        end
+      end
+
+      def process_buffer(index)
+        return close(:max_command_size_exceeded) if index > 31 # 'RC 9999 9999 9999 9999 RRGGBBAA'.size
+        command = @buffer[0, index]
+        index += 1
+        return command_px(command, index) if command.start_with?('PX ')
+        return command_rc(command, index) if command.start_with?('RC ')
+        return close(:quit) if command == 'QUIT'
+        return command_size(index) if command == 'SIZE'
+        close(:bad_command)
+      end
+    end
+
+    private_constant(:Connection)
+  end
+end

data/lib/pixelflut/text_image.rb

@@ -24,7 +24,7 @@ module Pixelflut
     end
 
     # def [](x, y)
-    #   @data[(4 * (x + @columns * y)) % @data.size, 4].bytes.map! do |b|
+    #   @@to_blob[(4 * (x + @columns * y)) % @data.size, 4].bytes.map! do |b|
     #     b = b.to_s(16)
     #     b = '0' + b if b.size == 1
     #     b
@@ -40,10 +40,10 @@ module Pixelflut
       x1, x2 = x2, x1 if x1 > x2
       y1, y2 = y2, y1 if y1 > y2
       color = as_color(rrggbbaa)
-      pos = (4 * (x1 + @columns * y1)) % @data.size
+      pos = (4 * (x1 + @columns * y1)) % @to_blob.size
       pattern = color * (x2 - x1 + 1)
       (y2 - y1 + 1).times do
-        @data[pos, pattern.size] = pattern
+        @to_blob[pos, pattern.size] = pattern
         pos += @row_inc
       end
       @changes += 1

data/lib/pixelflut/version.rb

@@ -1,3 +1,3 @@
 module Pixelflut
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.0.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelflut
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-04 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -60,6 +60,7 @@ executables:
 - pxf
 - pxf-generate
 - pxf-server
+- pxf-convert
 - pxf-help
 - pxf-version
 extensions: []
@@ -70,6 +71,7 @@ files:
 - README.md
 - TODO.md
 - bin/pxf
+- bin/pxf-convert
 - bin/pxf-generate
 - bin/pxf-help
 - bin/pxf-server
@@ -82,7 +84,10 @@ files:
 - lib/pixelflut/canvas/buffered.rb
 - lib/pixelflut/canvas/color.rb
 - lib/pixelflut/canvas/streamed.rb
+- lib/pixelflut/converter.rb
 - lib/pixelflut/server.rb
+- lib/pixelflut/server/configuration.rb
+- lib/pixelflut/server/connection.rb
 - lib/pixelflut/text_image.rb
 - lib/pixelflut/version.rb
 - pixelflut.gemspec