Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2013-05-26 11:20:58 +02:00
commit 162c62b906
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
recipes/taggeschau_de.recipe
View File

@ -3,13 +3,15 @@ from calibre.web.feeds.news import BasicNewsRecipe
## 1: Base Version
## 2: Added rules for wdr.de, ndr.de, br-online.de
## 3: Added rules for rbb-online.de, boerse.ard.de, sportschau.de
## 4: New design of tagesschau.de implemented. Simplyfied.
## 5: Taken out the pictures.
class Tagesschau(BasicNewsRecipe):
title = 'Tagesschau'
description = 'Nachrichten der ARD'
publisher = 'ARD'
language = 'de'
version = 3
version = 5
__author__ = 'Florian Andreas Pfaff, a.peter'
oldest_article = 7
@ -20,21 +22,20 @@ class Tagesschau(BasicNewsRecipe):
feeds = [('Tagesschau', 'http://www.tagesschau.de/xml/rss2')]
remove_tags = [
dict(name='div', attrs={'class':['linksZumThema schmal','teaserBox','boxMoreLinks','directLinks','teaserBox boxtext','fPlayer','zitatBox breit flashaudio','infobox ','footer clearfix','inner recommendations','teaser teaser-08 nachrichten smallstandard','infobox-rechts','infobox-links','csl2','teaserBox metaBlock','articleA archiveDisclaimer']}),
dict(name='div', attrs={'id':['pageFunctions']}), ## wdr.de
dict(name='div', attrs={'class':['chart','footerService','toplink','assetsLeft','assetsFullsize']}), ## boerse.ard.de
dict(name='div', attrs={'class':['ardMehrZumThemaLinks','socialBookmarks','ardContentEnd','ardDisclaimer']}), ## sportschau.de
dict(name='div', attrs={'id':['socialBookmarks','seitenanfang','comment']}),
dict(name='ul', attrs={'class':['directLinks','directLinks weltatlas','iconList','right']}),
dict(name='strong', attrs={'class':['boxTitle inv','inv']}),
dict(name='div', attrs={'class':['moreInfo right','moreInfo']}),
dict(name='span', attrs={'class':['videoLink']}),
dict(name='img', attrs={'class':['zoom float_right']}),
dict(name='a', attrs={'id':['zoom']})
dict(name='div', attrs={'class':['inline']}),
dict(name='div', attrs={'class':re.compile(r'.*linklist.*')}),
dict(name='div', attrs={'class':re.compile(r'.*media(Left|Right|Top|Bottom|Info).*')}),
dict(name='div', attrs={'class':re.compile(r'.*mod(Socialbar|ConComments).*')}),
dict(name='div', attrs={'class':re.compile(r'.*infokasten.*')}),
dict(name='div', attrs={'class':re.compile(r'.*articlePictureA.*')}),
dict(name='div', attrs={'id': re.compile(r'.*zoomTeaser.*')}),
dict(name='h2', attrs={'class':re.compile(r'.*conHeadline.*')}),
dict(name='ul', attrs={'class':['iconList']})
]
keep_only_tags = [dict(name='div', attrs={'id':'centerCol'}),
dict(name='div', attrs={'id':['mainColumn','ardContent']}),
dict(name='div', attrs={'class':['narrow clearfix','beitrag','detail_inlay','containerArticle noBorder','span-8']})]
keep_only_tags = [
dict(name='div', attrs={'class':['section sectionZ sectionArticle']}),
dict(name='div', attrs={'class':re.compile(r'.*containerArticle.*')})
]
def get_masthead_url(self):
return 'http://intern.tagesschau.de/html/img/image.jpg'

6
setup/installer/windows/notes.rst
View File

@ -196,11 +196,13 @@ following patch to have Qt load the openssl libraries bundled with calibre:
searchOrder << qSystemDirectory();
Now, run configure and make::
Now, run configure and make:
-no-plugin-manifests is needed so that loading the plugins does not fail looking for the CRT assembly
./configure.exe -ltcg -opensource -release -qt-zlib -qt-libmng -qt-libpng -qt-libtiff -qt-libjpeg -release -platform win32-msvc2008 -no-qt3support -webkit -xmlpatterns -no-phonon -no-style-plastique -no-style-cleanlooks -no-style-motif -no-style-cde -no-declarative -no-scripttools -no-audio-backend -no-multimedia -no-dbus -no-openvg -no-opengl -no-qt3support -confirm-license -nomake examples -nomake demos -nomake docs -nomake tools -no-plugin-manifests -openssl -I $OPENSSL_DIR/include -L $OPENSSL_DIR/lib && nmake
-no-accessibility is added because accessibility may be causing crashes on win 8 64 bit
./configure.exe -ltcg -opensource -release -qt-zlib -qt-libmng -qt-libpng -qt-libtiff -qt-libjpeg -release -platform win32-msvc2008 -no-qt3support -webkit -xmlpatterns -no-phonon -no-style-plastique -no-style-cleanlooks -no-style-motif -no-style-cde -no-accessibility -no-declarative -no-scripttools -no-audio-backend -no-multimedia -no-dbus -no-openvg -no-opengl -no-qt3support -confirm-license -nomake examples -nomake demos -nomake docs -nomake tools -no-plugin-manifests -openssl -I $OPENSSL_DIR/include -L $OPENSSL_DIR/lib && nmake
Add the path to the bin folder inside the Qt dir to your system PATH.