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

implement 'update()' for caches

Browse Source
This commit is contained in:
Mike Fährmann
2018-10-12 22:18:29 +02:00
parent d8492df51b
commit 2221cf97ff
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gallery_dl/cache.py
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright 2016-2017 Mike Fährmann # Copyright 2016-2018 Mike Fährmann
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as # it under the terms of the GNU General Public License version 2 as
@@ -187,12 +187,14 @@ class CacheDecorator():
return functools.partial(self.__call__, obj) return functools.partial(self.__call__, obj)
def invalidate(self, key=None): def invalidate(self, key=None):
if key is None: key = "%s-%s" % (self.key, key) if key else self.key
key = self.key
else:
key = "%s-%s" % (self.key, key)
del self.cache[key] del self.cache[key]
def update(self, key, result):
key = "%s-%s" % (self.key, key) if key else self.key
expires = int(time.time() + self.maxage)
self.cache[key] = result, expires
def build_cache_decorator(*modules): def build_cache_decorator(*modules):
if len(modules) > 1: if len(modules) > 1:

3
gallery_dl/extractor/deviantart.py
View File

@@ -577,8 +577,7 @@ class DeviantartAPI():
raise exception.AuthenticationError('"{} ({})"'.format( raise exception.AuthenticationError('"{} ({})"'.format(
data.get("error_description"), data.get("error"))) data.get("error_description"), data.get("error")))
if refresh_token: if refresh_token:
_refresh_token_cache.invalidate(refresh_token) _refresh_token_cache.update(refresh_token, data["refresh_token"])
_refresh_token_cache(refresh_token, data["refresh_token"])
return "Bearer " + data["access_token"] return "Bearer " + data["access_token"]
def _call(self, endpoint, params=None, expect_error=False, public=True): def _call(self, endpoint, params=None, expect_error=False, public=True):