From: Eric Wong <e@80x24.org>
To: dtas-all@nongnu.org
Subject: [PATCH 5/9] dtas-tl: drop encoding hacks, use binary stdout+stderr
Date: Sun, 23 Jan 2022 21:37:42 +0000 [thread overview]
Message-ID: <20220123213746.21085-6-e@80x24.org> (raw)
In-Reply-To: <20220123213746.21085-1-e@80x24.org>
Try to consistently treat pathnames as binary blobs everywhere,
since POSIX FSes allow everything but "\0" in pathnames.
---
bin/dtas-tl | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/bin/dtas-tl b/bin/dtas-tl
index 767b02d..e58ee31 100755
--- a/bin/dtas-tl
+++ b/bin/dtas-tl
@@ -7,6 +7,8 @@
# itself is also unstable, but better than this one probably).
require 'dtas/unix_client'
require 'shellwords'
+$stdout.binmode
+$stderr.binmode
def get_track_ids(c)
track_ids = c.req("tl tracks")
@@ -16,18 +18,11 @@ def get_track_ids(c)
track_ids
end
-def fix_enc!(str, enc)
- str.force_encoding(enc)
- str.force_encoding(Encoding::ASCII_8BIT) unless str.valid_encoding?
-end
-
def each_track(c)
- enc = Encoding.default_external
get_track_ids(c).each_slice(128) do |track_ids|
res = c.req("tl get #{track_ids.join(' ')}")
res = Shellwords.split(res.sub!(/\A\d+ /, ''))
while line = res.shift
- fix_enc!(line, enc)
yield line
end
end
@@ -109,7 +104,6 @@ def do_edit(c)
path = File.expand_path(path)
unless File.exist?(path)
path = orig.dup
- fix_enc!(path, enc)
path = Shellwords.split(path)[0]
path = File.expand_path(path)
end
next prev parent reply other threads:[~2022-01-23 21:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-23 21:37 [PATCH 0/9] various cuts for memory savings Eric Wong
2022-01-23 21:37 ` [PATCH 1/9] deduplicate and freeze pathnames + metadata Eric Wong
2022-01-23 21:37 ` [PATCH 2/9] player: remove omap conversion Eric Wong
2022-01-23 21:37 ` [PATCH 3/9] dtas: drop unnecessary "require 'yaml'" statements Eric Wong
2022-01-23 21:37 ` [PATCH 4/9] dtas-tl prune: cull missing files from tracklist Eric Wong
2022-01-23 21:37 ` Eric Wong [this message]
2022-01-23 21:37 ` [PATCH 6/9] use IO#wait_readable consistently Eric Wong
2022-01-23 21:37 ` [PATCH 7/9] get rid of DTAS::Nonblock wrapper for Ruby <= 2.0 Eric Wong
2022-01-23 21:37 ` [PATCH 8/9] unix_accepted: drop Ruby < 2.3 support code Eric Wong
2022-01-23 21:37 ` [PATCH 9/9] do not check IO#closed? before calling IO#close Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://80x24.org/dtas/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220123213746.21085-6-e@80x24.org \
--to=e@80x24.org \
--cc=dtas-all@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).