Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #3056 (Instapaper plugin should not require a password)

Browse Source
This commit is contained in:
Kovid Goyal 2009-08-06 10:11:34 -06:00
parent 33604318cb
commit 895cd6ef58
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/ebooks/conversion/cli.py
View File

@ -39,6 +39,10 @@ options. the available options depend on the input and output file types. \
To get help on them specify the input and output file and then use the -h \ To get help on them specify the input and output file and then use the -h \
option. option.
You can also get detailed help on all the options any input/output pair \
of formats supports by specifying the -h flag after the input and output \
filenames.
For full documentation of the conversion system see For full documentation of the conversion system see
''') + 'http://calibre.kovidgoyal.net/user_manual/conversion.html' ''') + 'http://calibre.kovidgoyal.net/user_manual/conversion.html'

19
src/calibre/web/feeds/recipes/recipe_instapaper.py
View File

@ -12,25 +12,28 @@ from calibre.web.feeds.news import BasicNewsRecipe
class Instapaper(BasicNewsRecipe): class Instapaper(BasicNewsRecipe):
title = 'Instapaper.com' title = 'Instapaper.com'
__author__ = 'Darko Miletic' __author__ = 'Darko Miletic'
description = 'Personalized news feeds. Go to instapaper.com to setup up your news.' description = '''Personalized news feeds. Go to instapaper.com to
setup up your news. Fill in your instapaper
username, and leave the password field
below blank.'''
publisher = 'Instapaper.com' publisher = 'Instapaper.com'
category = 'news, custom' category = 'news, custom'
oldest_article = 7 oldest_article = 7
max_articles_per_feed = 100 max_articles_per_feed = 100
no_stylesheets = True no_stylesheets = True
use_embedded_content = False use_embedded_content = False
remove_javascript = True remove_javascript = True
needs_subscription = True needs_subscription = True
INDEX = u'http://www.instapaper.com' INDEX = u'http://www.instapaper.com'
LOGIN = INDEX + u'/user/login' LOGIN = INDEX + u'/user/login'
html2lrf_options = [ html2lrf_options = [
'--comment', description '--comment', description
, '--category', category , '--category', category
, '--publisher', publisher , '--publisher', publisher
] ]
html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0em; margin-top: 0em; margin-bottom: 0.5em} img {margin-top: 0em; margin-bottom: 0.4em}"' html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0em; margin-top: 0em; margin-bottom: 0.5em} img {margin-top: 0em; margin-bottom: 0.4em}"'
feeds = [ feeds = [
(u'Unread articles' , INDEX + u'/u' ) (u'Unread articles' , INDEX + u'/u' )
@ -47,7 +50,7 @@ class Instapaper(BasicNewsRecipe):
br['password'] = self.password br['password'] = self.password
br.submit() br.submit()
return br return br
def parse_index(self): def parse_index(self):
totalfeeds = [] totalfeeds = []
lfeeds = self.get_feeds() lfeeds = self.get_feeds()
@ -71,4 +74,4 @@ class Instapaper(BasicNewsRecipe):
}) })
totalfeeds.append((feedtitle, articles)) totalfeeds.append((feedtitle, articles))
return totalfeeds return totalfeeds