From 787ead16a2158af8d1dcee10151823ff2bc865eb Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 7 Mar 2011 09:16:18 -0700
Subject: [PATCH] Updated Kompiuterra

---
 resources/recipes/kompiutierra.recipe | 73 ++++++++++++++-------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/resources/recipes/kompiutierra.recipe b/resources/recipes/kompiutierra.recipe
index 0d30afa3a7..528285b26c 100644
--- a/resources/recipes/kompiutierra.recipe
+++ b/resources/recipes/kompiutierra.recipe
@@ -1,36 +1,37 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-__license__   = 'GPL v3'
-__copyright__ = '2010, Vadim Dyadkin, dyadkin@gmail.com'
-__author__ = 'Vadim Dyadkin'
-
-from calibre.web.feeds.news import BasicNewsRecipe
-
-class Computerra(BasicNewsRecipe):
-    title = u'\u041a\u043e\u043c\u043f\u044c\u044e\u0442\u0435\u0440\u0440\u0430'
-    recursion = 50
-    oldest_article = 100
-    __author__  = 'Vadim Dyadkin'
-    max_articles_per_feed = 100
-    use_embedded_content  = False
-    simultaneous_downloads = 5
-    language = 'ru'
-    description = u'\u041a\u043e\u043c\u043f\u044c\u044e\u0442\u0435\u0440\u044b, \u043e\u043a\u043e\u043b\u043e\u043d\u0430\u0443\u0447\u043d\u044b\u0435 \u0438 \u043e\u043a\u043e\u043b\u043e\u0444\u0438\u043b\u043e\u0441\u043e\u0444\u0441\u043a\u0438\u0435 \u0441\u0442\u0430\u0442\u044c\u0438, \u0433\u0430\u0434\u0436\u0435\u0442\u044b.'
-
-    keep_only_tags = [dict(name='div', attrs={'id': 'content'}),]
-
-
-    feeds = [(u'\u041a\u043e\u043c\u043f\u044c\u044e\u0442\u0435\u0440\u0440\u0430', 'http://feeds.feedburner.com/ct_news/'),]
-
-    remove_tags = [dict(name='div', attrs={'id': ['fin', 'idc-container', 'idc-noscript',]}),
-                   dict(name='ul', attrs={'class': "related_post"}),
-                   dict(name='p', attrs={'class': 'info'}),
-                   dict(name='a', attrs={'rel': 'tag', 'class': 'twitter-share-button', 'type': 'button_count'}),
-                   dict(name='h2', attrs={}),]
-
-    extra_css = 'body { text-align: justify; }'
-
-    def get_article_url(self, article):
-        return article.get('feedburner:origLink', article.get('guid'))
-
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+__license__   = 'GPL v3'
+__copyright__ = '2010, Vadim Dyadkin, dyadkin@gmail.com'
+__author__ = 'Vadim Dyadkin'
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Computerra(BasicNewsRecipe):
+    title = u'\u041a\u043e\u043c\u043f\u044c\u044e\u0442\u0435\u0440\u0440\u0430'
+    oldest_article = 100
+    __author__  = 'Vadim Dyadkin (edited by A. Chewi)'
+    max_articles_per_feed = 50
+    use_embedded_content  = False
+    remove_javascript = True
+    no_stylesheets = True
+    conversion_options = {'linearize_tables' : True}
+    simultaneous_downloads = 5
+    language = 'ru'
+    description = u'Компьютерра: все новости про компьютеры, железо, новые технологии, информационные технологии'
+
+    keep_only_tags = [dict(name='div', attrs={'id': 'content'}),]
+
+    feeds = [(u'Компьютерра-Онлайн', 'http://feeds.feedburner.com/ct_news/'),]
+
+    remove_tags = [
+    dict(name='div', attrs={'id': ['fin', 'idc-container', 'idc-noscript',]}),
+    dict(name='ul', attrs={'class': "related_post"}),
+    dict(name='p', attrs={'class': 'info'}),
+    dict(name='a', attrs={'class': 'twitter-share-button'}),
+    dict(name='a', attrs={'type': 'button_count'}),
+    dict(name='h2', attrs={})
+    ]
+
+    def print_version(self, url):
+        return url + '?print=true'