more checkmate

Author: soodoku

R/domain_report.R

@@ -30,20 +30,11 @@
 #' summary(report1)
 #' }
 
-domain_report <- function(domain, ...) {
-  # Handle missing argument
-  if (missing(domain)) {
-    stop(virustotal_validation_error(
-      message = "Domain must be provided",
-      parameter = "domain",
-      value = "missing"
-    ))
-  }
-  
-  # Handle NULL before checkmate validation
+domain_report <- function(domain = NULL, ...) {
+  # Handle NULL argument
   if (is.null(domain)) {
     stop(virustotal_validation_error(
-      message = "Domain cannot be NULL",
+      message = "Domain must be provided",
       parameter = "domain",
       value = "NULL"
     ))

R/rescan_file.R

@@ -23,9 +23,8 @@
 
 rescan_file <- 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")
-    }
+    # Validate hash using checkmate
+    assert_character(hash, len = 1, any.missing = FALSE, min.chars = 1)
 
     res <- virustotal_POST(path = paste0("files/", hash, "/analyse"), ...)
 

R/scan_url.R

@@ -23,9 +23,8 @@
 
 scan_url <- function(url = NULL, ...) {
 
-  if (is.null(url) || !is.character(url) || nchar(url) == 0) {
-    stop("Must specify a valid URL.\n")
-  }
+  # Validate URL using checkmate
+  assert_character(url, len = 1, any.missing = FALSE, min.chars = 1)
 
   res <- virustotal_POST(path = "urls", 
                         body = list(url = url), ...)

R/set_key.R

@@ -19,13 +19,13 @@
 #' Sys.getenv("VirustotalToken")
 #' }
 
-set_key <- function(api_key) {
-  # Handle missing argument
-  if (missing(api_key)) {
+set_key <- function(api_key = NULL) {
+  # Handle NULL argument
+  if (is.null(api_key)) {
     stop(virustotal_validation_error(
       message = "API key must be provided",
       parameter = "api_key",
-      value = "missing"
+      value = "NULL"
     ))
   }
 

R/url_report.R

@@ -27,9 +27,8 @@
 
 url_report <- function(url_id = NULL, ...) {
 
-  if (is.null(url_id) || !is.character(url_id) || nchar(url_id) == 0) {
-        stop("Must specify a valid URL or URL ID.\n")
-  }
+  # Validate URL ID using checkmate
+  assert_character(url_id, len = 1, any.missing = FALSE, min.chars = 1)
 
   # If it looks like a URL, encode it to base64 (VirusTotal v3 requirement)
   if (grepl("^https?://", url_id)) {