Merge from trunk

This commit is contained in:
Charles Haley 2012-09-18 19:38:26 +02:00
commit 8a4829d54b
6 changed files with 100 additions and 7 deletions

BIN
recipes/icons/nsfw_corp.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 977 B

94
recipes/nsfw_corp.recipe Normal file
View File

@ -0,0 +1,94 @@
__license__ = 'GPL v3'
__copyright__ = '2012, Darko Miletic <darko.miletic at gmail.com>'
'''
www.nsfwcorp.com
'''
import urllib
from calibre import strftime
from calibre.web.feeds.news import BasicNewsRecipe
class NotSafeForWork(BasicNewsRecipe):
title = 'Not Safe For Work Corporation'
__author__ = 'Darko Miletic'
description = 'Not Safe For Work Corporation'
publisher = 'Not Safe For Work Corporation'
category = 'news, politics, USA, World'
no_stylesheets = True
oldest_article = 15
encoding = 'utf-8'
needs_subscription = True
auto_cleanup = False
INDEX = 'https://www.nsfwcorp.com'
LOGIN = INDEX + '/login'
use_embedded_content = False
language = 'en'
publication_type = 'magazine'
masthead_url = 'http://assets.nsfwcorp.com/media/headers/nsfw_banner.jpg'
extra_css = """
body{font-family: Constantia,"Lucida Bright",Lucidabright,"Lucida Serif",Lucida,"DejaVu Serif","Bitstream Vera Serif","Liberation Serif",Georgia,serif}
img{margin-top:0.5em; margin-bottom: 0.7em; display: block}
.fontFace{font-family: 'LeagueGothicRegular',Arial,sans-serif;}
.dispatchTitle{text-transform: uppercase; font-size: x-large; font-weight: bold}
.dispatchSubtitle{font-size: x-large; font-weight: bold}
#fromLine{color: gray; text-align:right}
#toLine{color: gray}
#toLine a{color: red}
#fromLine a{color: red}
.row a{color: red}
"""
conversion_options = {
'comment' : description
, 'tags' : category
, 'publisher' : publisher
, 'language' : language
}
remove_tags_before = dict(attrs={'id':'fromToLine'})
remove_tags_after = dict(attrs={'id':'unlockButtonDiv'})
remove_tags=[
dict(name=['meta', 'link', 'iframe', 'embed', 'object'])
,dict(name='a', attrs={'class':'switchToDeskNotes'})
,dict(attrs={'id':'unlockButtonDiv'})
]
remove_attributes = ['lang']
def get_browser(self):
br = BasicNewsRecipe.get_browser()
br.open(self.LOGIN)
if self.username is not None and self.password is not None:
data = urllib.urlencode({ 'email':self.username
,'password':self.password
})
br.open(self.LOGIN, data)
return br
def parse_index(self):
articles = []
soup = self.index_to_soup(self.INDEX)
dispatches = soup.find(attrs={'id':'dispatches'})
if dispatches:
for item in dispatches.findAll('h3'):
description = u''
title_link = item.find('span', attrs={'class':'dispatchTitle'})
description_link = item.find('span', attrs={'class':'dispatchSubtitle'})
feed_link = item.find('a', href=True)
if feed_link:
url = self.INDEX + feed_link['href']
title = self.tag_to_string(title_link)
description = self.tag_to_string(description_link)
date = strftime(self.timefmt)
articles.append({
'title' :title
,'date' :date
,'url' :url
,'description':description
})
return [('Dispatches', articles)]
def preprocess_html(self, soup):
for item in soup.findAll(style=True):
del item['style']
return soup

View File

@ -1,3 +1,5 @@
from calibre.web.feeds.news import BasicNewsRecipe
class AdvancedUserRecipe1347706704(BasicNewsRecipe): class AdvancedUserRecipe1347706704(BasicNewsRecipe):
title = u'Stamgasten' title = u'Stamgasten'
__author__ = u'DrMerry' __author__ = u'DrMerry'

View File

@ -1673,10 +1673,7 @@ class DeviceMixin(object): # {{{
if update_metadata: if update_metadata:
mi = db.get_metadata(id_, index_is_id=True, mi = db.get_metadata(id_, index_is_id=True,
get_cover=get_covers) get_cover=get_covers)
book.smart_update(db.get_metadata(id_, book.smart_update(mi, replace_metadata=True)
index_is_id=True,
get_cover=get_covers),
replace_metadata=True)
book.in_library = 'UUID' book.in_library = 'UUID'
# ensure that the correct application_id is set # ensure that the correct application_id is set
book.application_id = id_ book.application_id = id_

View File

@ -989,8 +989,8 @@ class CatalogBuilder(object):
file_fmts.add(fmt) file_fmts.add(fmt)
bookmark_extension = None bookmark_extension = None
if file_fmts.intersection(han_formats): if file_fmts.intersection(tan_formats):
book_extension = list(file_fmts.intersection(han_formats))[0] book_extension = list(file_fmts.intersection(tan_formats))[0]
bookmark_extension = 'han' bookmark_extension = 'han'
elif file_fmts.intersection(mbp_formats): elif file_fmts.intersection(mbp_formats):
book_extension = list(file_fmts.intersection(mbp_formats))[0] book_extension = list(file_fmts.intersection(mbp_formats))[0]

View File

@ -1262,7 +1262,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
ans = {} ans = {}
if path is not None: if path is not None:
stat = os.stat(path) stat = os.stat(path)
ans['path'] = path; ans['path'] = path
ans['size'] = stat.st_size ans['size'] = stat.st_size
ans['mtime'] = utcfromtimestamp(stat.st_mtime) ans['mtime'] = utcfromtimestamp(stat.st_mtime)
self.format_metadata_cache[id_][fmt] = ans self.format_metadata_cache[id_][fmt] = ans