From 624e7a2b64ee9f2ecae5777e74df75c0c6a88736 Mon Sep 17 00:00:00 2001 From: Luke Johnston Date: Fri, 7 Jun 2019 19:18:14 +0200 Subject: [PATCH] data needs to be in www and images in images --- R/convert-from-datacamp.R | 10 ++++++++++ R/parse-chapters.R | 3 ++- R/parse-slides.R | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/R/convert-from-datacamp.R b/R/convert-from-datacamp.R index 01ea907..bace9e8 100644 --- a/R/convert-from-datacamp.R +++ b/R/convert-from-datacamp.R @@ -117,5 +117,15 @@ copy_datasets_dir_to_lrnr <- function(.dc_path, .lrnr_pkg_path) { dc_dataset_dir <- fs::path(.dc_path, "datasets") lrnr_dataset_dir <- fs::path(.lrnr_pkg_path, "inst", "tutorials", "datasets") fs::dir_copy(dc_dataset_dir, lrnr_dataset_dir) + + data_files <- fs::dir_ls(lrnr_dataset_dir, regexp = ".*\\.[rR]d[sa]$") + new_data_files <- str_replace(data_files, "datasets", "www") + fs::dir_create(fs::path(.lrnr_pkg_path, "inst", "tutorials", "www")) + fs::file_move(data_files, new_data_files) + + image_files <- fs::dir_ls(lrnr_dataset_dir, regexp = ".*\\.(png|jpeg|jpg)$") + new_image_files <- str_replace(image_files, "datasets", "images") + fs::dir_create(fs::path(.lrnr_pkg_path, "inst", "tutorials", "images")) + fs::file_move(image_files, new_image_files) } diff --git a/R/parse-chapters.R b/R/parse-chapters.R index 33594bd..05ca88e 100644 --- a/R/parse-chapters.R +++ b/R/parse-chapters.R @@ -69,7 +69,8 @@ chpt_modify_instruction_name <- function(.lines) { chpt_modify_dataset_path <- function(.lines) { .lines %>% str_replace("^load.*?http.*(datasets)/.*/(.*\\.[rR]da).*$", "load('\\1/\\2')") %>% - str_replace("readRDS.*?http.*(datasets)/.*/(.*\\.[rR]ds).*$", "readRDS('\\1/\\2')") + str_replace("readRDS.*?http.*(datasets)/.*/(.*\\.[rR]ds).*$", "readRDS('\\1/\\2')") %>% + str_replace("datasets", "www") } chpt_modify_yaml <- function(.lines) { diff --git a/R/parse-slides.R b/R/parse-slides.R index 2c048ac..2ca7bed 100644 --- a/R/parse-slides.R +++ b/R/parse-slides.R @@ -38,7 +38,8 @@ sld_remove_dc_reveals <- function(.lines) { sld_modify_image_path <- function(.lines) { .lines %>% - str_replace("http.*(datasets)/.*/(.*\\..*\\))$", "\\1/\\2") + str_replace("http.*(datasets)/.*/(.*\\..*\\))$", "\\1/\\2") %>% + str_replace("datasets", "images") } sld_modify_r_chunks <- function(.lines) {