Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add default directory setting #2046

Merged
merged 8 commits into from
Jul 12, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 31 additions & 6 deletions lib/livebook/settings.ex
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ defmodule Livebook.Settings do
@spec remove_file_system(file_system_id()) :: :ok
def remove_file_system(file_system_id) do
if default_file_system_id() == file_system_id do
Livebook.Storage.delete_key(:settings, "global", :default_file_system_id)
Storage.delete_key(:settings, "global", :default_file_system_id)
end

Livebook.NotebookManager.remove_file_system(file_system_id)

Livebook.Storage.delete(:file_systems, file_system_id)
Storage.delete(:file_systems, file_system_id)
end

defp storage_to_fs(%{type: "s3"} = config) do
Expand Down Expand Up @@ -226,15 +226,15 @@ defmodule Livebook.Settings do
"""
@spec set_default_file_system(file_system_id()) :: :ok
def set_default_file_system(file_system_id) do
Livebook.Storage.insert(:settings, "global", default_file_system_id: file_system_id)
Storage.insert(:settings, "global", default_file_system_id: file_system_id)
end

@doc """
Returns the default file system.
"""
@spec default_file_system() :: Filesystem.t()
def default_file_system() do
case Livebook.Storage.fetch(:file_systems, default_file_system_id()) do
case Storage.fetch(:file_systems, default_file_system_id()) do
{:ok, file} -> storage_to_fs(file)
:error -> Livebook.Config.local_file_system()
end
Expand All @@ -245,7 +245,7 @@ defmodule Livebook.Settings do
"""
@spec default_file_system_id() :: file_system_id()
def default_file_system_id() do
case Livebook.Storage.fetch_key(:settings, "global", :default_file_system_id) do
case Storage.fetch_key(:settings, "global", :default_file_system_id) do
{:ok, default_file_system_id} -> default_file_system_id
:error -> "local"
end
Expand All @@ -255,5 +255,30 @@ defmodule Livebook.Settings do
Returns the home directory in the default file system.
"""
@spec default_file_system_home() :: FileSystem.File.t()
def default_file_system_home(), do: FileSystem.File.new(default_file_system())
def default_file_system_home() do
if file = get_default_dir() do
file
else
FileSystem.File.new(default_file_system())
end
end

@doc """
Sets default directory.
"""
@spec set_default_dir(FileSystem.File.t()) :: :ok
def set_default_dir(file) do
Storage.insert(:settings, "global", default_dir: file)
ByeongUkChoi marked this conversation as resolved.
Show resolved Hide resolved
end

@doc """
Gets default directory.
"""
@spec get_default_dir() :: FileSystem.File.t() | nil
jonatanklosko marked this conversation as resolved.
Show resolved Hide resolved
def get_default_dir() do
case Storage.fetch_key(:settings, "global", :default_dir) do
{:ok, file} -> file
:error -> nil
end
end
end
12 changes: 12 additions & 0 deletions lib/livebook_web/live/file_select_component.ex
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ defmodule LivebookWeb.FileSelectComponent do
<span>New notebook</span>
</button>
</.menu_item>
<.menu_item>
<button role="menuitem" phx-click="set_default_directory" phx-target={@myself}>
<.remix_icon icon="home-6-line" />
<span>Use as default directory</span>
</button>
</.menu_item>
</.menu>
<div :if={@inner_block}>
<%= render_slot(@inner_block) %>
Expand Down Expand Up @@ -560,6 +566,12 @@ defmodule LivebookWeb.FileSelectComponent do
{:noreply, assign(socket, error: false)}
end

def handle_event("set_default_directory", _params, socket) do
{dir, _prefix} = dir_and_prefix(socket.assigns.file)
Livebook.Settings.set_default_dir(dir)
{:noreply, socket}
end

defp update_file_infos(%{assigns: assigns} = socket, force_reload?) do
current_file_infos = assigns[:file_infos] || []
{dir, prefix} = dir_and_prefix(assigns.file)
Expand Down