Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make up for lack of 'total_seconds()' lib function for pre 2.7 version of python

This commit is contained in:
Martin Konecny 2013-05-16 12:25:21 -04:00
parent dc1ec789d2
commit 59785a952f
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python_apps/pypo/pure.py
View File

@ -5,3 +5,13 @@ def version_cmp(version1, version2):
def normalize(v): def normalize(v):
return [int(x) for x in re.sub(r'(\.0+)*$','', v).split(".")] return [int(x) for x in re.sub(r'(\.0+)*$','', v).split(".")]
return cmp(normalize(version1), normalize(version2)) return cmp(normalize(version1), normalize(version2))
def date_interval_to_seconds(interval):
"""
Convert timedelta object into int representing the number of seconds. If
number of seconds is less than 0, then return 0.
"""
seconds = (interval.microseconds + \
(interval.seconds + interval.days * 24 * 3600) * 10 ** 6) / float(10 ** 6)
return seconds

4
python_apps/pypo/pypofetch.py
View File

@ -11,6 +11,7 @@ import subprocess
import signal import signal
from datetime import datetime from datetime import datetime
import traceback import traceback
import pure
from Queue import Empty from Queue import Empty
from threading import Thread from threading import Thread
@ -19,6 +20,7 @@ from subprocess import Popen, PIPE
from api_clients import api_client from api_clients import api_client
from std_err_override import LogWriter from std_err_override import LogWriter
# configure logging # configure logging
logging_cfg = os.path.join(os.path.dirname(__file__), "logging.cfg") logging_cfg = os.path.join(os.path.dirname(__file__), "logging.cfg")
logging.config.fileConfig(logging_cfg) logging.config.fileConfig(logging_cfg)
@ -462,7 +464,7 @@ class PypoFetch(Thread):
start = datetime.strptime(media_item['start'], "%Y-%m-%d-%H-%M-%S") start = datetime.strptime(media_item['start'], "%Y-%m-%d-%H-%M-%S")
end = datetime.strptime(media_item['end'], "%Y-%m-%d-%H-%M-%S") end = datetime.strptime(media_item['end'], "%Y-%m-%d-%H-%M-%S")
length1 = (end - start).total_seconds() length1 = pure.date_interval_to_seconds(end - start)
length2 = media_item['cue_out'] - media_item['cue_in'] length2 = media_item['cue_out'] - media_item['cue_in']
if abs(length2 - length1) > 1: if abs(length2 - length1) > 1: