Merge branch 'dev' into nightly

This commit is contained in:
clinton-hall 2016-06-08 22:23:35 +09:30
commit e6900ee16b

View file

@ -21,7 +21,10 @@ def autoFork(section, inputCategory):
apikey = cfg.get("apikey") apikey = cfg.get("apikey")
ssl = int(cfg.get("ssl", 0)) ssl = int(cfg.get("ssl", 0))
web_root = cfg.get("web_root", "") web_root = cfg.get("web_root", "")
fork = core.FORKS.items()[core.FORKS.keys().index(cfg.get("fork", "auto"))] try:
fork = core.FORKS.items()[core.FORKS.keys().index(cfg.get("fork", "auto"))]
except:
fork = "auto"
protocol = "https://" if ssl else "http://" protocol = "https://" if ssl else "http://"
detected = False detected = False
@ -68,7 +71,7 @@ def autoFork(section, inputCategory):
r = [] r = []
if r and r.ok: if r and r.ok:
for param in params: for param in params:
if not 'name={param!r}'.format(param=param) in r.text: if not 'name="{param}"'.format(param=param) in r.text:
rem_params.append(param) rem_params.append(param)
for param in rem_params: for param in rem_params:
params.pop(param) params.pop(param)