From 50164ef512926e07e260c4d8b8b70071bc32bb58 Mon Sep 17 00:00:00 2001
From: Thomas Arrow <thomasarrow@gmail.com>
Date: Fri, 22 Apr 2016 16:25:57 +0100
Subject: [PATCH] Allow no outdir if dryrunning and ensure log file location

Stop getpapers from exiting if no output directory is given
and we are dry running. This means logging must happen outside of
the output directory. Logging was only happening in the output
directory because the logger didn't usually initialise as before
we changed directory. Now we ensure we know where we are writing by
getting a writable file stream and passing that straight to winston
---
 bin/getpapers.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/bin/getpapers.js b/bin/getpapers.js
index 949791f..ff0be0f 100755
--- a/bin/getpapers.js
+++ b/bin/getpapers.js
@@ -67,12 +67,15 @@ log = new (winston.Logger)({
 });
 winston.addColors(loglevels.colors);
 
+
+
 if (program.hasOwnProperty('logfile')) {
+  logstream = fs.createWriteStream(program.logfile.toString());
   log.add(winston.transports.File, {
-    filename: program.logfile,
+    stream: logstream,
     level: 'debug'
   });
-  log.info('Saving logs to ./' + program.outdir + '/' + program.logfile);
+  log.info('Saving logs to ./' + program.logfile);
 }
 
 // check arguments
@@ -83,12 +86,6 @@ if (!program.query) {
   process.exit(1);
 }
 
-if (!program.outdir) {
-  log.error('No output directory given. ' +
-            'You must provide the --outdir argument.');
-  process.exit(1);
-}
-
 log.info('Searching using ' + program.api + ' API');
 
 // run
@@ -103,9 +100,16 @@ options.noexecute = program.noexecute;
 if (options.noexecute) {
   log.info('Running in no-execute mode, so nothing will be downloaded');
 }
+else {
+  if (!program.outdir) {
+    log.error('No output directory given. ' +
+        'You must provide the --outdir argument.');
+    process.exit(1);
+  }
+  mkdirp.sync(program.outdir);
+  process.chdir(program.outdir);
+}
 
-mkdirp.sync(program.outdir);
-process.chdir(program.outdir);
 var chosenapi = api(program.api);
 var searchapi = new chosenapi(options);
 searchapi.search(program.query);