mpv2oboeru

Commit: 189595dfccd87cb205c1a582dcc720c42f15f03e
Parent: 0d98df39aaeb85cf60bc7da27cd06c4c5a22a35c
Author: Ren Tatsumoto
Date:   Thu, 27 Aug 2020 07:44:07 +0300

make timings always human readable

Diffstat:
M
README.md
 | 
3
---
M
subs2srs.lua
 | 
35
+++++++++++++++++++----------------

2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
@@ -72,9 +72,6 @@ autoclip=no
 # Remove all spaces from the subtitle text.
 # Only makes sense for languages without spaces like Japanese.
 nuke_spaces=yes
-# Format timestamps according to this pattern: `%dh%02dm%02ds%03dms`.
-# Use seconds otherwise.
-human_readable_time=yes
 
 # Media quality
 # 0 = lowest, 100=highest
diff --git a/subs2srs.lua b/subs2srs.lua
@@ -18,7 +18,6 @@ local config = {
     collection_path = string.format('%s/.local/share/Anki2/%s/collection.media/', os.getenv("HOME"), os.getenv("USER")),
     autoclip = false,           -- copy subs to the clipboard or not
     nuke_spaces = true,         -- remove all spaces or not
-    human_readable_time = true, -- use seconds if false
     snapshot_quality = 5,       -- from 0=lowest to 100=highest
     snapshot_width = -2,        -- a positive integer or -2 for auto
     snapshot_height = 200,      -- same
@@ -147,21 +146,25 @@ local function trim(str)
     return str
 end
 
-local function seconds_to_human_readable_time(time)
-    local hours = math.floor(time / 3600)
-    local mins = math.floor(time / 60) % 60
-    local secs = math.floor(time % 60)
-    local milliseconds = math.floor((time * 1000) % 1000)
+local function human_readable_time(seconds)
+    if type(seconds) ~= 'number' or seconds < 0 then
+        return 'empty'
+    end
 
-    return string.format("%dh%02dm%02ds%03dms", hours, mins, secs, milliseconds)
-end
+    local parts = {}
 
-local function format_time(time)
-    if config.human_readable_time == true then
-        return seconds_to_human_readable_time(time)
-    else
-        return string.format("%.3f", time)
+    parts.h  = math.floor(seconds / 3600)
+    parts.m  = math.floor(seconds / 60) % 60
+    parts.s  = math.floor(seconds % 60)
+    parts.ms = math.floor((seconds * 1000) % 1000)
+
+    local ret = string.format("%02dm%02ds%03dms", parts.m, parts.s, parts.ms)
+
+    if parts.h > 0 then
+        ret = string.format('%dh%s', parts.h, ret)
     end
+
+    return ret
 end
 
 local function anki_compatible_length(str)
@@ -205,8 +208,8 @@ local function construct_filename(sub)
     filename = string.format(
         '%s_(%s-%s)',
         filename,
-        format_time(sub['start']),
-        format_time(sub['end'])
+        human_readable_time(sub['start']),
+        human_readable_time(sub['end'])
     )
 
     return filename
@@ -439,7 +442,7 @@ subs.set_starting_point = function()
 
     if current_sub ~= nil then
         local starting_point = current_sub['start']
-        starting_point = seconds_to_human_readable_time(starting_point)
+        starting_point = human_readable_time(starting_point)
         mp.osd_message("Starting point is set to " .. starting_point, 2)
     else
         mp.osd_message("There's no visible subtitle.", 2)