From 265baf17539a4dfc9dfd8c347639666e83cd5188 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20K=C3=B6gl?= Date: Sun, 21 Oct 2012 14:16:53 +0000 Subject: [PATCH] various db-related fixes --- mygpo/db/couchdb/episode.py | 6 ++++-- mygpo/db/couchdb/episode_state.py | 2 +- mygpo/db/couchdb/user.py | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mygpo/db/couchdb/episode.py b/mygpo/db/couchdb/episode.py index d75f3ad6..bb8939f8 100644 --- a/mygpo/db/couchdb/episode.py +++ b/mygpo/db/couchdb/episode.py @@ -67,8 +67,10 @@ def episode_for_podcast_url(podcast_url, episode_url, create=False): def episode_for_podcast_id_url(podcast_id, episode_url, create=False): - key = 'episode-podcastid-%s-url-%s' % (sha1(podcast_id).hexdigest(), - sha1(episode_url).hexdigest()) + print sha1(episode_url.encode('utf-8')) + key = u'episode-podcastid-%s-url-%s' % ( + sha1(podcast_id.encode('utf-8')).hexdigest(), + sha1(episode_url.encode('utf-8')).hexdigest()) episode = cache.get(key) if episode: diff --git a/mygpo/db/couchdb/episode_state.py b/mygpo/db/couchdb/episode_state.py index 81c0f714..c4950abe 100644 --- a/mygpo/db/couchdb/episode_state.py +++ b/mygpo/db/couchdb/episode_state.py @@ -205,7 +205,7 @@ def get_episode_actions(user_id, since=None, until={}, podcast_id=None, until_str = until.strftime('%Y-%m-%dT%H:%M:%S') if until else {} if since_str >= until_str: - return + return [] if not podcast_id and not device_id: view = 'episode_actions/by_user' diff --git a/mygpo/db/couchdb/user.py b/mygpo/db/couchdb/user.py index 1697dc53..3b2032d1 100644 --- a/mygpo/db/couchdb/user.py +++ b/mygpo/db/couchdb/user.py @@ -111,6 +111,7 @@ def suggestions_for_user(user): @cache_result(timeout=60*60) def user_agent_stats(): + from mygpo.users.models import User res = User.view('clients/by_ua_string', wrap_doc = False, group_level = 1, @@ -121,6 +122,7 @@ def user_agent_stats(): def deleted_users(): + from mygpo.users.models import User users = User.view('users/deleted', include_docs = True, reduce = False, -- 2.11.4.GIT