Backup_Repos/FanFicFare
1
0
Fork 0
mirror of https://github.com/JimmXinu/FanFicFare.git synced 2026-01-04 23:23:47 +01:00
Code Issues Projects Releases Wiki Activity

Improve CLI config file specification, CLI only. Issue 19.

Browse source
This commit is contained in:
Jim Miller 2011-09-19 17:04:20 -05:00
parent 8e02856b55
commit f9466ef491
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
downloader.py
View file

@ -20,6 +20,7 @@ import logging
logging.basicConfig(level=logging.DEBUG,format="%(levelname)s:%(filename)s(%(lineno)d):%(message)s")
import sys, os
from os.path import normpath, expanduser, isfile, join
from StringIO import StringIO
from optparse import OptionParser
import getpass
@ -40,12 +41,15 @@ def writeStory(config,adapter,writeformat,metaonly=False,outstream=None):
del writer
def main():
# read in args, anything starting with -- will be treated as --<varible>=<value>
usage = "usage: %prog [options] storyurl"
parser = OptionParser(usage)
parser.add_option("-f", "--format", dest="format", default="epub",
help="write story as FORMAT, epub(default), text or html", metavar="FORMAT")
parser.add_option("-c", "--config",
action="append", dest="configfile", default=None,
help="read config from specified file(s) in addition to ~/.fanficdownloader/defaults.ini, ~/.fanficdownloader/personal.ini, ./defaults.ini, ./personal.ini", metavar="CONFIG")
parser.add_option("-b", "--begin", dest="begin", default=None,
help="Begin with Chapter START", metavar="START")
parser.add_option("-e", "--end", dest="end", default=None,
@ -72,11 +76,22 @@ def main():
parser.error("-u/--update-epub only works with epub")
config = ConfigParser.SafeConfigParser()
#logging.debug('reading defaults.ini config file, if present')
config.read('defaults.ini')
#logging.debug('reading personal.ini config file, if present')
config.read('personal.ini')
conflist = []
homepath = join(expanduser("~"),".fanficdownloader")
if isfile(join(homepath,"defaults.ini")):
conflist.append(join(homepath,"defaults.ini"))
if isfile(join(homepath,"personal.ini")):
conflist.append(join(homepath,"personal.ini"))
if isfile("defaults.ini"):
conflist.append("defaults.ini")
if isfile("personal.ini"):
conflist.append("personal.ini")
if options.configfile:
conflist.extend(options.configfile)
logging.debug('reading %s config file(s), if present'%conflist)
config.read(conflist)
try:
config.add_section("overrides")