From: Eric Wong <e@80x24.org>
To: dtas-all@nongnu.org
Subject: [PATCH] dtas-console: gracefully handle seek failures
Date: Sat, 13 Feb 2021 16:34:27 -0500 [thread overview]
Message-ID: <20210213213427.24381-1-e@80x24.org> (raw)
dtas-console doesn't need to quit when a user attempts to seek
an unseekable file, since the user often doesn't know it's
unseekable until a seek is attempted.
---
bin/dtas-console | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/bin/dtas-console b/bin/dtas-console
index d7e1a23..0c56450 100755
--- a/bin/dtas-console
+++ b/bin/dtas-console
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-# Copyright (C) 2013-2020 all contributors <dtas-all@nongnu.org>
+# Copyright (C) 2013-2021 all contributors <dtas-all@nongnu.org>
# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
# frozen_string_literal: true
#
@@ -112,7 +112,8 @@ def rg_string(rg, current)
rv
end
-def may_fail(res, events)
+def may_fail(c, req, events)
+ res = c.req(req)
events << res if res != "OK"
end
@@ -227,17 +228,17 @@ def may_fail(res, events)
when $stdin
# keybindings taken from mplayer / vi
case key = Curses.getch
- when "j" then c.req_ok("seek -5")
- when "k" then c.req_ok("seek +5")
+ when "j" then may_fail(c, "seek -5", events)
+ when "k" then may_fail(c, "seek +5", events)
when "q" then exit(0)
- when Curses::KEY_DOWN then c.req_ok("seek -60")
- when Curses::KEY_UP then c.req_ok("seek +60")
- when Curses::KEY_LEFT then c.req_ok("seek -10")
- when Curses::KEY_RIGHT then c.req_ok("seek +10")
- when Curses::KEY_BACKSPACE then c.req_ok("seek 0")
+ when Curses::KEY_DOWN then may_fail(c, "seek -60", events)
+ when Curses::KEY_UP then may_fail(c, "seek +60", events)
+ when Curses::KEY_LEFT then may_fail(c, "seek -10", events)
+ when Curses::KEY_RIGHT then may_fail(c, "seek +10", events)
+ when Curses::KEY_BACKSPACE then may_fail(c, "seek 0", events)
# yes, some of us have long audio files
- when Curses::KEY_PPAGE then c.req_ok("seek +600")
- when Curses::KEY_NPAGE then c.req_ok("seek -600")
+ when Curses::KEY_PPAGE then may_fail(c, "seek +600", events)
+ when Curses::KEY_NPAGE then may_fail(c, "seek -600", events)
when '9' then c.req_ok('rg volume-=0.01')
when '0' then c.req_ok('rg volume+=0.01')
when '=' then c.req_ok('rg volume=1')
@@ -248,8 +249,8 @@ def may_fail(res, events)
when "f" then c.req_ok("rg fallback_gain-=1")
when ">" then c.req_ok("tl next")
when "<" then c.req_ok("tl prev")
- when "!" then may_fail(c.req("cue prev"), events)
- when "@" then may_fail(c.req("cue next"), events)
+ when "!" then may_fail(c, "cue prev", events)
+ when "@" then may_fail(c, "cue next", events)
when "o" then tfmt = update_tfmt(prec_step[prec_nr], tsec = !tsec)
when " "
c.req("play_pause")
reply other threads:[~2021-02-13 21:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20210213213427.24381-1-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).