diff --git a/PCData/data/cpu.csv b/PCData/data/passmark/cpu.csv similarity index 100% rename from PCData/data/cpu.csv rename to PCData/data/passmark/cpu.csv diff --git a/PCData/data/gpu.csv b/PCData/data/passmark/gpu.csv similarity index 100% rename from PCData/data/gpu.csv rename to PCData/data/passmark/gpu.csv diff --git a/PCData/data/gpu_info.json b/PCData/data/passmark/gpu_info.json similarity index 99% rename from PCData/data/gpu_info.json rename to PCData/data/passmark/gpu_info.json index 53a4543..47a937a 100644 --- a/PCData/data/gpu_info.json +++ b/PCData/data/passmark/gpu_info.json @@ -14318,7 +14318,6 @@ "Core Clock(s)": "300 MHz", "DirectX": "12", "OpenGL": "4.4", - "Videocard Category": "Desktop", "Other names": "Intel(R) UHD Graphics 620", "Videocard First Benchmarked": "2017-08-28", "G3DMark/Price": "NA", @@ -39830,4 +39829,4 @@ "Samples": 1 } ] -} \ No newline at end of file +} diff --git a/PCData/passmark.py b/PCData/passmark.py index 055a667..7d71e3a 100644 --- a/PCData/passmark.py +++ b/PCData/passmark.py @@ -27,7 +27,7 @@ def crawl_cpu_gpu(cpu: bool) -> pd.DataFrame: :param cpu: True if cpu, False if gpu """ - file = Path("data/cpu.csv" if cpu else "data/gpu.csv") + file = Path("data/passmark/cpu.csv" if cpu else "data/passmark/gpu.csv") if file.exists(): return pd.read_csv(file) @@ -97,7 +97,7 @@ def crawl_id(id: str): def crawl_gpuinfo_batch(): - gpu_info_f = Path("data/gpu_info.json") + gpu_info_f = Path("data/passmark/gpu_info.json") gpu_info = {} if not gpu_info_f.exists() else json.loads(gpu_info_f.read_text()) left = [gpu for gpu in crawl_cpu_gpu(False)["id"] if gpu not in gpu_info]