Skip to content

Properly handle folder when performing zip operations #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anthonysena merged 1 commit into from
Jan 26, 2026
Merged

Properly handle folder when performing zip operations #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion R/Module-CohortDiagnostics.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ CohortDiagnosticsModule <- R6::R6Class(

# TODO: This is something CD does differently.
# Find the results zip file in the results sub folder
resultsFolder <- private$jobContext$moduleExecutionSettings$resultsSubFolder
resultsFolder <- normalizePath(private$jobContext$moduleExecutionSettings$resultsSubFolder)
zipFiles <- list.files(
path = resultsFolder,
pattern = "\\.zip$",
Expand All @@ -101,6 +101,8 @@ CohortDiagnosticsModule <- R6::R6Class(
zipFileName <- zipFiles[1]
} else {
# Create a zip file from the results in the directory
oldWd <- setwd(resultsFolder)
on.exit(setwd(oldWd))
DatabaseConnector::createZipFile(
zipFile = "results.zip",
files = list.files(resultsFolder, pattern = ".*\\.csv$"),
Expand Down
4 changes: 3 additions & 1 deletion R/Module-CohortMethod.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ CohortMethodModule <- R6::R6Class(

# TODO: This is something CM does differently.
# Find the results zip file in the results sub folder
resultsFolder <- private$jobContext$moduleExecutionSettings$resultsSubFolder
resultsFolder <- normalizePath(private$jobContext$moduleExecutionSettings$resultsSubFolder)
zipFiles <- list.files(
path = resultsFolder,
pattern = "\\.zip$",
Expand All @@ -116,6 +116,8 @@ CohortMethodModule <- R6::R6Class(
zipFileName <- zipFiles[1]
} else {
# Create a zip file from the results in the directory
oldWd <- setwd(resultsFolder)
on.exit(setwd(oldWd))
DatabaseConnector::createZipFile(
zipFile = "results.zip",
files = list.files(resultsFolder, pattern = ".*\\.csv$"),
Expand Down
4 changes: 3 additions & 1 deletion R/Module-SelfControlledCaseSeries.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ SelfControlledCaseSeriesModule <- R6::R6Class(

# TODO: This is something SCCS does differently.
# Find the results zip file in the results sub folder
resultsFolder <- private$jobContext$moduleExecutionSettings$resultsSubFolder
resultsFolder <- normalizePath(private$jobContext$moduleExecutionSettings$resultsSubFolder)
zipFiles <- list.files(
path = resultsFolder,
pattern = "\\.zip$",
Expand All @@ -130,6 +130,8 @@ SelfControlledCaseSeriesModule <- R6::R6Class(
zipFileName <- zipFiles[1]
} else {
# Create a zip file from the results in the directory
oldWd <- setwd(resultsFolder)
on.exit(setwd(oldWd))
DatabaseConnector::createZipFile(
zipFile = "results.zip",
files = list.files(resultsFolder, pattern = ".*\\.csv$"),
Expand Down
2 changes: 2 additions & 0 deletions R/ShareResults.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ zipResults <- function(resultsFolder, zipFile) {
recursive = TRUE,
full.names = TRUE
)
oldWd <- setwd(resultsFolder)
on.exit(setwd(oldWd))
DatabaseConnector::createZipFile(
zipFile = zipFile,
files = files,
Expand Down
Loading