From 28c36131e347dda08c77488c2627f02eb2456b2b Mon Sep 17 00:00:00 2001
From: Joshua Yin <56745535+Subjective@users.noreply.github.com>
Date: Thu, 7 Sep 2023 19:05:24 -0700
Subject: [PATCH 1/5] feat: add option to configure environment variable for
 edit command

---
 src/cmds/edit.rs   | 13 +++++++++++++
 src/config/code.rs |  3 +++
 2 files changed, 16 insertions(+)

diff --git a/src/cmds/edit.rs b/src/cmds/edit.rs
index 73a9878..84409fd 100644
--- a/src/cmds/edit.rs
+++ b/src/cmds/edit.rs
@@ -161,8 +161,21 @@ impl Command for EditCommand {
             args.extend_from_slice(&editor_args);
         }
 
+        let editor_env = &conf.code.editor_env;
+        let mut env: Vec<&str> = vec!["", ""];
+        if !editor_env.is_empty() {
+            env = editor_env.splitn(2, '=').collect();
+            if env.len() != 2 {
+                return Err(crate::Error::FeatureError(
+                    "Invalid environment variable, please check your configuration for errors"
+                        .into(),
+                ));
+            }
+        }
+
         args.push(path);
         std::process::Command::new(conf.code.editor)
+            .env(env[0], env[1])
             .args(args)
             .status()?;
         Ok(())
diff --git a/src/config/code.rs b/src/config/code.rs
index f8e6cea..ff5b329 100644
--- a/src/config/code.rs
+++ b/src/config/code.rs
@@ -17,6 +17,8 @@ pub struct Code {
     #[serde(rename(serialize = "editor-args"), alias = "editor-args", default)]
     pub editor_args: Option<Vec<String>>,
     #[serde(default, skip_serializing)]
+    pub editor_env: String,
+    #[serde(default, skip_serializing)]
     pub edit_code_marker: bool,
     #[serde(default, skip_serializing)]
     pub start_marker: String,
@@ -44,6 +46,7 @@ impl Default for Code {
         Self {
             editor: "vim".into(),
             editor_args: None,
+            editor_env: "".into(),
             edit_code_marker: false,
             start_marker: "".into(),
             end_marker: "".into(),

From 7b3047fb12860a20342c3f046dd6d337ac732c12 Mon Sep 17 00:00:00 2001
From: Joshua Yin <56745535+Subjective@users.noreply.github.com>
Date: Thu, 7 Sep 2023 19:31:39 -0700
Subject: [PATCH 2/5] feat: allow for unlimited environment variables

---
 src/cmds/edit.rs   | 39 +++++++++++++++++++++++++++++----------
 src/config/code.rs |  6 +++---
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/cmds/edit.rs b/src/cmds/edit.rs
index 84409fd..9f42efe 100644
--- a/src/cmds/edit.rs
+++ b/src/cmds/edit.rs
@@ -3,6 +3,7 @@ use super::Command;
 use crate::Error;
 use async_trait::async_trait;
 use clap::{Arg, ArgMatches, Command as ClapCommand};
+use std::collections::HashMap;
 
 /// Abstract `edit` command
 ///
@@ -161,21 +162,39 @@ impl Command for EditCommand {
             args.extend_from_slice(&editor_args);
         }
 
-        let editor_env = &conf.code.editor_env;
-        let mut env: Vec<&str> = vec!["", ""];
-        if !editor_env.is_empty() {
-            env = editor_env.splitn(2, '=').collect();
-            if env.len() != 2 {
-                return Err(crate::Error::FeatureError(
-                    "Invalid environment variable, please check your configuration for errors"
-                        .into(),
-                ));
+        // Set environment variables for editor
+        //
+        // for example:
+        //
+        // ```toml
+        // [code]
+        // editor = "nvim"
+        // editor_envs = [ "XDG_DATA_HOME=...", "XDG_CONFIG_HOME=...", "XDG_STATE_HOME=..." ]
+        // ```
+        //
+        // ```rust
+        // Command::new("nvim").envs(&[ ("XDG_DATA_HOME", "..."), ("XDG_CONFIG_HOME", "..."), ("XDG_STATE_HOME", "..."), ]);
+        // ```
+        let mut envs: HashMap<String, String> = Default::default();
+        if let Some(editor_envs) = &conf.code.editor_envs {
+            for env in editor_envs.iter() {
+                let parts: Vec<&str> = env.split('=').collect();
+                if parts.len() == 2 {
+                    let name = parts[0].trim();
+                    let value = parts[1].trim();
+                    envs.insert(name.to_string(), value.to_string());
+                } else {
+                    return Err(crate::Error::FeatureError(format!(
+                        "Invalid editor environment variable: {}",
+                        &env
+                    )));
+                }
             }
         }
 
         args.push(path);
         std::process::Command::new(conf.code.editor)
-            .env(env[0], env[1])
+            .envs(envs)
             .args(args)
             .status()?;
         Ok(())
diff --git a/src/config/code.rs b/src/config/code.rs
index ff5b329..b842657 100644
--- a/src/config/code.rs
+++ b/src/config/code.rs
@@ -16,8 +16,8 @@ pub struct Code {
     pub editor: String,
     #[serde(rename(serialize = "editor-args"), alias = "editor-args", default)]
     pub editor_args: Option<Vec<String>>,
-    #[serde(default, skip_serializing)]
-    pub editor_env: String,
+    #[serde(rename(serialize = "editor-envs"), alias = "editor-envs", default)]
+    pub editor_envs: Option<Vec<String>>,
     #[serde(default, skip_serializing)]
     pub edit_code_marker: bool,
     #[serde(default, skip_serializing)]
@@ -46,7 +46,7 @@ impl Default for Code {
         Self {
             editor: "vim".into(),
             editor_args: None,
-            editor_env: "".into(),
+            editor_envs: None,
             edit_code_marker: false,
             start_marker: "".into(),
             end_marker: "".into(),

From c9e8c1f876ad5ee1fd8f547405d365db97f4c47f Mon Sep 17 00:00:00 2001
From: Joshua Yin <56745535+Subjective@users.noreply.github.com>
Date: Thu, 7 Sep 2023 19:41:52 -0700
Subject: [PATCH 3/5] Update README for Optional environment variables

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 39c61dc..6706ab3 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,8 @@ To configure leetcode-cli, create a file at `~/.leetcode/leetcode.toml`):
 editor = 'emacs'
 # Optional parameter
 editor_args = ['-nw']
+# Optional environment variables (ex. [ "XDG_DATA_HOME=...", "XDG_CONFIG_HOME=...", "XDG_STATE_HOME=..." ])
+editor_envs = []
 lang = 'rust'
 edit_code_marker = false
 start_marker = ""
@@ -104,6 +106,8 @@ scripts = 'scripts'
 editor = 'emacs'
 # Optional parameter
 editor_args = ['-nw']
+# Optional environment variables (ex. [ "XDG_DATA_HOME=...", "XDG_CONFIG_HOME=...", "XDG_STATE_HOME=..." ])
+editor_envs = []
 lang = 'rust'
 edit_code_marker = true
 start_marker = "start_marker"

From 05464746645084b95404ac713585106c8ee49b72 Mon Sep 17 00:00:00 2001
From: Joshua Yin <56745535+Subjective@users.noreply.github.com>
Date: Thu, 7 Sep 2023 23:18:58 -0700
Subject: [PATCH 4/5] docs: fix inject_before example in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6706ab3..5a6ad7f 100644
--- a/README.md
+++ b/README.md
@@ -194,7 +194,7 @@ Some linting tools/lsps will throw errors unless the necessary libraries are imp
 
 ```toml
 [code]
-inject_before = ["#include<bits/stdc++.h", "using namespace std;"]
+inject_before = ["#include<bits/stdc++.h>", "using namespace std;"]
 inject_after = ["int main() {\n    Solution solution;\n\n}"]
 ```
 

From 7cb2355f6ad49369108076fd83322859c6269c9d Mon Sep 17 00:00:00 2001
From: Joshua Yin <56745535+Subjective@users.noreply.github.com>
Date: Fri, 8 Sep 2023 02:36:05 -0700
Subject: [PATCH 5/5] chore: fix grammar/typos

---
 src/cache/mod.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cache/mod.rs b/src/cache/mod.rs
index fc3da47..169c18b 100644
--- a/src/cache/mod.rs
+++ b/src/cache/mod.rs
@@ -115,7 +115,7 @@ impl Cache {
         let p: Problem = problems.filter(fid.eq(rfid)).first(&mut self.conn()?)?;
         if p.category != "algorithms" {
             return Err(Error::FeatureError(
-                "Not support database and shell questions for now".to_string(),
+                "No support for database and shell questions yet".to_string(),
             ));
         }
 
@@ -129,7 +129,7 @@ impl Cache {
             .first(&mut self.conn()?)?;
         if p.category != "algorithms" {
             return Err(Error::FeatureError(
-                "Not support database and shell questions for now".to_string(),
+                "No support for database and shell questions yet".to_string(),
             ));
         }
         Ok(p.fid)
@@ -174,7 +174,7 @@ impl Cache {
 
         if target.category != "algorithms" {
             return Err(Error::FeatureError(
-                "Not support database and shell questions for now".to_string(),
+                "No support for database and shell questions yet".to_string(),
             ));
         }
 
@@ -255,7 +255,7 @@ impl Cache {
         rfid: i32,
         test_case: Option<String>,
     ) -> Result<(HashMap<&'static str, String>, [String; 2]), Error> {
-        trace!("pre run code...");
+        trace!("pre-run code...");
         use crate::helper::code_path;
         use std::fs::File;
         use std::io::Read;

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/clearloop/leetcode-cli/pull/133.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/clearloop/leetcode-cli/pull/133.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/clearloop/leetcode-cli/pull/133.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/clearloop/leetcode-cli/pull/133.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>