Portin stuff

Author: Caleb-T-Owens

apps/buzz/dev.js

@@ -188,7 +188,7 @@ async function main() {
 		log('\n⚡ Starting Electron app...', colors.green);
 
 		// Start the electron app
-		electronProcess = spawnProcess('web', ['.'], buzzDir);
+		electronProcess = spawnProcess('electron', ['.'], buzzDir);
 
 		electronProcess.on('close', (code) => {
 			log(`Electron app exited with code ${code}`, colors.yellow);

apps/buzz/src/main.ts

@@ -1,4 +1,4 @@
-import { app, BrowserWindow, dialog, ipcMain } from 'web';
+import { app, BrowserWindow, dialog, ipcMain } from 'electron';
 import path from 'path';
 
 function createWindow() {

apps/buzz/src/preload.ts

@@ -1,4 +1,4 @@
-import { contextBridge, ipcRenderer } from 'web';
+import { contextBridge, ipcRenderer } from 'electron';
 
 contextBridge.exposeInMainWorld('electronAPI', {
 	openDirectory: async () => await ipcRenderer.invoke('dialog:openDirectory')

crates/but-interface/src/commands/cli.rs

@@ -1,10 +1,9 @@
 //! In place of commands.rs
 use std::path::Path;
 
-use anyhow::{anyhow, bail, Context};
-use serde::Deserialize;
+use anyhow::{Context, anyhow, bail};
 
-use crate::{IpcContext, error::Error};
+use crate::{IpcContext, NoParams, error::Error};
 
 fn get_cli_path() -> anyhow::Result<std::path::PathBuf> {
     let cli_path = std::env::current_exe()?;
@@ -15,7 +14,8 @@ fn do_install_cli() -> anyhow::Result<()> {
     let cli_path = get_cli_path()?;
     if cfg!(windows) {
         bail!(
-            "CLI installation is not supported on Windows. Please install manually by placing '{}' in PATH.", cli_path.display()
+            "CLI installation is not supported on Windows. Please install manually by placing '{}' in PATH.",
+            cli_path.display()
         );
     }
 
@@ -84,17 +84,11 @@ fn do_install_cli() -> anyhow::Result<()> {
     }
 }
 
-pub fn install_cli(
-    _ipc_ctx: &IpcContext,
-    _params: (),
-) -> Result<(), Error> {
+pub fn install_cli(_ipc_ctx: &IpcContext, _params: NoParams) -> Result<(), Error> {
     do_install_cli().map_err(Error::from)
 }
 
-pub fn cli_path(
-    _ipc_ctx: &IpcContext,
-    _params: (),
-) -> Result<String, Error> {
+pub fn cli_path(_ipc_ctx: &IpcContext, _params: NoParams) -> Result<String, Error> {
     let cli_path = get_cli_path()?;
     if !cli_path.exists() {
         return Err(anyhow::anyhow!(

crates/but-interface/src/commands/git.rs

@@ -8,6 +8,7 @@ use gitbutler_repo::RepositoryExt as _;
 use gitbutler_repo_actions::RepoActionsExt as _;
 use serde::Deserialize;
 
+use crate::NoParams;
 use crate::error::ToError as _;
 use crate::{IpcContext, error::Error};
 
@@ -89,7 +90,7 @@ pub fn git_head(ipc_ctx: &IpcContext, params: GitHeadParams) -> Result<String, E
     Ok(head.name().unwrap().to_string())
 }
 
-pub fn delete_all_data(_ipc_ctx: &IpcContext, _params: ()) -> Result<(), Error> {
+pub fn delete_all_data(_ipc_ctx: &IpcContext, _params: NoParams) -> Result<(), Error> {
     for project in gitbutler_project::list().context("failed to list projects")? {
         gitbutler_project::delete(project.id)
             .map_err(|err| err.context("failed to delete project"))?;

crates/but-interface/src/commands/github.rs

@@ -3,7 +3,7 @@ use anyhow::{Context, Result};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
-use crate::{IpcContext, error::Error};
+use crate::{IpcContext, NoParams, error::Error};
 
 #[derive(Debug, Deserialize, Serialize, Clone, Default)]
 pub struct Verification {
@@ -13,10 +13,15 @@ pub struct Verification {
 
 pub async fn init_device_oauth(
     ipc_ctx: &IpcContext,
-    _params: (),
+    _params: NoParams,
 ) -> Result<Verification, Error> {
     let mut req_body = HashMap::new();
-    let client_id = ipc_ctx.app_settings.get()?.github_oauth_app.oauth_client_id.clone();
+    let client_id = ipc_ctx
+        .app_settings
+        .get()?
+        .github_oauth_app
+        .oauth_client_id
+        .clone();
     req_body.insert("client_id", client_id.as_str());
     req_body.insert("scope", "repo");
 
@@ -58,7 +63,12 @@ pub async fn check_auth_status(
     }
 
     let mut req_body = HashMap::new();
-    let client_id = ipc_ctx.app_settings.get()?.github_oauth_app.oauth_client_id.clone();
+    let client_id = ipc_ctx
+        .app_settings
+        .get()?
+        .github_oauth_app
+        .oauth_client_id
+        .clone();
     req_body.insert("client_id", client_id.as_str());
     req_body.insert("device_code", params.device_code.as_str());
     req_body.insert("grant_type", "urn:ietf:params:oauth:grant-type:device_code");

crates/but-interface/src/commands/mod.rs

@@ -7,6 +7,7 @@ pub mod git;
 pub mod github;
 pub mod modes;
 pub mod open;
+pub mod projects;
 pub mod remotes;
 pub mod repo;
 pub mod rules;
@@ -17,3 +18,4 @@ pub mod undo;
 pub mod users;
 pub mod virtual_branches;
 pub mod workspace;
+pub mod zip;

crates/but-interface/src/commands/projects.rs

@@ -0,0 +1,64 @@
+use crate::{IpcContext, error::Error};
+use gitbutler_project::{self as projects, ProjectId};
+use std::path::PathBuf;
+use serde::Deserialize;
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UpdateProjectParams {
+    pub project: projects::UpdateRequest,
+}
+
+pub fn update_project(
+    _ipc_ctx: &IpcContext,
+    params: UpdateProjectParams,
+) -> Result<projects::Project, Error> {
+    Ok(gitbutler_project::update(&params.project)?)
+}
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AddProjectParams {
+    pub path: PathBuf,
+}
+
+pub fn add_project(
+    ipc_ctx: &IpcContext,
+    params: AddProjectParams,
+) -> Result<projects::Project, Error> {
+    let user = ipc_ctx.user_controller.get_user()?;
+    let name = user.as_ref().and_then(|u| u.name.clone());
+    let email = user.as_ref().and_then(|u| u.email.clone());
+    Ok(gitbutler_project::add(&params.path, name, email)?)
+}
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct GetProjectParams {
+    pub project_id: ProjectId,
+    pub no_validation: Option<bool>,
+}
+
+pub fn get_project(
+    _ipc_ctx: &IpcContext,
+    params: GetProjectParams,
+) -> Result<projects::Project, Error> {
+    if params.no_validation.unwrap_or(false) {
+        Ok(gitbutler_project::get_raw(params.project_id)?)
+    } else {
+        Ok(gitbutler_project::get_validated(params.project_id)?)
+    }
+}
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct DeleteProjectParams {
+    pub project_id: ProjectId,
+}
+
+pub fn delete_project(
+    _ipc_ctx: &IpcContext,
+    params: DeleteProjectParams,
+) -> Result<(), Error> {
+    gitbutler_project::delete(params.project_id).map_err(Into::into)
+}

crates/but-interface/src/commands/settings.rs

@@ -1,14 +1,12 @@
 //! In place of commands.rs
-use but_settings::api::{FeatureFlagsUpdate, TelemetryUpdate};
 use but_settings::AppSettings;
+use but_settings::api::{FeatureFlagsUpdate, TelemetryUpdate};
 use serde::Deserialize;
 
+use crate::NoParams;
 use crate::{IpcContext, error::Error};
 
-pub fn get_app_settings(
-    ipc_ctx: &IpcContext,
-    _params: (),
-) -> Result<AppSettings, Error> {
+pub fn get_app_settings(ipc_ctx: &IpcContext, _params: NoParams) -> Result<AppSettings, Error> {
     Ok(ipc_ctx.app_settings.get()?.clone())
 }
 
@@ -34,11 +32,11 @@ pub struct UpdateTelemetryParams {
     pub update: TelemetryUpdate,
 }
 
-pub fn update_telemetry(
-    ipc_ctx: &IpcContext,
-    params: UpdateTelemetryParams,
-) -> Result<(), Error> {
-    ipc_ctx.app_settings.update_telemetry(params.update).map_err(|e| e.into())
+pub fn update_telemetry(ipc_ctx: &IpcContext, params: UpdateTelemetryParams) -> Result<(), Error> {
+    ipc_ctx
+        .app_settings
+        .update_telemetry(params.update)
+        .map_err(|e| e.into())
 }
 
 #[derive(Deserialize)]
@@ -67,5 +65,8 @@ pub fn update_feature_flags(
     ipc_ctx: &IpcContext,
     params: UpdateFeatureFlagsParams,
 ) -> Result<(), Error> {
-    ipc_ctx.app_settings.update_feature_flags(params.update).map_err(|e| e.into())
-}
+    ipc_ctx
+        .app_settings
+        .update_feature_flags(params.update)
+        .map_err(|e| e.into())
+}

crates/but-interface/src/commands/users.rs

@@ -2,7 +2,7 @@ use anyhow::Result;
 use gitbutler_user::User;
 use serde::{Deserialize, Serialize};
 
-use crate::{IpcContext, error::Error};
+use crate::{IpcContext, NoParams, error::Error};
 
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -62,7 +62,7 @@ impl TryFrom<User> for UserWithSecrets {
     }
 }
 
-pub fn get_user(ipc_ctx: &IpcContext, _params: ()) -> Result<Option<UserWithSecrets>, Error> {
+pub fn get_user(ipc_ctx: &IpcContext, _params: NoParams) -> Result<Option<UserWithSecrets>, Error> {
     match ipc_ctx.user_controller.get_user()? {
         Some(user) => {
             if let Err(err) = user.access_token() {
@@ -80,7 +80,7 @@ pub fn set_user(ipc_ctx: &IpcContext, params: SetUserParams) -> Result<User, Err
     Ok(params.user)
 }
 
-pub fn delete_user(ipc_ctx: &IpcContext, _params: ()) -> Result<(), Error> {
+pub fn delete_user(ipc_ctx: &IpcContext, _params: NoParams) -> Result<(), Error> {
     ipc_ctx.user_controller.delete_user()?;
     Ok(())
 }