Fix config

R/config.R

@@ -1,7 +1,20 @@
 # config
 .yuque_config_path = "~/.yuque.json"
 
+#' Configure YuQue
+#'
+#' Ask some questions to user and save configuration to local file.
+#'
+#' More details see [yq_whoami], [yq_token].
+#'
+#' @return Nothing.
 #' @export
+#'
+#' @examples
+#' \dontrun{
+#' if (interactive())
+#'   yq_config()
+#' }
 yq_config = function() {
     config = list()
     config$login = ""
@@ -44,8 +57,26 @@ yq_config = function() {
     }
 
     message("Saving info to ", .yuque_config_path)
-    jsonlite::write_json(config, path = .yuque_config_path)
+    update_config(config, path = .yuque_config_path)
+
     message("Done. Enjoy this tool.\n- Shixiang")
 }
 
+update_config = function(x, path) {
+    if (!file.exists(path)) {
+        jsonlite::write_json(x, path = path)
+    } else {
+        up_config = jsonlite::read_json(path, simplifyVector = TRUE)
+        up_names = names(up_config)
+        for (i in names(x)) {
+            ifelse(i %in% up_names,
+                   message("Updating ", i),
+                   message("Adding ", i))
+            up_config[[i]] = x[[i]]
+        }
+        jsonlite::write_json(up_config, path = path)
+    }
+
+}
+
 #jsonlite::read_json("test.json", simplifyVector = TRUE)

R/token.R

@@ -16,7 +16,10 @@
 yq_token <- function() {
   if (file.exists(.yuque_config_path)) {
     token = jsonlite::read_json(.yuque_config_path, simplifyVector = TRUE)$token
+  } else {
+      token = ""
   }
+
   if (token != "") {
     return(token)
   } else {

R/whoami.R

@@ -48,11 +48,20 @@ yq_whoami <- function(.token = NULL, .api_url = NULL, .send_headers = NULL) {
       "For more on what to do with the PAT, see ?yq_whoami.",
       "\n==========================================="
     )
-    login = jsonlite::read_json(.yuque_config_path, simplifyVector = TRUE)$login
-    res <- yq(
-      endpoint = "/users/:login", login = login, .token = .token,
-      .api_url = .api_url, .send_headers = .send_headers
-    )
+    if (file.exists(.yuque_config_path)) {
+        login = jsonlite::read_json(.yuque_config_path, simplifyVector = TRUE)$login
+        res <- yq(
+            endpoint = "/users/:login", login = login, .token = .token,
+            .api_url = .api_url, .send_headers = .send_headers
+        )
+    } else {
+        message(
+            "Also no configure file for YuQue available.\n",
+            "Please either specify .token argument or \n",
+            "set configuration via yq_config()"
+        )
+        return(invisible(NULL))
+    }
   } else {
     res <- yq(
       endpoint = "/user", .token = .token,

R/yq.R

@@ -43,7 +43,7 @@ NULL
 #'   existing file.  Defaults to FALSE.
 #' @param .token Authentication token. Default to YUQUE_TOKEN
 #'   environment variables, in this order if any is set.
-#' @param .api_url Github API url (default: \url{https://www.yuque.com/api/v2}). Used
+#' @param .api_url YuQue API url (default: \url{https://www.yuque.com/api/v2}). Used
 #'   if \code{endpoint} just contains a path. Default to YuQue_API_URL
 #'   environment variable if set.
 #' @param .method HTTP method to use if not explicitly supplied in the