From: Stefan Kögl Date: Sat, 17 Aug 2013 15:54:05 +0000 (+0200) Subject: move "userdata" views into own database X-Git-Url: https://repo.or.cz/w/mygpo.git/commitdiff_plain/0dda04d60b2b831b6e67d6f5fa975619ef9550f0 move "userdata" views into own database --- diff --git a/couchdb/general/_design/chapters/views/by_episode/map.js b/couchdb/userdata/_design/chapters/views/by_episode/map.js similarity index 100% rename from couchdb/general/_design/chapters/views/by_episode/map.js rename to couchdb/userdata/_design/chapters/views/by_episode/map.js diff --git a/couchdb/general/_design/episode_actions/views/by_device/map.js b/couchdb/userdata/_design/episode_actions/views/by_device/map.js similarity index 100% rename from couchdb/general/_design/episode_actions/views/by_device/map.js rename to couchdb/userdata/_design/episode_actions/views/by_device/map.js diff --git a/couchdb/general/_design/episode_actions/views/by_podcast/map.js b/couchdb/userdata/_design/episode_actions/views/by_podcast/map.js similarity index 100% rename from couchdb/general/_design/episode_actions/views/by_podcast/map.js rename to couchdb/userdata/_design/episode_actions/views/by_podcast/map.js diff --git a/couchdb/general/_design/episode_actions/views/by_podcast_device/map.js b/couchdb/userdata/_design/episode_actions/views/by_podcast_device/map.js similarity index 100% rename from couchdb/general/_design/episode_actions/views/by_podcast_device/map.js rename to couchdb/userdata/_design/episode_actions/views/by_podcast_device/map.js diff --git a/couchdb/general/_design/episode_actions/views/by_user/map.js b/couchdb/userdata/_design/episode_actions/views/by_user/map.js similarity index 100% rename from couchdb/general/_design/episode_actions/views/by_user/map.js rename to couchdb/userdata/_design/episode_actions/views/by_user/map.js diff --git a/couchdb/general/_design/episode_states/filters/episode_states.js b/couchdb/userdata/_design/episode_states/filters/episode_states.js similarity index 100% rename from couchdb/general/_design/episode_states/filters/episode_states.js rename to couchdb/userdata/_design/episode_states/filters/episode_states.js diff --git a/couchdb/general/_design/episode_states/filters/has_play_events.js b/couchdb/userdata/_design/episode_states/filters/has_play_events.js similarity index 100% rename from couchdb/general/_design/episode_states/filters/has_play_events.js rename to couchdb/userdata/_design/episode_states/filters/has_play_events.js diff --git a/couchdb/general/_design/episode_states/views/by_podcast_episode/map.js b/couchdb/userdata/_design/episode_states/views/by_podcast_episode/map.js similarity index 100% rename from couchdb/general/_design/episode_states/views/by_podcast_episode/map.js rename to couchdb/userdata/_design/episode_states/views/by_podcast_episode/map.js diff --git a/couchdb/general/_design/episode_states/views/by_ref_urls/map.js b/couchdb/userdata/_design/episode_states/views/by_ref_urls/map.js similarity index 100% rename from couchdb/general/_design/episode_states/views/by_ref_urls/map.js rename to couchdb/userdata/_design/episode_states/views/by_ref_urls/map.js diff --git a/couchdb/general/_design/episode_states/views/by_user_episode/map.js b/couchdb/userdata/_design/episode_states/views/by_user_episode/map.js similarity index 100% rename from couchdb/general/_design/episode_states/views/by_user_episode/map.js rename to couchdb/userdata/_design/episode_states/views/by_user_episode/map.js diff --git a/couchdb/general/_design/episode_states/views/by_user_podcast/map.js b/couchdb/userdata/_design/episode_states/views/by_user_podcast/map.js similarity index 100% rename from couchdb/general/_design/episode_states/views/by_user_podcast/map.js rename to couchdb/userdata/_design/episode_states/views/by_user_podcast/map.js diff --git a/couchdb/general/_design/favorites/views/episodes_by_user/map.js b/couchdb/userdata/_design/favorites/views/episodes_by_user/map.js similarity index 100% rename from couchdb/general/_design/favorites/views/episodes_by_user/map.js rename to couchdb/userdata/_design/favorites/views/episodes_by_user/map.js diff --git a/couchdb/general/_design/heatmap/views/by_episode/map.js b/couchdb/userdata/_design/heatmap/views/by_episode/map.js similarity index 100% rename from couchdb/general/_design/heatmap/views/by_episode/map.js rename to couchdb/userdata/_design/heatmap/views/by_episode/map.js diff --git a/couchdb/general/_design/heatmap/views/by_episode/reduce.js b/couchdb/userdata/_design/heatmap/views/by_episode/reduce.js similarity index 100% rename from couchdb/general/_design/heatmap/views/by_episode/reduce.js rename to couchdb/userdata/_design/heatmap/views/by_episode/reduce.js diff --git a/couchdb/general/_design/history/views/by_device/map.js b/couchdb/userdata/_design/history/views/by_device/map.js similarity index 100% rename from couchdb/general/_design/history/views/by_device/map.js rename to couchdb/userdata/_design/history/views/by_device/map.js diff --git a/couchdb/general/_design/history/views/by_user/map.js b/couchdb/userdata/_design/history/views/by_user/map.js similarity index 100% rename from couchdb/general/_design/history/views/by_user/map.js rename to couchdb/userdata/_design/history/views/by_user/map.js diff --git a/couchdb/general/_design/listeners/views/by_episode/map.js b/couchdb/userdata/_design/listeners/views/by_episode/map.js similarity index 100% rename from couchdb/general/_design/listeners/views/by_episode/map.js rename to couchdb/userdata/_design/listeners/views/by_episode/map.js diff --git a/couchdb/general/_design/listeners/views/by_episode/reduce.js b/couchdb/userdata/_design/listeners/views/by_episode/reduce.js similarity index 100% rename from couchdb/general/_design/listeners/views/by_episode/reduce.js rename to couchdb/userdata/_design/listeners/views/by_episode/reduce.js diff --git a/couchdb/general/_design/listeners/views/by_podcast/map.js b/couchdb/userdata/_design/listeners/views/by_podcast/map.js similarity index 100% rename from couchdb/general/_design/listeners/views/by_podcast/map.js rename to couchdb/userdata/_design/listeners/views/by_podcast/map.js diff --git a/couchdb/general/_design/listeners/views/by_podcast/reduce.js b/couchdb/userdata/_design/listeners/views/by_podcast/reduce.js similarity index 100% rename from couchdb/general/_design/listeners/views/by_podcast/reduce.js rename to couchdb/userdata/_design/listeners/views/by_podcast/reduce.js diff --git a/couchdb/general/_design/listeners/views/by_podcast_episode/map.js b/couchdb/userdata/_design/listeners/views/by_podcast_episode/map.js similarity index 100% rename from couchdb/general/_design/listeners/views/by_podcast_episode/map.js rename to couchdb/userdata/_design/listeners/views/by_podcast_episode/map.js diff --git a/couchdb/general/_design/listeners/views/by_podcast_episode/reduce.js b/couchdb/userdata/_design/listeners/views/by_podcast_episode/reduce.js similarity index 100% rename from couchdb/general/_design/listeners/views/by_podcast_episode/reduce.js rename to couchdb/userdata/_design/listeners/views/by_podcast_episode/reduce.js diff --git a/couchdb/general/_design/listeners/views/by_user/map.js b/couchdb/userdata/_design/listeners/views/by_user/map.js similarity index 100% rename from couchdb/general/_design/listeners/views/by_user/map.js rename to couchdb/userdata/_design/listeners/views/by_user/map.js diff --git a/couchdb/general/_design/listeners/views/by_user/reduce.js b/couchdb/userdata/_design/listeners/views/by_user/reduce.js similarity index 100% rename from couchdb/general/_design/listeners/views/by_user/reduce.js rename to couchdb/userdata/_design/listeners/views/by_user/reduce.js diff --git a/couchdb/general/_design/listeners/views/by_user_podcast/map.js b/couchdb/userdata/_design/listeners/views/by_user_podcast/map.js similarity index 100% rename from couchdb/general/_design/listeners/views/by_user_podcast/map.js rename to couchdb/userdata/_design/listeners/views/by_user_podcast/map.js diff --git a/couchdb/general/_design/listeners/views/by_user_podcast/reduce.js b/couchdb/userdata/_design/listeners/views/by_user_podcast/reduce.js similarity index 100% rename from couchdb/general/_design/listeners/views/by_user_podcast/reduce.js rename to couchdb/userdata/_design/listeners/views/by_user_podcast/reduce.js diff --git a/couchdb/general/_design/listeners/views/times_played_by_user/map.js b/couchdb/userdata/_design/listeners/views/times_played_by_user/map.js similarity index 100% rename from couchdb/general/_design/listeners/views/times_played_by_user/map.js rename to couchdb/userdata/_design/listeners/views/times_played_by_user/map.js diff --git a/couchdb/general/_design/listeners/views/times_played_by_user/reduce.js b/couchdb/userdata/_design/listeners/views/times_played_by_user/reduce.js similarity index 100% rename from couchdb/general/_design/listeners/views/times_played_by_user/reduce.js rename to couchdb/userdata/_design/listeners/views/times_played_by_user/reduce.js diff --git a/couchdb/general/_design/podcast_states/validate_doc_update.js b/couchdb/userdata/_design/podcast_states/validate_doc_update.js similarity index 100% rename from couchdb/general/_design/podcast_states/validate_doc_update.js rename to couchdb/userdata/_design/podcast_states/validate_doc_update.js diff --git a/couchdb/general/_design/podcast_states/views/by_device/map.js b/couchdb/userdata/_design/podcast_states/views/by_device/map.js similarity index 100% rename from couchdb/general/_design/podcast_states/views/by_device/map.js rename to couchdb/userdata/_design/podcast_states/views/by_device/map.js diff --git a/couchdb/general/_design/podcast_states/views/by_podcast/map.js b/couchdb/userdata/_design/podcast_states/views/by_podcast/map.js similarity index 100% rename from couchdb/general/_design/podcast_states/views/by_podcast/map.js rename to couchdb/userdata/_design/podcast_states/views/by_podcast/map.js diff --git a/couchdb/general/_design/podcast_states/views/by_user/map.js b/couchdb/userdata/_design/podcast_states/views/by_user/map.js similarity index 100% rename from couchdb/general/_design/podcast_states/views/by_user/map.js rename to couchdb/userdata/_design/podcast_states/views/by_user/map.js diff --git a/couchdb/general/_design/subscribers/views/by_podcast/map.js b/couchdb/userdata/_design/subscribers/views/by_podcast/map.js similarity index 100% rename from couchdb/general/_design/subscribers/views/by_podcast/map.js rename to couchdb/userdata/_design/subscribers/views/by_podcast/map.js diff --git a/couchdb/general/_design/subscribers/views/by_podcast/reduce.js b/couchdb/userdata/_design/subscribers/views/by_podcast/reduce.js similarity index 100% rename from couchdb/general/_design/subscribers/views/by_podcast/reduce.js rename to couchdb/userdata/_design/subscribers/views/by_podcast/reduce.js diff --git a/couchdb/general/_design/subscriptions/views/by_device/map.js b/couchdb/userdata/_design/subscriptions/views/by_device/map.js similarity index 100% rename from couchdb/general/_design/subscriptions/views/by_device/map.js rename to couchdb/userdata/_design/subscriptions/views/by_device/map.js diff --git a/couchdb/general/_design/subscriptions/views/by_podcast/map.js b/couchdb/userdata/_design/subscriptions/views/by_podcast/map.js similarity index 100% rename from couchdb/general/_design/subscriptions/views/by_podcast/map.js rename to couchdb/userdata/_design/subscriptions/views/by_podcast/map.js diff --git a/couchdb/general/_design/subscriptions/views/by_podcast/reduce.js b/couchdb/userdata/_design/subscriptions/views/by_podcast/reduce.js similarity index 100% rename from couchdb/general/_design/subscriptions/views/by_podcast/reduce.js rename to couchdb/userdata/_design/subscriptions/views/by_podcast/reduce.js diff --git a/couchdb/general/_design/subscriptions/views/by_user/map.js b/couchdb/userdata/_design/subscriptions/views/by_user/map.js similarity index 100% rename from couchdb/general/_design/subscriptions/views/by_user/map.js rename to couchdb/userdata/_design/subscriptions/views/by_user/map.js diff --git a/couchdb/general/_design/subscriptions/views/by_user/reduce.js b/couchdb/userdata/_design/subscriptions/views/by_user/reduce.js similarity index 100% rename from couchdb/general/_design/subscriptions/views/by_user/reduce.js rename to couchdb/userdata/_design/subscriptions/views/by_user/reduce.js diff --git a/couchdb/general/_design/usertags/views/by_podcast/map.js b/couchdb/userdata/_design/usertags/views/by_podcast/map.js similarity index 100% rename from couchdb/general/_design/usertags/views/by_podcast/map.js rename to couchdb/userdata/_design/usertags/views/by_podcast/map.js diff --git a/couchdb/general/_design/usertags/views/by_podcast/reduce.js b/couchdb/userdata/_design/usertags/views/by_podcast/reduce.js similarity index 100% rename from couchdb/general/_design/usertags/views/by_podcast/reduce.js rename to couchdb/userdata/_design/usertags/views/by_podcast/reduce.js diff --git a/couchdb/general/_design/usertags/views/podcasts/map.js b/couchdb/userdata/_design/usertags/views/podcasts/map.js similarity index 100% rename from couchdb/general/_design/usertags/views/podcasts/map.js rename to couchdb/userdata/_design/usertags/views/podcasts/map.js diff --git a/couchdb/general/_design/usertags/views/podcasts/reduce.js b/couchdb/userdata/_design/usertags/views/podcasts/reduce.js similarity index 100% rename from couchdb/general/_design/usertags/views/podcasts/reduce.js rename to couchdb/userdata/_design/usertags/views/podcasts/reduce.js diff --git a/doc/dev/couchdb-views.rst b/doc/dev/couchdb-views.rst index 7fd00fdf..c1f4276e 100644 --- a/doc/dev/couchdb-views.rst +++ b/doc/dev/couchdb-views.rst @@ -15,16 +15,6 @@ This group of views is available on the general database, called ``mygpo`` by default. -Chapters -^^^^^^^^ - -Doc-Types: EpisodeUserState - -**Views** - -* `chapters/by_episode `_ - - Clients ^^^^^^^ @@ -35,32 +25,6 @@ Doc-Types: User * `clients/by_ua_string `_ -Episode Actions -^^^^^^^^^^^^^^^ - -Doc-Types: EpisodeUserState - -**Views** - -* `episode_actions/by_device `_ -* `episode_actions/by_podcast_device `_ -* `episode_actions/by_podcast `_ -* `episode_actions/by_user `_ - - -Episode States -^^^^^^^^^^^^^^ - -Doc-Types: EpisodeUserState - -**Views** - -* `episode_states/by_podcast_episode `_ -* `episode_states/by_ref_urls `_ -* `episode_states/by_user_episode `_ -* `episode_states/by_user_podcast `_ - - Episode Statistics ^^^^^^^^^^^^^^^^^^ @@ -86,52 +50,6 @@ Doc-Types: Episode * `episodes/need_update `_ -Favorites -^^^^^^^^^ - -Doc-Types: EpisodeUserState - -**Views** - -* `episodes/favorites_by_user `_ - - -Heatmap -^^^^^^^ - -Doc-Types: EpisodeUserState - -**Views** - -* `heatmap/by_episode `_ - - -History -^^^^^^^ - -Doc-Types: EpisodeUserState, PodcastUserState - -**Views** - -* `history/by_device `_ -* `history/by_user `_ - - -Listeners -^^^^^^^^^ - -Doc-Types: EpisodeUserState - -**Views** - -* `listeners/by_episode `_ -* `listeners/by_podcast_episode `_ -* `listeners/by_podcast `_ -* `listeners/by_user `_ -* `listeners/by_user_podcast `_ -* `listeners/times_played_by_user `_ - - Podcast Lists ^^^^^^^^^^^^^ @@ -144,18 +62,6 @@ Doc-Types: PodcastList * `podcastlists/random `_ -Podcast States -^^^^^^^^^^^^^^ - -Doc-Types: PodcastUserState - -**Views** - -* `podcast_states/by_device `_ -* `podcast_states/by_podcast `_ -* `podcast_states/by_user `_ - - Podcasts ^^^^^^^^ @@ -187,28 +93,6 @@ Doc-Types: Podcast, PodcastGroup, Episode * `slugs/missing `_ -Subscribers -^^^^^^^^^^^ - -Doc-Types: PodcastUserState - -**Views** - -* `subscribers/by_podcast `_ - - -Subscriptions -^^^^^^^^^^^^^ - -Doc-Types: PodcastUserState - -**Views** - -* `subscriptions/by_device `_ -* `subscriptions/by_podcast `_ -* `subscriptions/by_user `_ - - Suggestions ^^^^^^^^^^^ @@ -262,6 +146,128 @@ Doc-Types: User * `users/deleted `_ +Userdata +-------- + +This group of views is available in the *userdata* database, called +``mygpo_userdata`` by default. + +Chapters +^^^^^^^^ + +Doc-Types: EpisodeUserState + +**Views** + +* `chapters/by_episode `_ + + +Episode Actions +^^^^^^^^^^^^^^^ + +Doc-Types: EpisodeUserState + +**Views** + +* `episode_actions/by_device `_ +* `episode_actions/by_podcast_device `_ +* `episode_actions/by_podcast `_ +* `episode_actions/by_user `_ + + +Episode States +^^^^^^^^^^^^^^ + +Doc-Types: EpisodeUserState + +**Views** + +* `episode_states/by_podcast_episode `_ +* `episode_states/by_ref_urls `_ +* `episode_states/by_user_episode `_ +* `episode_states/by_user_podcast `_ + + +Favorites +^^^^^^^^^ + +Doc-Types: EpisodeUserState + +**Views** + +* `episodes/favorites_by_user `_ + + +Heatmap +^^^^^^^ + +Doc-Types: EpisodeUserState + +**Views** + +* `heatmap/by_episode `_ + + +History +^^^^^^^ + +Doc-Types: EpisodeUserState, PodcastUserState + +**Views** + +* `history/by_device `_ +* `history/by_user `_ + + +Listeners +^^^^^^^^^ + +Doc-Types: EpisodeUserState + +**Views** + +* `listeners/by_episode `_ +* `listeners/by_podcast_episode `_ +* `listeners/by_podcast `_ +* `listeners/by_user `_ +* `listeners/by_user_podcast `_ +* `listeners/times_played_by_user `_ + + +Podcast States +^^^^^^^^^^^^^^ + +Doc-Types: PodcastUserState + +**Views** + +* `podcast_states/by_device `_ +* `podcast_states/by_podcast `_ +* `podcast_states/by_user `_ + + +Subscribers +^^^^^^^^^^^ + +Doc-Types: PodcastUserState + +**Views** + +* `subscribers/by_podcast `_ + + +Subscriptions +^^^^^^^^^^^^^ + +Doc-Types: PodcastUserState + +**Views** + +* `subscriptions/by_device `_ +* `subscriptions/by_podcast `_ +* `subscriptions/by_user `_ + + User-Tags ^^^^^^^^^ @@ -275,6 +281,7 @@ Doc-Types: PodcastUserState + Categories ---------- diff --git a/mygpo/settings.py b/mygpo/settings.py index e12ad80d..a0dd1eda 100644 --- a/mygpo/settings.py +++ b/mygpo/settings.py @@ -72,6 +72,9 @@ COUCHDB_DATABASES = { 'mygpo.categories': {'URL': 'http://127.0.0.1:5984/mygpo_categories'}, + + 'mygpo.userdata': + {'URL': 'http://127.0.0.1:5984/mygpo_userdata'}, } # Maps design documents to databases. The keys correspond to the directories in @@ -83,6 +86,7 @@ COUCHDB_DDOC_MAPPING = { 'general': 'core', 'categories': 'categories', 'pubsub': 'pubsub', + 'userdata': 'userdata', } # Local time zone for this installation. Choices can be found here: