Adapted recorder.rb and generate_gifs.sh to websockets.

This commit is contained in:
Fabian Schlenz 2019-10-23 12:37:25 +02:00
parent f5d47fe7da
commit 2a6f68cc45
4 changed files with 111 additions and 75 deletions

View File

@ -1,7 +1,7 @@
#!/bin/bash
IP="$1"
EFFECTS=`egrep "case" ../effects.cpp | tr -s "\t" " " | cut -d" " -f 7 | sort`
EFFECTS=`./list_effects.rb $IP | sort`
mkdir effects

26
src/tools/list_effects.rb Executable file
View File

@ -0,0 +1,26 @@
#!/usr/bin/env ruby
require 'websocket-eventmachine-client'
require 'json'
IP = ARGV[0] or raise "No IP given"
uri = "ws://#{IP}:80/ws"
EM.run do
ws = WebSocket::EventMachine::Client.connect(uri: uri)
ws.onopen do
ws.send "effects?"
end
ws.onmessage do |msg, type|
if type==:text
j = JSON.parse(msg)
if j["effects"]
j["effects"].each do |effect|
puts effect
end
exit
end
end
end
end

10
src/tools/monitor.rb Normal file → Executable file
View File

@ -13,6 +13,7 @@ def rgb2ansi(r, g, b)
end
IP = ARGV[0]
EFFECT = ARGV[1]
uri = "ws://#{IP}:80/ws"
puts "Connecting to #{uri}..."
@ -21,11 +22,12 @@ EM.run do
ws.onopen do
puts "\033[2J\033[H\n Connected."
ws.send "E:blur2d"
ws.send "effect:#{EFFECT}" if EFFECT
ws.send "monitor:1"
end
ws.onmessage do |msg, type|
raise "Unexpected message type #{type.inspect}" if type!=:binary
if type==:binary
data = msg.unpack("C*")
width = data.shift
height = data.shift
@ -46,6 +48,10 @@ EM.run do
end
str += "+#{"-"*width}+\n"
puts str
else
puts msg
exit
end
end
ws.onclose do |msg, reason|

View File

@ -1,39 +1,19 @@
#!/usr/bin/env ruby
require 'socket'
require 'websocket-eventmachine-client'
require 'pp'
require 'rmagick'
include Magick
IP = ARGV[0]
PORT = 2122
FILE = ARGV[1] or raise "No filename given"
EFFECT = ARGV[2]
FRAMES = 125
FACTOR = 2
delay = 50
puts "Connecting to #{IP}:#{PORT}..."
s = TCPSocket.new(IP, PORT)
puts "Connected."
init = s.recv(3).unpack("C*")
raise "Initial data packet wasn't usable!" if init[2] != 0xFF
puts "Got initial data packet."
dim_x, dim_y = *init
len = dim_x * dim_y * 3 + 3
puts "Size: #{dim_x}x#{dim_y}. Expecting packet length #{len}."
puts "Opening local UDP socket..."
udp = UDPSocket.new
udp.bind("10.10.2.1", 13330)
puts "Waiting for UDP packets on port 13330..."
s.sendmsg("P\x12\x34\x00")
s.sendmsg("E#{EFFECT}\x00") if EFFECT
uri = "ws://#{IP}:80/ws"
puts "Connecting to #{uri}..."
gif = ImageList.new
last_id = 255
@ -41,31 +21,37 @@ last_frame_time = nil
img = nil
last_diff = nil
while gif.length < FRAMES do
data = udp.recvfrom(1024)[0].unpack("C*")
EM.run do
ws = WebSocket::EventMachine::Client.connect(uri: uri)
ws.onopen do
puts "Connected."
puts "Waiting for delay..." if delay>0
ws.send "effect:#{EFFECT}" if EFFECT
ws.send "monitor:1"
end
ws.onmessage do |msg, type|
if type==:binary
if delay > 0
delay -= 1
next
end
#puts "Packet. ID: #{data[0]}, length: #{data.length}"
raise "Unexpected packet length" unless data.count == len
raise "Invalid data packet" unless data[len - 1]==0xFF
data = msg.unpack("C*")
width = data.shift
height = data.shift
splitter = data.shift
raise "Unexpected value #{splitter} at index 2" unless splitter==0xFF
expected_length = width * height * 3 + 4
raise "Unexpected message length. Expected: #{expected_length}, was: #{data.count + 3}" unless data.count + 3==expected_length
id = data.shift << 8 | data.shift
if last_id != id-1 && last_id != id-2
puts "Skipped from #{last_id} to #{id}."
gif = ImageList.new
end
last_id = id
img = Image.new(dim_x, dim_y)
img = Image.new(width, height)
gc = Draw.new
#next
print "."
print "#{gif.length}" if gif.length%50==0
(0...dim_y).each do |y|
(0...dim_x).each do |x|
(0...height).each do |y|
(0...width).each do |x|
r, g, b = *data.shift(3)
gc.fill("rgb(#{r}, #{g}, #{b})")
gc.point(x, y)
@ -75,8 +61,26 @@ while gif.length < FRAMES do
gc.draw(img)
img.sample!(FACTOR)
gif << img
if gif.length >= FRAMES
ws.close
end
else
puts "-->#{msg}"
exit
end
end
ws.onerror do |error|
puts "Error: #{error}"
end
ws.onclose do |msg, reason|
puts "Disconnected."
EventMachine.stop_event_loop
end
end
s.close
puts
puts "Generating gif..."
gif.ticks_per_second = 100