Change `Filepath::starts_with()` to take Filepath as argument

This makes more sense, as the argument is a valid path.

3 files changed, 8 insertions, 7 deletions

diff --git a/include/filepath.h b/include/filepath.h
index 6308f2ae..be148b10 100644
--- a/include/filepath.h
+++ b/include/filepath.h
@@ -95,8 +95,9 @@ public:
 
 	// Return `true` if Filepath start with `base`, `false` otherwise.
 	//
-	// \note `ext` is interpreted as bytes in locale encoding.
-	bool starts_with(const std::string& base) const;
+	// Only considers whole path components to match, i.e. "/foo" is **not**
+	// a prefix of "/foobar/baz".
+	bool starts_with(const Filepath& base) const;
 
 	/// Returns the final component of the path, if there is one.
 	nonstd::optional<Filepath> file_name() const;
diff --git a/rust/libnewsboat-ffi/src/filepath.rs b/rust/libnewsboat-ffi/src/filepath.rs
index 778ed0de..65ed82b8 100644
--- a/rust/libnewsboat-ffi/src/filepath.rs
+++ b/rust/libnewsboat-ffi/src/filepath.rs
@@ -25,7 +25,7 @@ mod bridged {
         fn clone(filepath: &PathBuf) -> Box<PathBuf>;
         fn is_absolute(filepath: &PathBuf) -> bool;
         fn set_extension(filepath: &mut PathBuf, extension: Vec<u8>) -> bool;
-        fn starts_with(filepath: &PathBuf, str: Vec<u8>) -> bool;
+        fn starts_with(filepath: &PathBuf, base: &PathBuf) -> bool;
         fn file_name(filepath: &PathBuf) -> Vec<u8>;
     }
 }
@@ -68,8 +68,8 @@ fn set_extension(filepath: &mut PathBuf, extension: Vec<u8>) -> bool {
     filepath.0.set_extension(OsStr::from_bytes(&extension))
 }
 
-fn starts_with(filepath: &PathBuf, base: Vec<u8>) -> bool {
-    filepath.0.starts_with(OsStr::from_bytes(&base))
+fn starts_with(filepath: &PathBuf, base: &PathBuf) -> bool {
+    filepath.0.starts_with(&base.0)
 }
 
 fn file_name(filepath: &PathBuf) -> Vec<u8> {
diff --git a/src/filepath.cpp b/src/filepath.cpp
index b5ff097e..6ff48526 100644
--- a/src/filepath.cpp
+++ b/src/filepath.cpp
@@ -85,9 +85,9 @@ bool Filepath::set_extension(const std::string& ext)
 	return filepath::bridged::set_extension(*rs_object, string_to_vec(ext));
 }
 
-bool Filepath::starts_with(const std::string& base) const
+bool Filepath::starts_with(const Filepath& base) const
 {
-	return filepath::bridged::starts_with(*rs_object, string_to_vec(base));
+	return filepath::bridged::starts_with(*rs_object, *base.rs_object);
 }
 
 nonstd::optional<Filepath> Filepath::file_name() const