[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/subed 94c28993b7 21/22: Define obsolete function aliases
|
From: |
ELPA Syncer |
|
Subject: |
[nongnu] elpa/subed 94c28993b7 21/22: Define obsolete function aliases |
|
Date: |
Tue, 1 Feb 2022 14:06:12 -0500 (EST) |
branch: elpa/subed
commit 94c28993b77f79ec04db495ed4166212a55f9cb5
Author: Sacha Chua <sacha@sachachua.com>
Commit: Sacha Chua <sacha@sachachua.com>
Define obsolete function aliases
* subed/subed-common.el (subed-define-generic-function): Define old
internal functions as obsolete function aliases in order to minimize
breaking other people's code.
* subed/subed-srt.el: Call generic functions.
(subed-srt--regenerate-ids-soon): Move implementation into a generic
function.
* tests/test-subed-common.el: Call generic functions. Add tests for
generic functions.
* tests/test-subed-srt.el: Call generic functions.
---
NEWS.org | 7 +-
subed/subed-common.el | 27 ++++
subed/subed-srt.el | 32 ++---
subed/subed.el | 2 +-
tests/test-subed-common.el | 336 +++++++++++++++++++++++++--------------------
tests/test-subed-srt.el | 6 +-
6 files changed, 230 insertions(+), 180 deletions(-)
diff --git a/NEWS.org b/NEWS.org
index d5d197ea90..c82e5ff09f 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,5 +1,10 @@
* subed news
-** Version 0.1.0 - [2022-01-02 Sun] - Sacha Chua
+** Version 1.0.1 - 2022-02-01 - Sacha Chua
+
+Added obsolete function aliases in case people are calling
+format-specific functions in their code.
+
+** Version 1.0.0 - 2022-01-02 - Sacha Chua
Format-specific modes are now initialized with =(subed-srt-mode)=,
=(subed-vtt-mode)=, or =(subed-ass-mode)= instead of the corresponding
diff --git a/subed/subed-common.el b/subed/subed-common.el
index 49177af10a..8896900d19 100644
--- a/subed/subed-common.el
+++ b/subed/subed-common.el
@@ -60,6 +60,14 @@ interactive form."
,@(if is-interactive
(cdr body)
body))
+ ;; Define old internal functions as obsolete aliases
+ ,@(mapcar (lambda (sub-format)
+ `(define-obsolete-function-alias
+ (quote ,(intern (format "subed-%s--%s" sub-format
(symbol-name name))))
+ (function ,(intern (format "subed-%s" (symbol-name
name))))
+ "1.0.0"
+ ,doc))
+ '("srt" "vtt" "ass"))
,(if is-interactive
`(defun ,(intern (concat "subed-" (symbol-name name))) ,args
,(concat doc "\n\nThis function calls the generic function `"
@@ -336,6 +344,25 @@ If BEG and END are not specified, use the whole buffer."
(subed-define-generic-function validate ()
"Move point to the first invalid subtitle and report an error.")
+(subed-define-generic-function regenerate-ids ()
+ "Ensure consecutive, unduplicated subtitle IDs in formats that use them.")
+
+(defvar-local subed--regenerate-ids-soon-timer nil)
+(subed-define-generic-function regenerate-ids-soon ()
+ "Delay regenerating subtitle IDs for a short amount of time.
+
+ Run `subed-regenerate-ids' in 100ms unless this function is
+called again within the next 100ms, in which case the previously
+scheduled call is canceled and another call is scheduled in
+100ms."
+ (interactive)
+ (when subed--regenerate-ids-soon-timer
+ (cancel-timer subed-srt--regenerate-ids-soon-timer))
+ (setq subed--regenerate-ids-soon-timer
+ (run-at-time 0.1 nil (lambda ()
+ (setq subed--regenerate-ids-soon-timer nil)
+ (subed-regenerate-ids)))))
+
;;; Utilities
(defmacro subed-save-excursion (&rest body)
diff --git a/subed/subed-srt.el b/subed/subed-srt.el
index 44f8ce06c0..77c260cf41 100644
--- a/subed/subed-srt.el
+++ b/subed/subed-srt.el
@@ -268,12 +268,12 @@ Return new point. Use the format-specific function for
MAJOR-MODE."
(cl-defmethod subed--kill-subtitle :after (&context (major-mode
subed-srt-mode))
"Remove subtitle at point.
Use the format-specific function for MAJOR-MODE."
- (subed-srt--regenerate-ids-soon))
+ (subed-regenerate-ids-soon))
(cl-defmethod subed--split-subtitle :after (&context (major-mode
subed-srt-mode) &optional offset)
"Split current subtitle at point.
Use the format-specific function for MAJOR-MODE."
- (subed-srt--regenerate-ids-soon))
+ (subed-regenerate-ids-soon))
(cl-defmethod subed--merge-with-next (&context (major-mode subed-srt-mode))
"Merge the current subtitle with the next subtitle.
@@ -290,12 +290,12 @@ Use the format-specific function for MAJOR-MODE."
(delete-region pos (point))
(insert "\n")
(subed-set-subtitle-time-stop new-end)
- (subed-srt--regenerate-ids-soon))
+ (subed-regenerate-ids-soon))
(error "No subtitle to merge into")))))
;;; Maintenance
-(defun subed-srt--regenerate-ids ()
+(cl-defmethod subed-regenerate-ids (&context (major-mode subed-srt-mode))
"Ensure consecutive, unduplicated subtitle IDs."
(interactive)
(atomic-change-group
@@ -315,22 +315,6 @@ Use the format-specific function for MAJOR-MODE."
(insert id-str)))
(setq id (1+ id))))))))
-(defvar-local subed-srt--regenerate-ids-soon-timer nil)
-(defun subed-srt--regenerate-ids-soon ()
- "Delay regenerating subtitle IDs for a short amount of time.
-
-Run `subed-srt--regenerate-ids' in 100ms unless this function is
-called again within the next 100ms, in which case the previously
-scheduled call is canceled and another call is scheduled in
-100ms."
- (interactive)
- (when subed-srt--regenerate-ids-soon-timer
- (cancel-timer subed-srt--regenerate-ids-soon-timer))
- (setq subed-srt--regenerate-ids-soon-timer
- (run-at-time 0.1 nil (lambda ()
- (setq subed-srt--regenerate-ids-soon-timer nil)
- (subed-srt--regenerate-ids)))))
-
(cl-defmethod subed--sanitize (&context (major-mode subed-srt-mode))
"Remove surplus newlines and whitespace.
Use the format-specific function for MAJOR-MODE."
@@ -409,16 +393,16 @@ Use the format-specific function for MAJOR-MODE."
(cl-defmethod subed--sort :after (&context (major-mode subed-srt-mode))
"Renumber after sorting. Format-specific for MAJOR-MODE."
- (subed-srt--regenerate-ids))
+ (subed-regenerate-ids))
(cl-defmethod subed--insert-subtitle :after (&context (major-mode
subed-srt-mode) &optional arg)
"Renumber afterwards. Format-specific for MAJOR-MODE."
- (subed-srt--regenerate-ids-soon)
+ (subed-regenerate-ids-soon)
(point))
(cl-defmethod subed--insert-subtitle-adjacent :after (&context (major-mode
subed-srt-mode) &optional arg)
"Renumber afterwards. Format-specific for MAJOR-MODE."
- (subed-srt--regenerate-ids-soon)
+ (subed-regenerate-ids-soon)
(point))
;;;###autoload
@@ -444,7 +428,7 @@ Use the format-specific function for MAJOR-MODE."
(mapconcat 'identity '("^-"
"[[:graph:]]*$") "\\|")
"\\)")))
- (add-hook 'subed-sanitize-functions #'subed-srt--regenerate-ids t t))
+ (add-hook 'subed-sanitize-functions #'subed-regenerate-ids t t))
;;;###autoload
(add-to-list 'auto-mode-alist '("\\.srt\\'" . subed-srt-mode))
diff --git a/subed/subed.el b/subed/subed.el
index 34f830a775..130e0cff6b 100644
--- a/subed/subed.el
+++ b/subed/subed.el
@@ -1,6 +1,6 @@
;;; subed.el --- A major mode for editing subtitles -*- lexical-binding: t;
-*-
-;; Version: 1.0.0
+;; Version: 1.0.1
;; Keywords: convenience, files, hypermedia, multimedia
;; URL: https://github.com/rndusr/subed
;; Package-Requires: ((emacs "25.1"))
diff --git a/tests/test-subed-common.el b/tests/test-subed-common.el
index 491de99ccf..5b868dcfb2 100644
--- a/tests/test-subed-common.el
+++ b/tests/test-subed-common.el
@@ -978,18 +978,18 @@ Baz.
(it "a single subtile."
(cl-loop for arg in (list nil 1) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(expect (subed-insert-subtitle arg) :to-equal 33)
(expect (buffer-string) :to-equal (concat "0\n"
"00:00:00,000
--> 00:00:01,000\n"
"\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtiles."
(cl-loop for arg in (list 2) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(expect (subed-insert-subtitle arg) :to-equal 33)
(expect (buffer-string) :to-equal (concat "0\n"
"00:00:00,000
--> 00:00:01,000\n"
@@ -998,25 +998,25 @@ Baz.
"00:00:01,100
--> 00:00:02,100\n"
"\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
(describe "prepending"
(it "a single subtile."
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(expect (subed-insert-subtitle arg) :to-equal 33)
(expect (buffer-string) :to-equal (concat "0\n"
"00:00:00,000
--> 00:00:01,000\n"
"\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtiles."
(cl-loop for arg in (list -2 (list -16)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(expect (subed-insert-subtitle arg) :to-equal 33)
(expect (buffer-string) :to-equal (concat "0\n"
"00:00:00,000
--> 00:00:01,000\n"
@@ -1025,8 +1025,8 @@ Baz.
"00:00:01,100
--> 00:00:02,100\n"
"\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
)
(describe "in a non-empty buffer"
@@ -1034,7 +1034,7 @@ Baz.
(it "a single subtitle."
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1053,12 +1053,12 @@ Baz.
"00:02:00,000
--> 00:02:01,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list -2 (list 16)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1080,14 +1080,14 @@ Baz.
"00:02:00,000
--> 00:02:01,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
(describe "appending between subtitles"
(it "a single subtitle."
(cl-loop for arg in (list nil 1) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1106,12 +1106,12 @@ Baz.
"00:02:00,000
--> 00:02:01,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list 2) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1133,14 +1133,14 @@ Baz.
"00:02:00,000
--> 00:02:01,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
(describe "prepending to the first subtitle"
(it "a single subtitle."
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:01:00,000 --> 00:01:01,000\n"
"Foo.\n"))
@@ -1153,12 +1153,12 @@ Baz.
"00:01:00,000
--> 00:01:01,000\n"
"Foo.\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list -2 (list 16)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:01:00,000 --> 00:01:01,000\n"
"Foo.\n"))
@@ -1174,14 +1174,14 @@ Baz.
"00:01:00,000
--> 00:01:01,000\n"
"Foo.\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
(describe "appending to the last subtitle"
(it "a single subtitle."
(cl-loop for arg in (list nil 1) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n"))
@@ -1194,8 +1194,8 @@ Baz.
"00:01:00,100
--> 00:01:01,100\n"
"\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list 2) do
(with-temp-srt-buffer
@@ -1220,7 +1220,7 @@ Baz.
(it "a single subtitle."
(cl-loop for arg in (list nil 1) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1239,12 +1239,12 @@ Baz.
"00:01:00,600
--> 00:01:02,000\n"
"Foo.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list 2) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1266,15 +1266,15 @@ Baz.
"00:01:00,600
--> 00:01:02,000\n"
"Foo.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
(describe "to prepend"
(describe "between subtitles"
(it "a single subtitle."
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:57,000 --> 00:00:59,100\n"
"Foo.\n\n"
@@ -1293,12 +1293,12 @@ Baz.
"00:01:00,000 --> 00:01:02,000\n"
"Foo.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list -2 (list 16)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:57,000 --> 00:00:59,100\n"
"Foo.\n\n"
@@ -1320,14 +1320,14 @@ Baz.
"00:01:00,000 --> 00:01:02,000\n"
"Foo.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
(describe "before the first subtitle"
(it "a single subtitle."
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:00,500 --> 00:00:02,000\n"
"Foo.\n"))
@@ -1340,12 +1340,12 @@ Baz.
"00:00:00,500 --> 00:00:02,000\n"
"Foo.\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list -2 (list 16)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:00,600 --> 00:00:01,500\n"
"Foo.\n"))
@@ -1361,8 +1361,8 @@ Baz.
"00:00:00,600 --> 00:00:01,500\n"
"Foo.\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
)
)
@@ -1372,7 +1372,7 @@ Baz.
(it "a single subtitle."
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:55,000 --> 00:00:59,950\n"
"Foo.\n\n"
@@ -1391,12 +1391,12 @@ Baz.
"00:01:00,000 --> 00:01:02,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list -2 (list 16)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:57,000 --> 00:00:59,999\n"
"Foo.\n\n"
@@ -1418,14 +1418,14 @@ Baz.
"00:01:00,000 --> 00:01:02,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
(describe "when appending"
(it "a single subtitle."
(cl-loop for arg in (list nil 1) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1444,12 +1444,12 @@ Baz.
"00:01:00,010 --> 00:01:02,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list 2) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1471,15 +1471,15 @@ Baz.
"00:01:00,100 --> 00:01:02,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
)
(describe "before the first subtitle"
(it "a single subtitle."
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:00,050 --> 00:00:02,000\n"
"Foo.\n"))
@@ -1492,12 +1492,12 @@ Baz.
"00:00:00,050
--> 00:00:02,000\n"
"Foo.\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list -2 (list 16)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:00,100 --> 00:00:01,500\n"
"Foo.\n"))
@@ -1513,8 +1513,8 @@ Baz.
"00:00:00,100
--> 00:00:01,500\n"
"Foo.\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
)
)
@@ -1526,18 +1526,18 @@ Baz.
(it "a single subtile."
(cl-loop for arg in (list nil 1) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(expect (subed-insert-subtitle-adjacent arg) :to-equal 33)
(expect (buffer-string) :to-equal (concat "0\n"
"00:00:00,000
--> 00:00:01,000\n"
"\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtiles."
(cl-loop for arg in (list 2) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(expect (subed-insert-subtitle-adjacent arg) :to-equal 33)
(expect (buffer-string) :to-equal (concat "0\n"
"00:00:00,000
--> 00:00:01,000\n"
@@ -1546,25 +1546,25 @@ Baz.
"00:00:01,100
--> 00:00:02,100\n"
"\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
(describe "prepending"
(it "a single subtile."
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(expect (subed-insert-subtitle-adjacent arg) :to-equal 33)
(expect (buffer-string) :to-equal (concat "0\n"
"00:00:00,000
--> 00:00:01,000\n"
"\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtiles."
(cl-loop for arg in (list -2 (list -16)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(expect (subed-insert-subtitle-adjacent arg) :to-equal 33)
(expect (buffer-string) :to-equal (concat "0\n"
"00:00:00,000
--> 00:00:01,000\n"
@@ -1573,8 +1573,8 @@ Baz.
"00:00:01,100
--> 00:00:02,100\n"
"\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
)
(describe "in a non-empty buffer"
@@ -1582,7 +1582,7 @@ Baz.
(it "a single subtitle."
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1601,12 +1601,12 @@ Baz.
"00:02:00,000
--> 00:02:01,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list -2 (list 16)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1628,14 +1628,14 @@ Baz.
"00:02:00,000
--> 00:02:01,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
(describe "appending between subtitles"
(it "a single subtitle."
(cl-loop for arg in (list nil 1) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1654,12 +1654,12 @@ Baz.
"00:02:00,000
--> 00:02:01,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list 2) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1681,14 +1681,14 @@ Baz.
"00:02:00,000
--> 00:02:01,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
(describe "prepending to the first subtitle"
(it "a single subtitle."
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:01:00,000 --> 00:01:01,000\n"
"Foo.\n"))
@@ -1701,12 +1701,12 @@ Baz.
"00:01:00,000
--> 00:01:01,000\n"
"Foo.\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list -2 (list 16)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:01:00,000 --> 00:01:01,000\n"
"Foo.\n"))
@@ -1722,14 +1722,14 @@ Baz.
"00:01:00,000
--> 00:01:01,000\n"
"Foo.\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
(describe "appending to the last subtitle"
(it "a single subtitle."
(cl-loop for arg in (list nil 1) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n"))
@@ -1742,12 +1742,12 @@ Baz.
"00:01:00,100
--> 00:01:01,100\n"
"\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list 2) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n"))
@@ -1763,15 +1763,15 @@ Baz.
"00:01:01,200
--> 00:01:02,200\n"
"\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
(describe "when there is not enough time for the subtitles"
(describe "to append"
(it "a single subtitle."
(cl-loop for arg in (list nil 1) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1790,12 +1790,12 @@ Baz.
"00:01:00,500
--> 00:01:05,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list 2) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1817,15 +1817,15 @@ Baz.
"00:01:00,500
--> 00:01:05,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
(describe "to prepend"
(describe "between subtitles"
(it "a single subtitle."
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1844,12 +1844,12 @@ Baz.
"00:01:00,700 --> 00:01:05,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list -2 (list 16)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1871,14 +1871,14 @@ Baz.
"00:01:00,500 --> 00:01:05,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
(describe "before the first subtitle"
(it "a single subtitle."
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:01,000 --> 00:00:02,000\n"
"Foo.\n"))
@@ -1891,12 +1891,12 @@ Baz.
"00:00:01,000 --> 00:00:02,000\n"
"Foo.\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list -2 (list 16)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:00,800 --> 00:00:03,000\n"
"Foo.\n"))
@@ -1912,8 +1912,8 @@ Baz.
"00:00:00,800 --> 00:00:03,000\n"
"Foo.\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
)
)
@@ -1923,7 +1923,7 @@ Baz.
(it "a single subtitle."
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1942,12 +1942,12 @@ Baz.
"00:01:00,005 --> 00:01:05,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list -2 (list 16)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1969,14 +1969,14 @@ Baz.
"00:01:00,025 --> 00:01:05,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
(describe "when appending"
(it "a single subtitle."
(cl-loop for arg in (list nil 1) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -1995,12 +1995,12 @@ Baz.
"00:01:00,099 --> 00:01:05,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list 2) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:59,000 --> 00:01:00,000\n"
"Foo.\n\n"
@@ -2022,15 +2022,15 @@ Baz.
"00:01:00,075 --> 00:01:05,000\n"
"Bar.\n"))
(expect (point) :to-equal 71)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
)
(describe "before the first subtitle"
(it "a single subtitle."
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:00,040 --> 00:00:05,000\n"
"Foo.\n"))
@@ -2043,12 +2043,12 @@ Baz.
"00:00:00,040
--> 00:00:05,000\n"
"Foo.\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
(it "multiple subtitles."
(cl-loop for arg in (list -2 (list 16)) do
(with-temp-srt-buffer
- (spy-on 'subed-srt--regenerate-ids-soon)
+ (spy-on 'subed-regenerate-ids-soon)
(insert (concat "1\n"
"00:00:00,024 --> 00:00:05,000\n"
"Foo.\n"))
@@ -2064,8 +2064,8 @@ Baz.
"00:00:00,024
--> 00:00:05,000\n"
"Foo.\n"))
(expect (point) :to-equal 33)
- (expect 'subed-srt--regenerate-ids-soon
:to-have-been-called-times 1)
- (spy-calls-reset 'subed-srt--regenerate-ids-soon))))
+ (expect 'subed-regenerate-ids-soon
:to-have-been-called-times 1)
+ (spy-calls-reset 'subed-regenerate-ids-soon))))
)
)
)
@@ -2196,7 +2196,7 @@ that has two lines.
(goto-char (match-end 0))
(subed-split-subtitle 100)
(expect (subed-subtitle-text 1) :to-equal "This is a")
- (subed-srt--regenerate-ids)
+ (subed-regenerate-ids)
(expect (subed-subtitle-text 2) :to-equal "subtitle\nthat has two
lines.")))
(it "properly splits text when called at the end of a line in the
middle of the subtitle"
(with-temp-srt-buffer
@@ -2205,7 +2205,7 @@ that has two lines.
(goto-char (match-end 0))
(subed-split-subtitle 100)
(expect (subed-subtitle-text 1) :to-equal "This is a subtitle")
- (subed-srt--regenerate-ids)
+ (subed-regenerate-ids)
(expect (subed-subtitle-text 2) :to-equal "that has two lines.")))
(it "properly splits text when called at the beginning of a line in
the middle of the subtitle."
(with-temp-srt-buffer
@@ -2221,7 +2221,7 @@ This is a subtitle
00:01:23,200 --> 00:02:34,567
that has two lines.
") (expect (subed-subtitle-text 1) :to-equal "This is a subtitle")
- (subed-srt--regenerate-ids)
+ (subed-regenerate-ids)
(expect (subed-subtitle-text 2) :to-equal "that has two lines.")))
(it "properly splits text when called at the end of the subtitle."
(with-temp-srt-buffer
@@ -2229,7 +2229,7 @@ that has two lines.
(subed-jump-to-subtitle-end 1)
(subed-split-subtitle 100)
(expect (subed-subtitle-text 1) :to-equal "This is a subtitle\nthat
has two lines.")
- (subed-srt--regenerate-ids)
+ (subed-regenerate-ids)
(expect (subed-subtitle-text 2) :to-equal "")))
(it "properly splits text when called before whitespace at the end of
the subtitle."
(with-temp-srt-buffer
@@ -2238,7 +2238,7 @@ that has two lines.
(save-excursion (insert " "))
(subed-split-subtitle 100)
(expect (subed-subtitle-text 1) :to-equal "This is a subtitle\nthat
has two lines.")
- (subed-srt--regenerate-ids)
+ (subed-regenerate-ids)
(expect (subed-subtitle-text 2) :to-equal ""))))
(describe "with another subtitle after it"
:var ((text "1
@@ -2277,7 +2277,7 @@ This is another.
(backward-word 1)
(subed-split-subtitle 100)
(expect (subed-subtitle-text 1) :to-equal "This is a")
- (subed-srt--regenerate-ids)
+ (subed-regenerate-ids)
(expect (subed-subtitle-text 2) :to-equal "subtitle\nthat has two
lines.")))
(it "properly splits text when called at the end of a line in the
middle of the subtitle"
(with-temp-srt-buffer
@@ -2286,7 +2286,7 @@ This is another.
(goto-char (match-end 0))
(subed-split-subtitle 100)
(expect (subed-subtitle-text 1) :to-equal "This is a subtitle")
- (subed-srt--regenerate-ids)
+ (subed-regenerate-ids)
(expect (subed-subtitle-text 2) :to-equal "that has two lines.")))
(it "properly splits text when called at the beginning of a line in
the middle of the subtitle."
(with-temp-srt-buffer
@@ -2306,7 +2306,7 @@ that has two lines.
00:05:00,000 --> 00:06:00,000
This is another.
") (expect (subed-subtitle-text 1) :to-equal "This is a subtitle")
- (subed-srt--regenerate-ids)
+ (subed-regenerate-ids)
(expect (subed-subtitle-text 2) :to-equal "that has two lines.")))
(it "properly splits text when called at the end of the subtitle."
(with-temp-srt-buffer
@@ -2314,7 +2314,7 @@ This is another.
(subed-jump-to-subtitle-end 1)
(subed-split-subtitle 100)
(expect (subed-subtitle-text 1) :to-equal "This is a subtitle\nthat
has two lines.")
- (subed-srt--regenerate-ids)
+ (subed-regenerate-ids)
(expect (subed-subtitle-text 2) :to-equal "")))
(it "properly splits text when called before whitespace at the end of
the subtitle."
(with-temp-srt-buffer
@@ -2323,7 +2323,7 @@ This is another.
(save-excursion (insert " "))
(subed-split-subtitle 100)
(expect (subed-subtitle-text 1) :to-equal "This is a subtitle\nthat
has two lines.")
- (subed-srt--regenerate-ids)
+ (subed-regenerate-ids)
(expect (subed-subtitle-text 2) :to-equal "")))))
(describe "when playing the video in MPV"
(it "splits at point in the middle of the subtitle."
@@ -3131,3 +3131,37 @@ This is another.
(2 122234 130345 "Bar.")))))
)
)
+
+(describe "An old generic function"
+ :var ((function-list
+ (list "subtitle-id" "subtitle-id-max" "subtitle-id-at-msecs"
+ "subtitle-msecs-start" "subtitle-msecs-stop"
+ "subtitle-text" "subtitle-relative-point"
+ "msecs-to-timestamp" "timestamp-to-msecs"
+ "jump-to-subtitle-id" "jump-to-subtitle-id-at-msecs"
+ "jump-to-subtitle-time-start" "jump-to-subtitle-time-stop"
+ "jump-to-subtitle-text" "jump-to-subtitle-text-at-msecs"
+ "jump-to-subtitle-end"
+ "forward-subtitle-id" "backward-subtitle-id"
+ "forward-subtitle-text" "backward-subtitle-text"
+ "forward-subtitle-end" "backward-subtitle-end"
+ "forward-subtitle-time-start" "backward-subtitle-time-start"
+ "forward-subtitle-time-stop" "backward-subtitle-time-stop"
+ "set-subtitle-time-start" "set-subtitle-time-stop"
+ "prepend-subtitle" "append-subtitle" "kill-subtitle"
"merge-with-next"
+ "regenerate-ids" "regenerate-ids-soon"
+ "sanitize" "validate" "sort" "make-subtitle")))
+ (it "is declared as a common function"
+ (mapc (lambda (f)
+ (let ((function-name (format "subed-%s" f)))
+ (unless (functionp (intern function-name))
+ (buttercup-fail "%s is not a function" function-name))))
+ function-list))
+ (it "has format-specific internal functions"
+ (mapc (lambda (f)
+ (mapc (lambda (sub-format)
+ (let ((function-name (format "subed-%s--%s" sub-format f)))
+ (unless (functionp (intern function-name))
+ (buttercup-fail "%s is not a function"
function-name))))
+ '("srt" "vtt" "ass")))
+ function-list)))
diff --git a/tests/test-subed-srt.el b/tests/test-subed-srt.el
index 13514f0a1a..957bb4b13a 100644
--- a/tests/test-subed-srt.el
+++ b/tests/test-subed-srt.el
@@ -1430,7 +1430,7 @@ Baz.
(while (looking-at "^[0-9]$")
(replace-match "123"))
(expect (buffer-string) :not :to-equal mock-srt-data)
- (subed-srt--regenerate-ids)
+ (subed-regenerate-ids)
(expect (buffer-string) :to-equal mock-srt-data)))
(it "runs before saving."
(with-temp-srt-buffer
@@ -1448,11 +1448,11 @@ Baz.
(goto-char (point-min))
(while (looking-at "^[0-9]$")
(insert "555"))
- (subed-srt--regenerate-ids)
+ (subed-regenerate-ids)
(expect (car kill-ring) :to-equal "asdf")))
(it "does not modify empty buffer."
(with-temp-srt-buffer
- (subed-srt--regenerate-ids)
+ (subed-regenerate-ids)
(expect (buffer-string) :to-equal "")))
)
- [nongnu] elpa/subed d6b46496f8 11/22: Fix save hook name, (continued)
- [nongnu] elpa/subed d6b46496f8 11/22: Fix save hook name, ELPA Syncer, 2022/02/01
- [nongnu] elpa/subed e1b24bff31 05/22: Remove duplicate functions, ELPA Syncer, 2022/02/01
- [nongnu] elpa/subed 5c4ac92ddc 07/22: Add NEWS.org file, ELPA Syncer, 2022/02/01
- [nongnu] elpa/subed f3b48e319e 16/22: Use function instead of quote in subed-define-generic-function, ELPA Syncer, 2022/02/01
- [nongnu] elpa/subed 5e9518da77 18/22: Work around direct call of subed-mode by guessing format, ELPA Syncer, 2022/02/01
- [nongnu] elpa/subed 5ed05ad398 02/22: Implement mode-specific functions with cl-defmethod, ELPA Syncer, 2022/02/01
- [nongnu] elpa/subed 1f7e32e176 06/22: README.org: document branches, mention autoloads, ELPA Syncer, 2022/02/01
- [nongnu] elpa/subed a58b002fe9 15/22: Clean up undercover-init.el, ELPA Syncer, 2022/02/01
- [nongnu] elpa/subed 3e99c6cb6f 22/22: Merge branch 'derived-mode' into main, ELPA Syncer, 2022/02/01
- [nongnu] elpa/subed b3a4ae08ab 10/22: Add missing tests for merging and subtitle ID at msecs, ELPA Syncer, 2022/02/01
- [nongnu] elpa/subed 94c28993b7 21/22: Define obsolete function aliases,
ELPA Syncer <=
- [nongnu] elpa/subed 00d5525712 17/22: Add autoloads, ELPA Syncer, 2022/02/01
- [nongnu] elpa/subed 52fa457512 20/22: subed-define-generic-function: edebug and indent like a defun, ELPA Syncer, 2022/02/01
- [nongnu] elpa/subed 3199cd60d8 19/22: Document subed-define-generic-function, ELPA Syncer, 2022/02/01