[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/4] mlib: remove redundant tag massaging and encoding
From: |
Eric Wong |
Subject: |
[PATCH 2/4] mlib: remove redundant tag massaging and encoding |
Date: |
Tue, 30 Jan 2018 09:17:10 +0000 |
Redundant since ("player: support guessing encodings for comments")
---
lib/dtas/mlib.rb | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
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 @@ def worker_work(job)
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
--
EW