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

Fix regression that affected using the --url option with the default profile in web2lrf.

Browse Source
This commit is contained in:
Kovid Goyal 2007-11-14 22:09:27 +00:00
parent 64b149f024
commit c9e629b729
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libprs500/ebooks/lrf/web/convert_from.py
View File

@ -104,13 +104,17 @@ def process_profile(args, options, logger=None):
builtin_profiles.append(classes[0][1]) builtin_profiles.append(classes[0][1])
available_profiles.append(name) available_profiles.append(name)
if len(args) < 2: if len(args) < 2:
args.append('') args.append(name)
args[1] = name args[1] = name
if len(args) == 2: if len(args) == 2:
try: try:
index = -1
if args[1] != 'default':
index = available_profiles.index(args[1]) index = available_profiles.index(args[1])
except ValueError: except ValueError:
raise CommandLineError('Unknown profile: %s\nValid profiles: %s'%(args[1], available_profiles)) raise CommandLineError('Unknown profile: %s\nValid profiles: %s'%(args[1], available_profiles))
else:
raise CommandLineError('Only one profile at a time is allowed.')
profile = DefaultProfile if index == -1 else builtin_profiles[index] profile = DefaultProfile if index == -1 else builtin_profiles[index]
profile = profile(logger, options.verbose, options.username, options.password) profile = profile(logger, options.verbose, options.username, options.password)
if profile.browser is not None: if profile.browser is not None:
@ -159,7 +163,7 @@ def process_profile(args, options, logger=None):
def main(args=sys.argv, logger=None): def main(args=sys.argv, logger=None):
parser = option_parser() parser = option_parser()
options, args = parser.parse_args(args) options, args = parser.parse_args(args)
if len(args) > 2: if len(args) > 2 or (len(args) == 1 and not options.user_profile):
parser.print_help() parser.print_help()
return 1 return 1
try: try:

3
src/libprs500/ebooks/lrf/web/profiles/__init__.py
View File

@ -85,7 +85,10 @@ class DefaultProfile(object):
self.verbose = verbose self.verbose = verbose
self.temp_dir = tempfile.mkdtemp(prefix=__appname__+'_') self.temp_dir = tempfile.mkdtemp(prefix=__appname__+'_')
self.browser = self.get_browser() self.browser = self.get_browser()
try:
self.url = 'file:'+ ('' if iswindows else '//') + self.build_index() self.url = 'file:'+ ('' if iswindows else '//') + self.build_index()
except NotImplementedError:
self.url = None
def __del__(self): def __del__(self):
import os, shutil import os, shutil