[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/subed c4e3fec 352/389: Add error handling for subed-split-
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/subed c4e3fec 352/389: Add error handling for subed-split-subtitle |
Date: |
Fri, 3 Dec 2021 11:00:56 -0500 (EST) |
branch: elpa/subed
commit c4e3fecdcc1cad0ca4e68059518ed4f2d8c40049
Author: Sacha Chua <sacha@sachachua.com>
Commit: Random User <rndusr@posteo.de>
Add error handling for subed-split-subtitle
* subed/subed-common.el (subed-split-subtitle): Detect if we're in a
text segment. Regenerate IDs after insertion.
---
subed/subed-common.el | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/subed/subed-common.el b/subed/subed-common.el
index 2a8942c..e99beea 100644
--- a/subed/subed-common.el
+++ b/subed/subed-common.el
@@ -636,15 +636,20 @@ Update the end timestamp accordingly."
(interactive)
(let* ((end-timestamp (subed-subtitle-msecs-stop))
(orig (point))
+ (text-beg (save-excursion (subed-jump-to-subtitle-text)))
+ (text-end (save-excursion (subed-jump-to-subtitle-end)))
(text (buffer-substring orig (save-excursion
(subed-jump-to-subtitle-end) (point)))))
(unless subed-mpv-playback-position
(error "Not playing back in MPV"))
+ (unless (and text-beg text-end (> orig text-beg) (< orig text-end))
+ (error "Not in the middle of subtitle text"))
(when (or (> subed-mpv-playback-position end-timestamp)
(< subed-mpv-playback-position (subed-subtitle-msecs-start)))
(error "Not in the currently playing subtitle segment"))
(subed-set-subtitle-time-stop subed-mpv-playback-position)
(delete-region (point) (subed-jump-to-subtitle-end))
- (subed-append-subtitle nil subed-mpv-playback-position end-timestamp
(string-trim text))))
+ (subed-append-subtitle nil subed-mpv-playback-position end-timestamp
(string-trim text))
+ (subed-regenerate-ids-soon)))
;;; Replay time-adjusted subtitle
- [nongnu] elpa/subed ec38a0b 317/389: Add function: subed-mpv-add-subtitles, (continued)
- [nongnu] elpa/subed ec38a0b 317/389: Add function: subed-mpv-add-subtitles, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 7764909 324/389: Add some (require ...)s to prevent compiler warnings, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed a084f5d 326/389: Improve comment, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed cd3af86 328/389: Silence checkdoc, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 29d8b84 337/389: Initial implementation of subed-vtt.el, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 6db0005 338/389: New function subed-mpv-play-video-from-url, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed d3df6f2 347/389: Fix "test" target in Makefile, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 5b8c23a 348/389: New commands: subed-merge-with-next, subed-merge-with-previous, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed a7b25c8 341/389: subed-vtt: Fix ID->timestamp and stop generating IDs, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 9796a77 349/389: Merge branch 'sacha', ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed c4e3fec 352/389: Add error handling for subed-split-subtitle,
ELPA Syncer <=
- [nongnu] elpa/subed 918ba6f 370/389: Prevent showing the "Match data clobbered" message, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 808ef92 118/389: Fix comment, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 97bb125 183/389: Add default keybindings for copying player position, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 7665826 248/389: Add tests for copying player position to start/stop time, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed a280e89 251/389: Add more text to README, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 311f4af 331/389: Require Emacs 25.1, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed fc7a12d 335/389: Fix mpv arguments, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed d9c41ba 345/389: Add test for validation fix, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed 8bdec56 356/389: Move subed-split-subtitle to "Inserting" section, ELPA Syncer, 2021/12/03
- [nongnu] elpa/subed b28f528 364/389: Revert indentation changes, ELPA Syncer, 2021/12/03