Grigoriy Petukhov avatar Grigoriy Petukhov committed d9df423

Update feedzilla to work with django 1.4. Remove cache decorators from feedzilla views

Comments (0)

Files changed (4)

feedzilla/syndication.py

 # Copyright: 2011, Grigoriy Petukhov
 # Author: Grigoriy Petukhov (http://lorien.name)
 # License: BSD
-import os
-from datetime import datetime
+from django.contrib.syndication.views import Feed
 
-from django.contrib.syndication.feeds import FeedDoesNotExist
-from django.contrib.syndication.feeds import Feed
-from django.utils.feedgenerator import Atom1Feed
 from django.conf import settings
 
 from feedzilla.models import Post
 
 
 class PostFeed(Feed):
-    feed_type = Atom1Feed
+    title = settings.FEEDZILLA_SITE_TITLE
+    description = settings.FEEDZILLA_SITE_DESCRIPTION
     link = '/'
-    title = settings.FEEDZILLA_SITE_TITLE
-    subtitle = settings.FEEDZILLA_SITE_DESCRIPTION
-
-    #def item_link(self, obj):
-        #return obj.get_imdb_link()
-
-    def item_guid(self, obj):
-        return str(obj.guid)
 
     def items(self, obj):
         return Post.active_objects.all()\
                    .order_by('-created')[:settings.FEEDZILLA_PAGE_SIZE]
 
-    def item_pubdate(self, obj):
-        return obj.created
+    #def item_title(self, item):
+        #return item.name
+
+    #def item_description(self, item):
+        #return item.description
+
+    def item_pubdate(self, item):
+        return item.created
+
+    def item_guid(self, item):
+        return str(item.guid)

feedzilla/urls.py

 
 from feedzilla.syndication import PostFeed
 
-feed_dict = {
-    'posts': PostFeed,
-}
-
 urlpatterns = patterns('feedzilla.views',
     url(r'^$', 'index', name='feedzilla_index'),
     url('^tag/(?P<tag_value>.+)$', 'tag', name='feedzilla_tag'),
 )
 
 urlpatterns += patterns('django.contrib.syndication.views',
-    url(r'^feeds/(?P<url>.*)$', 'feed', {'feed_dict': feed_dict}, name='feedzilla_feed'),
+    url(r'^ru/projects/feed$', PostFeed(), name='feedzilla_feed'),
 )

feedzilla/views.py

 from django.db.models import Count
 from django.db import connection
 from django.utils.translation import ugettext_lazy as _
-from django.views.decorators.cache import cache_page
 from django.core.mail import mail_admins
 
 from common.decorators import render_to
 from feedzilla.forms import AddBlogForm
 
 
-@cache_page(60 * 5)
 @render_to('feedzilla/index.html')
 def index(request):
     qs = Post.active_objects.all().select_related('feed')
             }
 
 
-@cache_page(60 * 15)
 @render_to('feedzilla/tag.html')
 def tag(request, tag_value):
     tag = get_object_or_404(Tag, name=tag_value)
             }
 
 
-@cache_page(60 * 15)
 @render_to('feedzilla/source_list.html')
 def source_list(request):
 
 
 setup(
     name = 'feedzilla',
-    version = '0.1.20',
+    version = '0.1.21',
     description = 'Django application for atom/rss feeds aggregation i.e. planet engine',
     url = 'http://bitbucket.org/lorien/feedzilla',
     author = 'Grigoriy Petukhov',
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.