more checkmate

Author: soodoku

.gitignore

@@ -11,3 +11,4 @@ tests/testthat/virustotal_api_key
 *.gz
 /docs/
 docs
+/..Rcheck

R/download_file.R

@@ -22,9 +22,7 @@
 
 download_file <- function(hash = NULL, output_path = NULL, ...) {
 
-  if (is.null(hash) || !is.character(hash) || nchar(hash) == 0) {
-    stop("Must specify a valid file hash (MD5, SHA1, or SHA256).\n")
-  }
+  assert_character(hash, len = 1, any.missing = FALSE, min.chars = 1)
 
   # Note: This endpoint returns raw file content, not JSON
   res <- GET("https://www.virustotal.com/",

R/get_file_comments.R

@@ -22,9 +22,7 @@
 
 get_file_comments <- function(hash = NULL, limit = NULL, cursor = NULL, ...) {
 
-  if (is.null(hash) || !is.character(hash) || nchar(hash) == 0) {
-    stop("Must specify a valid file hash (MD5, SHA1, or SHA256).\n")
-  }
+  assert_character(hash, len = 1, any.missing = FALSE, min.chars = 1)
 
   res <- virustotal_GET(path = paste0("files/", hash, "/comments"),
                        query = list(limit = limit, cursor = cursor), ...)

R/get_file_download_url.R

@@ -20,9 +20,7 @@
 
 get_file_download_url <- function(hash = NULL, ...) {
 
-  if (is.null(hash) || !is.character(hash) || nchar(hash) == 0) {
-    stop("Must specify a valid file hash (MD5, SHA1, or SHA256).\n")
-  }
+  assert_character(hash, len = 1, any.missing = FALSE, min.chars = 1)
 
   res <- virustotal_GET(path = paste0("files/", hash, "/download_url"), ...)
 

R/get_file_relationships.R

@@ -25,13 +25,8 @@
 get_file_relationships <- function(hash = NULL, relationship = NULL, 
                                   limit = NULL, cursor = NULL, ...) {
 
-  if (is.null(hash) || !is.character(hash) || nchar(hash) == 0) {
-    stop("Must specify a valid file hash (MD5, SHA1, or SHA256).\n")
-  }
-
-  if (is.null(relationship) || !is.character(relationship)) {
-    stop("Must specify a relationship type.\n")
-  }
+  assert_character(hash, len = 1, any.missing = FALSE, min.chars = 1)
+  assert_character(relationship, len = 1, any.missing = FALSE, min.chars = 1)
 
   valid_relationships <- c("behaviours", "bundled_files", "compression_parents", 
                           "contacted_domains", "contacted_ips", "contacted_urls", 
@@ -40,8 +35,7 @@ get_file_relationships <- function(hash = NULL, relationship = NULL,
                           "pe_resource_parents", "similar_files", "submissions")
 
   if (!relationship %in% valid_relationships) {
-    stop("Invalid relationship type. Must be one of: ", 
-         paste(valid_relationships, collapse = ", "), "\n")
+    stop("Invalid relationship type")
   }
 
   res <- virustotal_GET(path = paste0("files/", hash, "/relationships/", relationship),

R/ip_report.R

@@ -25,9 +25,7 @@
 
 ip_report <- function(ip = NULL, ...) {
     # Input validation first (before API key for proper test precedence)
-    if (is.null(ip) || !is.character(ip) || nchar(ip) == 0) {
-        stop("Must specify a valid IP address.\n")
-    }
+    assert_character(ip, len = 1, any.missing = FALSE, min.chars = 1)
 
     # Check API key after basic validation
     if (identical(Sys.getenv("VirustotalToken"), "")) {