diff --git a/blender_cloud/__init__.py b/blender_cloud/__init__.py index faefaf6..940ad21 100644 --- a/blender_cloud/__init__.py +++ b/blender_cloud/__init__.py @@ -47,12 +47,12 @@ if 'pillar' in locals(): wheels.load_wheels() pillar = importlib.reload(pillar) - cache = importlib.reload(cache) + cache = importlib.reload(http_cache) else: from . import wheels wheels.load_wheels() - from . import pillar, cache + from . import pillar, http_cache def register(): diff --git a/blender_cloud/blender.py b/blender_cloud/blender.py index cfee4fa..582b0b7 100644 --- a/blender_cloud/blender.py +++ b/blender_cloud/blender.py @@ -9,7 +9,7 @@ import bpy from bpy.types import AddonPreferences, Operator, WindowManager, Scene from bpy.props import StringProperty -from . import pillar, gui, cache +from . import pillar, gui, http_cache ADDON_NAME = 'blender_cloud' @@ -106,7 +106,7 @@ def register(): WindowManager.thumbnails_cache = StringProperty( name="Thumbnails cache", subtype='DIR_PATH', - default=os.path.join(cache.cache_directory(), 'thumbnails')) + default=os.path.join(http_cache.cache_directory(), 'thumbnails')) WindowManager.blender_cloud_project = StringProperty( name="Blender Cloud project UUID", diff --git a/blender_cloud/cache.py b/blender_cloud/http_cache.py similarity index 85% rename from blender_cloud/cache.py rename to blender_cloud/http_cache.py index cf5ed52..7439644 100644 --- a/blender_cloud/cache.py +++ b/blender_cloud/http_cache.py @@ -1,4 +1,10 @@ -"""Cache management.""" +"""HTTP Cache management. + +This module configures a cached session for the Requests package. +It allows for filesystem-based caching of HTTP requests. + +Requires the 3rd party packages CacheControl and lockfile. +""" import os import logging @@ -44,4 +50,3 @@ def requests_session() -> requests.Session: cache=FileCache(cache_name)) return _session - diff --git a/blender_cloud/pillar.py b/blender_cloud/pillar.py index fbfddcb..35a9a13 100644 --- a/blender_cloud/pillar.py +++ b/blender_cloud/pillar.py @@ -10,7 +10,7 @@ import pillarsdk import pillarsdk.exceptions import pillarsdk.utils -from . import cache +from . import http_cache _pillar_api = None # will become a pillarsdk.Api object. @@ -65,7 +65,7 @@ def pillar_api(pillar_endpoint: str=None) -> pillarsdk.Api: from . import blender pillar_endpoint = blender.preferences().pillar_server - pillarsdk.Api.requests_session = cache.requests_session() + pillarsdk.Api.requests_session = http_cache.requests_session() _pillar_api = pillarsdk.Api(endpoint=pillar_endpoint, username=profile['username'],