mikf/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move some exception handling code

Browse Source
This commit is contained in:
Mike Fährmann 2017-02-25 23:53:31 +01:00
parent 6208d9dd79
commit 24f41e13b3
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gallery_dl/__init__.py
View File

@ -182,16 +182,7 @@ def main():
except exception.NoExtractorError:
print("No suitable extractor found for URL '", url, "'",
sep="", file=sys.stderr)
except exception.AuthenticationError:
print("Authentication failed. Please provide a valid "
"username/password pair.", file=sys.stderr)
except exception.AuthorizationError:
print("You do not have permission to access the resource ",
"at '", url, "'", sep="", file=sys.stderr)
except exception.NotFoundError as err:
res = str(err) or "resource (gallery/image/user)"
print("The ", res, " at '", url, "' does not exist",
sep="", file=sys.stderr)
except KeyboardInterrupt:
print("\nKeyboardInterrupt", file=sys.stderr)

12
gallery_dl/job.py
View File

@ -6,6 +6,7 @@
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
import sys
import json
import hashlib
from . import extractor, downloader, config, util, path, output, exception
@ -16,6 +17,7 @@ class Job():
"""Base class for Job-types"""
def __init__(self, url):
self.url = url
self.extractor = extractor.find(url)
if self.extractor is None:
raise exception.NoExtractorError(url)
@ -53,6 +55,16 @@ class Job():
self.extractor.category, msg[1]
)
# TODO: support for multiple message versions
except exception.AuthenticationError:
print("Authentication failed. Please provide a valid "
"username/password pair.", file=sys.stderr)
except exception.AuthorizationError:
print("You do not have permission to access the resource ",
"at '", self.url, "'", sep="", file=sys.stderr)
except exception.NotFoundError as err:
res = str(err) or "resource (gallery/image/user)"
print("The ", res, " at '", self.url, "' does not exist",
sep="", file=sys.stderr)
except exception.StopExtraction:
pass