From 81f229754654032fd2cc683b700f2f3d8f5d0ee2 Mon Sep 17 00:00:00 2001
From: Stefan Koegl <stefan@skoegl.net>
Date: Sat, 24 Apr 2010 13:38:11 +0200
Subject: [PATCH] marking episodes as favorites, added favorite-list

---
 htdocs/media/fav-add.png           | Bin 0 -> 2043 bytes
 htdocs/media/fav.png               | Bin 0 -> 1761 bytes
 install/update-29.sql              |   8 ++++++++
 mygpo/api/models/users.py          |  30 ++++++++++++++++++++++++++++++
 mygpo/urls.py                      |   3 +++
 mygpo/web/templates/episode.html   |  16 ++++++++++++++++
 mygpo/web/templates/favorites.html |  35 +++++++++++++++++++++++++++++++++++
 mygpo/web/templatetags/menu.py     |   1 +
 mygpo/web/views/episode.py         |  23 +++++++++++++++++++++++
 9 files changed, 116 insertions(+)
 create mode 100644 htdocs/media/fav-add.png
 create mode 100644 htdocs/media/fav.png
 create mode 100644 mygpo/api/models/users.py
 create mode 100644 mygpo/web/templates/favorites.html

diff --git a/htdocs/media/fav-add.png b/htdocs/media/fav-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..431fb2b3cc36e2b44effcdf71ab7e130a0e951dd
GIT binary patch
literal 2043
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
ZhKxs;;VA$B002ovPDHLkV1hC*GdXLv0qOt%

literal 0
HcwPel00001

diff --git a/htdocs/media/fav.png b/htdocs/media/fav.png
new file mode 100644
index 0000000000000000000000000000000000000000..f92802e9b36d49d6b8c131365b972c4fba394e98
GIT binary patch
literal 1761
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
Dq^WJ6

literal 0
HcwPel00001

diff --git a/install/update-29.sql b/install/update-29.sql
index 531ae42a..0021a6cc 100644
--- a/install/update-29.sql
+++ b/install/update-29.sql
@@ -4,3 +4,11 @@ alter table subscription add index public (public);
 alter table episode_log add column started int(11) default null;
 alter table episode_log add column total int(11) default null;
 
+
+create table episode_favorites (
+    id int(11) primary key auto_increment,
+    episode_id int (11) not null,
+    created datetime not null,
+    user_id int (11) not null
+);
+
diff --git a/mygpo/api/models/users.py b/mygpo/api/models/users.py
new file mode 100644
index 00000000..2643aefc
--- /dev/null
+++ b/mygpo/api/models/users.py
@@ -0,0 +1,30 @@
+#
+# This file is part of my.gpodder.org.
+#
+# my.gpodder.org is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# my.gpodder.org is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with my.gpodder.org. If not, see <http://www.gnu.org/licenses/>.
+#
+
+from django.db import models
+from django.contrib.auth.models import User
+from mygpo.api.models import Episode
+
+class EpisodeFavorite(models.Model):
+    user = models.ForeignKey(User)
+    episode = models.ForeignKey(Episode)
+    created = models.DateTimeField(auto_now_add=True)
+
+    class Meta:
+        db_table = 'episode_favorites'
+        unique_together = ('user', 'episode')
+
diff --git a/mygpo/urls.py b/mygpo/urls.py
index 95ad8335..8561fcd3 100644
--- a/mygpo/urls.py
+++ b/mygpo/urls.py
@@ -50,6 +50,9 @@ urlpatterns = patterns('',
     (r'^episode/(?P<id>\d+)$', 'mygpo.web.views.episode.episode'),
     (r'^episode/(?P<id>\d+)/add-chapter$', 'mygpo.web.views.episode.add_chapter'),
     (r'^episode/(?P<id>\d+)/remove-chapter/(?P<chapter_id>\d+)$', 'mygpo.web.views.episode.remove_chapter'),
+    (r'^episode/(?P<id>\d+)/toggle-favorite', 'mygpo.web.views.episode.toggle_favorite'),
+
+    (r'^favorites/', 'mygpo.web.views.episode.list_favorites'),
 
     (r'account/$', 'mygpo.web.views.settings.account'),
     (r'account/privacy$', 'mygpo.web.views.settings.privacy'),
diff --git a/mygpo/web/templates/episode.html b/mygpo/web/templates/episode.html
index c742b2c3..ddd30bd5 100644
--- a/mygpo/web/templates/episode.html
+++ b/mygpo/web/templates/episode.html
@@ -37,6 +37,22 @@
   {% endif %}
 
   {% if user.is_authenticated %}
+
+   {% if is_favorite %}
+    <div>
+     <a href="/episode/{{ episode.id }}/toggle-favorite">
+      <img src="/media/fav.png" style="vertical-align: middle;" /> {% trans "Favorite" %}
+     </a>
+    </div>
+   {% else %}
+    <div>
+     <a href="/episode/{{ episode.id }}/toggle-favorite">
+      <img src="/media/fav-add.png" style="vertical-align: middle;" /> {% trans "Add as Favorite" %}
+     </a>
+    </div>
+   {% endif %}
+
+
   <hr/>
    <h2>{% trans "Chapters" %}</h2>
 
diff --git a/mygpo/web/templates/favorites.html b/mygpo/web/templates/favorites.html
new file mode 100644
index 00000000..97b56d92
--- /dev/null
+++ b/mygpo/web/templates/favorites.html
@@ -0,0 +1,35 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load podcasts %}
+
+{% load menu %}
+{% block mainmenu %}{{ "/subscriptions/"|main_menu }}{% endblock %}
+{% block sectionmenu %}{{ "/favorites/"|section_menu }}{% endblock %}
+
+{% block title %}{% trans "Favorite Episodes" %}{% endblock %}
+
+{% block content %}
+  <h1>{% trans "Favorite Episodes" %}</h1>
+
+  <table class="list episode_list">
+   <tr>
+    <th></th>
+    <th></th>
+   </tr>
+  {% for episode in episodes %}
+   <tr>
+    <td>{{ episode.podcast|podcast_logo }}</td>
+    <td><a href="/episode/{{ episode.id }}">
+     {% if episode.title %}
+      {{ episode.title|striptags }}
+     {% else %}
+      {% trans "Unnamed Episode" %}
+     {% endif %}
+     </a><br/>
+     <span class="from_podcast">{% trans "from" %} <a href="/podcast/{{ episode.podcast.id }}">{{ episode.podcast|striptags }}</a></td>
+   </tr>
+  {% endfor %}
+  </table>
+
+{% endblock %}
+
diff --git a/mygpo/web/templatetags/menu.py b/mygpo/web/templatetags/menu.py
index c6abb6da..9ed85a58 100644
--- a/mygpo/web/templatetags/menu.py
+++ b/mygpo/web/templatetags/menu.py
@@ -22,6 +22,7 @@ MENU_STRUCTURE = (
         )),
         (_('My Podcasts'), (
             ('/subscriptions/', _('Subscriptions')),
+            ('/favorites/', _('Favorite Episodes')),
             ('/history/', _('History')),
             ('/suggestions/', _('Suggestions')),
         )),
diff --git a/mygpo/web/views/episode.py b/mygpo/web/views/episode.py
index fffe5d76..0cdc1d30 100644
--- a/mygpo/web/views/episode.py
+++ b/mygpo/web/views/episode.py
@@ -20,6 +20,7 @@ from django.http import HttpResponseRedirect, HttpResponse, HttpResponseBadReque
 from django.template import RequestContext
 from mygpo.api.models import Podcast, Episode, Device, EpisodeAction, Subscription
 from mygpo.api.models.episodes import Chapter
+from mygpo.api.models.users import EpisodeFavorite
 from mygpo.utils import parse_time
 from django.utils.translation import ugettext as _
 from django.contrib.auth.decorators import login_required
@@ -37,9 +38,11 @@ def episode(request, id):
             subscription_meta = subscription_tmp[0].get_meta()
         else:
             subscription_meta = None
+        is_fav = EpisodeFavorite.objects.filter(user=request.user, episode=episode).exists()
     else:
         history = []
         subscription_meta = None
+        is_fav = False
 
     chapters = [c for c in Chapter.objects.filter(episode=episode).order_by('start') if c.is_public() or c.user == request.user]
 
@@ -48,6 +51,7 @@ def episode(request, id):
         'history': history,
         'chapters': chapters,
         'subscription_meta': subscription_meta,
+        'is_favorite': is_fav,
     }, context_instance=RequestContext(request))
 
 
@@ -79,3 +83,22 @@ def remove_chapter(request, id, chapter_id):
 
     return HttpResponseRedirect('/episode/%s' % id)
 
+
+@login_required
+def toggle_favorite(request, id):
+    episode = get_object_or_404(Episode, id=id)
+    fav, c = EpisodeFavorite.objects.get_or_create(user=request.user, episode=episode)
+    if not c:
+        fav.delete()
+
+    return HttpResponseRedirect('/episode/%s' % id)
+
+
+@login_required
+def list_favorites(request):
+    episodes = [x.episode for x in EpisodeFavorite.objects.filter(user=request.user).order_by('-created')]
+
+    return render_to_response('favorites.html', {
+        'episodes': episodes
+        }, context_instance=RequestContext(request))
+
-- 
2.11.4.GIT