From 988427d88184ecbfc2aa203a36b53ea17ae1acc2 Mon Sep 17 00:00:00 2001 From: Nitesh Sawant Date: Tue, 23 Jan 2018 22:03:39 +0530 Subject: [PATCH] Fix merge conflict Changed videotime_from_seconds function to fix merge conflict. --- core/internals.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/internals.py b/core/internals.py index 5f14781..99e29e3 100755 --- a/core/internals.py +++ b/core/internals.py @@ -107,12 +107,13 @@ def filter_path(path): os.remove(os.path.join(path, temp)) + def videotime_from_seconds(time): if time < 60: return str(time) if time < 3600: - return '{}:{}'.format(str(time // 60), str(time % 60).zfill(2)) + return '{0}:{1:02}'.format(time//60, time % 60) - return '{}:{}:{}'.format(str(time // 60), - str((time % 60) // 60).zfill(2), - str((time % 60) % 60).zfill(2)) + return '{0}:{1:02}:{2:02}'.format((time//60)//60, + (time//60) % 60, + time % 60)