getting ready to push

1 files changed, 31 insertions, 21 deletions

diff --git a/backend/views.py b/backend/views.py
index f059314..7003f09 100644
--- a/backend/views.py
+++ b/backend/views.py
@@ -21,6 +21,8 @@ import time
 import urllib
 import views
 import sys
+import pprint
+import inspect
 
 from backend.models import SJLike
 from backend.models import SJRoom
@@ -146,7 +148,7 @@ def videos_response_str(videos):
            v.user.username,
            s['url'],
            s['title'],
-	   v.sjlike_set.count()
+           v.sjlike_set.count()
        ) + out
     return out
 
@@ -165,7 +167,7 @@ def videos_response_list(videos):
            v.user.username,
            s['url'],
            s['title'],
-	   v.sjlike_set.count()
+           v.sjlike_set.count()
        ]
        retval.append(l)
     return retval
@@ -183,7 +185,7 @@ def text_response_list(videos):
            v.user.id,
            v.user.username,
            s['text'],
-	   v.sjlike_set.count()
+           v.sjlike_set.count()
        ]
        retval.append(l)
     return retval
@@ -411,6 +413,9 @@ def api_auth_sneakin(request):
         return response
     try:
         user = auth.models.User.objects.get(username=request.POST['username'])
+        pp = pprint.PrettyPrinter(indent=4)
+        #return response_error(str(dir(user)));  #FIXME
+        #return response_error(str(user.id));  #FIXME
         if user.id != int(request.POST['userid']):
             return response_error('NO MATCH')
     except:
@@ -442,16 +447,16 @@ def api_auth_register(request):
         user.save()
     except Exception as e:
         sys.stderr.write(str(e))
-	return response_error('DB ERROR')
+        return response_error('DB ERROR')
     user_profile = SJUserProfile(user=user,
-		lastseen_chat = datetime.now(),
-		lastseen_webcam = datetime.now(),
+        lastseen_chat = datetime.now(),
+        lastseen_webcam = datetime.now(),
     )
     try:
         user_profile.save()
     except Exception as e:
         sys.stderr.write(str(e))
-	return response_error('DB ERROR')
+        return response_error('DB ERROR')
     response = response_success()
     response.write(user_response_str(request, user))
     return response
@@ -495,7 +500,8 @@ def api_auth_password(request):
             user_profile.save()
         except auth.models.User.DoesNotExist:
             return response_error('NO SUCH USER')
-        except:
+        except Exception as e:
+	    sys.stderr.write(str(e))
             return response_error('DB ERROR')
         return response_success()
     return HttpResponse()
@@ -516,7 +522,8 @@ def api_user_videos(request):
         query = Q(user=auth.models.User.objects.get(id=request.POST['user']))
     except auth.models.User.DoesNotExist:
         return response_error('NO SUCH USER')
-    except:
+    except Exception as e:
+        sys.stderr.write(str(e))
         return response_error('DB ERROR')
     if 'start' in request.POST:
         try:
@@ -553,8 +560,9 @@ def api_user_likes(request):
         query = Q(sjlike__user=auth.models.User.objects.get(id=request.POST['user']))
     except auth.models.User.DoesNotExist:
         return response_error('NO SUCH USER')
-    except:
-        return response_error('DB ERROR')
+    except Exception as e:
+        sys.stderr.write(str(e))
+	return response_error('DB ERROR')
     if 'start' in request.POST:
         try:
             timestamp = float(request.POST['start'])
@@ -565,9 +573,11 @@ def api_user_likes(request):
     if not videos:
         return response_error('NO VIDEOS')
     response = response_success()
-    for v in videos:
-        l = '\t'.join([str(v.user.id), str(v.id), str(v.datetime)])
-        response.write(l + '\n')
+    response.write(videos_response_str(videos))
+    #for v in videos:
+        #videos_response_list(v)
+	#l = '\t'.join([str(v.user.id), str(v.id), str(v.datetime)])
+        #response.write(l + '\n')
     return response
 
 @require_POST
@@ -754,7 +764,7 @@ def api_room_poll(request):
     """
     user = request.user
     if not user.is_authenticated():
-        return response_error('NO LOGGED IN')
+        return response_error('NOT LOGGED IN')
     user_profile = user.get_profile()
     form_fields = ['room']
     response = check_form_fields(request, form_fields)
@@ -775,11 +785,11 @@ def api_room_poll(request):
     if 'cam' in request.POST and request.POST['cam'] == "true":
         user_profile.lastseen_webcam = nowtime
     else:
-    	user_profile.lastseen_webcam = datetime.fromtimestamp(0) # never
+        user_profile.lastseen_webcam = datetime.fromtimestamp(0) # never
     user_profile.save()
     
     for user in room.users.filter(sjuserprofile__lastseen_chat__lt=lastseentime):
-    	room.users.remove(user)
+        room.users.remove(user)
     room.save()
 
     response = response_success(str(datetime_to_timestamp(nowtime)))
@@ -794,18 +804,18 @@ def api_room_poll(request):
     videos = []
     texts = SJContent.objects.filter(room=room, content_type='text', datetime__gte=last).order_by('-datetime')[0:ROOM_CHAT_LOG_SIZE]
     if texts:
-	    #video_last = datetime.fromtimestamp(max(datetime_to_timestamp(last), datetime_to_timestamp(texts[ROOM_CHAT_LOG_SIZE-1].datetime)))
-	    videos = SJContent.objects.filter(room=room, content_type='video', datetime__gte=last).order_by('-datetime')[0:ROOM_CHAT_LOG_SIZE]
+        #video_last = datetime.fromtimestamp(max(datetime_to_timestamp(last), datetime_to_timestamp(texts[ROOM_CHAT_LOG_SIZE-1].datetime)))
+        videos = SJContent.objects.filter(room=room, content_type='video', datetime__gte=last).order_by('-datetime')[0:ROOM_CHAT_LOG_SIZE]
 
     #if videos and last <= datetime_to_timestamp(videos[0].datetime):
     #    response.write(videos_response_str([v for v in videos if last <= datetime_to_timestamp(v.datetime)]))
     if videos:
-    	response.write(videos_response_str(videos))
+        response.write(videos_response_str(videos))
 
     #if texts and last <= datetime_to_timestamp(texts[0].datetime):
     #    response.write(texts_response_str([t for t in texts if last <= datetime_to_timestamp(t.datetime)]))
     if texts:
-    	response.write(texts_response_str(texts))
+        response.write(texts_response_str(texts))
 
     likes = SJLike.objects.filter(content__content_type='video', content__user=user, datetime__gte=lastseen_likes)[0:ROOM_CHAT_LOG_SIZE]
     response.write(likes_response_str(likes))