Merge branch 'clinton-hall/dev'

Conflicts:
	autoProcess/autoProcessMovie.py
	autoProcess/autoProcessMusic.py
	autoProcess/autoProcessTV.py
	autoProcess/migratecfg.py
	autoProcess/nzbToMediaUtil.py
This commit is contained in:
echel0n 2014-04-01 21:48:57 -07:00
commit 6cffd5364d
13 changed files with 96 additions and 44 deletions

View file

@ -45,7 +45,7 @@ def process(dirName, nzbName=None, status=0, inputCategory=None):
else:
protocol = "http://"
nzbName, dirName = converto_to_ascii(nzbName, dirName)
nzbName, dirName = convert_to_ascii(nzbName, dirName)
baseURL = protocol + host + ":" + port + web_root + "/api?api_key=" + apikey + "&mode="