diff --git a/DESCRIPTION b/DESCRIPTION index 707de5d..e38baea 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: ari Type: Package Title: Automated R Instructor -Version: 0.3.3 +Version: 0.3.5 Authors@R: c( person("Sean", "Kross", email = "sean@seankross.com", role = c("aut", "cre")), person("John", "Muschelli", role = "ctb") @@ -16,7 +16,7 @@ SystemRequirements: ffmpeg (>= 3.2.4) Depends: R (>= 3.1.0) Imports: - text2speech (>= 0.2.4), + text2speech (>= 0.2.8), tuneR, webshot, purrr, @@ -30,13 +30,11 @@ Suggests: testthat, grDevices, xaringan, - aws.signature, - aws.polly, knitr License: MIT + file LICENSE URL: http://github.com/seankross/ari BugReports: http://github.com/seankross/ari/issues Encoding: UTF-8 LazyData: true -RoxygenNote: 6.1.1 +RoxygenNote: 7.0.2 VignetteBuilder: knitr diff --git a/NAMESPACE b/NAMESPACE index 605d9fc..56605c6 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -36,6 +36,7 @@ importFrom(rvest,html_nodes) importFrom(rvest,html_text) importFrom(text2speech,tts) importFrom(text2speech,tts_auth) +importFrom(text2speech,tts_default_voice) importFrom(tools,file_ext) importFrom(tools,file_path_sans_ext) importFrom(tuneR,Wave) diff --git a/NEWS.md b/NEWS.md index 7b1dda5..6fe426e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,12 @@ +# ari 0.3.5 + +- Removed `have_polly()`. + +# ari 0.3.4 + +- Removed strict dependency on aws.polly and associated Cloudyr projects because +they have been orphaned. + # ari 0.3.3 - Added vignette for using via a Docker image. diff --git a/R/ari_narrate.R b/R/ari_narrate.R index 183bf5c..63f4a4c 100644 --- a/R/ari_narrate.R +++ b/R/ari_narrate.R @@ -16,7 +16,8 @@ #' \code{\link[text2speech]{tts_voices}} for more information #' about what voices are available. #' @param service speech synthesis service to use, -#' passed to \code{\link[text2speech]{tts}}. +#' passed to \code{\link[text2speech]{tts}}. +#' Either \code{"amazon"} or \code{"google"}. #' @param capture_method Either \code{"vectorized"} or \code{"iterative"}. #' The vectorized mode is faster though it can cause screens to repeat. If #' making a video from an \code{\link[rmarkdown]{ioslides_presentation}} @@ -52,7 +53,7 @@ #' } ari_narrate <- function(script, slides, output = tempfile(fileext = ".mp4"), - voice = "Joanna", + voice = text2speech::tts_default_voice(service = service), service = "amazon", capture_method = c("vectorized", "iterative"), subtitles = FALSE, ..., diff --git a/R/ari_spin.R b/R/ari_spin.R index 764fc92..1a5d125 100644 --- a/R/ari_spin.R +++ b/R/ari_spin.R @@ -1,8 +1,7 @@ #' Create a video from images and text #' #' Given equal length vectors of paths to images (preferably \code{.jpg}s -#' or \code{.png}s) and strings which will be -#' \code{\link[aws.polly]{synthesize}}d by +#' or \code{.png}s) and strings which will be synthesized by #' \href{https://aws.amazon.com/polly/}{Amazon Polly} or #' any other synthesizer available in #' \code{\link[text2speech]{tts}}, this function creates an @@ -15,7 +14,7 @@ #' narration. You can find a guide for accessing AWS from R #' \href{http://seankross.com/2017/05/02/Access-Amazon-Web-Services-in-R.html}{here}. #' For more information about how R connects -#' to Amazon Polly see the \code{\link[aws.polly]{aws.polly}} documentation +#' to Amazon Polly see the \code{aws.polly]} documentation #' \href{https://github.com/cloudyr/aws.polly}{here}. #' #' @param images A vector of paths to images. @@ -25,7 +24,8 @@ #' \code{\link[text2speech]{tts_voices}} for more information #' about what voices are available. #' @param service speech synthesis service to use, -#' passed to \code{\link[text2speech]{tts}} +#' passed to \code{\link[text2speech]{tts}}. +#' Either \code{"amazon"} or \code{"google"}. #' @param subtitles Should a \code{.srt} file be created with subtitles? The #' default value is \code{FALSE}. If \code{TRUE} then a file with the same name #' as the \code{output} argument will be created, but with the file extension @@ -34,7 +34,7 @@ #' #' @return The output from \code{\link{ari_stitch}} #' -#' @importFrom text2speech tts_auth tts +#' @importFrom text2speech tts_auth tts tts_default_voice #' @importFrom tuneR bind Wave #' @importFrom purrr map reduce #' @importFrom progress progress_bar @@ -54,7 +54,7 @@ ari_spin <- function( images, paragraphs, output = tempfile(fileext = ".mp4"), - voice = "Joanna", + voice = text2speech::tts_default_voice(service = service), service = "amazon", subtitles = FALSE, ...){ @@ -135,4 +135,4 @@ ari_spin <- function( attr(res, "voice") = voice attr(res, "service") = service return(res) -} \ No newline at end of file +} diff --git a/R/ari_talk.R b/R/ari_talk.R index fc55f7c..48c0c1b 100644 --- a/R/ari_talk.R +++ b/R/ari_talk.R @@ -8,7 +8,7 @@ #' about what voices are available. #' @param service speech synthesis service to use, #' passed to \code{\link[text2speech]{tts}} -#' +#' Either \code{"amazon"} or \code{"google"}. #' @return A \code{Wave} output object, with the attribute \code{outfile} #' of the output file name. #' @importFrom text2speech tts_auth tts @@ -17,7 +17,7 @@ #' @export ari_talk <- function(paragraphs, output = tempfile(fileext = ".wav"), - voice = "Joanna", + voice = text2speech::tts_default_voice(service = service), service = "amazon") { auth = text2speech::tts_auth(service = service) if (!auth) { diff --git a/README.md b/README.md index bf65975..32ef902 100644 --- a/README.md +++ b/README.md @@ -48,9 +48,9 @@ to put narration right in your `.Rmd` file (see `file.show(ari_example("ari_comments.Rmd"))`). Make sure to knit your `.Rmd` file into the HTML slides you want to be turned into a video. -Once you've finished your script and slides install the -[`aws.polly`](https://github.com/cloudyr/aws.polly) package. You can find a -guide for quickly setting up R to use Amazon Web Services +Once you have finished your script and slides install the +`aws.polly` package. You can find a guide for quickly +setting up R to use Amazon Web Services [here](http://seankross.com/2017/05/02/Access-Amazon-Web-Services-in-R.html). Run `aws.polly::list_voices()` to make sure your keys are working (this function should return a data frame). Once you've set up your access keys you diff --git a/cran-comments.md b/cran-comments.md index 432fff0..3e782e0 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -8,4 +8,6 @@ ## R CMD check results -0 errors | 0 warnings | 0 notes \ No newline at end of file +0 errors | 0 warnings | 1 note + +* New submission, Package was archived on CRAN diff --git a/docs/404.html b/docs/404.html new file mode 100644 index 0000000..568e2b3 --- /dev/null +++ b/docs/404.html @@ -0,0 +1,150 @@ + + + + + + + + +Page not found (404) • ari + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+ +
+
+
+

Page not found (404)

+
+ +Content not found. Please use links in the navbar. + +
+ +
+ + + + +
+ + + + + + + + diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 1774646..5c7b70e 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -8,21 +8,25 @@ License • ari + + - + + - - + + + @@ -30,10 +34,12 @@ + + @@ -44,6 +50,7 @@ + @@ -60,7 +67,7 @@ ari - 0.3.2 + 0.3.3 @@ -68,22 +75,33 @@ -