1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 06:07:44 +00:00

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.
This commit is contained in:
Nicholas Hollett 2020-04-26 20:30:01 +01:00 committed by Andreas Kling
parent 2708cc0f72
commit b7810a31c3
10 changed files with 109 additions and 111 deletions

View file

@ -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());
}
}

View file

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

View file

@ -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());
}
}

View file

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

View file

@ -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