Refactoring submission 3

Author: petteripiiroinen

tmcrstudioaddin/R/HTTPQueries.R

@@ -123,43 +123,6 @@ download_exercise <- function(exercise_id,
          url_config         = url_config)
   }
 
-
-#' @title Upload an exercise to the TMC server
-#'
-#' @description Upload an exercise to the TMC server
-#'
-#' @usage upload_exercise(token, exercise_id, project_path, server_address,
-#'         zip_name = "temp", remove_zip = TRUE)
-#'
-#' @param token \code{OAuth2} token associated with the current login
-#' session.
-#' @param exercise_id ID of the submitted exercise.
-#' @param project_path File path to the directory of the submitted
-#' exercise.
-#' @param server_address Address of the TMC server where the exercise is
-#' submitted to.
-#' @param zip_name Name of the \code{zip} file which contains the
-#' exercise submission. Default is \code{temp}
-#' @param remove_zip \code{TRUE} or \code{FALSE} depending on if you
-#' wish to delete the submission \code{zip} file after sending it to the
-#' server. Defaults to \code{TRUE}.
-#'
-#' @details Packs the exercise directory into a \code{zip} file and
-#' sends it to the TMC server as a list.
-#'
-#' @return \code{HTTP} response to the submission attempt.
-#'
-#' @seealso \code{\link[httr]{add_headers}},
-#' \code{\link[httr]{upload_file}}, \code{\link[httr]{POST}},
-#' \code{\link[base]{file.remove}}
-
-# Zips and uploads a single exercise, which is located in project_path.
-# Returns the response, which contains a field $submission_url
-# containing the details of the submission.
-upload_exercise <- function(token, exercise_id, project_path,
-                            server_address, zip_name = "temp",
-                            remove_zip = TRUE) {
-  url_data <- .upload_exercise1(token, exercise_id, server_address)
   .upload_exercise2 <- function(url_data, project_path, remove_zip) {
     exercises_response <- list()
     exercises_url      <- url_data$exercises_url
@@ -212,6 +175,44 @@ upload_exercise <- function(token, exercise_id, project_path,
 
     return(exercises_response)
   }
+
+
+#' @title Upload an exercise to the TMC server
+#'
+#' @description Upload an exercise to the TMC server
+#'
+#' @usage upload_exercise(token, exercise_id, project_path, server_address,
+#'         zip_name = "temp", remove_zip = TRUE)
+#'
+#' @param token \code{OAuth2} token associated with the current login
+#' session.
+#' @param exercise_id ID of the submitted exercise.
+#' @param project_path File path to the directory of the submitted
+#' exercise.
+#' @param server_address Address of the TMC server where the exercise is
+#' submitted to.
+#' @param zip_name Name of the \code{zip} file which contains the
+#' exercise submission. Default is \code{temp}
+#' @param remove_zip \code{TRUE} or \code{FALSE} depending on if you
+#' wish to delete the submission \code{zip} file after sending it to the
+#' server. Defaults to \code{TRUE}.
+#'
+#' @details Packs the exercise directory into a \code{zip} file and
+#' sends it to the TMC server as a list.
+#'
+#' @return \code{HTTP} response to the submission attempt.
+#'
+#' @seealso \code{\link[httr]{add_headers}},
+#' \code{\link[httr]{upload_file}}, \code{\link[httr]{POST}},
+#' \code{\link[base]{file.remove}}
+
+# Zips and uploads a single exercise, which is located in project_path.
+# Returns the response, which contains a field $submission_url
+# containing the details of the submission.
+upload_exercise <- function(token, exercise_id, project_path,
+                            server_address, zip_name = "temp",
+                            remove_zip = TRUE) {
+  url_data <- .upload_exercise1(token, exercise_id, server_address)
   .upload_exercise2(url_data, project_path, remove_zip)
 }
 

tmcrstudioaddin/R/Submissions.R

@@ -113,16 +113,17 @@ upload_current_exercise <- function(credentials,
                                     remove_zip = TRUE) {
   upload_with_id <- function(id) {
     token    <- credentials$token
+    upload_exercise <- function(exercise_id,
+                                server_address) {
+      url_data <- .upload_exercise1(token, exercise_id, server_address)
+      .upload_exercise2(url_data, project_path, remove_zip)
+    }
     address  <- paste(sep = "", credentials$serverAddress, "/")
     #
     # uploading starts
     tryCatch({
-      response <- upload_exercise(token = credentials$token,
-                                  exercise_id = id,
-                                  project_path = project_path,
-                                  server_address = address,
-                                  zip_name = zip_name,
-                                  remove_zip = remove_zip)
+      response <- upload_exercise(exercise_id    = id,
+                                  server_address = address)
       return(response)
       }, error = function(e) {
         cat("Uploading exercise failed.\n")