From 3b5eb9a9a6b2e7272057c339d66ad5a33f08f54f Mon Sep 17 00:00:00 2001 From: jefleponot Date: Wed, 28 Sep 2016 23:28:34 +0200 Subject: [PATCH] fix all --- bin/flvtool2 | 2 +- lib/flv/amf_string_buffer.rb | 2 +- lib/flv/core_extensions.rb | 20 +++++++++++--------- lib/flvtool2/base.rb | 4 ++++ lib/mixml.rb | 2 +- lib/miyaml.rb | 2 +- setup.rb | 2 +- test/31163.flv | Bin 6091637 -> 6095575 bytes 8 files changed, 20 insertions(+), 14 deletions(-) mode change 100755 => 100644 bin/flvtool2 diff --git a/bin/flvtool2 b/bin/flvtool2 old mode 100755 new mode 100644 index 3812ac6..d383cbe --- a/bin/flvtool2 +++ b/bin/flvtool2 @@ -1,3 +1,3 @@ -#! /usr/bin/env ruby +#! /usr/bin/ruby1.9.1 require 'flvtool2' diff --git a/lib/flv/amf_string_buffer.rb b/lib/flv/amf_string_buffer.rb index 7bf65f6..8ac6699 100644 --- a/lib/flv/amf_string_buffer.rb +++ b/lib/flv/amf_string_buffer.rb @@ -213,7 +213,7 @@ def write__AMF_object(object) write__UI8 3 object.instance_variables.each do |variable| - write__AMF_key variable.gsub('@', '') + write__AMF_key variable.to_s.gsub('@', '') write__AMF_data object.instance_variable_get( variable.intern ) end diff --git a/lib/flv/core_extensions.rb b/lib/flv/core_extensions.rb index a3b1cf1..24b3878 100644 --- a/lib/flv/core_extensions.rb +++ b/lib/flv/core_extensions.rb @@ -63,22 +63,22 @@ def to_s class IO def read__UI8(position = nil) seek position unless position.nil? - readchar + readbyte end def read__UI16(position = nil) seek position unless position.nil? - (readchar << 8) + readchar + (readbyte << 8) + readbyte end def read__UI24(position = nil) seek position unless position.nil? - (readchar << 16) + (readchar << 8) + readchar + (readbyte << 16) + (readbyte << 8) + readbyte end def read__UI32(position = nil) seek position unless position.nil? - (readchar << 24) + (readchar << 16) + (readchar << 8) + readchar + (readbyte << 24) + (readbyte << 16) + (readbyte << 8) + readbyte end def read__STRING(length, position = nil) @@ -111,28 +111,30 @@ def write__STRING(string, position = nil) end class ARGFWrapper + def readbyte + ARGF.readbyte + end def readchar ARGF.readchar end - def read(length) ARGF.read(length) end def read__UI8 - readchar + readbyte end def read__UI16 - (readchar << 8) + readchar + (readbyte << 8) + readbyte end def read__UI24 - (readchar << 16) + (readchar << 8) + readchar + (readbyte << 16) + (readbyte << 8) + readbyte end def read__UI32 - (readchar << 24) + (readchar << 16) + (readchar << 8) + readchar + (readbyte << 24) + (readbyte << 16) + (readbyte << 8) + readbyte end def read__STRING(length) diff --git a/lib/flvtool2/base.rb b/lib/flvtool2/base.rb index 70ad94c..baf535a 100644 --- a/lib/flvtool2/base.rb +++ b/lib/flvtool2/base.rb @@ -57,6 +57,10 @@ def execute!(options) def add(options, stream, in_path, out_path) + if options.class != Hash + puts "-A needs Tag file\n" + return + end tag_structures = MiXML.parse( File.open( options[:tag_file], File::RDONLY ) { |file| file.readlines }.join ) add_tag = Proc.new do |data| diff --git a/lib/mixml.rb b/lib/mixml.rb index 8ac48a1..a334756 100644 --- a/lib/mixml.rb +++ b/lib/mixml.rb @@ -75,7 +75,7 @@ def self.normalize_cdata(branch) hash end else - if branch[:cdata] && branch.size == 1 + if branch.class != String && branch[:cdata] && branch.size == 1 branch[:cdata] else branch diff --git a/lib/miyaml.rb b/lib/miyaml.rb index 580f22a..1cba390 100644 --- a/lib/miyaml.rb +++ b/lib/miyaml.rb @@ -38,7 +38,7 @@ def self.dump_object(object, indent = 0) yaml = '' if object.class == Object - object = object.instance_variables.inject( {} ) { |hash, var| hash[var.gsub('@', '')] = object.instance_variable_get(var); hash } + object = object.instance_variables.inject( {} ) { |hash, var| hash[var.to_s.gsub('@', '')] = object.instance_variable_get(var); hash } end case object diff --git a/setup.rb b/setup.rb index 424a5f3..4f1e198 100644 --- a/setup.rb +++ b/setup.rb @@ -785,7 +785,7 @@ def ToplevelInstaller.load_rbconfig else require 'rbconfig' end - ::Config::CONFIG + ::RbConfig::CONFIG end def initialize(ardir_root, config) diff --git a/test/31163.flv b/test/31163.flv index 2e138798defec649c4d6c653264eec55a1106784..d7284cdd0cff09ee25d179243efa8fd551ab5565 100644 GIT binary patch delta 4591 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 delta 571 zcmXZW+cH977{>8$MI=QlvJK0APfA5Z*<=@@>>0DBwU{+V%`|ld2FHzCG2_&jaSiUk zu^F8Ei-X^L@VuMvd%OKIeZPO2QCijRI* z?)i6w$%~wNt<%*-Wb9#DYM1S5K{K+NnpgkQ#6v=AJ1d3htfr?8O+-qo6kA%&Bz65N zm0iwgV*cYlx21D>={>IKCeeJLYf7|msZ0bEk1ym8hP*z->+uAvrJqXf8^dvLI3$=* zhH{uufl63V1uLpygB>-f#qYihC+biS7aGurCN!f3t#G3a?dX7lPIRFgJ?KRr`Z0h( z3}F}}7{wUI;lTvF@L>{u1Q5g&rV+vnW)a35<`F>@3s}SwmJ!1WR|hs3q_Bs59N-W~IL677;W)i}d~&^>zJz}OC@G>r