add 'get_subdir_from_url' fn for #64

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: roreviewapi
 Title: Plumber API to report package structure and function
-Version: 0.1.0.060
+Version: 0.1.0.061
 Authors@R: 
     person("Mark", "Padgham", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-2172-5265"))

NAMESPACE

@@ -6,6 +6,7 @@ export(collate_editor_check)
 export(dl_gh_repo)
 export(editor_check)
 export(get_branch_from_url)
+export(get_subdir_from_url)
 export(is_user_authorized)
 export(pkgrep_install_deps)
 export(post_to_issue)

R/utils.R

@@ -69,7 +69,7 @@ authorized_users <- c (
 )
 
 #' Get branch from a GitHub URL if non-default branch specified there
-#' @param repourl Potentially with "/tree/branch_name" appended
+#' @param repourl Potentially with "/tree/branch_name/sub-directory" appended
 #' @return Branch as single string.
 #' @family github
 #' @export
@@ -80,10 +80,32 @@ get_branch_from_url <- function (repourl) {
     if (length (domains) > 4L & any (domains == "tree")) {
         i <- which (domains == "tree")
         branch <- domains [which (domains == "tree") + 1L]
+        if (branch %in% c ("main", "master") && length (domains) > (i + 1)) {
+            # URL has branch only as prefix to sub-directory
+            branch <- NULL
+        }
     }
     return (branch)
 }
 
+#' Return sub-directory from URL if present. This function is also intended to
+#' test whether packages are in sub-directories (issue #64)
+#'
+#' @inheritParams get_branch_from_url
+#' @export
+get_subdir_from_url <- function (reporul) {
+
+    subdir <- NULL
+    domains <- strsplit (repourl, "\\/+") [[1]]
+    if (length (domains) > 4L & any (domains == "tree")) {
+        i <- which (domains == "tree")
+        if (length (domains) > (i + 1)) {
+            subdir <- domains [i + 2L]
+        }
+    }
+    return (subdir)
+}
+
 #' Bob Rudis's URL checker function
 #'
 #' This is used here to check the URLs in the `check_issue_template` function.

codemeta.json

@@ -8,7 +8,7 @@
   "codeRepository": "https://github.com/ropensci-review-tools/roreviewapi",
   "issueTracker": "https://github.com/ropensci-review-tools/roreviewapi/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.1.0.060",
+  "version": "0.1.0.061",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",