LibDesktop: Switch to LaunchServer for DesktopServices::open

Moves DirectoryServices out of LibCore (because we need to link with
LibIPC), renames it Desktop::Launcher (because Desktop::DesktopServices
doesn't scan right) and ports it to use the LaunchServer which is now
responsible for starting programs for a file.

Applications/FileManager/DirectoryView.cpp

@@ -29,7 +29,7 @@
 #include <AK/NumberFormat.h>
 #include <AK/StringBuilder.h>
 #include <AK/URL.h>
-#include <LibCore/DesktopServices.h>
+#include <LibDesktop/Launcher.h>
 #include <LibGUI/SortingProxyModel.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -53,7 +53,7 @@ void DirectoryView::handle_activation(const GUI::ModelIndex& index)
         return;
     }
 
-    Core::DesktopServices::open(URL::create_with_file_protocol(path));
+    Desktop::Launcher::open(URL::create_with_file_protocol(path));
 }
 
 DirectoryView::DirectoryView()

Applications/FileManager/Makefile

@@ -6,6 +6,6 @@ OBJS = \
 
 PROGRAM = FileManager
 
-LIB_DEPS = GUI Gfx IPC Thread Pthread Core
+LIB_DEPS = GUI Gfx Desktop IPC Thread Pthread Core
 
 include ../../Makefile.common

Applications/FileManager/main.cpp

@@ -31,9 +31,9 @@
 #include <AK/StringBuilder.h>
 #include <AK/URL.h>
 #include <LibCore/ConfigFile.h>
-#include <LibCore/DesktopServices.h>
 #include <LibCore/MimeData.h>
 #include <LibCore/StandardPaths.h>
+#include <LibDesktop/Launcher.h>
 #include <LibGUI/AboutDialog.h>
 #include <LibGUI/Action.h>
 #include <LibGUI/ActionGroup.h>
@@ -86,7 +86,7 @@ int main(int argc, char** argv)
 
     GUI::Application app(argc, argv);
 
-    if (pledge("stdio thread shared_buffer accept cpath rpath wpath fattr proc exec", nullptr) < 0) {
+    if (pledge("stdio thread shared_buffer accept cpath rpath wpath fattr proc exec unix", nullptr) < 0) {
         perror("pledge");
         return 1;
     }
@@ -158,7 +158,7 @@ int run_in_desktop_mode(RefPtr<Core::ConfigFile> config, String initial_location
             return;
         auto& node = model->node(index);
         auto path = node.full_path(model);
-        Core::DesktopServices::open(URL::create_with_file_protocol(path));
+        Desktop::Launcher::open(URL::create_with_file_protocol(path));
     };
 
     auto desktop_view_context_menu = GUI::Menu::construct("Directory View");
@@ -205,11 +205,11 @@ int run_in_desktop_mode(RefPtr<Core::ConfigFile> config, String initial_location
     });
 
     auto file_manager_action = GUI::Action::create("Show in FileManager...", {}, Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-folder.png"), [&](const GUI::Action&) {
-        Core::DesktopServices::open(URL::create_with_file_protocol(model->root_path()));
+        Desktop::Launcher::open(URL::create_with_file_protocol(model->root_path()));
     });
 
     auto display_properties_action = GUI::Action::create("Display settings...", {}, Gfx::Bitmap::load_from_file("/res/icons/16x16/app-display-settings.png"), [&](const GUI::Action&) {
-        Core::DesktopServices::open(URL::create_with_file_protocol("/bin/DisplaySettings"));
+        Desktop::Launcher::open(URL::create_with_file_protocol("/bin/DisplaySettings"));
     });
 
     desktop_view_context_menu->add_action(mkdir_action);

Libraries/LibCore/DesktopServices.cpp

@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <AK/URL.h>
-#include <LibCore/DesktopServices.h>
-#include <stdio.h>
-#include <sys/stat.h>
-
-namespace Core {
-
-static bool open_file_url(const URL&);
-static bool spawn(String executable, String argument);
-
-bool DesktopServices::open(const URL& url)
-{
-    if (url.protocol() == "file")
-        return open_file_url(url);
-
-    if (url.protocol() == "irc")
-        return spawn("/bin/IRCClient", url.to_string());
-
-    return spawn("/bin/Browser", url.to_string());
-}
-
-bool spawn(String executable, String argument)
-{
-    pid_t child_pid = fork();
-    if (child_pid < 0) {
-        perror("fork");
-        return false;
-    }
-    if (child_pid == 0) {
-        if (execl(executable.characters(), executable.characters(), argument.characters(), nullptr) < 0) {
-            perror("execl");
-            exit(1);
-        }
-        ASSERT_NOT_REACHED();
-    }
-    return true;
-}
-
-bool open_file_url(const URL& url)
-{
-    struct stat st;
-    if (stat(url.path().characters(), &st) < 0) {
-        perror("stat");
-        return false;
-    }
-
-    if (S_ISDIR(st.st_mode))
-        return spawn("/bin/FileManager", url.path());
-
-    if (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))
-        return spawn(url.path(), {});
-
-    if (url.path().to_lowercase().ends_with(".png"))
-        return spawn("/bin/QuickShow", url.path());
-
-    if (url.path().to_lowercase().ends_with(".gif"))
-        return spawn("/bin/QuickShow", url.path());
-
-    if (url.path().to_lowercase().ends_with(".html"))
-        return spawn("/bin/Browser", url.path());
-
-    if (url.path().to_lowercase().ends_with(".wav"))
-        return spawn("/bin/SoundPlayer", url.path());
-
-    if (url.path().to_lowercase().ends_with(".font"))
-        return spawn("/bin/FontEditor", url.path());
-
-    return spawn("/bin/TextEditor", url.path());
-}
-
-}

Libraries/LibCore/Makefile

@@ -2,7 +2,6 @@ OBJS = \
     ArgsParser.o \
     ConfigFile.o \
     DateTime.o \
-    DesktopServices.o \
     DirIterator.o \
     ElapsedTimer.o \
     Event.o \

Libraries/LibDesktop/Launcher.cpp

@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <AK/URL.h>
+#include <LaunchServer/LaunchClientEndpoint.h>
+#include <LaunchServer/LaunchServerEndpoint.h>
+#include <LibDesktop/Launcher.h>
+#include <LibIPC/ServerConnection.h>
+#include <stdlib.h>
+
+namespace Desktop {
+
+class LaunchServerConnection : public IPC::ServerConnection<LaunchClientEndpoint, LaunchServerEndpoint>
+    , public LaunchClientEndpoint {
+    C_OBJECT(LaunchServerConnection)
+public:
+    virtual void handshake() override
+    {
+        auto response = send_sync<Messages::LaunchServer::Greet>();
+        set_my_client_id(response->client_id());
+    }
+
+private:
+    LaunchServerConnection()
+        : IPC::ServerConnection<LaunchClientEndpoint, LaunchServerEndpoint>(*this, "/tmp/portal/launch")
+    {
+
+    }
+    virtual void handle(const Messages::LaunchClient::Dummy&) override {}
+};
+
+bool Launcher::open(const URL& url)
+{
+    auto connection = LaunchServerConnection::construct();
+
+    if (url.protocol() == "file") {
+        // Make the path fully qualified - LaunchServer won't know our cwd
+        char* path = realpath(url.path().characters(), nullptr);
+        if (path == nullptr) {
+            return false;
+        }
+        auto fully_qualified = URL::create_with_file_protocol(path);
+        free(path);
+
+        return connection->send_sync<Messages::LaunchServer::OpenUrl>(fully_qualified.to_string());
+    }
+    return connection->send_sync<Messages::LaunchServer::OpenUrl>(url.to_string());
+}
+
+}

Libraries/LibCore/DesktopServices.h → Libraries/LibDesktop/Launcher.h

@@ -28,9 +28,9 @@
 
 #include <AK/Forward.h>
 
-namespace Core {
+namespace Desktop {
 
-class DesktopServices {
+class Launcher {
 public:
     static bool open(const URL&);
 };

Libraries/LibDesktop/Makefile

@@ -0,0 +1,20 @@
+OBJS = \
+    Launcher.o
+
+LIBRARY = libdesktop.a
+
+# HACK: LaunchServer builds after LibDesktop so we need to explicitly generate these IPC headers
+Launcher.cpp: ../../Services/LaunchServer/LaunchServerEndpoint.h ../../Services/LaunchServer/LaunchClientEndpoint.h
+
+../../Services/LaunchServer/LaunchServerEndpoint.h:
+	$(MAKE) -C $(dir $(@)) LaunchServerEndpoint.h
+
+../../Services/LaunchServer/LaunchClientEndpoint.h:
+	$(MAKE) -C $(dir $(@)) LaunchClientEndpoint.h
+
+install:
+	mkdir -p $(SERENITY_BASE_DIR)/Root/usr/include/LibDesktop/
+	cp ./*.h $(SERENITY_BASE_DIR)/Root/usr/include/LibDesktop/
+	cp $(LIBRARY) $(SERENITY_BASE_DIR)/Root/usr/lib/
+
+include ../../Makefile.common

Userland/Makefile

@@ -4,7 +4,7 @@ APPS = ${SRCS:.cpp=}
 
 EXTRA_CLEAN = $(APPS)
 
-LIB_DEPS = Crypto TLS Web TextCodec GUI Gfx Audio Protocol IPC Thread Pthread PCIDB Markdown JS Core Line X86 Debug
+LIB_DEPS = Crypto TLS Web TextCodec GUI Gfx Desktop Audio Protocol IPC Thread Pthread PCIDB Markdown JS Core Line X86 Debug
 
 include ../Makefile.common
 

Userland/open.cpp

@@ -27,10 +27,13 @@
 #include <AK/URL.h>
 #include <AK/Vector.h>
 #include <LibCore/ArgsParser.h>
-#include <LibCore/DesktopServices.h>
+#include <LibDesktop/Launcher.h>
+#include <LibGUI/Application.h>
 
 int main(int argc, char* argv[])
 {
+    GUI::Application app(argc, argv);
+
     Vector<const char*> urls_or_paths;
     Core::ArgsParser parser;
     parser.add_positional_argument(urls_or_paths, "URL or file path to open", "url-or-path");
@@ -40,7 +43,7 @@ int main(int argc, char* argv[])
 
     for (auto& url_or_path : urls_or_paths) {
         URL url = URL::create_with_url_or_path(url_or_path);
-        bool ok = Core::DesktopServices::open(url);
+        bool ok = Desktop::Launcher::open(url);
         all_ok = all_ok && ok;
     }