Merge branch 'vapoursynth' into feature

arch1t3cht · Feb 27, 2024 · e2e3906 · e2e3906
2 parents dcca721 + deb0f19
commit e2e3906
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/automation/vapoursynth/aegisub_vs.py b/automation/vapoursynth/aegisub_vs.py
@@ -187,10 +187,7 @@ def wrap_lwlibavsource(filename: str, cachedir: str | None = None, **kwargs: Any
     if cachedir is None:
         cachedir = aegi_vscache
 
-    try:
-        os.mkdir(cachedir)
-    except FileExistsError:
-        pass
+    os.makedirs(cachedir, exist_ok=True)
     cachefile = os.path.join(cachedir, make_lwi_cache_filename(filename))
 
     progress_set_message("Loading video file")

diff --git a/src/vapoursynth_common.cpp b/src/vapoursynth_common.cpp
@@ -43,7 +43,9 @@ int OpenScriptOrVideo(const VSAPI *api, const VSSCRIPTAPI *sapi, VSScript *scrip
 			throw VapourSynthError("Failed to create VSMap for script info");
 
 		SetStringVar(api, map, "filename", filename.string());
-		SetStringVar(api, map, "__aegi_vscache", config::path->Decode("?local/vscache").string());
+		auto vscache = config::path->Decode("?local/vscache");
+		agi::fs::CreateDirectory(vscache);
+		SetStringVar(api, map, "__aegi_vscache", vscache.string());
 #ifdef WIN32
 		SetStringVar(api, map, "__aegi_vsplugins", config::path->Decode("?data/vapoursynth").string());
 #else