From eb116a758a1fdfd5847d433d337531bcfb81304b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 29 Jan 2018 01:47:58 +0000 Subject: mlib: remove redundant tag massaging and encoding Redundant since ("player: support guessing encodings for comments") --- lib/dtas/mlib.rb | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'lib/dtas/mlib.rb') diff --git a/lib/dtas/mlib.rb b/lib/dtas/mlib.rb index e217b59..d1707fb 100644 --- a/lib/dtas/mlib.rb +++ b/lib/dtas/mlib.rb @@ -106,18 +106,10 @@ class DTAS::Mlib # :nodoc: return ignore(job) if tlen < 0 tlen = tlen.round tmp = {} - found.comments.each do |tag, value| - tag_id = @tag_map[tag] or next - value.strip! - - # FIXME: this fallback needs testing - [ Encoding::UTF_8, Encoding::ISO_8859_1 ].each do |enc| - value.force_encoding(enc) - if value.valid_encoding? - value.encode!(Encoding::UTF_8) if enc != Encoding::UTF_8 - tmp[tag_id] = value - break - end + if comments = found.comments + comments.each do |tag, value| + tag_id = @tag_map[tag] or next + tmp[tag_id] = value if value.valid_encoding? end end @db.transaction do -- cgit v1.2.3-24-ge0c7