Moved all request methods to seperate file, since it is getting a core function

headphones/helpers.py

@@ -18,16 +18,9 @@ import re
 import time
 import shutil
 import datetime
-import requests
-import feedparser
 import headphones
 
-from headphones import logger
-
-from xml.dom import minidom
 from operator import itemgetter
-from bs4 import BeautifulSoup
-
 from beets.mediafile import MediaFile, FileTypeError, UnreadableFileError
 
 # Modified from https://github.com/Verrus/beets-plugin-featInTitle
@@ -243,6 +236,8 @@ def expand_subfolders(f):
     case, normal post processing will be better.
     """
 
+    from headphones import logger
+
     # Find all folders with media files in them
     media_folders = []
 
@@ -338,6 +333,8 @@ def extract_metadata(f):
     artists, albums and years found in the media files.
     """
 
+    from headphones import logger
+
     # Walk directory and scan all media files
     results = []
     count = 0
@@ -595,113 +592,4 @@ def create_https_certificates(ssl_cert, ssl_key):
         logger.error("Error creating SSL key and certificate: %s", e)
         return False
 
-    return True
-
-def request_response(url, method="get", auto_raise=True, whitelist_status_code=None, **kwargs):
-    """
-    Convenient wrapper for `requests.get', which will capture the exceptions and
-    log them. On success, the Response object is returned. In case of a
-    exception, None is returned.
-    """
-
-    # Convert whitelist_status_code to a list if needed
-    if whitelist_status_code and type(whitelist_status_code) != list:
-        whitelist_status_code = [whitelist_status_code]
-
-    # Map method to the request.XXX method. This is a simple hack, but it allows
-    # requests to apply more magic per method. See lib/requests/api.py.
-    request_method = getattr(requests, method)
-
-    try:
-        # Request the URL
-        logger.debug("Requesting URL via %s method: %s", method.upper(), url)
-        response = request_method(url, **kwargs)
-
-        # If status code != OK, then raise exception, except if the status code
-        # is white listed.
-        if whitelist_status_code and auto_raise:
-            if response.status_code not in whitelist_status_code:
-                response.raise_for_status()
-            else:
-                logger.debug("Response Status code %d is white listed, not raising exception", response.status_code)
-        elif auto_raise:
-            response.raise_for_status()
-
-        return response
-    except requests.ConnectionError:
-        logger.error("Unable to connect to remote host.")
-    except requests.Timeout:
-        logger.error("Request timed out.")
-    except requests.HTTPError, e:
-        if e.response is not None:
-            logger.error("Request raise HTTP error with status code: %d", e.response.status_code)
-        else:
-            logger.error("Request raised HTTP error.")
-    except requests.RequestException, e:
-        logger.error("Request raised exception: %s", e)
-
-def request_soup(url, **kwargs):
-    """
-    Wrapper for `request_response', which will return a BeatifulSoup object if
-    no exceptions are raised.
-    """
-
-    parser = kwargs.pop("parser", "html5lib")
-    response = request_response(url, **kwargs)
-
-    if response is not None:
-        return BeautifulSoup(response.content, parser)
-
-def request_minidom(url, **kwargs):
-    """
-    Wrapper for `request_response', which will return a Minidom object if no
-    exceptions are raised.
-    """
-
-    response = request_response(url, **kwargs)
-
-    if response is not None:
-        return minidom.parseString(response.content)
-
-def request_json(url, **kwargs):
-    """
-    Wrapper for `request_response', which will decode the response as JSON
-    object and return the result, if no exceptions are raised.
-
-    As an option, a validator callback can be given, which should return True if
-    the result is valid.
-    """
-
-    validator = kwargs.pop("validator", None)
-    response = request_response(url, **kwargs)
-
-    if response is not None:
-        try:
-            result = response.json()
-
-            if validator and not validator(result):
-                logger.error("JSON validation result vailed")
-            else:
-                return result
-        except ValueError:
-            logger.error("Response returned invalid JSON data")
-
-def request_content(url, **kwargs):
-    """
-    Wrapper for `request_response', which will return the raw content.
-    """
-
-    response = request_response(url, **kwargs)
-
-    if response is not None:
-        return response.content
-
-def request_feed(url, **kwargs):
-    """
-    Wrapper for `request_response', which will return a feed object.
-    """
-
-    response = request_response(url, **kwargs)
-
-    if response is not None:
-        return feedparser.parse(response.content)
+    return True