0x2620/pandora_client
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix typo, better time remaining

Browse source
This commit is contained in:
j 2012-02-28 18:20:49 +01:00
parent ff715aaf65
commit c1fc16ea4e
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pandora_client/__init__.py
View file

@ -3,14 +3,16 @@
# vi:si:et:sw=4:sts=4:ts=4 # vi:si:et:sw=4:sts=4:ts=4
# GPL 2012 # GPL 2012
from __future__ import division, with_statement from __future__ import division, with_statement
import os
import json
import sqlite3
import time
import shutil
import sys
import socket
import getpass import getpass
import json
import math
import os
import shutil
import socket
import sqlite3
import sys
import time
import ox import ox
@ -530,7 +532,7 @@ class API(ox.API):
self.media_cache = media_cache self.media_cache = media_cache
if not self.media_cache: if not self.media_cache:
self.media_cache = os.path.exanduser(default_media_cache) self.media_cache = os.path.expanduser(default_media_cache)
self._resume_file = '/tmp/pandora_client.%s.json' % os.environ.get('USER') self._resume_file = '/tmp/pandora_client.%s.json' % os.environ.get('USER')
def uploadVideo(self, filename, data, profile, info=None): def uploadVideo(self, filename, data, profile, info=None):
@ -612,7 +614,7 @@ class API(ox.API):
elapsed = time.mktime(time.localtime()) - start elapsed = time.mktime(time.localtime()) - start
remaining = "" remaining = ""
if done: if done:
r = int((elapsed / (done/fsize) - elapsed)/60) * 60 * 1000 r = math.ceil((elapsed / (done/fsize) - elapsed)/60) * 60 * 1000
r = ox.formatDuration(r, milliseconds=False, verbosity=2) r = ox.formatDuration(r, milliseconds=False, verbosity=2)
if r: if r:
remaining = ", %s remaining" % r remaining = ", %s remaining" % r