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

...

Browse Source
This commit is contained in:
Kovid Goyal 2012-02-14 19:58:50 +05:30
parent dd0dc01b7e
commit 20e46a53c6
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
setup/upload.py
View File

@ -5,7 +5,7 @@ __license__ = 'GPL v3'
__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en'
import os, re, subprocess, hashlib, shutil, glob, stat, sys, time
import os, subprocess, hashlib, shutil, glob, stat, sys, time
from subprocess import check_call
from tempfile import NamedTemporaryFile, mkdtemp
from zipfile import ZipFile
@ -64,15 +64,11 @@ class ReUpload(Command): # {{{
# Data {{{
def get_google_data():
PASSWORD_FILE = os.path.expanduser('~/.googlecodecalibre')
OFFLINEIMAP = os.path.expanduser('~/work/kde/conf/offlineimap/rc')
with open(os.path.expanduser('~/.googlecodecalibre'), 'rb') as f:
gc_password, ga_un, pw = f.read().strip().split('|')
gc_password = open(PASSWORD_FILE).read().strip()
raw = open(OFFLINEIMAP).read()
pw = re.search(r'(?s)remoteuser = .*@gmail.com.*?remotepass = (\S+)',
raw).group(1).strip()
return {
'username':'kovidgoyal@gmail.com', 'password':pw, 'gc_password':gc_password,
'username':ga_un, 'password':pw, 'gc_password':gc_password,
'path_map_server':'root@kovidgoyal.net',
'path_map_location':'/var/www/status.calibre-ebook.com/googlepaths',
# If you change this remember to change it in the

7
src/calibre/ebooks/pdf/pdftohtml.py
View File

@ -69,11 +69,12 @@ def pdftohtml(output_dir, pdf_path, no_images):
raise
logf.flush()
logf.close()
out = open(logf.name, 'rb').read()
out = open(logf.name, 'rb').read().strip()
if ret != 0:
raise ConversionError(out)
print "pdftohtml log:"
print out
if out:
print "pdftohtml log:"
print out
if not os.path.exists(index) or os.stat(index).st_size < 100:
raise DRMError()