[Librefm-commits] [1640] The two code paths don't really share any code.

[Daniel Watkins]

Revision: 1640
          http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1640
Author:   odd_bloke
Date:     2009-05-15 19:41:12 +0000 (Fri, 15 May 2009)
Log Message:
-----------
The two code paths don't really share any code.

Modified Paths:
--------------
    trunk/scripts/offline-submit.py

Modified: trunk/scripts/offline-submit.py
===================================================================
--- trunk/scripts/offline-submit.py     2009-05-15 19:41:09 UTC (rev 1639)
+++ trunk/scripts/offline-submit.py     2009-05-15 19:41:12 UTC (rev 1640)
@@ -19,22 +19,23 @@
     return datetime.datetime.utcfromtimestamp(float(string))
 
 
-def _get_date(start_string=None, tracks=None):
-    if start_string is not None:
-        dt = _parse_date(start_string)
-        input = ''
-        while input not in ['y', 'n']:
-            input = raw_input("Did you mean '%s UTC'? [Y/n]: " % (dt,)).lower()
-        if input == 'n':
-            sys.exit()
-    else:
-        offset = datetime.timedelta()
-        for track in tracks:
-            offset += datetime.timedelta(seconds=_get_track(track).info.length)
-        dt = datetime.datetime.now() - offset
+def _get_date_from_string(start_string):
+    dt = _parse_date(start_string)
+    input = ''
+    while input not in ['y', 'n']:
+        input = raw_input("Did you mean '%s UTC'? [Y/n]: " % (dt,)).lower()
+    if input == 'n':
+        sys.exit()
     return dt
 
 
+def _get_offset_date(tracks):
+    offset = datetime.timedelta()
+    for track in tracks:
+        offset += datetime.timedelta(seconds=_get_track(track).info.length)
+    return datetime.datetime.now() - offset
+
+
 def _get_track(filename):
     f = mutagen.File(filename)
     if f is None:
@@ -71,9 +72,9 @@
     server = GobbleServer(server, username, password)
 
     if opts.just_finished:
-        dt = _get_date(tracks=tracks)
+        dt = _get_offset_date(tracks)
     else:
-        dt = _get_date(start_string)
+        dt = _get_date_from_string(start_string)
 
     for track in tracks:
         f = _get_track(track)