From 76612a27be2d5e5d941b1555cd75a66e89938efa Mon Sep 17 00:00:00 2001
From: Olivier Chafik <ochafik@google.com>
Date: Sat, 8 Jun 2024 19:50:30 +0100
Subject: [PATCH] url: tweak sig of fs_get_cache_file

---
 common/common.cpp | 9 +++++----
 common/common.h   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/common.cpp b/common/common.cpp
index 65f69f9a3..1591790e6 100644
--- a/common/common.cpp
+++ b/common/common.cpp
@@ -200,13 +200,13 @@ void gpt_params_handle_model_default(gpt_params & params) {
             }
             params.hf_file = params.model;
         } else if (params.model.empty()) {
-            params.model = fs_get_cache_file_path(params.hf_file);
+            params.model = fs_get_cache_file(string_split(params.hf_file, '/').back());
         }
     } else if (!params.model_url.empty()) {
         if (params.model.empty()) {
             auto f = string_split(params.model_url, '#').front();
             f = string_split(f, '?').front();
-            params.model = fs_get_cache_file_path(f);
+            params.model = fs_get_cache_file(string_split(f, '/').back());
         }
     } else if (params.model.empty()) {
         params.model = DEFAULT_MODEL_PATH;
@@ -2273,13 +2273,14 @@ std::string fs_get_cache_directory() {
     return ensure_trailing_slash(cache_directory);
 }
 
-std::string fs_get_cache_file_path(const std::string & path) {
+std::string fs_get_cache_file(const std::string & filename) {
+    GGML_ASSERT(filename.find(DIRECTORY_SEPARATOR) == std::string::npos);
     std::string cache_directory = fs_get_cache_directory();
     const bool success = fs_create_directory_with_parents(cache_directory);
     if (!success) {
         throw std::runtime_error("failed to create cache directory: " + cache_directory);
     }
-    return cache_directory + string_split(path, '/').back();
+    return cache_directory + filename;
 }
 
 
diff --git a/common/common.h b/common/common.h
index 304597dea..2345d855e 100644
--- a/common/common.h
+++ b/common/common.h
@@ -277,7 +277,7 @@ bool fs_validate_filename(const std::string & filename);
 bool fs_create_directory_with_parents(const std::string & path);
 
 std::string fs_get_cache_directory();
-std::string fs_get_cache_file_path(const std::string & path);
+std::string fs_get_cache_file(const std::string & filename);
 
 //
 // Model utils