final changes to app

ezvz · Sep 16, 2012 · 28fc01f · 28fc01f
1 parent e3e44f3
commit 28fc01f
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 193 deletions.
diff --git a/app.py b/app.py
@@ -39,14 +39,14 @@ def convert(person):
         print >>fp, station
         for song in songs.find({"station": station, "has_uri": 1}):
             print >>fp, song['uri']
-    refresh_tables()
+    fp.close()
     return filename
 
 def run_spotify_tool(person, filename):
 	spotify_cmd = "./pandorify "+person['s_uname']+" "+ person['s_pword']+" "+filename
 	process = None
 	def target():
-		logging.info("Spotify process started")
+		logging.info("Spotify process started with cmd: "+spotify_cmd)
 		process = subprocess.Popen(spotify_cmd, shell=True, stderr=subprocess.PIPE)
 		(stdout, stderr) = process.communicate()
 		logging.info("Spotify process finished")
@@ -55,7 +55,7 @@ def target():
 	thread = threading.Thread(target=target)
 	thread.start()
 
-	thread.join(10000)
+	thread.join(20000)
 	if thread.is_alive():
 		logging.info("Spotify hung, restarting")
 		process.terminate()
@@ -87,12 +87,14 @@ def run(self):
 			format_songs(songs, email)
 			logging.debug("Calling spotify tools")
 			filename = convert(pandora_user)
-			while not run_spotify_tool(person, filename):
-				pass
-			self.queue.task_done()
+			if person['s_uname'] and person['s_pword']:
+				while not run_spotify_tool(person, filename):
+					pass
 			logging.info("Finished processing person")
 			sendEmail(email, person['user_email'])
-
+			#refresh_tables()
+			self.queue.task_done()
+
 t = ThreadCrawler(queue)
 t.setDaemon(True)
 t.start()

diff --git a/app.pyc b/app.pyc
diff --git a/logs/app.log b/logs/app.log
diff --git a/pandorify_c/tmp/Storage/index.dat b/pandorify_c/tmp/Storage/index.dat
diff --git a/pandorify_c/tmp/Users/bish3al-user/offline2 b/pandorify_c/tmp/Users/bish3al-user/offline2
diff --git a/pandorify_c/tmp/Users/bish3al-user/playlist.bnk b/pandorify_c/tmp/Users/bish3al-user/playlist.bnk
diff --git a/pandorify_c/tmp/Users/bish3al-user/social_manager.bnk b/pandorify_c/tmp/Users/bish3al-user/social_manager.bnk
diff --git a/pandorify_c/tmp/offline.bnk b/pandorify_c/tmp/offline.bnk
diff --git a/pandorify_c/tmp/settings b/pandorify_c/tmp/settings
@@ -1 +1 @@
-{"autologin_username":"bish3al","autologin_canonical_username":"bish3al","autologin_mode":0,"proxy_pass":"","realtime_clock_delta":-5,"csrf":""}
+{"autologin_username":"bish3al","autologin_canonical_username":"bish3al","autologin_mode":0,"proxy_pass":"","realtime_clock_delta":-6,"csrf":""}