Fix getting default sources path (#19)

kpman · Nov 20, 2017 · f6aa271 · f6aa271
1 parent b809f4b
commit f6aa271
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/src/__tests__/opml.spec.js b/src/__tests__/opml.spec.js
@@ -1,3 +1,5 @@
+const path = require('path');
+
 const opml = require('../opml');
 
 jest.mock('fs');
@@ -31,6 +33,15 @@ describe('#opml', () => {
     expect(fs.readFileSync).toBeCalledWith('/testonly/awesome.opml');
   });
 
+  it('should use default file path', async () => {
+    fs.existsSync.mockReturnValue(false);
+    const opmlpath = undefined;
+    await opml(opmlpath);
+    expect(fs.readFileSync).toBeCalledWith(
+      path.join(__dirname, '..', './sources.opml')
+    );
+  });
+
   it('should parse correctly', async () => {
     const opmlpath = 'awesome.opml';
     const result = await opml(opmlpath);

diff --git a/src/main.js b/src/main.js
@@ -23,8 +23,8 @@ const main = async argv => {
     process.exit(0);
   }
 
-  const opmlPath = argv.o ? argv.o : './sources.opml';
-  const sources = await parseOpml(opmlPath);
+  const customOpmlPath = argv.o;
+  const sources = await parseOpml(customOpmlPath);
 
   let source;
   let pageSize;

diff --git a/src/opml.js b/src/opml.js
@@ -6,11 +6,18 @@ const parseOpml = thenify(require('node-opml-parser'));
 
 module.exports = async opmlPath => {
   let filePath;
-  if (fs.existsSync(opmlPath)) {
-    filePath = opmlPath;
+
+  if (opmlPath) {
+    if (fs.existsSync(opmlPath)) {
+      filePath = opmlPath;
+    } else {
+      filePath = path.join(process.cwd(), opmlPath);
+    }
   } else {
-    filePath = path.join(process.cwd(), opmlPath);
+    // default sources
+    filePath = path.join(__dirname, './sources.opml');
   }
+
   const opmlFile = fs.readFileSync(filePath);
   const result = await parseOpml(opmlFile.toString());
   return result;