KevinMidboe/spotify-downloader
1
0
Fork 0
mirror of https://github.com/KevinMidboe/spotify-downloader.git synced 2025-12-08 20:39:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source 
Changed videotime_from_seconds function to fix merge conflict.
This commit is contained in:
Nitesh Sawant
2018-01-23 22:03:39 +05:30
committed by GitHub
parent 9ed7347f03
commit 988427d881
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/internals.py
View File

@@ -107,12 +107,13 @@ def filter_path(path):
os.remove(os.path.join(path, temp)) os.remove(os.path.join(path, temp))
def videotime_from_seconds(time): def videotime_from_seconds(time):
if time < 60: if time < 60:
return str(time) return str(time)
if time < 3600: 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), return '{0}:{1:02}:{2:02}'.format((time//60)//60,
str((time % 60) // 60).zfill(2), (time//60) % 60,
str((time % 60) % 60).zfill(2)) time % 60)