Cloud rm

NEWS.md

@@ -5,6 +5,7 @@
 - added `get_username()` as exported function.
 - added `get_cached_token()` as exported function.
 - added `token_stache_path()` as exported function.
+- fixed bug related to file downloads #332 and #335
 
 # version 1.3.2
 

R/gql_helpers.R

@@ -86,3 +86,16 @@ delete_item_query <- function(id) {
 	run_gql_query(query, httr::handle(url = pkg.env$graphql_url), json = json)
 }
 
+# {"operationName":"DeleteQuery","variables":{"input":{"cuid":null,"key":"65cbc0b3d34ef4b119cb37e9/rf1.csv"}},"query":"mutation DeleteQuery($input: DeleteFileInput!) {\n  deleteFile(input: $input) {\n    id\n    __typename\n  }\n}\n"}
+delete_file_query <- function(id, cuid, file) {
+	query <- "mutation DeleteQuery($input: DeleteFileInput!) {\n  deleteFile(input: $input) {\n    id\n    __typename\n  }\n}\n"
+
+	variables <- list(input = list(cuid = cuid, key = paste0(id, "/", file)))
+
+	json = jsonlite::toJSON(list(operationName = "DeleteQuery",
+															 query = query,
+															 variables = variables),
+													auto_unbox = TRUE, null = 'null')
+
+	run_gql_query(query, httr::handle(url = pkg.env$graphql_url), json = json)
+}

R/item_replace_files.R

@@ -24,7 +24,7 @@ item_replace_files <- function(sb_id, files, ..., all=FALSE,
 	if(all){
 		item <- item_rm_files(sb_id, ...)
 	}else{
-		item <- item_rm_files(sb_id, files, ...)
+		item <- item_rm_files(sb_id, basename(files), ...)
 	}
 
 	if(!is.null(item))

R/item_rm.R

@@ -63,7 +63,7 @@ item_rm = function(sb_id, ..., limit=1000, recursive=FALSE) {
 #' # then delete the whole folder
 #' sbtools:::item_rm_recursive(folder)
 #' }
-item_rm_recursive = function(sb_id, ..., limit) {
+item_rm_recursive = function(sb_id, ..., limit = 1000) {
 
 	id <- as.sbitem(sb_id)$id
 	# check args

R/item_rm_files.R

@@ -27,7 +27,6 @@
 #' @export
 item_rm_files <- function(sb_id, files,...){
 
-	#force a pull of the item to refresh the file info
 	sb_id = as.sbitem(sb_id)
 
 	if(is.null(sb_id)) return(NULL)
@@ -41,18 +40,25 @@ item_rm_files <- function(sb_id, files,...){
 
 	#if files not supplied, set files vector to of files is just going to be empty
 	if(missing(files)){
-		files_to_keep = vector()
+		remove <- item$files
 	}else{
 		#match the names supplied with the names of item files (sticking to basename, might have paths supplied)
-		fnames = sapply(item$files, function(x)x$name)
-		files_to_keep = item$files[!fnames %in% basename(files)]
-		#files_to_keep = lapply(files_to_keep, function(x){x[c('name', 'title', 'contentType')]})
+		fnames = sapply(item$files, function(x) x$name)
+		remove = item$files[fnames %in% basename(files)]
 	}
 
-	if(length(files_to_keep) == 0 && is.list(files_to_keep)) {
+	if(length(remove) == 0 && is.list(0)) {
+		# nothing to do
 		return(item)
 	}
 
-	as.sbitem(item_update(item$id, info = list(files = files_to_keep), ...))
+	for(f in remove) {
+		cuid <- f$cuid
+		file <- f$name
+
+		delete_file_query(item$id, cuid, file)
+	}
+
+	return(get_item(sb_id$id))
 
 }