Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Mirrors
biopet.biopet
Commits
fe65dd17
Commit
fe65dd17
authored
Nov 09, 2016
by
Peter van 't Hof
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added sanity checks for outputDir
parent
531c04b7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
0 deletions
+15
-0
biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala
...c/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala
+14
-0
biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/PipelineCommand.scala
...main/scala/nl/lumc/sasc/biopet/core/PipelineCommand.scala
+1
-0
No files found.
biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala
View file @
fe65dd17
...
...
@@ -38,6 +38,8 @@ trait BiopetQScript extends Configurable with GatkLogging { qscript: QScript =>
if
(
config
.
contains
(
"output_dir"
,
path
=
Nil
))
config
(
"output_dir"
,
path
=
Nil
).
asFile
else
new
File
(
"."
)
}
require
(
outputDir
.
canRead
,
s
"No premision to read outputdir: $outputDir"
)
require
(
outputDir
.
canWrite
,
s
"No premision to read outputdir: $outputDir"
)
@Argument
(
doc
=
"Disable all scatters"
,
shortName
=
"DSC"
,
required
=
false
)
var
disableScatter
:
Boolean
=
false
...
...
@@ -67,6 +69,9 @@ trait BiopetQScript extends Configurable with GatkLogging { qscript: QScript =>
final
def
script
()
{
outputDir
=
config
(
"output_dir"
)
outputDir
=
outputDir
.
getAbsoluteFile
BiopetQScript
.
checkOutputDir
(
outputDir
)
init
()
biopetScript
()
logger
.
info
(
"Biopet script done"
)
...
...
@@ -153,4 +158,13 @@ trait BiopetQScript extends Configurable with GatkLogging { qscript: QScript =>
object
BiopetQScript
{
case
class
InputFile
(
file
:
File
,
md5
:
Option
[
String
]
=
None
)
def
checkOutputDir
(
outputDir
:
File
)
:
Unit
=
{
// Sanity checks
require
(
outputDir
.
getParentFile
.
canRead
,
s
"No premision to read parent of outputdir: ${outputDir.getParentFile}"
)
require
(
outputDir
.
getParentFile
.
canWrite
,
s
"No premision to write parent of outputdir: ${outputDir.getParentFile}"
)
outputDir
.
mkdir
()
require
(
outputDir
.
canRead
,
s
"No premision to read outputdir: $outputDir"
)
require
(
outputDir
.
canWrite
,
s
"No premision to write outputdir: $outputDir"
)
}
}
biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/PipelineCommand.scala
View file @
fe65dd17
...
...
@@ -77,6 +77,7 @@ trait PipelineCommand extends MainCommand with GatkLogging with ImplicitConversi
val
pipelineName
=
this
.
getClass
.
getSimpleName
.
toLowerCase
.
split
(
"""\$"""
).
head
val
pipelineConfig
=
globalConfig
.
map
.
getOrElse
(
pipelineName
,
Map
()).
asInstanceOf
[
Map
[
String
,
Any
]]
val
pipelineOutputDir
=
new
File
(
globalConfig
.
map
.
getOrElse
(
"output_dir"
,
pipelineConfig
.
getOrElse
(
"output_dir"
,
"./"
)).
toString
)
BiopetQScript
.
checkOutputDir
(
pipelineOutputDir
)
val
logDir
:
File
=
new
File
(
pipelineOutputDir
,
".log"
)
logDir
.
mkdirs
()
new
File
(
logDir
,
"biopet."
+
BiopetQCommandLine
.
timestamp
+
".log"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment