* [PATCH 1/2] av_ff_common: attempt to fix encodings for ffprobe/avprobe
@ 2023-09-04 6:21 7% Eric Wong
0 siblings, 0 replies; 1+ results
From: Eric Wong @ 2023-09-04 6:21 UTC (permalink / raw)
To: dtas-all
As with sox, these will be dealing with legacy encodings
and badly-encoding software until the end of days, so do
our best to fix them up.
---
lib/dtas/source/av_ff_common.rb | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/dtas/source/av_ff_common.rb b/lib/dtas/source/av_ff_common.rb
index 5299fdb..332a0bb 100644
--- a/lib/dtas/source/av_ff_common.rb
+++ b/lib/dtas/source/av_ff_common.rb
@@ -104,13 +104,14 @@ def av_ff_ok?
prev_cmd = cmd
end while incomplete.compact[0]
+ enc = Encoding.default_external # typically Encoding::UTF_8
# old avprobe
s.scan(%r{^\[FORMAT\]\n(.*?)\n\[/FORMAT\]\n}m) do |_|
f = $1.dup
f =~ /^duration=([\d\.]+)\s*$/nm and @duration = $1.to_f
# TODO: multi-line/multi-value/repeated tags
f.gsub!(/^TAG:([^=]+)=(.*)$/ni) { |_|
- @comments[$1.upcase] = -($2)
+ @comments[-DTAS.try_enc($1.upcase, enc)] = $2
}
end
@@ -118,13 +119,17 @@ def av_ff_ok?
s.scan(%r{^\[format\.tags\]\n(.*?)\n\n}m) do |_|
f = $1.dup
f.gsub!(/^([^=]+)=(.*)$/ni) { |_|
- @comments[$1.upcase] = -$2
+ @comments[-DTAS.try_enc($1.upcase, enc)] = $2
}
end
s.scan(%r{^\[format\]\n(.*?)\n\n}m) do |_|
f = $1.dup
f =~ /^duration=([\d\.]+)\s*$/nm and @duration = $1.to_f
end
+ comments.each do |k,v|
+ v.chomp!
+ comments[k] = -DTAS.try_enc(v, enc)
+ end
! @astreams.compact.empty?
end
^ permalink raw reply related [relevance 7%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-09-04 6:21 7% [PATCH 1/2] av_ff_common: attempt to fix encodings for ffprobe/avprobe Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/dtas.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).