projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[iwara] Improve extraction
[youtube-dl]
/
youtube_dl
/
cache.py
diff --git
a/youtube_dl/cache.py
b/youtube_dl/cache.py
index 79ff09f7897c2987d0824becca088f2e4cd3a164..7bdade1bdb49a7406457688400830a91a98ef186 100644
(file)
--- a/
youtube_dl/cache.py
+++ b/
youtube_dl/cache.py
@@
-8,7
+8,9
@@
import re
import shutil
import traceback
import shutil
import traceback
+from .compat import compat_getenv
from .utils import (
from .utils import (
+ expand_path,
write_json_file,
)
write_json_file,
)
@@
-20,9
+22,9
@@
class Cache(object):
def _get_root_dir(self):
res = self._ydl.params.get('cachedir')
if res is None:
def _get_root_dir(self):
res = self._ydl.params.get('cachedir')
if res is None:
- cache_root =
os.environ.get
('XDG_CACHE_HOME', '~/.cache')
+ cache_root =
compat_getenv
('XDG_CACHE_HOME', '~/.cache')
res = os.path.join(cache_root, 'youtube-dl')
res = os.path.join(cache_root, 'youtube-dl')
- return
os.path.expanduser
(res)
+ return
expand_path
(res)
def _get_cache_fn(self, section, key, dtype):
assert re.match(r'^[a-zA-Z0-9_.-]+$', section), \
def _get_cache_fn(self, section, key, dtype):
assert re.match(r'^[a-zA-Z0-9_.-]+$', section), \