Merge pull request #224 from Lchiffon/master

update write function ( utf8 encoding)
ropensci · Jun 21, 2018 · 36a8702 · 36a8702
2 parents fb5e03a + 1582026
commit 36a8702
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/R/docs_bulk_update.R b/R/docs_bulk_update.R
@@ -119,6 +119,6 @@ make_bulk_update <- function(df, index, type, counter, path = NULL) {
 
   data <- lapply(tmp, jsonlite::toJSON, na = "null", auto_unbox = TRUE)
   tmpf <- if (is.null(path)) tempfile("elastic__") else path
-  writeLines(paste(metadata, data, sep = "\n"), tmpf)
+  write_utf8(paste(metadata, data, sep = "\n"), tmpf)
   invisible(tmpf)
 }
diff --git a/R/docs_bulk_utils.R b/R/docs_bulk_utils.R
@@ -23,7 +23,7 @@ make_bulk <- function(df, index, type, counter, es_ids, path = NULL) {
   )
   data <- jsonlite::toJSON(df, collapse = FALSE, na = "null", auto_unbox = TRUE)
   tmpf <- if (is.null(path)) tempfile("elastic__") else path
-  writeLines(paste(metadata, data, sep = "\n"), tmpf)
+  write_utf8(paste(metadata, data, sep = "\n"), tmpf)
   invisible(tmpf)
 }
 

diff --git a/R/zzz.r b/R/zzz.r
@@ -157,3 +157,11 @@ assert <- function(x, y) {
     }
   }
 }
+
+
+write_utf8 = function(text, con, ...) {
+  # prevent re-encoding the text in the file() connection in writeLines()
+  # https://kevinushey.github.io/blog/2018/02/21/string-encoding-and-r/
+  opts = options(encoding = 'native.enc'); on.exit(options(opts), add = TRUE)
+  writeLines(enc2utf8(text), con, ..., useBytes = TRUE)
+}