Skip to content

Commit de6c3d2

Browse files
committed
Remove nesting of get_cache_dir function
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
1 parent 747475b commit de6c3d2

File tree

2 files changed

+30
-8
lines changed

2 files changed

+30
-8
lines changed

tests/test_tldr.py

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import sys
21
import io
2+
import os
3+
import pytest
4+
import sys
5+
import tldr
36
import types
47
from unittest import mock
5-
import tldr
6-
import pytest
78

89

910
def test_whole_page():
@@ -89,3 +90,21 @@ def test_tldr_language(tldr_language, language, lang, expected, monkeypatch):
8990
def test_get_platform(platform, expected):
9091
with mock.patch("sys.platform", platform):
9192
assert tldr.get_platform() == expected
93+
94+
95+
def test_get_cache_dir_xdg(monkeypatch):
96+
monkeypatch.setenv("XDG_CACHE_HOME", "/tmp/cache")
97+
assert tldr.get_cache_dir() == "/tmp/cache/tldr"
98+
99+
100+
def test_get_cache_dir_home(monkeypatch):
101+
monkeypatch.delenv("XDG_CACHE_HOME", raising=False)
102+
monkeypatch.setenv("HOME", "/tmp/home")
103+
assert tldr.get_cache_dir() == "/tmp/home/.cache/tldr"
104+
105+
106+
def test_get_cache_dir_default(monkeypatch):
107+
monkeypatch.delenv("XDG_CACHE_HOME", raising=False)
108+
monkeypatch.delenv("HOME", raising=False)
109+
monkeypatch.setattr(os.path, 'expanduser', lambda _: '/tmp/expanduser')
110+
assert tldr.get_cache_dir() == "/tmp/expanduser/.cache/tldr"

tldr.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
'https://tldr-pages.github.io/assets/tldr.zip'
3131
)
3232

33+
USE_NETWORK = int(os.environ.get('TLDR_NETWORK_ENABLED', '1')) > 0
3334
USE_CACHE = int(os.environ.get('TLDR_CACHE_ENABLED', '1')) > 0
3435
MAX_CACHE_AGE = int(os.environ.get('TLDR_CACHE_MAX_AGE', 24))
3536

@@ -75,11 +76,11 @@ def get_default_language() -> str:
7576

7677

7778
def get_cache_dir() -> str:
78-
if not os.environ.get('XDG_CACHE_HOME', False):
79-
if not os.environ.get('HOME', False):
80-
return os.path.join(os.path.expanduser("~"), ".cache", "tldr")
79+
if os.environ.get('XDG_CACHE_HOME', False):
80+
return os.path.join(os.environ.get('XDG_CACHE_HOME'), 'tldr')
81+
if os.environ.get('HOME', False):
8182
return os.path.join(os.environ.get('HOME'), '.cache', 'tldr')
82-
return os.path.join(os.environ.get('XDG_CACHE_HOME'), 'tldr')
83+
return os.path.join(os.path.expanduser("~"), ".cache", "tldr")
8384

8485

8586
def get_cache_file_path(command: str, platform: str, language: str) -> str:
@@ -163,10 +164,12 @@ def get_page_for_platform(
163164
).read()
164165
data_downloaded = True
165166
except Exception:
167+
if not USE_CACHE:
168+
raise
166169
data = load_page_from_cache(command, platform, language)
167170
if data is None:
168171
raise
169-
if data_downloaded:
172+
if data_downloaded and USE_CACHE:
170173
store_page_to_cache(data, command, platform, language)
171174
return data.splitlines()
172175

0 commit comments

Comments
 (0)