[api] Added os.path.basename()

flomesh-io · Aug 2, 2024 · 61e907e · 61e907e
1 parent 084f958
commit 61e907e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/src/api/os.cpp b/src/api/os.cpp
@@ -221,6 +221,16 @@ OS::RmdirOptions::RmdirOptions(pjs::Object *options) : MkdirOptions(options) {
 // OS::Path
 //
 
+auto OS::Path::basename(const std::string &path) -> std::string {
+  return utils::path_basename(path);
+}
+
+auto OS::Path::basename(const std::string &path, const std::string &suffix) -> std::string {
+  auto name = basename(path);
+  if (utils::ends_with(name, suffix)) name.resize(path.length() - suffix.length());
+  return name;
+}
+
 auto OS::Path::dirname(const std::string &path) -> std::string {
   return utils::path_dirname(path);
 }
@@ -481,6 +491,17 @@ template<> void ClassDef<OS::Stats>::init() {
 template<> void ClassDef<OS::Path>::init() {
   ctor();
 
+  // os.path.basename
+  method("basename", [](Context &ctx, Object *, Value &ret) {
+    Str *path;
+    Str *suffix = nullptr;
+    if (!ctx.arguments(1, &path, &suffix)) return;
+    ret.set(suffix
+      ? OS::Path::basename(path->str(), suffix->str())
+      : OS::Path::basename(path->str())
+    );
+  });
+
   // os.path.dirname
   method("dirname", [](Context &ctx, Object *, Value &ret) {
     Str *path;

diff --git a/src/api/os.hpp b/src/api/os.hpp
@@ -63,6 +63,8 @@ class OS : public pjs::ObjectTemplate<OS> {
 
   class Path : public pjs::ObjectTemplate<Path> {
   public:
+    static auto basename(const std::string &path) -> std::string;
+    static auto basename(const std::string &path, const std::string &suffix) -> std::string;
     static auto dirname(const std::string &path) -> std::string;
     static auto join(int argc, const pjs::Value argv[]) -> std::string;
     static auto resolve(int argc, const pjs::Value argv[]) -> std::string;

diff --git a/src/utils.cpp b/src/utils.cpp
@@ -751,6 +751,12 @@ auto path_dirname(const std::string &path) -> std::string {
   return path.substr(0, i);
 }
 
+auto path_basename(const std::string &path) -> std::string {
+  auto i = path.rfind('/');
+  if (i == std::string::npos) return path;
+  return path.substr(i + 1);
+}
+
 //
 // HexEncoder
 //

diff --git a/src/utils.hpp b/src/utils.hpp
@@ -87,6 +87,7 @@ auto decode_base64url(void *out, const char *inp, int len) -> int;
 auto path_join(const std::string &base, const std::string &path) -> std::string;
 auto path_normalize(const std::string &path) -> std::string;
 auto path_dirname(const std::string &path) -> std::string;
+auto path_basename(const std::string &path) -> std::string;
 
 //
 // HexEncoder