From e8d1e03f737ccbb765276c608f474fe0670a9ea6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 19 Jan 2010 08:31:41 -0700
Subject: [PATCH] Fix #4607 (Updated recipe for The Amercian Spectator)

---
 resources/recipes/amspec.recipe | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/resources/recipes/amspec.recipe b/resources/recipes/amspec.recipe
index 62bec5ae18..e5a76a4f86 100644
--- a/resources/recipes/amspec.recipe
+++ b/resources/recipes/amspec.recipe
@@ -1,7 +1,5 @@
-#!/usr/bin/env  python
-
 __license__   = 'GPL v3'
-__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2009-2010, Darko Miletic <darko.miletic at gmail.com>'
 '''
 spectator.org
 '''
@@ -11,20 +9,22 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class TheAmericanSpectator(BasicNewsRecipe):
     title                 = 'The American Spectator'
     __author__            = 'Darko Miletic'
-    language = 'en'
-
     description           = 'News from USA'
+    category              = 'news, politics, USA, world'
+    publisher             = 'The American Spectator'
     oldest_article        = 7
     max_articles_per_feed = 100
     no_stylesheets        = True
     use_embedded_content  = False
+    language              = 'en'
     INDEX                 = 'http://spectator.org'
       
-    html2lrf_options = [
-                             '--comment'       , description
-                           , '--category'      , 'news, politics, USA'
-                           , '--publisher'     , title
-                         ]
+    conversion_options = {  
+                             'comments'        : description
+                            ,'tags'            : category
+                            ,'language'        : language
+                            ,'publisher'       : publisher
+                         }
 
     keep_only_tags   = [
                              dict(name='div', attrs={'class':'post inner'})
@@ -33,13 +33,11 @@ class TheAmericanSpectator(BasicNewsRecipe):
 
     remove_tags     = [
                              dict(name='object')
-                            ,dict(name='div', attrs={'class':'col3'         })
-                            ,dict(name='div', attrs={'class':'post-options' })
-                            ,dict(name='p'  , attrs={'class':'letter-editor'})
-                            ,dict(name='div', attrs={'class':'social'       })
+                            ,dict(name='div', attrs={'class':['col3','post-options','social']})
+                            ,dict(name='p'  , attrs={'class':['letter-editor','meta']})
                         ]
                          
-    feeds = [ (u'Articles', u'http://feedproxy.google.com/amspecarticles')]
+    feeds = [ (u'Articles', u'http://feeds.feedburner.com/amspecarticles')]
 
     def get_cover_url(self):
         cover_url = None
@@ -53,3 +51,7 @@ class TheAmericanSpectator(BasicNewsRecipe):
           
     def print_version(self, url):
         return url + '/print'
+        
+    def get_article_url(self, article):
+        return article.get('guid', None)
+