add launcher, socket and paths to healthcheck (fix #52, fix #53)

Author: atomicptr

crates/bridge/src/main.rs

@@ -3,12 +3,12 @@ use std::{
     path::{PathBuf, absolute},
 };
 
-use anyhow::{Context, Result};
+use anyhow::Result;
 use clap::{Parser, Subcommand};
 use defold_nvim_core::{
     editor,
     focus::{focus_game, focus_neovim},
-    mobdap, neovide, project, script_api,
+    mobdap, neovide, path, project, script_api,
 };
 use tracing::Level;
 use tracing_appender::rolling::never;
@@ -116,10 +116,7 @@ fn main() -> Result<()> {
         }
     };
 
-    let logs = dirs::cache_dir()
-        .context("could not get cache dir")?
-        .join("defold.nvim")
-        .join("logs");
+    let logs = path::cache_dir()?.join("logs");
 
     fs::create_dir_all(&logs)?;
 

crates/core/src/bridge.rs

@@ -1,11 +1,11 @@
-use anyhow::{Context, Result};
+use anyhow::Result;
 use std::{
     fs::{self},
     path::{Path, PathBuf},
 };
 use version_compare::Version;
 
-use crate::{release_downloader, utils};
+use crate::{path, release_downloader, utils};
 
 const EXECUTABLE_NAME: &str = "defold-nvim-bridge";
 const OWNER: &str = "atomicptr";
@@ -51,10 +51,7 @@ fn exe_name() -> String {
 }
 
 fn local_path() -> Result<PathBuf> {
-    let dir = dirs::data_dir()
-        .context("could not get data dir")?
-        .join("defold.nvim")
-        .join("bin");
+    let dir = path::data_dir()?.join("bin");
 
     fs::create_dir_all(&dir)?;
 

crates/core/src/cache.rs

@@ -1,12 +1,9 @@
-use crate::utils::sha3;
-use anyhow::{Context, Result};
+use crate::{path, utils::sha3};
+use anyhow::Result;
 use std::{fs, path::PathBuf, time::Duration};
 
 fn cache_dir() -> Result<PathBuf> {
-    let dir = dirs::cache_dir()
-        .context("could not get cache dir")?
-        .join("defold.nvim")
-        .join("cache");
+    let dir = path::cache_dir()?.join("cache");
 
     fs::create_dir_all(&dir)?;
 

crates/core/src/defold_annotations.rs

@@ -8,7 +8,7 @@ use anyhow::{Context, Result, bail};
 use version_compare::Version;
 use zip::ZipArchive;
 
-use crate::{github, project, utils};
+use crate::{github, path, project, utils};
 
 const OWNER: &str = "astrochili";
 const REPOSITORY: &str = "defold-annotations";
@@ -19,10 +19,7 @@ pub fn dir() -> Result<PathBuf> {
 }
 
 fn version_path() -> Result<PathBuf> {
-    let dir = dirs::data_dir()
-        .context("could not get data dir")?
-        .join("defold.nvim")
-        .join("meta");
+    let dir = path::data_dir()?.join("meta");
 
     fs::create_dir_all(&dir)?;
 

crates/core/src/editor_config.rs

@@ -5,7 +5,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use crate::{bridge, editor};
+use crate::{bridge, editor, path};
 
 #[derive(Debug, Deserialize)]
 pub enum LauncherType {
@@ -102,10 +102,7 @@ fn create_runner_script(
     plugin_root: &Path,
     launcher_settings: &LauncherSettings,
 ) -> Result<PathBuf> {
-    let dir = dirs::data_dir()
-        .context("could not get data dir")?
-        .join("defold.nvim")
-        .join("bin");
+    let dir = path::data_dir()?.join("bin");
     fs::create_dir_all(&dir)?;
 
     let script_path = dir.join(format!("run.{SCRIPT_EXT}"));

crates/core/src/lib.rs

@@ -9,6 +9,7 @@ pub mod github;
 pub mod mobdap;
 pub mod neovide;
 pub mod nvim_server;
+pub mod path;
 pub mod project;
 mod release_downloader;
 pub mod script_api;

crates/core/src/neovide.rs

@@ -7,7 +7,7 @@ use std::{
 
 use anyhow::{Context, Result, bail};
 
-use crate::{release_downloader, utils};
+use crate::{path, release_downloader, utils};
 
 const EXECUTABLE_NAME: &str = "neovide";
 const OWNER: &str = "neovide";
@@ -26,10 +26,7 @@ const ASSET_NAME: &str = "Neovide-aarch64-apple-darwin.dmg";
 const ASSET_NAME: &'static str = "neovide.exe.zip";
 
 fn bin_dir() -> Result<PathBuf> {
-    let dir = dirs::data_dir()
-        .context("could not get data dir")?
-        .join("defold.nvim")
-        .join("bin");
+    let dir = path::data_dir()?.join("bin");
 
     Ok(dir)
 }

crates/core/src/nvim_server.rs

@@ -1,4 +1,4 @@
-use crate::utils::project_id;
+use crate::{path, utils::project_id};
 use anyhow::{Context, Result, bail};
 use std::{
     fs,
@@ -36,9 +36,7 @@ pub fn runtime_dir(root_dir: &Path) -> Result<PathBuf> {
         .to_str()
         .context("could not convert root dir to string")?;
 
-    let dir = dirs::cache_dir()
-        .context("could not get cache dir")?
-        .join("defold.nvim")
+    let dir = path::cache_dir()?
         .join("runtime")
         .join(project_id(root_dir)?);
 

crates/core/src/path.rs

@@ -0,0 +1,14 @@
+use anyhow::{Context, Result};
+use std::path::PathBuf;
+
+pub fn data_dir() -> Result<PathBuf> {
+    dirs::data_dir()
+        .context("could not get data dir")
+        .map(|p| p.join("defold.nvim"))
+}
+
+pub fn cache_dir() -> Result<PathBuf> {
+    dirs::cache_dir()
+        .context("could not get cache dir")
+        .map(|p| p.join("defold.nvim"))
+}

crates/core/src/project.rs

@@ -7,7 +7,7 @@ use std::{
 use crate::{
     defold_annotations,
     game_project::GameProject,
-    script_api,
+    path, script_api,
     utils::{self, sha3},
 };
 use anyhow::{Context, Result, bail};
@@ -21,10 +21,7 @@ fn ident(string: &str) -> Result<String> {
 }
 
 pub fn deps_root() -> Result<PathBuf> {
-    let dir = dirs::data_dir()
-        .context("could not get data dir")?
-        .join("defold.nvim")
-        .join("deps");
+    let dir = path::data_dir()?.join("deps");
     fs::create_dir_all(&dir)?;
     Ok(dir)
 }