wipwip

odoo · Feb 27, 2025 · 57bab45 · 57bab45
1 parent f1a2309
commit 57bab45
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/src/impls/impl-posix/pkg.cpp b/src/impls/impl-posix/pkg.cpp
@@ -1,5 +1,6 @@
 #include <karm-pkg/_embed.h>
 #include <karm-sys/_embed.h>
+#include <karm-sys/proc.h>
 
 #include "utils.h"
 
@@ -9,9 +10,9 @@ Res<Vec<String>> installedBundles() {
     auto [repo, format] = try$(Posix::repoRoot());
     Mime::Url repoRoot;
     if (format == Posix::RepoType::CUTEKIT) {
-        repoRoot = Mime::parseUrlOrPath(repo);
+        repoRoot = Mime::parseUrlOrPath(repo, Sys::pwd());
     } else if (format == Posix::RepoType::PREFIX) {
-        repoRoot = Mime::parseUrlOrPath(repo)
+        repoRoot = Mime::parseUrlOrPath(repo, Sys::pwd())
                        .join("share");
     } else {
         return Error::notFound("unknown repo type");

diff --git a/src/libs/karm-mime/url.cpp b/src/libs/karm-mime/url.cpp
@@ -133,7 +133,7 @@ Url parseUrlOrPath(Str str, Opt<Url> origin) {
         return Url::parse(str, origin);
     }
 
-    Url url = origin.unwrapOr("file:"_url);
+    Url url = origin.unwrapOr(""_url);
     url.path = url.path.join(Path::parse(str));
 
     return url;

diff --git a/src/libs/karm-sys/proc.h b/src/libs/karm-sys/proc.h
@@ -5,6 +5,10 @@
 
 namespace Karm::Sys {
 
+Mime::Url pwd() {
+    // call embed that will call posix
+}
+
 inline Res<> sleep(Duration span) {
     return _Embed::sleep(span);
 }

diff --git a/src/libs/karm-text/cli/main.cpp b/src/libs/karm-text/cli/main.cpp
@@ -1,6 +1,7 @@
 #include <karm-sys/entry.h>
 #include <karm-sys/file.h>
 #include <karm-sys/mmap.h>
+#include <karm-sys/proc.h>
 #include <karm-text/book.h>
 #include <karm-text/loader.h>
 #include <karm-text/ttf.h>
@@ -65,7 +66,7 @@ Async::Task<> entryPointAsync(Sys::Context& ctx) {
         if (args.len() != 2)
             co_return Error::invalidInput("Usage: karm-text.cli dump-ttf <url>");
 
-        auto url = Mime::parseUrlOrPath(args[1]);
+        auto url = Mime::parseUrlOrPath(args[1], Sys::pwd());
         auto file = co_try$(Sys::File::open(url));
         auto map = co_try$(Sys::mmap().map(file));
         auto ttf = co_try$(Ttf::Parser::init(map.bytes()));
@@ -83,7 +84,7 @@ Async::Task<> entryPointAsync(Sys::Context& ctx) {
         if (args.len() != 2)
             co_return Error::invalidInput("Usage: karm-text.cli dump-attr <url>");
 
-        auto url = Mime::parseUrlOrPath(args[1]);
+        auto url = Mime::parseUrlOrPath(args[1], Sys::pwd());
         auto font = co_try$(Text::loadFontface(url));
 
         Sys::println("{}", font->attrs());

diff --git a/src/main.cpp b/src/main.cpp
@@ -4,6 +4,7 @@
 #include <karm-print/file-printer.h>
 #include <karm-sys/entry.h>
 #include <karm-sys/file.h>
+#include <karm-sys/proc.h>
 #include <vaev-driver/fetcher.h>
 #include <vaev-driver/print.h>
 #include <vaev-driver/render.h>
@@ -224,14 +225,14 @@ Async::Task<> entryPointAsync(Sys::Context& ctx) {
 
             Opt<Sys::FileReader> inputFile;
             if (inputArg.unwrap() != "-"s) {
-                inputUrl = Mime::parseUrlOrPath(inputArg);
+                inputUrl = Mime::parseUrlOrPath(inputArg, Sys::pwd());
                 inputFile = co_try$(Sys::File::open(inputUrl));
                 input = &inputFile.unwrap();
             }
 
             Opt<Sys::FileWriter> outputFile;
             if (outputArg.unwrap() != "-"s) {
-                auto outputUrl = Mime::parseUrlOrPath(outputArg);
+                auto outputUrl = Mime::parseUrlOrPath(outputArg, Sys::pwd());
                 outputFile = co_try$(Sys::File::create(outputUrl));
                 output = &outputFile.unwrap();
             }
@@ -278,14 +279,14 @@ Async::Task<> entryPointAsync(Sys::Context& ctx) {
 
             Opt<Sys::FileReader> inputFile;
             if (inputArg.unwrap() != "-"s) {
-                inputUrl = Mime::parseUrlOrPath(inputArg);
+                inputUrl = Mime::parseUrlOrPath(inputArg, Sys::pwd());
                 inputFile = co_try$(Sys::File::open(inputUrl));
                 input = &inputFile.unwrap();
             }
 
             Opt<Sys::FileWriter> outputFile;
             if (outputArg.unwrap() != "-"s) {
-                auto outputUrl = Mime::parseUrlOrPath(outputArg);
+                auto outputUrl = Mime::parseUrlOrPath(outputArg, Sys::pwd());
                 outputFile = co_try$(Sys::File::create(outputUrl));
                 output = &outputFile.unwrap();
             }

diff --git a/src/web/vaev-browser/main/main.cpp b/src/web/vaev-browser/main/main.cpp
@@ -7,7 +7,7 @@ import Vaev.Browser;
 Async::Task<> entryPointAsync(Sys::Context& ctx) {
     auto args = Sys::useArgs(ctx);
     auto url = args.len()
-                   ? Mime::parseUrlOrPath(args[0])
+                   ? Mime::parseUrlOrPath(args[0], Sys::pwd())
                    : "about:start"_url;
     Gc::Heap heap;