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

Sync to trunk.

Browse Source
This commit is contained in:
John Schember 2009-10-21 21:12:28 -04:00
commit 79eccec4df
7 changed files with 86 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/recipes/dn_se.recipe
View File

@ -10,7 +10,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
class DN_se(BasicNewsRecipe):
title = 'Dagens Nyheter'
__author__ = 'Darko Miletic'
description = 'News from Sveden'
description = 'News from Sweden'
publisher = 'Dagens Nyheter'
category = 'news, politics, Sveden'
oldest_article = 2

19
resources/recipes/o_globo.recipe
View File

@ -10,7 +10,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
class OGlobo(BasicNewsRecipe):
title = 'O Globo'
__author__ = 'Darko Miletic'
__author__ = 'Darko Miletic and Sujata Raman'
description = 'News from Brasil'
publisher = 'O Globo'
category = 'news, politics, Brasil'
@ -30,15 +30,26 @@ class OGlobo(BasicNewsRecipe):
html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"'
keep_only_tags = [dict(name='div', attrs={'id':'ltintb'})]
extra_css = '''
cite{color:#007BB5; font-size:xx-small; font-style:italic;}
body{font-family:Arial,Helvetica,sans-serif;font-size:x-small;}
h3{font-size:large; color:#082963; font-weight:bold;}
#ident{color:#0179B4; font-size:xx-small;}
p{color:#000000;font-weight:normal;}
.commentario p{color:#007BB5; font-style:italic;}
'''
keep_only_tags = [dict(name='div', attrs={'id':'ltintb'}),
dict(name='a', attrs={'class':['img imgLoader','img ftr imgLoader']}),]
remove_tags = [
dict(name='script')
,dict(name='object')
,dict(name='form')
,dict(name='div', attrs={'id':['linksPatGoogle','rdpm','cor','com','env','rcm_st']})
,dict(name='div', attrs={'id':['linksPatGoogle','rdpm','cor','com','env','rcm_st','coment',]})
,dict(name='div', attrs={'class':'box-zap-anu2'})
,dict(name='a')
,dict(name='a', attrs={'class':'assine'})
,dict(name='link')
]

2
resources/recipes/svd_se.recipe
View File

@ -10,7 +10,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
class SVD_se(BasicNewsRecipe):
title = 'Svenska Dagbladet'
__author__ = 'Darko Miletic'
description = 'News from Sveden'
description = 'News from Sweden'
publisher = 'Svenska Dagbladet'
category = 'news, politics, Sveden'
oldest_article = 2

6
setup/installer/linux/freeze.py
View File

@ -24,7 +24,8 @@ class LinuxFreeze(Command):
is64bit = platform.architecture()[0] == '64bit'
arch = 'x86_64' if is64bit else 'i686'
ffi = '/usr/lib/libffi.so.5' if is64bit else '/usr/lib/gcc/i686-pc-linux-gnu/4.4.1/libffi.so.4'
stdcpp = '/usr/lib/gcc/%s-pc-linux-gnu/%s/libstdc++.so.6'%(arch, '4.4.2'
if is64bit else '4.4.1')
QTDIR = '/usr/lib/qt4'
QTDLLS = ('QtCore', 'QtGui', 'QtNetwork', 'QtSvg', 'QtXml',
@ -57,8 +58,7 @@ class LinuxFreeze(Command):
'/usr/lib/libjpeg.so.7',
'/usr/lib/libxslt.so.1',
'/usr/lib/libgthread-2.0.so.0',
'/usr/lib/gcc/***-pc-linux-gnu/4.4.1/libstdc++.so.6'.replace('***',
arch),
stdcpp,
ffi,
'/usr/lib/libpng12.so.0',
'/usr/lib/libexslt.so.0',

18
src/calibre/linux.py
View File

@ -6,7 +6,7 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
import sys, os, shutil, cPickle, textwrap, stat
from subprocess import check_call
from calibre import __version__, __appname__, prints
from calibre import __appname__, prints
entry_points = {
@ -491,36 +491,36 @@ complete -o filenames -F _'''%(opts,exts) + name + ' ' + name +"\n\n"
VIEWER = '''\
[Desktop Entry]
Version=%s
Version=1.0
Type=Application
Name=LRF Viewer
GenericName=Viewer for LRF files
Comment=Viewer for LRF files (SONY ebook format files)
TryExec=lrfviewer
Exec=lrfviewer %%F
Exec=lrfviewer %F
Icon=calibre-viewer
MimeType=application/x-sony-bbeb;
Categories=Graphics;Viewer;
'''%(__version__,)
'''
EVIEWER = '''\
[Desktop Entry]
Version=%s
Version=1.0
Type=Application
Name=E-book Viewer
GenericName=Viewer for E-books
Comment=Viewer for E-books
TryExec=ebook-viewer
Exec=ebook-viewer %%F
Exec=ebook-viewer %F
Icon=calibre-viewer
MimeType=application/epub+zip;
Categories=Graphics;Viewer;
'''%(__version__,)
'''
GUI = '''\
[Desktop Entry]
Version=%s
Version=1.0
Type=Application
Name=calibre
GenericName=E-book library management
@ -529,7 +529,7 @@ TryExec=calibre
Exec=calibre
Icon=calibre-gui
Categories=Office;
'''%(__version__,)
'''
MIME = '''\
<?xml version="1.0"?>

8
src/calibre/translations/calibre.pot
View File

@ -4,9 +4,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: calibre 0.6.18\n"
"POT-Creation-Date: 2009-10-20 17:23+MDT\n"
"PO-Revision-Date: 2009-10-20 17:23+MDT\n"
"Project-Id-Version: calibre 0.6.19\n"
"POT-Creation-Date: 2009-10-20 18:49+MDT\n"
"PO-Revision-Date: 2009-10-20 18:49+MDT\n"
"Last-Translator: Automatically generated\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
@ -5243,7 +5243,7 @@ msgstr ""
msgid "No matches found for this book"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:60
#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:71
msgid "Search"
msgstr ""

8
src/calibre/utils/Zeroconf.py
View File

@ -259,7 +259,7 @@ class DNSQuestion(DNSEntry):
def __init__(self, name, type, clazz):
if not name.endswith('.local.'):
raise NonLocalNameException
raise NonLocalNameException('DNSQuestion: Not a local name '+name)
DNSEntry.__init__(self, name, type, clazz)
def answeredBy(self, rec):
@ -856,11 +856,17 @@ class Engine(threading.Thread):
self.condition.wait(self.timeout)
self.condition.release()
else:
from calibre.constants import DEBUG
try:
rr, wr, er = select.select(rs, [], [], self.timeout)
for socket in rr:
try:
self.readers[socket].handle_read()
except NonLocalNameException, err:
print err
except UnicodeDecodeError:
if DEBUG:
traceback.print_exc()
except:
traceback.print_exc()
except: