branch: elpa/subed
commit e22f4b7b1785945e70c1e811afabd3bb0452f022
Author: Random User <rnd...@posteo.de>
Commit: Random User <rnd...@posteo.de>
Make subed-srt-* functions private
If there will ever be support for other subtitle formats, subed should take
care
of loading the correct functions and make them available in the generic
subed-*
namespace.
---
subed/subed-srt.el | 166 ++++++++++----------
subed/subed.el | 40 ++---
tests/test-subed-srt.el | 402 ++++++++++++++++++++++++------------------------
3 files changed, 304 insertions(+), 304 deletions(-)
diff --git a/subed/subed-srt.el b/subed/subed-srt.el
index 2bfa4af..8594bfd 100644
--- a/subed/subed-srt.el
+++ b/subed/subed-srt.el
@@ -60,7 +60,7 @@ Return nil if TIME-STRING doesn't match the pattern."
(defun subed-srt--subtitle-id ()
"Return the ID of subtitle at point or nil if there is no ID."
(save-excursion
- (when (subed-srt-jump-to-subtitle-id)
+ (when (subed-srt--jump-to-subtitle-id)
(string-to-number (current-word)))))
(defun subed-srt--subtitle-id-at-msecs (msecs)
@@ -82,18 +82,18 @@ after MSECS if there is one and its start time is >= MSECS +
;; Move to first subtitle that starts at or after MSECS
(catch 'last-subtitle-reached
(while (<= (or (subed-srt--subtitle-msecs-start) -1) msecs)
- (unless (subed-srt-forward-subtitle-id)
+ (unless (subed-srt--forward-subtitle-id)
(throw 'last-subtitle-reached nil))))
;; Move back to previous subtitle if start of current subtitle is in the
;; future (i.e. MSECS is between subtitles)
(when (> (or (subed-srt--subtitle-msecs-start) -1) msecs)
- (subed-srt-backward-subtitle-id))
+ (subed-srt--backward-subtitle-id))
(subed-srt--subtitle-id))))
(defun subed-srt--subtitle-msecs-start (&optional sub-id)
"Subtitle start time in milliseconds or nil if it can't be found."
(let ((timestamp (save-excursion
- (when (subed-srt-jump-to-subtitle-time-start sub-id)
+ (when (subed-srt--jump-to-subtitle-time-start sub-id)
(when (looking-at subed-srt--regexp-timestamp)
(match-string 0))))))
(when timestamp
@@ -102,7 +102,7 @@ after MSECS if there is one and its start time is >= MSECS +
(defun subed-srt--subtitle-msecs-stop (&optional sub-id)
"Subtitle stop time in milliseconds or nil if it can't be found."
(let ((timestamp (save-excursion
- (when (subed-srt-jump-to-subtitle-time-stop sub-id)
+ (when (subed-srt--jump-to-subtitle-time-stop sub-id)
(when (looking-at subed-srt--regexp-timestamp)
(match-string 0))))))
(when timestamp
@@ -111,15 +111,15 @@ after MSECS if there is one and its start time is >=
MSECS +
(defun subed-srt--subtitle-text (&optional sub-id)
"Return subtitle's text."
(or (save-excursion
- (let ((beg (subed-srt-jump-to-subtitle-text sub-id))
- (end (subed-srt-jump-to-subtitle-end sub-id)))
+ (let ((beg (subed-srt--jump-to-subtitle-text sub-id))
+ (end (subed-srt--jump-to-subtitle-end sub-id)))
(when (and beg end)
(buffer-substring beg end)))) ""))
(defun subed-srt--subtitle-relative-point ()
"Point relative to subtitle's ID or nil if ID can't be found."
(let ((start-point (save-excursion
- (when (subed-srt-jump-to-subtitle-id)
+ (when (subed-srt--jump-to-subtitle-id)
(point)))))
(when start-point
(- (point) start-point))))
@@ -127,7 +127,7 @@ after MSECS if there is one and its start time is >= MSECS +
;;; Traversing
-(defun subed-srt-jump-to-subtitle-id (&optional sub-id)
+(defun subed-srt--jump-to-subtitle-id (&optional sub-id)
"Move to the ID of a subtitle and return point.
If SUBTITLE-ID is not given, focus the current subtitle's ID.
Return point or nil if no subtitle ID could be found."
@@ -157,59 +157,59 @@ Return point or nil if no subtitle ID could be found."
(when (looking-at "^\\([0-9]+\\)$")
(point))))
-(defun subed-srt-jump-to-subtitle-id-at-msecs (msecs)
+(defun subed-srt--jump-to-subtitle-id-at-msecs (msecs)
"Move point to the ID of the subtitle that is playing at MSECS.
Return point or nil if point is still on the same subtitle.
See also `subed-srt--subtitle-id-at-msecs'."
(let ((current-sub-id (subed-srt--subtitle-id))
(target-sub-id (subed-srt--subtitle-id-at-msecs msecs)))
(when (and target-sub-id current-sub-id (not (= target-sub-id
current-sub-id)))
- (subed-srt-jump-to-subtitle-id target-sub-id))))
+ (subed-srt--jump-to-subtitle-id target-sub-id))))
-(defun subed-srt-jump-to-subtitle-time-start (&optional sub-id)
+(defun subed-srt--jump-to-subtitle-time-start (&optional sub-id)
"Move point to subtitle's start time.
Return point or nil if no start time could be found."
(interactive)
(save-match-data
- (when (subed-srt-jump-to-subtitle-id sub-id)
+ (when (subed-srt--jump-to-subtitle-id sub-id)
(forward-line)
(when (looking-at subed-srt--regexp-timestamp)
(point)))))
-(defun subed-srt-jump-to-subtitle-time-stop (&optional sub-id)
+(defun subed-srt--jump-to-subtitle-time-stop (&optional sub-id)
"Move point to subtitle's stop time.
Return point or nil if no stop time could be found."
(interactive)
(save-match-data
- (when (subed-srt-jump-to-subtitle-id sub-id)
+ (when (subed-srt--jump-to-subtitle-id sub-id)
(forward-line 1)
(re-search-forward " *--> *" (point-at-eol) t)
(when (looking-at subed-srt--regexp-timestamp)
(point)))))
-(defun subed-srt-jump-to-subtitle-text (&optional sub-id)
+(defun subed-srt--jump-to-subtitle-text (&optional sub-id)
"Move point on the first character of subtitle's text.
Return point."
(interactive)
- (when (subed-srt-jump-to-subtitle-id sub-id)
+ (when (subed-srt--jump-to-subtitle-id sub-id)
(forward-line 2)
(point)))
-(defun subed-srt-jump-to-subtitle-text-at-msecs (msecs)
+(defun subed-srt--jump-to-subtitle-text-at-msecs (msecs)
"Move point to the text of the subtitle that is playing at MSECS.
Return point or nil if point is still on the same subtitle.
See also `subed-srt--subtitle-id-at-msecs'."
- (when (subed-srt-jump-to-subtitle-id-at-msecs msecs)
- (subed-srt-jump-to-subtitle-text)))
+ (when (subed-srt--jump-to-subtitle-id-at-msecs msecs)
+ (subed-srt--jump-to-subtitle-text)))
-(defun subed-srt-jump-to-subtitle-end (&optional sub-id)
+(defun subed-srt--jump-to-subtitle-end (&optional sub-id)
"Move point after the last character of the subtitle's text.
Return point or nil if point did not change or if no subtitle end
can be found."
(interactive)
(save-match-data
(let ((orig-point (point)))
- (subed-srt-jump-to-subtitle-text sub-id)
+ (subed-srt--jump-to-subtitle-text sub-id)
;; Look for next separator or end of buffer. We can't use
;; `subed-srt--regexp-separator' here because if subtitle text is empty,
;; it may be the only empty line in the separator, i.e. there's only one
@@ -220,78 +220,78 @@ can be found."
(unless (= (point) orig-point)
(point)))))
-(defun subed-srt-forward-subtitle-id ()
+(defun subed-srt--forward-subtitle-id ()
"Move point to next subtitle's ID.
Return point or nil if there is no next subtitle."
(interactive)
(save-match-data
(when (re-search-forward (concat subed-srt--regexp-separator "[0-9]+\n")
nil t)
- (subed-srt-jump-to-subtitle-id))))
+ (subed-srt--jump-to-subtitle-id))))
-(defun subed-srt-backward-subtitle-id ()
+(defun subed-srt--backward-subtitle-id ()
"Move point to previous subtitle's ID.
Return point or nil if there is no previous subtitle."
(interactive)
(let ((orig-point (point))
(orig-sub-id (subed-srt--subtitle-id)))
- (when (subed-srt-jump-to-subtitle-id)
+ (when (subed-srt--jump-to-subtitle-id)
(forward-line -1)
(if (= (subed-srt--subtitle-id) orig-sub-id)
(progn (goto-char orig-point)
nil)
- (subed-srt-jump-to-subtitle-id)))))
+ (subed-srt--jump-to-subtitle-id)))))
-(defun subed-srt-forward-subtitle-text ()
+(defun subed-srt--forward-subtitle-text ()
"Move point to next subtitle's text.
Return point or nil if there is no next subtitle."
(interactive)
- (when (subed-srt-forward-subtitle-id)
- (subed-srt-jump-to-subtitle-text)))
+ (when (subed-srt--forward-subtitle-id)
+ (subed-srt--jump-to-subtitle-text)))
-(defun subed-srt-backward-subtitle-text ()
+(defun subed-srt--backward-subtitle-text ()
"Move point to previous subtitle's text.
Return point or nil if there is no previous subtitle."
(interactive)
- (when (subed-srt-backward-subtitle-id)
- (subed-srt-jump-to-subtitle-text)))
+ (when (subed-srt--backward-subtitle-id)
+ (subed-srt--jump-to-subtitle-text)))
-(defun subed-srt-forward-subtitle-end ()
+(defun subed-srt--forward-subtitle-end ()
"Move point to end of next subtitle.
Return point or nil if there is no next subtitle."
(interactive)
- (when (subed-srt-forward-subtitle-id)
- (subed-srt-jump-to-subtitle-end)))
+ (when (subed-srt--forward-subtitle-id)
+ (subed-srt--jump-to-subtitle-end)))
-(defun subed-srt-backward-subtitle-end ()
+(defun subed-srt--backward-subtitle-end ()
"Move point to end of previous subtitle.
Return point or nil if there is no previous subtitle."
(interactive)
- (when (subed-srt-backward-subtitle-id)
- (subed-srt-jump-to-subtitle-end)))
+ (when (subed-srt--backward-subtitle-id)
+ (subed-srt--jump-to-subtitle-end)))
-(defun subed-srt-forward-subtitle-time-start ()
+(defun subed-srt--forward-subtitle-time-start ()
"Move point to next subtitle's start time."
(interactive)
- (when (subed-srt-forward-subtitle-id)
- (subed-srt-jump-to-subtitle-time-start)))
+ (when (subed-srt--forward-subtitle-id)
+ (subed-srt--jump-to-subtitle-time-start)))
-(defun subed-srt-backward-subtitle-time-start ()
+(defun subed-srt--backward-subtitle-time-start ()
"Move point to previous subtitle's start time."
(interactive)
- (when (subed-srt-backward-subtitle-id)
- (subed-srt-jump-to-subtitle-time-start)))
+ (when (subed-srt--backward-subtitle-id)
+ (subed-srt--jump-to-subtitle-time-start)))
-(defun subed-srt-forward-subtitle-time-stop ()
+(defun subed-srt--forward-subtitle-time-stop ()
"Move point to next subtitle's stop time."
(interactive)
- (when (subed-srt-forward-subtitle-id)
- (subed-srt-jump-to-subtitle-time-stop)))
+ (when (subed-srt--forward-subtitle-id)
+ (subed-srt--jump-to-subtitle-time-stop)))
-(defun subed-srt-backward-subtitle-time-stop ()
+(defun subed-srt--backward-subtitle-time-stop ()
"Move point to previous subtitle's stop time."
(interactive)
- (when (subed-srt-backward-subtitle-id)
- (subed-srt-jump-to-subtitle-time-stop)))
+ (when (subed-srt--backward-subtitle-id)
+ (subed-srt--jump-to-subtitle-time-stop)))
;;; Manipulation
@@ -309,7 +309,7 @@ nil if nothing was adjusted."
(let* ((msecs-start (subed-srt--subtitle-msecs-start))
(msecs-new (when msecs-start (+ msecs-start msecs)))
(msecs-prev (save-excursion
- (when (subed-srt-backward-subtitle-id)
+ (when (subed-srt--backward-subtitle-id)
(subed-srt--subtitle-msecs-stop))))
(msecs-min (if msecs-prev (+ msecs-prev subed-subtitle-spacing) 0))
(msecs-max (subed-srt--subtitle-msecs-stop)))
@@ -323,7 +323,7 @@ nil if nothing was adjusted."
(when (or (and (> msecs 0) (> msecs-new msecs-start)) ;; Adding
(and (< msecs 0) (< msecs-new msecs-start))) ;; Subtracting
(save-excursion
- (subed-srt-jump-to-subtitle-time-start)
+ (subed-srt--jump-to-subtitle-time-start)
(when (looking-at subed-srt--regexp-timestamp)
(replace-match (subed-srt--msecs-to-timestamp msecs-new))
(subed--run-subtitle-time-adjusted-hook)
@@ -342,7 +342,7 @@ nil if nothing was adjusted."
(let* ((msecs-stop (subed-srt--subtitle-msecs-stop))
(msecs-new (when msecs-stop (+ msecs-stop msecs)))
(msecs-next (save-excursion
- (when (subed-srt-forward-subtitle-id)
+ (when (subed-srt--forward-subtitle-id)
(subed-srt--subtitle-msecs-start))))
(msecs-min (subed-srt--subtitle-msecs-start))
(msecs-max (when msecs-next (- msecs-next subed-subtitle-spacing))))
@@ -356,13 +356,13 @@ nil if nothing was adjusted."
(when (or (and (> msecs 0) (> msecs-new msecs-stop)) ;; Adding
(and (< msecs 0) (< msecs-new msecs-stop))) ;; Subtracting
(save-excursion
- (subed-srt-jump-to-subtitle-time-stop)
+ (subed-srt--jump-to-subtitle-time-stop)
(when (looking-at subed-srt--regexp-timestamp)
(replace-match (subed-srt--msecs-to-timestamp msecs-new))
(subed--run-subtitle-time-adjusted-hook)
(- msecs-new msecs-stop)))))))
-(defun subed-srt-subtitle-insert (&optional arg)
+(defun subed-srt--subtitle-insert (&optional arg)
"Insert subtitle(s).
`universal-argument' is used in the following manner:
\\[subed-subtitle-insert] Insert 1 subtitle after the current
subtitle
@@ -385,17 +385,17 @@ nil if nothing was adjusted."
;; Ensure number-of-subs is positive, now that we figured out
`insert-before'
(number-of-subs (abs number-of-subs)))
(subed-debug "Inserting %s subtitle(s) %s the current" number-of-subs
(if insert-before "before" "after"))
- (subed-srt-jump-to-subtitle-id)
+ (subed-srt--jump-to-subtitle-id)
;; Move to the ID of the subtitle we're prepending subtitles to so that
we
;; can do (insert "<new subtitle>")
(if insert-before
- (subed-srt-jump-to-subtitle-id)
- (when (and (not (subed-srt-forward-subtitle-id)) ;; Appending after
last subtitle
+ (subed-srt--jump-to-subtitle-id)
+ (when (and (not (subed-srt--forward-subtitle-id)) ;; Appending after
last subtitle
(> (buffer-size) 0)) ;; Buffer is not empty
;; There is no ID because we're appending to the last subtitle. We
just
;; have to make sure there is a subtitle delimiter ("\n\n") after the
;; last subtitle and point is where the new ID will go.
- (subed-srt-jump-to-subtitle-end)
+ (subed-srt--jump-to-subtitle-end)
(forward-line)
(insert "\n")))
;; Insert subtitles
@@ -407,7 +407,7 @@ nil if nothing was adjusted."
(if (looking-at "^[0-9]$")
;; We're inserting between subtitles or
;; before the first one
- (when (subed-srt-backward-subtitle-id)
+ (when (subed-srt--backward-subtitle-id)
(subed-srt--subtitle-msecs-stop))
;; We're append after the last subtitle
(subed-srt--subtitle-msecs-stop))))
@@ -439,25 +439,25 @@ nil if nothing was adjusted."
(when (looking-at "^[[:blank:]]*$")
(forward-line -1)
(kill-whole-line)))
- (subed-srt-regenerate-ids)
- (subed-srt-jump-to-subtitle-text))))
+ (subed-srt--regenerate-ids)
+ (subed-srt--jump-to-subtitle-text))))
-(defun subed-srt-subtitle-kill ()
+(defun subed-srt--subtitle-kill ()
"Remove subtitle at point."
(interactive)
(let ((beg (save-excursion
- (subed-srt-jump-to-subtitle-id)
+ (subed-srt--jump-to-subtitle-id)
(point)))
(end (save-excursion
- (subed-srt-jump-to-subtitle-id)
- (when (subed-srt-forward-subtitle-id)
+ (subed-srt--jump-to-subtitle-id)
+ (when (subed-srt--forward-subtitle-id)
(point)))))
(if (not end)
(progn
(let ((beg (save-excursion
(goto-char beg)
- (subed-srt-backward-subtitle-text)
- (subed-srt-jump-to-subtitle-end)
+ (subed-srt--backward-subtitle-text)
+ (subed-srt--jump-to-subtitle-end)
(1+ (point))))
(end (save-excursion
(goto-char (point-max)))))
@@ -468,7 +468,7 @@ nil if nothing was adjusted."
;;; Maintenance
-(defun subed-srt-regenerate-ids ()
+(defun subed-srt--regenerate-ids ()
"Ensure subtitle IDs start at 1 and are incremented by 1 for
each subtitle."
(interactive)
@@ -476,19 +476,19 @@ each subtitle."
(save-match-data
(save-excursion
(goto-char (point-min))
- (subed-srt-jump-to-subtitle-id)
+ (subed-srt--jump-to-subtitle-id)
(unless (string= (current-word) "1")
(kill-word 1)
(insert "1"))
(let ((id 2))
- (while (subed-srt-forward-subtitle-id)
+ (while (subed-srt--forward-subtitle-id)
(let ((id-str (number-to-string id)))
(unless (string= (current-word) id-str)
(kill-word 1)
(insert id-str)))
(setq id (1+ id))))))))
-(defun subed-srt-sanitize ()
+(defun subed-srt--sanitize ()
"Remove surplus newlines and whitespace."
(interactive)
(atomic-change-group
@@ -509,8 +509,8 @@ each subtitle."
;; Replace separators between subtitles with double newlines
(goto-char (point-min))
- (while (subed-srt-forward-subtitle-id)
- (let ((prev-sub-end (save-excursion (when
(subed-srt-backward-subtitle-end)
+ (while (subed-srt--forward-subtitle-id)
+ (let ((prev-sub-end (save-excursion (when
(subed-srt--backward-subtitle-end)
(point)))))
(when (and prev-sub-end
(not (string= (buffer-substring prev-sub-end (point))
"\n\n")))
@@ -520,7 +520,7 @@ each subtitle."
;; Two trailing newline if last subtitle text is empty,
;; one trailing newline otherwise
(goto-char (point-max))
- (subed-srt-jump-to-subtitle-end)
+ (subed-srt--jump-to-subtitle-end)
(unless (looking-at "\n\\'")
(delete-region (point) (point-max))
(insert "\n"))
@@ -532,7 +532,7 @@ each subtitle."
(unless (= (length (match-string 0)) 5)
(replace-match " --> "))))))))
-(defun subed-srt-validate ()
+(defun subed-srt--validate ()
"Move point to the first invalid subtitle and report an error."
(interactive)
(when (> (buffer-size) 0)
@@ -559,24 +559,24 @@ each subtitle."
(error "Found invalid stop time: %S" (substring (or
(thing-at-point 'line :no-properties) "\n") 0 -1))))
(goto-char orig-point))))))
-(defun subed-srt-sort ()
+(defun subed-srt--sort ()
"Sanitize, then sort subtitles by start time and re-number them."
(interactive)
(atomic-change-group
- (subed-srt-sanitize)
- (subed-srt-validate)
+ (subed-srt--sanitize)
+ (subed-srt--validate)
(subed--save-excursion
(goto-char (point-min))
(sort-subr nil
;; nextrecfun (move to next record/subtitle or to end-of-buffer
;; if there are no more records)
- (lambda () (unless (subed-srt-forward-subtitle-id)
+ (lambda () (unless (subed-srt--forward-subtitle-id)
(goto-char (point-max))))
;; endrecfun (move to end of current record/subtitle)
- #'subed-srt-jump-to-subtitle-end
+ #'subed-srt--jump-to-subtitle-end
;; startkeyfun (return sort value of current record/subtitle)
#'subed-srt--subtitle-msecs-start))
- (subed-srt-regenerate-ids)))
+ (subed-srt--regenerate-ids)))
(provide 'subed-srt)
;;; subed-srt.el ends here
diff --git a/subed/subed.el b/subed/subed.el
index 1cfd98b..66385fd 100644
--- a/subed/subed.el
+++ b/subed/subed.el
@@ -46,26 +46,26 @@
(fset 'subed--adjust-subtitle-start #'subed-srt--adjust-subtitle-start)
(fset 'subed--adjust-subtitle-stop #'subed-srt--adjust-subtitle-stop)
-(fset 'subed-jump-to-subtitle-id #'subed-srt-jump-to-subtitle-id)
-(fset 'subed-jump-to-subtitle-time-start
#'subed-srt-jump-to-subtitle-time-start)
-(fset 'subed-jump-to-subtitle-time-stop #'subed-srt-jump-to-subtitle-time-stop)
-(fset 'subed-jump-to-subtitle-text-at-msecs
#'subed-srt-jump-to-subtitle-text-at-msecs)
-(fset 'subed-jump-to-subtitle-text #'subed-srt-jump-to-subtitle-text)
-(fset 'subed-jump-to-subtitle-end #'subed-srt-jump-to-subtitle-end)
-
-(fset 'subed-forward-subtitle-id #'subed-srt-forward-subtitle-id)
-(fset 'subed-backward-subtitle-id #'subed-srt-backward-subtitle-id)
-(fset 'subed-forward-subtitle-text #'subed-srt-forward-subtitle-text)
-(fset 'subed-backward-subtitle-text #'subed-srt-backward-subtitle-text)
-(fset 'subed-forward-subtitle-time-start
#'subed-srt-forward-subtitle-time-start)
-(fset 'subed-backward-subtitle-time-start
#'subed-srt-backward-subtitle-time-start)
-(fset 'subed-forward-subtitle-time-stop #'subed-srt-forward-subtitle-time-stop)
-(fset 'subed-backward-subtitle-time-stop
#'subed-srt-backward-subtitle-time-stop)
-
-(fset 'subed-subtitle-insert #'subed-srt-subtitle-insert)
-(fset 'subed-subtitle-kill #'subed-srt-subtitle-kill)
-(fset 'subed-sanitize #'subed-srt-sanitize)
-(fset 'subed-sort #'subed-srt-sort)
+(fset 'subed-jump-to-subtitle-id #'subed-srt--jump-to-subtitle-id)
+(fset 'subed-jump-to-subtitle-time-start
#'subed-srt--jump-to-subtitle-time-start)
+(fset 'subed-jump-to-subtitle-time-stop
#'subed-srt--jump-to-subtitle-time-stop)
+(fset 'subed-jump-to-subtitle-text-at-msecs
#'subed-srt--jump-to-subtitle-text-at-msecs)
+(fset 'subed-jump-to-subtitle-text #'subed-srt--jump-to-subtitle-text)
+(fset 'subed-jump-to-subtitle-end #'subed-srt--jump-to-subtitle-end)
+
+(fset 'subed-forward-subtitle-id #'subed-srt--forward-subtitle-id)
+(fset 'subed-backward-subtitle-id #'subed-srt--backward-subtitle-id)
+(fset 'subed-forward-subtitle-text #'subed-srt--forward-subtitle-text)
+(fset 'subed-backward-subtitle-text #'subed-srt--backward-subtitle-text)
+(fset 'subed-forward-subtitle-time-start
#'subed-srt--forward-subtitle-time-start)
+(fset 'subed-backward-subtitle-time-start
#'subed-srt--backward-subtitle-time-start)
+(fset 'subed-forward-subtitle-time-stop
#'subed-srt--forward-subtitle-time-stop)
+(fset 'subed-backward-subtitle-time-stop
#'subed-srt--backward-subtitle-time-stop)
+
+(fset 'subed-subtitle-insert #'subed-srt--subtitle-insert)
+(fset 'subed-subtitle-kill #'subed-srt--subtitle-kill)
+(fset 'subed-sanitize #'subed-srt--sanitize)
+(fset 'subed-sort #'subed-srt--sort)
;;; Debugging
diff --git a/tests/test-subed-srt.el b/tests/test-subed-srt.el
index 97bc32d..60061e8 100644
--- a/tests/test-subed-srt.el
+++ b/tests/test-subed-srt.el
@@ -20,7 +20,7 @@ Baz.
(it "returns the subtitle ID if it can be found."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 2)
+ (subed-srt--jump-to-subtitle-text 2)
(expect (subed-srt--subtitle-id) :to-equal 2)))
(it "returns nil if no subtitle ID can be found."
(with-temp-buffer
@@ -34,7 +34,7 @@ Baz.
(let ((msecs
(subed-srt--subtitle-msecs-start target-id)))
(cl-loop for outset-id from 1 to 3 do
(progn
- (subed-srt-jump-to-subtitle-id
outset-id)
+
(subed-srt--jump-to-subtitle-id outset-id)
(expect
(subed-srt--subtitle-id-at-msecs msecs) :to-equal target-id)))))))
(it "returns subtitle ID if time is equal to stop time."
(with-temp-buffer
@@ -43,7 +43,7 @@ Baz.
(let ((msecs
(subed-srt--subtitle-msecs-stop target-id)))
(cl-loop for outset-id from 1 to 3 do
(progn
- (subed-srt-jump-to-subtitle-id
outset-id)
+
(subed-srt--jump-to-subtitle-id outset-id)
(expect
(subed-srt--subtitle-id-at-msecs msecs) :to-equal target-id)))))))
(it "returns subtitle ID if time is between start and stop
time."
(with-temp-buffer
@@ -52,7 +52,7 @@ Baz.
(let ((msecs (+ 1
(subed-srt--subtitle-msecs-start target-id))))
(cl-loop for outset-id from 1 to 3 do
(progn
- (subed-srt-jump-to-subtitle-id
outset-id)
+
(subed-srt--jump-to-subtitle-id outset-id)
(expect
(subed-srt--subtitle-id-at-msecs msecs) :to-equal target-id)))))))
(it "returns first subtitle ID if time is before the first
subtitle's start time."
(with-temp-buffer
@@ -62,7 +62,7 @@ Baz.
(subed-srt--subtitle-msecs-start))
1)))
(cl-loop for outset-id from 1 to 3 do
(progn
- (subed-srt-jump-to-subtitle-id
outset-id)
+ (subed-srt--jump-to-subtitle-id
outset-id)
(expect
(subed-srt--subtitle-id-at-msecs msecs) :to-equal 1))))))
(it "returns last subtitle ID if time is after the last
subtitle's start time."
(with-temp-buffer
@@ -72,7 +72,7 @@ Baz.
(subed-srt--subtitle-msecs-stop))
1)))
(cl-loop for outset-id from 1 to 3 do
(progn
- (subed-srt-jump-to-subtitle-id
outset-id)
+ (subed-srt--jump-to-subtitle-id
outset-id)
(expect
(subed-srt--subtitle-id-at-msecs msecs) :to-equal 3))))))
(it "returns previous subtitle ID when time is between
subtitles."
(with-temp-buffer
@@ -81,19 +81,19 @@ Baz.
(let ((msecs (+
(subed-srt--subtitle-msecs-stop target-id) 1)))
(cl-loop for outset-id from 1 to 3 do
(progn
- (subed-srt-jump-to-subtitle-id
outset-id)
+
(subed-srt--jump-to-subtitle-id outset-id)
(expect
(subed-srt--subtitle-id-at-msecs msecs) :to-equal target-id))))
(let ((msecs (-
(subed-srt--subtitle-msecs-start (+ target-id 1)) 1)))
(cl-loop for outset-id from 1 to 3 do
(progn
- (subed-srt-jump-to-subtitle-id
outset-id)
+
(subed-srt--jump-to-subtitle-id outset-id)
(expect
(subed-srt--subtitle-id-at-msecs msecs) :to-equal target-id)))))))
(it "doesn't fail when start time is invalid."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 2)
+ (subed-srt--jump-to-subtitle-id 2)
(let ((msecs (- (subed-srt--subtitle-msecs-start)
1)))
- (subed-srt-jump-to-subtitle-time-start)
+ (subed-srt--jump-to-subtitle-time-start)
(forward-char 8) (delete-char 1)
(expect (subed-srt--subtitle-id-at-msecs msecs)
:to-equal 2))))
)
@@ -101,7 +101,7 @@ Baz.
(it "returns the time in milliseconds."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 2)
+ (subed-srt--jump-to-subtitle-text 2)
(expect (subed-srt--subtitle-msecs-start) :to-equal
(+ (* 2 60000) (* 2 1000) 234))
(expect (subed-srt--subtitle-msecs-stop) :to-equal
(+ (* 2 60000) (* 10 1000) 345))))
(it "returns nil if time can't be found."
@@ -114,31 +114,31 @@ Baz.
(it "and at the beginning with a trailing
newline."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 1)
+ (subed-srt--jump-to-subtitle-text 1)
(kill-line)
(expect (subed-srt--subtitle-text)
:to-equal "")))
(it "and at the beginning without a trailing
newline."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 1)
+ (subed-srt--jump-to-subtitle-text 1)
(kill-whole-line)
(expect (subed-srt--subtitle-text)
:to-equal "")))
(it "and in the middle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 2)
+ (subed-srt--jump-to-subtitle-text 2)
(kill-line)
(expect (subed-srt--subtitle-text)
:to-equal "")))
(it "and at the end with a trailing newline."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 3)
+ (subed-srt--jump-to-subtitle-text 3)
(kill-line)
(expect (subed-srt--subtitle-text)
:to-equal "")))
(it "and at the end without a trailing newline."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 3)
+ (subed-srt--jump-to-subtitle-text 3)
(kill-whole-line)
(expect (subed-srt--subtitle-text)
:to-equal "")))
)
@@ -146,12 +146,12 @@ Baz.
(it "and has no linebreaks."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 2)
+ (subed-srt--jump-to-subtitle-text 2)
(expect (subed-srt--subtitle-text)
:to-equal "Bar.")))
(it "and has linebreaks."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 2)
+ (subed-srt--jump-to-subtitle-text 2)
(insert "Bar.\n")
(expect (subed-srt--subtitle-text)
:to-equal "Bar.\nBar.")))
)
@@ -160,7 +160,7 @@ Baz.
(it "returns the relative point if we can find an ID."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 2)
+ (subed-srt--jump-to-subtitle-id 2)
(expect (subed-srt--subtitle-relative-point)
:to-equal 0)
(forward-line)
(expect (subed-srt--subtitle-relative-point)
:to-equal 2)
@@ -175,7 +175,7 @@ Baz.
(it "returns nil if we can't find an ID."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 1)
+ (subed-srt--jump-to-subtitle-id 1)
(insert "foo")
(expect (subed-srt--subtitle-relative-point)
:to-equal nil)))
)
@@ -188,21 +188,21 @@ Baz.
(insert mock-srt-data)
(goto-char (point-min))
(expect (thing-at-point 'word) :to-equal "1")
- (expect (subed-srt-jump-to-subtitle-id) :to-equal 1)
+ (expect (subed-srt--jump-to-subtitle-id) :to-equal 1)
(expect (thing-at-point 'word) :to-equal "1")))
(it "returns ID's point when point is on the duration."
(with-temp-buffer
(insert mock-srt-data)
(search-backward ",234")
(expect (thing-at-point 'word) :to-equal "02")
- (expect (subed-srt-jump-to-subtitle-id) :to-equal 39)
+ (expect (subed-srt--jump-to-subtitle-id) :to-equal
39)
(expect (thing-at-point 'word) :to-equal "2")))
(it "returns ID's point when point is on the text."
(with-temp-buffer
(insert mock-srt-data)
(search-backward "Baz.")
(expect (thing-at-point 'word) :to-equal "Baz")
- (expect (subed-srt-jump-to-subtitle-id) :to-equal 77)
+ (expect (subed-srt--jump-to-subtitle-id) :to-equal
77)
(expect (thing-at-point 'word) :to-equal "3")))
(it "returns ID's point when point is between subtitles."
(with-temp-buffer
@@ -210,18 +210,18 @@ Baz.
(goto-char (point-min))
(search-forward "Bar.\n")
(expect (thing-at-point 'line) :to-equal "\n")
- (expect (subed-srt-jump-to-subtitle-id) :to-equal 39)
+ (expect (subed-srt--jump-to-subtitle-id) :to-equal
39)
(expect (thing-at-point 'word) :to-equal "2")))
(it "returns nil if buffer is empty."
(with-temp-buffer
(expect (buffer-string) :to-equal "")
- (expect (subed-srt-jump-to-subtitle-id) :to-equal
nil)))
+ (expect (subed-srt--jump-to-subtitle-id) :to-equal
nil)))
(it "returns ID's point when buffer starts with blank
lines."
(with-temp-buffer
(insert (concat " \n \t \n" mock-srt-data))
(search-backward "Foo.")
(expect (thing-at-point 'line) :to-equal "Foo.\n")
- (expect (subed-srt-jump-to-subtitle-id) :to-equal 7)
+ (expect (subed-srt--jump-to-subtitle-id) :to-equal 7)
(expect (thing-at-point 'word) :to-equal "1")))
(it "returns ID's point when subtitles are separated with
blank lines."
(with-temp-buffer
@@ -229,7 +229,7 @@ Baz.
(goto-char (point-min))
(search-forward "Foo.\n")
(insert " \n \t \n")
- (expect (subed-srt-jump-to-subtitle-id) :to-equal 1)
+ (expect (subed-srt--jump-to-subtitle-id) :to-equal 1)
(expect (thing-at-point 'word) :to-equal "1")))
)
(describe "to specific subtitle ID"
@@ -237,11 +237,11 @@ Baz.
(with-temp-buffer
(insert mock-srt-data)
(goto-char (point-max))
- (expect (subed-srt-jump-to-subtitle-id 2) :to-equal
39)
+ (expect (subed-srt--jump-to-subtitle-id 2) :to-equal
39)
(expect (thing-at-point 'word) :to-equal "2")
- (expect (subed-srt-jump-to-subtitle-id 1) :to-equal
1)
+ (expect (subed-srt--jump-to-subtitle-id 1) :to-equal
1)
(expect (thing-at-point 'word) :to-equal "1")
- (expect (subed-srt-jump-to-subtitle-id 3) :to-equal
77)
+ (expect (subed-srt--jump-to-subtitle-id 3) :to-equal
77)
(expect (thing-at-point 'word) :to-equal "3")))
(it "returns nil and does not move if wanted ID does not
exists."
(with-temp-buffer
@@ -249,7 +249,7 @@ Baz.
(goto-char (point-min))
(search-forward "Foo")
(let ((stored-point (point)))
- (expect (subed-srt-jump-to-subtitle-id 4)
:to-equal nil)
+ (expect (subed-srt--jump-to-subtitle-id 4)
:to-equal nil)
(expect stored-point :to-equal (point)))))
)
(describe "to subtitle ID at specific time"
@@ -258,7 +258,7 @@ Baz.
(insert mock-srt-data)
(goto-char (point-max))
(spy-on 'subed-srt--subtitle-id-at-msecs
:and-return-value (point-min))
- (expect (subed-srt-jump-to-subtitle-id-at-msecs
123450) :to-equal (point-min))
+ (expect (subed-srt--jump-to-subtitle-id-at-msecs
123450) :to-equal (point-min))
(expect (point) :to-equal (point-min))
(expect 'subed-srt--subtitle-id-at-msecs
:to-have-been-called-with 123450)
(expect 'subed-srt--subtitle-id-at-msecs
:to-have-been-called-times 1)))
@@ -267,7 +267,7 @@ Baz.
(insert mock-srt-data)
(goto-char 75)
(spy-on 'subed-srt--subtitle-id-at-msecs
:and-return-value 75)
- (expect (subed-srt-jump-to-subtitle-id-at-msecs
123450) :to-equal nil)
+ (expect (subed-srt--jump-to-subtitle-id-at-msecs
123450) :to-equal nil)
(expect (point) :to-equal 75)
(expect 'subed-srt--subtitle-id-at-msecs
:to-have-been-called-with 123450)
(expect 'subed-srt--subtitle-id-at-msecs
:to-have-been-called-times 1)))
@@ -277,328 +277,328 @@ Baz.
(with-temp-buffer
(insert mock-srt-data)
(goto-char (point-min))
- (expect (subed-srt-jump-to-subtitle-time-start)
:to-equal 3)
+ (expect (subed-srt--jump-to-subtitle-time-start)
:to-equal 3)
(expect (looking-at subed-srt--regexp-timestamp)
:to-be t)
(expect (match-string 0) :to-equal "00:01:01,000")
(re-search-forward "\n\n")
- (expect (subed-srt-jump-to-subtitle-time-start)
:to-equal 41)
+ (expect (subed-srt--jump-to-subtitle-time-start)
:to-equal 41)
(expect (looking-at subed-srt--regexp-timestamp)
:to-be t)
(expect (match-string 0) :to-equal "00:02:02,234")
(re-search-forward "\n\n")
- (expect (subed-srt-jump-to-subtitle-time-start)
:to-equal 79)
+ (expect (subed-srt--jump-to-subtitle-time-start)
:to-equal 79)
(expect (looking-at subed-srt--regexp-timestamp)
:to-be t)
(expect (match-string 0) :to-equal "00:03:03,45")))
(it "returns nil if movement failed."
(with-temp-buffer
- (expect (subed-srt-jump-to-subtitle-time-start)
:to-equal nil)))
+ (expect (subed-srt--jump-to-subtitle-time-start)
:to-equal nil)))
)
(describe "to subtitle stop time"
(it "returns stop time's point if movement was successful."
(with-temp-buffer
(insert mock-srt-data)
(goto-char (point-min))
- (expect (subed-srt-jump-to-subtitle-time-stop)
:to-equal 20)
+ (expect (subed-srt--jump-to-subtitle-time-stop)
:to-equal 20)
(expect (looking-at subed-srt--regexp-timestamp)
:to-be t)
(expect (match-string 0) :to-equal "00:01:05,123")
(re-search-forward "\n\n")
- (expect (subed-srt-jump-to-subtitle-time-stop)
:to-equal 58)
+ (expect (subed-srt--jump-to-subtitle-time-stop)
:to-equal 58)
(expect (looking-at subed-srt--regexp-timestamp)
:to-be t)
(expect (match-string 0) :to-equal "00:02:10,345")
(re-search-forward "\n\n")
- (expect (subed-srt-jump-to-subtitle-time-stop)
:to-equal 95)
+ (expect (subed-srt--jump-to-subtitle-time-stop)
:to-equal 95)
(expect (looking-at subed-srt--regexp-timestamp)
:to-be t)
(expect (match-string 0) :to-equal "00:03:15,5")))
(it "returns nil if movement failed."
(with-temp-buffer
- (expect (subed-srt-jump-to-subtitle-time-stop)
:to-equal nil)))
+ (expect (subed-srt--jump-to-subtitle-time-stop)
:to-equal nil)))
)
(describe "to subtitle text"
(it "returns subtitle text's point if movement was
successful."
(with-temp-buffer
(insert mock-srt-data)
(goto-char (point-min))
- (expect (subed-srt-jump-to-subtitle-text) :to-equal
33)
+ (expect (subed-srt--jump-to-subtitle-text) :to-equal
33)
(expect (point) :to-equal (save-excursion (goto-char
(point-max)) (search-backward "Foo.")))
(re-search-forward "\n\n")
- (expect (subed-srt-jump-to-subtitle-text) :to-equal
71)
+ (expect (subed-srt--jump-to-subtitle-text) :to-equal
71)
(expect (point) :to-equal (save-excursion (goto-char
(point-max)) (search-backward "Bar.")))
(re-search-forward "\n\n")
- (expect (subed-srt-jump-to-subtitle-text) :to-equal
106)
+ (expect (subed-srt--jump-to-subtitle-text) :to-equal
106)
(expect (point) :to-equal (save-excursion (goto-char
(point-max)) (search-backward "Baz.")))))
(it "returns nil if movement failed."
(with-temp-buffer
- (expect (subed-srt-jump-to-subtitle-time-stop)
:to-equal nil)))
+ (expect (subed-srt--jump-to-subtitle-time-stop)
:to-equal nil)))
)
(describe "to end of subtitle text"
(it "returns point if subtitle end can be found."
(with-temp-buffer
(insert mock-srt-data)
(goto-char (point-min))
- (expect (subed-srt-jump-to-subtitle-end) :to-be 37)
+ (expect (subed-srt--jump-to-subtitle-end) :to-be 37)
(expect (looking-back "^Foo.$") :to-be t)
(forward-char 2)
- (expect (subed-srt-jump-to-subtitle-end) :to-be 75)
+ (expect (subed-srt--jump-to-subtitle-end) :to-be 75)
(expect (looking-back "^Bar.$") :to-be t)
(forward-char 2)
- (expect (subed-srt-jump-to-subtitle-end) :to-be 110)
+ (expect (subed-srt--jump-to-subtitle-end) :to-be 110)
(expect (looking-back "^Baz.$") :to-be t)
(goto-char (point-max))
(backward-char 2)
- (expect (subed-srt-jump-to-subtitle-end) :to-be 110)
+ (expect (subed-srt--jump-to-subtitle-end) :to-be 110)
(expect (looking-back "^Baz.$") :to-be t)))
(it "returns nil if subtitle end cannot be found."
(with-temp-buffer
- (expect (subed-srt-jump-to-subtitle-end) :to-be
nil)))
+ (expect (subed-srt--jump-to-subtitle-end) :to-be
nil)))
(it "returns nil if point did not move."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 1)
+ (subed-srt--jump-to-subtitle-text 1)
(kill-line)
- (expect (subed-srt-jump-to-subtitle-end) :to-be
nil)))
+ (expect (subed-srt--jump-to-subtitle-end) :to-be
nil)))
(it "works if text is empty with trailing newline."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 1)
+ (subed-srt--jump-to-subtitle-text 1)
(kill-line)
(backward-char)
- (expect (subed-srt-jump-to-subtitle-end) :to-be 33)
+ (expect (subed-srt--jump-to-subtitle-end) :to-be 33)
(expect (looking-at "^$") :to-be t)
- (subed-srt-jump-to-subtitle-text 2)
+ (subed-srt--jump-to-subtitle-text 2)
(kill-line)
(backward-char)
- (expect (subed-srt-jump-to-subtitle-end) :to-be 67)
+ (expect (subed-srt--jump-to-subtitle-end) :to-be 67)
(expect (looking-at "^$") :to-be t)
- (subed-srt-jump-to-subtitle-text 3)
+ (subed-srt--jump-to-subtitle-text 3)
(kill-line)
(backward-char)
- (expect (subed-srt-jump-to-subtitle-end) :to-be 98)
+ (expect (subed-srt--jump-to-subtitle-end) :to-be 98)
(expect (looking-at "^$") :to-be t)))
(it "works if text is empty without trailing newline."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 1)
+ (subed-srt--jump-to-subtitle-text 1)
(kill-whole-line)
- (expect (subed-srt-jump-to-subtitle-end) :to-be nil)
+ (expect (subed-srt--jump-to-subtitle-end) :to-be nil)
(expect (looking-at "^$") :to-be t)
(goto-char (point-min))
- (expect (subed-srt-jump-to-subtitle-end) :to-be 33)
+ (expect (subed-srt--jump-to-subtitle-end) :to-be 33)
(expect (looking-at "^$") :to-be t)
- (subed-srt-jump-to-subtitle-text 2)
+ (subed-srt--jump-to-subtitle-text 2)
(kill-whole-line)
- (expect (subed-srt-jump-to-subtitle-end) :to-be nil)
+ (expect (subed-srt--jump-to-subtitle-end) :to-be nil)
(expect (looking-at "^$") :to-be t)
(backward-char)
- (expect (subed-srt-jump-to-subtitle-end) :to-be 66)
+ (expect (subed-srt--jump-to-subtitle-end) :to-be 66)
(expect (looking-at "^$") :to-be t)
- (subed-srt-jump-to-subtitle-text 3)
+ (subed-srt--jump-to-subtitle-text 3)
(kill-whole-line)
- (expect (subed-srt-jump-to-subtitle-end) :to-be nil)
+ (expect (subed-srt--jump-to-subtitle-end) :to-be nil)
(expect (looking-at "^$") :to-be t)
(backward-char)
- (expect (subed-srt-jump-to-subtitle-end) :to-be 96)
+ (expect (subed-srt--jump-to-subtitle-end) :to-be 96)
(expect (looking-at "^$") :to-be t)))
)
(describe "to next subtitle ID"
(it "returns point when there is a next subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 1)
+ (subed-srt--jump-to-subtitle-id 1)
(expect (thing-at-point 'word) :to-equal "1")
- (expect (subed-srt-forward-subtitle-id) :to-be 39)
+ (expect (subed-srt--forward-subtitle-id) :to-be 39)
(expect (thing-at-point 'word) :to-equal "2")
- (subed-srt-jump-to-subtitle-time-start 2)
+ (subed-srt--jump-to-subtitle-time-start 2)
(expect (thing-at-point 'word) :to-equal "00")
- (expect (subed-srt-forward-subtitle-id) :to-be 77)
+ (expect (subed-srt--forward-subtitle-id) :to-be 77)
(expect (thing-at-point 'word) :to-equal "3")))
(it "returns nil and doesn't move when there is no next
subtitle."
(with-temp-buffer
(expect (thing-at-point 'word) :to-equal nil)
- (expect (subed-srt-forward-subtitle-id) :to-be nil))
+ (expect (subed-srt--forward-subtitle-id) :to-be nil))
(with-temp-buffer
(insert (concat mock-srt-data))
- (subed-srt-jump-to-subtitle-text 1)
+ (subed-srt--jump-to-subtitle-text 1)
(expect (thing-at-point 'word) :to-equal "Foo")
- (expect (subed-srt-forward-subtitle-id) :to-be 39)
+ (expect (subed-srt--forward-subtitle-id) :to-be 39)
(expect (thing-at-point 'word) :to-equal "2")
- (subed-srt-jump-to-subtitle-time-stop 2)
+ (subed-srt--jump-to-subtitle-time-stop 2)
(expect (thing-at-point 'word) :to-equal "00")
- (expect (subed-srt-forward-subtitle-id) :to-be 77)
+ (expect (subed-srt--forward-subtitle-id) :to-be 77)
(expect (thing-at-point 'word) :to-equal "3"))
(with-temp-buffer
(insert (concat mock-srt-data))
- (subed-srt-jump-to-subtitle-text 3)
+ (subed-srt--jump-to-subtitle-text 3)
(expect (thing-at-point 'word) :to-equal "Baz")
- (expect (subed-srt-forward-subtitle-id) :to-be nil)
+ (expect (subed-srt--forward-subtitle-id) :to-be nil)
(expect (thing-at-point 'word) :to-equal "Baz"))
(with-temp-buffer
(insert (concat mock-srt-data "\n\n"))
- (subed-srt-jump-to-subtitle-time-stop 3)
+ (subed-srt--jump-to-subtitle-time-stop 3)
(expect (thing-at-point 'word) :to-equal "00")
- (expect (subed-srt-forward-subtitle-id) :to-be nil)
+ (expect (subed-srt--forward-subtitle-id) :to-be nil)
(expect (thing-at-point 'word) :to-equal "00")))
)
(describe "to previous subtitle ID"
(it "returns point when there is a previous subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 2)
+ (subed-srt--jump-to-subtitle-text 2)
(expect (thing-at-point 'word) :to-equal "Bar")
- (expect (subed-srt-backward-subtitle-id) :to-be 1)
+ (expect (subed-srt--backward-subtitle-id) :to-be 1)
(expect (thing-at-point 'word) :to-equal "1")
- (subed-srt-jump-to-subtitle-time-stop 3)
+ (subed-srt--jump-to-subtitle-time-stop 3)
(expect (thing-at-point 'word) :to-equal "00")
- (expect (subed-srt-backward-subtitle-id) :to-be 39)
+ (expect (subed-srt--backward-subtitle-id) :to-be 39)
(expect (thing-at-point 'word) :to-equal "2")))
(it "returns nil and doesn't move when there is no
previous subtitle."
(with-temp-buffer
- (expect (subed-srt-backward-subtitle-id) :to-be nil))
+ (expect (subed-srt--backward-subtitle-id) :to-be
nil))
(with-temp-buffer
(insert (concat mock-srt-data))
- (subed-srt-jump-to-subtitle-id 1)
+ (subed-srt--jump-to-subtitle-id 1)
(expect (thing-at-point 'word) :to-equal "1")
- (expect (subed-srt-backward-subtitle-id) :to-be nil)
+ (expect (subed-srt--backward-subtitle-id) :to-be nil)
(expect (thing-at-point 'word) :to-equal "1"))
(with-temp-buffer
(insert (concat mock-srt-data))
- (subed-srt-jump-to-subtitle-text 1)
+ (subed-srt--jump-to-subtitle-text 1)
(expect (thing-at-point 'word) :to-equal "Foo")
- (expect (subed-srt-backward-subtitle-id) :to-be nil)
+ (expect (subed-srt--backward-subtitle-id) :to-be nil)
(expect (thing-at-point 'word) :to-equal "Foo"))
(with-temp-buffer
(insert (concat "\n\n\n" mock-srt-data))
- (subed-srt-jump-to-subtitle-time-stop 1)
+ (subed-srt--jump-to-subtitle-time-stop 1)
(expect (thing-at-point 'word) :to-equal "00")
- (expect (subed-srt-backward-subtitle-id) :to-be nil)
+ (expect (subed-srt--backward-subtitle-id) :to-be nil)
(expect (thing-at-point 'word) :to-equal "00")))
)
(describe "to next subtitle text"
(it "returns point when there is a next subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 1)
+ (subed-srt--jump-to-subtitle-id 1)
(expect (thing-at-point 'word) :to-equal "1")
- (expect (subed-srt-forward-subtitle-text) :to-be 71)
+ (expect (subed-srt--forward-subtitle-text) :to-be 71)
(expect (thing-at-point 'word) :to-equal "Bar")))
(it "returns nil and doesn't move when there is no next
subtitle."
(with-temp-buffer
(goto-char (point-max))
(insert (concat mock-srt-data "\n\n"))
- (subed-srt-jump-to-subtitle-id 3)
+ (subed-srt--jump-to-subtitle-id 3)
(expect (thing-at-point 'word) :to-equal "3")
- (expect (subed-srt-forward-subtitle-text) :to-be nil)
+ (expect (subed-srt--forward-subtitle-text) :to-be
nil)
(expect (thing-at-point 'word) :to-equal "3")))
)
(describe "to previous subtitle text"
(it "returns point when there is a previous subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 3)
+ (subed-srt--jump-to-subtitle-id 3)
(expect (thing-at-point 'word) :to-equal "3")
- (expect (subed-srt-backward-subtitle-text) :to-be 71)
+ (expect (subed-srt--backward-subtitle-text) :to-be
71)
(expect (thing-at-point 'word) :to-equal "Bar")))
(it "returns nil and doesn't move when there is no
previous subtitle."
(with-temp-buffer
(insert mock-srt-data)
(goto-char (point-min))
(expect (thing-at-point 'word) :to-equal "1")
- (expect (subed-srt-backward-subtitle-text) :to-be
nil)
+ (expect (subed-srt--backward-subtitle-text) :to-be
nil)
(expect (thing-at-point 'word) :to-equal "1")))
)
(describe "to next subtitle end"
(it "returns point when there is a next subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 2)
+ (subed-srt--jump-to-subtitle-text 2)
(expect (thing-at-point 'word) :to-equal "Bar")
- (expect (subed-srt-forward-subtitle-end) :to-be 110)
+ (expect (subed-srt--forward-subtitle-end) :to-be 110)
(expect (thing-at-point 'word) :to-equal nil)))
(it "returns nil and doesn't move when there is no next
subtitle."
(with-temp-buffer
(insert (concat mock-srt-data "\n\n"))
- (subed-srt-jump-to-subtitle-text 3)
+ (subed-srt--jump-to-subtitle-text 3)
(end-of-line)
(expect (thing-at-point 'word) :to-equal nil)
- (expect (subed-srt-forward-subtitle-end) :to-be nil)
+ (expect (subed-srt--forward-subtitle-end) :to-be nil)
(expect (thing-at-point 'word) :to-equal nil)))
)
(describe "to previous subtitle end"
(it "returns point when there is a previous subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 3)
+ (subed-srt--jump-to-subtitle-id 3)
(expect (thing-at-point 'word) :to-equal "3")
- (expect (subed-srt-backward-subtitle-text) :to-be 71)
+ (expect (subed-srt--backward-subtitle-text) :to-be
71)
(expect (thing-at-point 'word) :to-equal "Bar")))
(it "returns nil and doesn't move when there is no
previous subtitle."
(with-temp-buffer
(insert mock-srt-data)
(goto-char (point-min))
(expect (thing-at-point 'word) :to-equal "1")
- (expect (subed-srt-backward-subtitle-text) :to-be
nil)
+ (expect (subed-srt--backward-subtitle-text) :to-be
nil)
(expect (thing-at-point 'word) :to-equal "1")))
)
(describe "to next subtitle start time"
(it "returns point when there is a next subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 1)
+ (subed-srt--jump-to-subtitle-text 1)
(expect (thing-at-point 'word) :to-equal "Foo")
- (expect (subed-srt-forward-subtitle-time-start)
:to-be 41)
+ (expect (subed-srt--forward-subtitle-time-start)
:to-be 41)
(expect (thing-at-point 'word) :to-equal "00")))
(it "returns nil and doesn't move when there is no next
subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 3)
+ (subed-srt--jump-to-subtitle-id 3)
(expect (thing-at-point 'word) :to-equal "3")
- (expect (subed-srt-forward-subtitle-time-start)
:to-be nil)
+ (expect (subed-srt--forward-subtitle-time-start)
:to-be nil)
(expect (thing-at-point 'word) :to-equal "3")))
)
(describe "to previous subtitle start time"
(it "returns point when there is a previous subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 2)
+ (subed-srt--jump-to-subtitle-id 2)
(expect (thing-at-point 'word) :to-equal "2")
- (expect (subed-srt-backward-subtitle-time-start)
:to-be 3)
+ (expect (subed-srt--backward-subtitle-time-start)
:to-be 3)
(expect (thing-at-point 'word) :to-equal "00")))
(it "returns nil and doesn't move when there is no
previous subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 1)
+ (subed-srt--jump-to-subtitle-id 1)
(expect (thing-at-point 'word) :to-equal "1")
- (expect (subed-srt-backward-subtitle-time-start)
:to-be nil)
+ (expect (subed-srt--backward-subtitle-time-start)
:to-be nil)
(expect (thing-at-point 'word) :to-equal "1")))
)
(describe "to next subtitle stop time"
(it "returns point when there is a next subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 1)
+ (subed-srt--jump-to-subtitle-text 1)
(expect (thing-at-point 'word) :to-equal "Foo")
- (expect (subed-srt-forward-subtitle-time-stop)
:to-be 58)
+ (expect (subed-srt--forward-subtitle-time-stop)
:to-be 58)
(expect (thing-at-point 'word) :to-equal "00")))
(it "returns nil and doesn't move when there is no next
subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 3)
+ (subed-srt--jump-to-subtitle-id 3)
(expect (thing-at-point 'word) :to-equal "3")
- (expect (subed-srt-forward-subtitle-time-stop)
:to-be nil)
+ (expect (subed-srt--forward-subtitle-time-stop)
:to-be nil)
(expect (thing-at-point 'word) :to-equal "3")))
)
(describe "to previous subtitle stop time"
(it "returns point when there is a previous subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 3)
+ (subed-srt--jump-to-subtitle-id 3)
(expect (thing-at-point 'word) :to-equal "3")
- (expect (subed-srt-backward-subtitle-time-stop)
:to-be 58)
+ (expect (subed-srt--backward-subtitle-time-stop)
:to-be 58)
(expect (thing-at-point 'word) :to-equal "00")))
(it "returns nil and doesn't move when there is no
previous subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 1)
+ (subed-srt--jump-to-subtitle-id 1)
(expect (thing-at-point 'word) :to-equal "1")
- (expect (subed-srt-backward-subtitle-time-stop)
:to-be nil)
+ (expect (subed-srt--backward-subtitle-time-stop)
:to-be nil)
(expect (thing-at-point 'word) :to-equal "1")))
)
)
@@ -614,76 +614,76 @@ Baz.
(expect (subed-increase-start-time) :to-equal 100)
(expect 'foo :to-have-been-called-with 3 183550)
(expect 'foo :to-have-been-called-times 1)
- (subed-srt-jump-to-subtitle-id 1)
+ (subed-srt--jump-to-subtitle-id 1)
(expect (subed-increase-stop-time) :to-equal 100)
(expect 'foo :to-have-been-called-with 1 61000)
(expect 'foo :to-have-been-called-times 2)
- (subed-srt-jump-to-subtitle-end 2)
+ (subed-srt--jump-to-subtitle-end 2)
(expect (subed-decrease-start-time) :to-equal -100)
(expect 'foo :to-have-been-called-with 2 122134)
(expect 'foo :to-have-been-called-times 3)
- (subed-srt-jump-to-subtitle-text 3)
+ (subed-srt--jump-to-subtitle-text 3)
(expect (subed-decrease-stop-time) :to-equal -100)
(expect 'foo :to-have-been-called-with 3 183550)
(expect 'foo :to-have-been-called-times 4))))
(it "adjusts the start/stop time."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 1)
+ (subed-srt--jump-to-subtitle-id 1)
(expect (subed-increase-start-time) :to-equal 100)
- (expect (save-excursion (subed-srt-jump-to-subtitle-time-start)
+ (expect (save-excursion
(subed-srt--jump-to-subtitle-time-start)
(thing-at-point 'line)) :to-equal
"00:01:01,100 --> 00:01:05,123\n")
(expect (subed-decrease-start-time) :to-equal -100)
(expect (subed-decrease-start-time) :to-equal -100)
- (expect (save-excursion (subed-srt-jump-to-subtitle-time-start)
+ (expect (save-excursion
(subed-srt--jump-to-subtitle-time-start)
(thing-at-point 'line)) :to-equal
"00:01:00,900 --> 00:01:05,123\n")
(expect (subed-increase-stop-time) :to-equal 100)
(expect (subed-increase-stop-time) :to-equal 100)
- (expect (save-excursion (subed-srt-jump-to-subtitle-time-start)
+ (expect (save-excursion
(subed-srt--jump-to-subtitle-time-start)
(thing-at-point 'line)) :to-equal
"00:01:00,900 --> 00:01:05,323\n")
(expect (subed-decrease-stop-time) :to-equal -100)
- (expect (save-excursion (subed-srt-jump-to-subtitle-time-start)
+ (expect (save-excursion
(subed-srt--jump-to-subtitle-time-start)
(thing-at-point 'line)) :to-equal
"00:01:00,900 --> 00:01:05,223\n")))
(it "adjusts the start/stop time if milliseconds lack digits."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 3)
+ (subed-srt--jump-to-subtitle-id 3)
(expect (subed-increase-start-time 200) :to-equal 200)
(expect (subed-decrease-start-time 100) :to-equal -100)
- (expect (save-excursion (subed-srt-jump-to-subtitle-time-start)
+ (expect (save-excursion
(subed-srt--jump-to-subtitle-time-start)
(thing-at-point 'line)) :to-equal
"00:03:03,550 --> 00:03:15,5\n")
(expect (subed-increase-stop-time 100) :to-equal 100)
(expect (subed-decrease-stop-time 200) :to-equal -200)
- (expect (save-excursion (subed-srt-jump-to-subtitle-time-stop)
+ (expect (save-excursion (subed-srt--jump-to-subtitle-time-stop)
(thing-at-point 'line)) :to-equal
"00:03:03,550 --> 00:03:15,400\n")))
(it "sets the number of milliseconds if given an argument."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 1)
+ (subed-srt--jump-to-subtitle-id 1)
(expect (subed-increase-start-time 200) :to-equal 200)
(expect (subed-increase-start-time) :to-equal 200)
(expect (subed-increase-start-time) :to-equal 200)
- (expect (save-excursion (subed-srt-jump-to-subtitle-time-start)
+ (expect (save-excursion
(subed-srt--jump-to-subtitle-time-start)
(thing-at-point 'line)) :to-equal
"00:01:01,600 --> 00:01:05,123\n")
(expect (subed-decrease-start-time 50) :to-be -50)
(expect (subed-decrease-start-time) :to-be -50)
- (expect (save-excursion (subed-srt-jump-to-subtitle-time-start)
+ (expect (save-excursion
(subed-srt--jump-to-subtitle-time-start)
(thing-at-point 'line)) :to-equal
"00:01:01,500 --> 00:01:05,123\n")
(expect (subed-decrease-stop-time 1000) :to-be -1000)
(expect (subed-decrease-stop-time) :to-be -1000)
(expect (subed-decrease-stop-time) :to-be -1000)
- (expect (save-excursion (subed-srt-jump-to-subtitle-time-start)
+ (expect (save-excursion
(subed-srt--jump-to-subtitle-time-start)
(thing-at-point 'line)) :to-equal
"00:01:01,500 --> 00:01:02,123\n")
(expect (subed-increase-stop-time 2000) :to-be 2000)
(expect (subed-increase-stop-time) :to-be 2000)
- (expect (save-excursion (subed-srt-jump-to-subtitle-time-start)
+ (expect (save-excursion
(subed-srt--jump-to-subtitle-time-start)
(thing-at-point 'line)) :to-equal
"00:01:01,500 --> 00:01:06,123\n")))
(describe "enforces limits"
(describe "when decreasing start time"
(it "of the first subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 1)
+ (subed-srt--jump-to-subtitle-id 1)
(expect (subed-decrease-start-time 60999)
:to-be -60999)
(expect (subed-srt--subtitle-msecs-start)
:to-be 1)
(expect (subed-decrease-start-time 1)
:to-be -1)
@@ -693,7 +693,7 @@ Baz.
(it "of a non-first subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 2)
+ (subed-srt--jump-to-subtitle-id 2)
(message (buffer-string))
(expect (subed-decrease-start-time (-
(subed-srt--subtitle-msecs-start 2)
(subed-srt--subtitle-msecs-stop 1)
@@ -712,7 +712,7 @@ Baz.
(it "when increasing start time."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 2)
+ (subed-srt--jump-to-subtitle-id 2)
(expect (subed-increase-start-time (-
(subed-srt--subtitle-msecs-stop 2)
(subed-srt--subtitle-msecs-start 2)
1)) :to-be
8110)
@@ -724,7 +724,7 @@ Baz.
(it "when decreasing stop time."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 2)
+ (subed-srt--jump-to-subtitle-id 2)
(expect (subed-decrease-stop-time (-
(subed-srt--subtitle-msecs-stop 2)
(subed-srt--subtitle-msecs-start 2)
1)) :to-be
-8110)
@@ -737,7 +737,7 @@ Baz.
(it "of the last subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 3)
+ (subed-srt--jump-to-subtitle-id 3)
(expect (subed-increase-stop-time (- (* 99
3600000)
(subed-srt--subtitle-msecs-stop 3)))
:to-be 356204500)
@@ -757,7 +757,7 @@ Baz.
(it "of a non-last subtitle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 2)
+ (subed-srt--jump-to-subtitle-id 2)
(expect (subed-increase-stop-time (-
(subed-srt--subtitle-msecs-start 3)
(subed-srt--subtitle-msecs-stop 2)
subed-subtitle-spacing
@@ -813,8 +813,8 @@ Baz.
(it "removes it when it is the first one."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 1)
- (subed-srt-subtitle-kill)
+ (subed-srt--jump-to-subtitle-text 1)
+ (subed-srt--subtitle-kill)
(expect (buffer-string) :to-equal (concat "2\n"
"00:02:02,234 -->
00:02:10,345\n"
"Bar.\n"
@@ -825,8 +825,8 @@ Baz.
(it "removes it when it is in the middle."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 2)
- (subed-srt-subtitle-kill)
+ (subed-srt--jump-to-subtitle-text 2)
+ (subed-srt--subtitle-kill)
(expect (buffer-string) :to-equal (concat "1\n"
"00:01:01,000 -->
00:01:05,123\n"
"Foo.\n"
@@ -837,8 +837,8 @@ Baz.
(it "removes it when it is the last one."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 3)
- (subed-srt-subtitle-kill)
+ (subed-srt--jump-to-subtitle-text 3)
+ (subed-srt--subtitle-kill)
(expect (buffer-string) :to-equal (concat "1\n"
"00:01:01,000 -->
00:01:05,123\n"
"Foo.\n"
@@ -849,10 +849,10 @@ Baz.
(it "removes the previous subtitle when point is right above an ID."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 3)
+ (subed-srt--jump-to-subtitle-id 3)
(backward-char)
(expect (looking-at "^\n3\n") :to-be t)
- (subed-srt-subtitle-kill)
+ (subed-srt--subtitle-kill)
(expect (buffer-string) :to-equal (concat "1\n"
"00:01:01,000 -->
00:01:05,123\n"
"Foo.\n"
@@ -868,14 +868,14 @@ Baz.
(it "a single subtile."
(cl-loop for arg in (list nil 1) do
(with-temp-buffer
- (subed-srt-subtitle-insert arg)
+ (subed-srt--subtitle-insert arg)
(expect (buffer-string) :to-equal
(concat "1\n"
"00:00:00,100 --> 00:00:00,900\n\n"))
(expect (point) :to-equal 33))))
(it "multiple subtiles."
(cl-loop for arg in (list 2) do
(with-temp-buffer
- (subed-srt-subtitle-insert arg)
+ (subed-srt--subtitle-insert arg)
(expect (buffer-string) :to-equal
(concat "1\n"
"00:00:00,100 --> 00:00:00,950\n\n\n"
"2\n"
@@ -885,14 +885,14 @@ Baz.
(it "a single subtile."
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-buffer
- (subed-srt-subtitle-insert arg)
+ (subed-srt--subtitle-insert arg)
(expect (buffer-string) :to-equal
(concat "1\n"
"00:00:00,100 --> 00:00:00,900\n\n"))
(expect (point) :to-equal 33))))
(it "multiple subtiles."
(cl-loop for arg in (list -2 (list -16)) do
(with-temp-buffer
- (subed-srt-subtitle-insert arg)
+ (subed-srt--subtitle-insert arg)
(expect (buffer-string) :to-equal
(concat "1\n"
"00:00:00,100 --> 00:00:00,950\n\n\n"
"2\n"
@@ -905,8 +905,8 @@ Baz.
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text
2)
- (subed-srt-subtitle-insert arg)
+ (subed-srt--jump-to-subtitle-text
2)
+ (subed-srt--subtitle-insert arg)
(expect (buffer-string) :to-equal
(concat "1\n"
"00:01:01,000 --> 00:01:05,123\n"
"Foo.\n\n"
@@ -924,8 +924,8 @@ Baz.
(cl-loop for arg in (list -2 (list 16)) do
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text
2)
- (subed-srt-subtitle-insert arg)
+ (subed-srt--jump-to-subtitle-text
2)
+ (subed-srt--subtitle-insert arg)
(expect (buffer-string) :to-equal
(concat "1\n"
"00:01:01,000 --> 00:01:05,123\n"
"Foo.\n\n"
@@ -948,8 +948,8 @@ Baz.
(cl-loop for arg in (list nil 1) do
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text
1)
- (subed-srt-subtitle-insert arg)
+ (subed-srt--jump-to-subtitle-text
1)
+ (subed-srt--subtitle-insert arg)
(expect (buffer-string) :to-equal
(concat "1\n"
"00:01:01,000 --> 00:01:05,123\n"
"Foo.\n\n"
@@ -967,8 +967,8 @@ Baz.
(cl-loop for arg in (list 2) do
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text
1)
- (subed-srt-subtitle-insert arg)
+ (subed-srt--jump-to-subtitle-text
1)
+ (subed-srt--subtitle-insert arg)
(expect (buffer-string) :to-equal
(concat "1\n"
"00:01:01,000 --> 00:01:05,123\n"
"Foo.\n\n"
@@ -991,8 +991,8 @@ Baz.
(cl-loop for arg in (list '- -1 (list 4)) do
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text
1)
- (subed-srt-subtitle-insert arg)
+ (subed-srt--jump-to-subtitle-text
1)
+ (subed-srt--subtitle-insert arg)
(expect (buffer-string) :to-equal
(concat "1\n"
"00:00:00,100 --> 00:01:00,900\n"
"\n\n"
@@ -1010,8 +1010,8 @@ Baz.
(cl-loop for arg in (list -2 (list 16)) do
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text
1)
- (subed-srt-subtitle-insert arg)
+ (subed-srt--jump-to-subtitle-text
1)
+ (subed-srt--subtitle-insert arg)
(expect (buffer-string) :to-equal
(concat "1\n"
"00:00:00,100 --> 00:00:30,450\n"
"\n\n"
@@ -1034,8 +1034,8 @@ Baz.
(cl-loop for arg in (list nil 1) do
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text
3)
- (subed-srt-subtitle-insert arg)
+ (subed-srt--jump-to-subtitle-text
3)
+ (subed-srt--subtitle-insert arg)
(expect (buffer-string) :to-equal
(concat "1\n"
"00:01:01,000 --> 00:01:05,123\n"
"Foo.\n\n"
@@ -1053,8 +1053,8 @@ Baz.
(cl-loop for arg in (list 2) do
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text
3)
- (subed-srt-subtitle-insert arg)
+ (subed-srt--jump-to-subtitle-text
3)
+ (subed-srt--subtitle-insert arg)
(expect (buffer-string) :to-equal
(concat "1\n"
"00:01:01,000 --> 00:01:05,123\n"
"Foo.\n\n"
@@ -1078,55 +1078,55 @@ Baz.
(describe "Validating"
(it "works in empty buffer."
(with-temp-buffer
- (expect (subed-srt-validate) :to-be nil)))
+ (expect (subed-srt--validate) :to-be nil)))
(it "reports invalid IDs."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-id 1)
+ (subed-srt--jump-to-subtitle-id 1)
(insert "x")
- (expect (subed-srt-validate) :to-throw
+ (expect (subed-srt--validate) :to-throw
'error '("Found invalid subtitle ID: \"x1\""))
(expect (point) :to-equal 1)))
(it "reports invalid start time."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-time-start 1)
+ (subed-srt--jump-to-subtitle-time-start 1)
(forward-char 5)
(delete-char 1)
- (expect (subed-srt-validate) :to-throw
+ (expect (subed-srt--validate) :to-throw
'error '("Found invalid start time: \"00:0101,000 -->
00:01:05,123\""))
(expect (point) :to-equal 3)))
(it "reports invalid stop time."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-time-stop 1)
+ (subed-srt--jump-to-subtitle-time-stop 1)
(forward-char 10)
(insert "3")
- (expect (subed-srt-validate) :to-throw
+ (expect (subed-srt--validate) :to-throw
'error '("Found invalid stop time: \"00:01:01,000 -->
00:01:05,1323\""))
(expect (point) :to-equal 20)))
(it "reports invalid time separator."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-time-stop 1)
+ (subed-srt--jump-to-subtitle-time-stop 1)
(delete-char -1)
- (expect (subed-srt-validate) :to-throw
+ (expect (subed-srt--validate) :to-throw
'error '("Found invalid separator between start and
stop time: \"00:01:01,000 -->00:01:05,123\""))
(expect (point) :to-equal 15)))
(it "does not report error when last subtitle text is empty."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 3)
+ (subed-srt--jump-to-subtitle-text 3)
(kill-whole-line)
(forward-char -2)
- (subed-srt-validate)
+ (subed-srt--validate)
(expect (point) :to-equal 104)))
(it "preserves point if there is no error."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 2)
+ (subed-srt--jump-to-subtitle-text 2)
(forward-char 2)
- (subed-srt-validate)
+ (subed-srt--validate)
(expect (point) :to-equal 73)))
)
@@ -1138,7 +1138,7 @@ Baz.
(while (re-search-forward "\n" nil t)
(replace-match " \n"))
(expect (buffer-string) :not :to-equal mock-srt-data)
- (subed-srt-sanitize)
+ (subed-srt--sanitize)
(expect (buffer-string) :to-equal mock-srt-data))
(with-temp-buffer
(insert mock-srt-data)
@@ -1146,7 +1146,7 @@ Baz.
(while (re-search-forward "\n" nil t)
(replace-match "\t\n"))
(expect (buffer-string) :not :to-equal mock-srt-data)
- (subed-srt-sanitize)
+ (subed-srt--sanitize)
(expect (buffer-string) :to-equal mock-srt-data)))
(it "removes leading tabs and spaces from all lines."
(with-temp-buffer
@@ -1155,7 +1155,7 @@ Baz.
(while (re-search-forward "\n" nil t)
(replace-match "\n "))
(expect (buffer-string) :not :to-equal mock-srt-data)
- (subed-srt-sanitize)
+ (subed-srt--sanitize)
(expect (buffer-string) :to-equal mock-srt-data))
(with-temp-buffer
(insert mock-srt-data)
@@ -1163,7 +1163,7 @@ Baz.
(while (re-search-forward "\n" nil t)
(replace-match "\n\t"))
(expect (buffer-string) :not :to-equal mock-srt-data)
- (subed-srt-sanitize)
+ (subed-srt--sanitize)
(expect (buffer-string) :to-equal mock-srt-data)))
(it "removes excessive empty lines between subtitles."
(with-temp-buffer
@@ -1172,12 +1172,12 @@ Baz.
(while (re-search-forward "\n\n" nil t)
(replace-match "\n \n \t \t\t \n\n \t\n"))
(expect (buffer-string) :not :to-equal mock-srt-data)
- (subed-srt-sanitize)
+ (subed-srt--sanitize)
(expect (buffer-string) :to-equal mock-srt-data)))
(it "ensures double newline between subtitles if text of previous
subtitle is empty."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 1)
+ (subed-srt--jump-to-subtitle-text 1)
(kill-whole-line)
(expect (buffer-string) :to-equal (concat "1\n"
"00:01:01,000 -->
00:01:05,123\n"
@@ -1188,7 +1188,7 @@ Baz.
"3\n"
"00:03:03,45 -->
00:03:15,5\n"
"Baz.\n"))
- (subed-srt-sanitize)
+ (subed-srt--sanitize)
(expect (buffer-string) :to-equal (concat "1\n"
"00:01:01,000 -->
00:01:05,123\n"
"\n\n"
@@ -1204,7 +1204,7 @@ Baz.
(goto-char (point-min))
(insert " \n\t\n")
(expect (buffer-string) :not :to-equal mock-srt-data)
- (subed-srt-sanitize)
+ (subed-srt--sanitize)
(expect (buffer-string) :to-equal mock-srt-data)))
(it "removes empty lines from end of buffer."
(with-temp-buffer
@@ -1212,7 +1212,7 @@ Baz.
(goto-char (point-max))
(insert " \n\t\n\n")
(expect (buffer-string) :not :to-equal mock-srt-data)
- (subed-srt-sanitize)
+ (subed-srt--sanitize)
(expect (buffer-string) :to-equal mock-srt-data)))
(it "ensures a single newline after the last subtitle."
(with-temp-buffer
@@ -1221,12 +1221,12 @@ Baz.
(while (eq (char-before (point-max)) ?\n)
(delete-backward-char 1))
(expect (buffer-string) :not :to-equal mock-srt-data)
- (subed-srt-sanitize)
+ (subed-srt--sanitize)
(expect (buffer-string) :to-equal mock-srt-data)))
(it "ensures single newline after last subtitle if text is empty."
(with-temp-buffer
(insert mock-srt-data)
- (subed-srt-jump-to-subtitle-text 3)
+ (subed-srt--jump-to-subtitle-text 3)
(kill-whole-line)
(expect (buffer-string) :to-equal (concat "1\n"
"00:01:01,000 -->
00:01:05,123\n"
@@ -1237,7 +1237,7 @@ Baz.
"3\n"
"00:03:03,45 -->
00:03:15,5\n"
""))
- (subed-srt-sanitize)
+ (subed-srt--sanitize)
(expect (buffer-string) :to-equal (concat "1\n"
"00:01:01,000 -->
00:01:05,123\n"
"Foo.\n\n"
@@ -1258,7 +1258,7 @@ Baz.
(re-search-forward " --> ")
(replace-match "-->")
(expect (buffer-string) :not :to-equal mock-srt-data)
- (subed-srt-sanitize)
+ (subed-srt--sanitize)
(expect (buffer-string) :to-equal mock-srt-data)))
)
@@ -1270,7 +1270,7 @@ Baz.
(while (looking-at "^[0-9]$")
(replace-match "123"))
(expect (buffer-string) :not :to-equal mock-srt-data)
- (subed-srt-regenerate-ids)
+ (subed-srt--regenerate-ids)
(expect (buffer-string) :to-equal mock-srt-data))))
(describe "Sorting"
@@ -1286,7 +1286,7 @@ Baz.
(goto-char (point-min))
(re-search-forward "03:03")
(replace-match "11:03")
- (subed-srt-sort)
+ (subed-srt--sort)
(expect (buffer-string) :to-equal
(concat
"1\n"
@@ -1309,13 +1309,13 @@ Baz.
(replace-match "12:01")
(search-forward "\n")
(expect (current-word) :to-equal "Foo")
- (subed-srt-sort)
+ (subed-srt--sort)
(expect (current-word) :to-equal "Foo")))
(it "when subtitle text is empty."
(with-temp-buffer
(insert "1\n00:12:01,000 --> 00:01:05,123\n")
(goto-char (point-max))
- (subed-srt-sort)
+ (subed-srt--sort)
(expect (point) :to-equal 33)))
)
)
