diff --git a/nzbtomedia/autoProcess/autoProcessComics.py b/nzbtomedia/autoProcess/autoProcessComics.py index 5fce575b..de942648 100644 --- a/nzbtomedia/autoProcess/autoProcessComics.py +++ b/nzbtomedia/autoProcess/autoProcessComics.py @@ -60,13 +60,13 @@ class autoProcessComics: Logger.debug("Opening URL: %s", url) try: - r = requests.get(url, auth=(username, password)) + r = requests.get(url, auth=(username, password), stream=True) except requests.ConnectionError: Logger.exception("Unable to open URL") return 1 # failure - if r.ok: - Logger.info("%s", r.text) + for line in r.iter_lines(): + if line: Logger.info("%s", line) time.sleep(60) #wait 1 minute for now... need to see just what gets logged and how long it takes to process return 0 # Success diff --git a/nzbtomedia/autoProcess/autoProcessGames.py b/nzbtomedia/autoProcess/autoProcessGames.py index e6b1f3b0..e48a1be5 100644 --- a/nzbtomedia/autoProcess/autoProcessGames.py +++ b/nzbtomedia/autoProcess/autoProcessGames.py @@ -57,13 +57,17 @@ class autoProcessGames: Logger.debug("Opening URL: %s", url) try: - r = requests.get(url) + r = requests.get(url, stream=True) except requests.ConnectionError: Logger.exception("Unable to open URL") return 1 # failure - result = json.load(r.text) - Logger.info("Gamez returned %s", result) + result = {} + for line in r.iter_lines(): + if line: + Logger.info("%s", line) + result.update(json.load(line)) + if result['success']: Logger.info("Status for %s has been set to %s in Gamez", gamezID, downloadStatus) return 0 # Success diff --git a/nzbtomedia/autoProcess/autoProcessMovie.py b/nzbtomedia/autoProcess/autoProcessMovie.py index c58f0aed..c9af482e 100644 --- a/nzbtomedia/autoProcess/autoProcessMovie.py +++ b/nzbtomedia/autoProcess/autoProcessMovie.py @@ -69,7 +69,7 @@ class autoProcessMovie: release2 = [] moviestatus2 = [] try: - result = json.load(r.text) + result = r.json() movieid2 = [item["_id"] for item in result["movies"]] for item in result["movies"]: if "identifier" in item: @@ -143,7 +143,7 @@ class autoProcessMovie: return None, None try: - result = json.load(r.text) + result = r.json() movie_status = str(result["media"]["status"]) Logger.debug("This movie is marked as status %s in CouchPotatoServer", movie_status) except: @@ -260,7 +260,7 @@ class autoProcessMovie: Logger.exception("Unable to open URL") return 1 # failure - result = json.load(r.text) + result = r.json() Logger.info("CouchPotatoServer returned %s", result) if result['success']: Logger.info("%s scan started on CouchPotatoServer for %s", method, nzbName) @@ -283,12 +283,13 @@ class autoProcessMovie: Logger.debug("Opening URL: %s", url) try: - r = requests.get(url) + r = requests.get(url, stream=True) except requests.ConnectionError: Logger.exception("Unable to open URL") return 1 # failure - Logger.info("%s", r.text) + for line in r.iter_lines(): + if line: Logger.info("%s", line) Logger.info("Movie %s set to try the next best release on CouchPotatoServer", movie_id) if delete_failed and not dirName in ['sys.argv[0]','/','']: Logger.info("Deleting failed files and folder %s", dirName) diff --git a/nzbtomedia/autoProcess/autoProcessTV.py b/nzbtomedia/autoProcess/autoProcessTV.py index 06fa8237..40cb3f98 100644 --- a/nzbtomedia/autoProcess/autoProcessTV.py +++ b/nzbtomedia/autoProcess/autoProcessTV.py @@ -177,12 +177,14 @@ class autoProcessTV: Logger.debug("Opening URL: %s", url) try: - r = requests.get(url, auth=(username, password)) + r = requests.get(url, auth=(username, password), stream=True) except requests.ConnectionError: Logger.exception("Unable to open URL") return 1 # failure - Logger.info("%s", r.text) + for line in r.iter_lines(): + if line: Logger.info("%s", line) + if status != 0 and delete_failed and not dirName in ['sys.argv[0]','/','']: delete(dirName) return 0 # Success