restructure single vs multi-core fns for #1

Author: mpadge

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: githist
 Title: Code analyses traced along the 'git' history of a package
-Version: 0.1.0.032
+Version: 0.1.0.033
 Authors@R: 
     person("Mark", "Padgham", , "mark.padgham@email.com", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-2172-5265"))

R/githist-fn.R

@@ -37,59 +37,67 @@ githist <- function (path, n = NULL, step_size = 1L, num_cores = -1L) {
 
     num_cores <- set_num_cores (num_cores)
 
-    path_cp <- fs::path (fs::path_temp (), basename (path))
-    clean_after <- FALSE
-    if (fs::path (fs::path_dir (path)) != fs::path_temp () &&
-        !fs::dir_exists (path_cp)) {
-        path_cp <- fs::dir_copy (path, fs::path_temp ())
-        clean_after <- TRUE
-    }
-
-    h <- gert::git_log (repo = path_cp, max = 1e6)
+    h <- gert::git_log (repo = path, max = 1e6)
     if (step_size > 1L) {
         h <- h [seq (1, nrow (h), by = step_size), ]
     }
     if (!is.null (n)) {
         h <- h [seq_len (n), ]
     }
 
-    res <- extract_pkgstats_data (h, path_cp, num_cores)
+    if (num_cores == 1L) {
+
+        res <- extract_pkgstats_data_single (h, path)
+
+    } else {
+
+        res <- extract_pkgstats_data_multi (h, path, num_cores)
 
-    if (clean_after) {
-        fs::dir_delete (path_cp)
     }
 
     collate_pkgstats (res)
 }
 
-extract_pkgstats_data <- function (log, path, num_cores) {
+extract_pkgstats_data_single <- function (log, path) {
 
-    if (num_cores == 1L) {
-
-        res <- pbapply::pblapply (seq_len (nrow (log)), function (i) {
-            g <- gert::git_reset_hard (ref = log$commit [i], repo = path)
-            run_one_pkgstats (path = path, pkg_date = log$time [i])
-        })
+    path_cp <- fs::path (fs::path_temp (), basename (path))
+    clean_after <- FALSE
+    if (fs::path (fs::path_dir (path)) != fs::path_temp () &&
+        !fs::dir_exists (path_cp)) {
+        path_cp <- fs::dir_copy (path, fs::path_temp ())
+        clean_after <- TRUE
+    }
 
-    } else {
+    res <- pbapply::pblapply (seq_len (nrow (log)), function (i) {
+        g <- gert::git_reset_hard (ref = log$commit [i], repo = path_cp)
+        run_one_pkgstats (path = path_cp, pkg_date = log$time [i])
+    })
 
-        cl <- parallel::makeCluster (num_cores)
-        parallel::clusterExport (cl, c ("log", "path", "run_one_pkgstats"))
-        res <- pbapply::pblapply (seq_len (nrow (log)), function (i) {
-            path_cp <- fs::dir_copy (path, fs::path_temp ())
-            g <- gert::git_reset_hard (ref = log$commit [i], repo = path_cp)
-            s <- run_one_pkgstats (path = path_cp, pkg_date = log$time [i])
-            fs::dir_delete (path_cp)
-            return (s)
-        }, cl = cl)
-        parallel::stopCluster (cl)
-
-        return (res)
+    if (clean_after) {
+        fs::dir_delete (path_cp)
     }
 
     return (res)
 }
 
+extract_pkgstats_data_multi <- function (log, path, num_cores) {
+
+    cl <- parallel::makeCluster (num_cores)
+    parallel::clusterExport (cl, c ("log", "path", "run_one_pkgstats"))
+    res <- pbapply::pblapply (seq_len (nrow (log)), function (i) {
+        path_cp <- fs::dir_copy (path, fs::path_temp ())
+        g <- gert::git_reset_hard (ref = log$commit [i], repo = path_cp)
+        s <- run_one_pkgstats (path = path_cp, pkg_date = log$time [i])
+        fs::dir_delete (path_cp)
+        return (s)
+    }, cl = cl)
+    parallel::stopCluster (cl)
+
+    return (res)
+
+    return (res)
+}
+
 collate_pkgstats <- function (x) {
     nms <- names (x [[1]])
     nms2df <- nms [seq_len (which (nms == "loc") - 1L)]

codemeta.json

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