new version with no_read function

Author: Marius Schlueter

pytrackunit/__init__.py

@@ -1,3 +1,3 @@
 """init module"""
 
-__version__ = "1.0.3"
+__version__ = "1.1.0"

pytrackunit/tucache.py

@@ -11,4 +11,7 @@ def clean(self):
         self.cache.clean()
     def get(self,url):
         """takes the data from cache if possible. otherwise data is loaded from web"""
-        return self.cache.get(url)
+        data = self.cache.get(url)
+        if len(data) == 0:
+            data["list"] = []
+        return data

pytrackunit/webcache.py

@@ -9,10 +9,12 @@
 import shutil
 import requests
 
-def get_from_file(fname):
+def get_from_file(fname,dont_read=False):
     """get_from_file method"""
     try:
         if os.path.isfile(fname):
+            if dont_read:
+                return {}
             try:
                 with open(fname,encoding='utf8') as file:
                     return json.load(file)
@@ -39,6 +41,7 @@ def __init__(self,auth=None,_dir=None,verbose=False):
         else:
             self.dir = _dir
         self.min_write_len = 0
+        self.dont_read_files = False
         Path(self.dir).mkdir(parents=True, exist_ok=True)
     def clean(self):
         """clean method"""
@@ -57,7 +60,7 @@ def get_from_web(self,url):
     def get(self,url):
         """get method"""
         fname = join(self.dir,md5(url.encode('utf-8')).hexdigest()+".json")
-        data = get_from_file(fname)
+        data = get_from_file(fname,self.dont_read_files)
         if data is None:
             resp = self.get_from_web(url)
             if len(resp.text) > self.min_write_len:

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="pytrackunit",
-    version="1.0.3",
+    version="1.1.0",
     author="Marius Schlueter",
     author_email="themrslue@googlemail.com",
     description="Easy access for TrackUnit REST API",

tests/test_trackunit.py

@@ -28,4 +28,14 @@ def test_getcandata():
 	tu.cache.dir = "pytest-web-cache"
 	tu.cache.clean()
 	data = tu.get_candata("3331359",tdelta=100)
-	assert len(data) > 10000
+	assert len(data) > 10000
+def test_getcandata_no_file_read():
+	tu = TrackUnit()
+	tu.cache.cache.dont_read_files = True
+	tu.cache.dir = "pytest-web-cache"
+	tu.cache.clean()
+	data = tu.get_candata("3331359",tdelta=100)
+	assert len(data) > 10000
+	data = tu.get_candata("3331359",tdelta=100)
+	assert len(data) == 0
+	assert data == []

tests/test_tucache.py

@@ -1,6 +1,7 @@
 from pytrackunit.tucache import TuCache
 
 DUMMY_URL = 'https://pokeapi.co/api/v2/pokemon/ditto'
+DATA_LEN = 21779
 
 def test_clean_start():
 	cache = TuCache(_dir="pytest-web-cache")
@@ -17,4 +18,24 @@ def test_Get_WithFile():
 	assert data["abilities"][0]["ability"]["name"] == "limber"
 	data = cache.get(DUMMY_URL)
 	assert data["abilities"][0]["ability"]["name"] == "limber"
+	cache.clean()
+def test_Get_no_file_read():
+	cache = TuCache(_dir="pytest-web-cache")
+	cache.cache.dont_read_files = True
+	cache.clean()
+	data = cache.get(DUMMY_URL)
+	assert data["abilities"][0]["ability"]["name"] == "limber"
+	data = cache.get(DUMMY_URL)
+	assert len(data) == 1
+	assert data["list"] == []
+	cache.clean()
+def test_Get_verbose(capsys):
+	cache = TuCache(_dir="pytest-web-cache",verbose=True)
+	cache.clean()
+	data = cache.get(DUMMY_URL)
+	captured = capsys.readouterr()
+	assert captured.out == DUMMY_URL+" "+str(DATA_LEN)+" W\n"
+	data = cache.get(DUMMY_URL)
+	captured = capsys.readouterr()
+	assert captured.out == DUMMY_URL+" "+str(DATA_LEN)+" C\n"
 	cache.clean()

tests/test_webcache.py

@@ -74,3 +74,12 @@ def test_Get_WithFile():
 	data = cache.get(DUMMY_URL)
 	assert data["abilities"][0]["ability"]["name"] == "limber"
 	cache.clean()
+def test_Get_no_file_read():
+	cache = WebCache(_dir="pytest-web-cache")
+	cache.dont_read_files = True
+	cache.clean()
+	data = cache.get(DUMMY_URL)
+	assert data["abilities"][0]["ability"]["name"] == "limber"
+	data = cache.get(DUMMY_URL)
+	assert data == {}
+	cache.clean()