Merge pull request #5 from karl0ss/DontSendProcessed

Dont send processed

.gitignore

@@ -8,3 +8,4 @@ feedCache.json
 dist/jdrssdownloader-linux
 dist/jdrssdownloader-win.exe
 dist/jdrssdownloader-macos
+downloadHistory.json

FeedFilter.js

@@ -2,6 +2,7 @@ const fs = require('fs')
 const { linkAdder } = require('./JDLinkAdder');
 const { getLinksFromURL } = require('./LinkGrabber')
 const { checkFileName } = require('./checkFileName')
+const { checkDownloadHistory } = require('./checkDownloadHistory')
 
 async function filterFeed() {
     let myshowlist = JSON.parse(fs.readFileSync('config.json')).Shows
@@ -47,8 +48,13 @@ async function filterFeed() {
                     let download_list = urlObj.urlList
                     // Send Links to JDdownloader
                     if (download_list.length !== 0) {
-                        log.info(download_list.length + ' links for ' + urlObj.fileName + ' have been sent to JDdownloader')
+                        if (checkDownloadHistory(urlObj)) {
-                        linkAdder(download_list)
+                            log.info(urlObj.fileName + ' already downloaded, skipped.')
+                            break
+                        } else {
+                            log.info(download_list.length + ' links for ' + urlObj.fileName + ' have been sent to JDdownloader.')
+                            linkAdder(download_list)
+                        }
                     } else {
                         // No HEVC links found
                         log.info(download_list.length + ' links for ' + show.Name + ' have been found, will recheck next time.')

JDRssDownloader.js

@@ -1,19 +1,24 @@
 const fs = require("fs");
 const { feedUpdater } = require('./FeedUpdater')
 const { filterFeed } = require('./FeedFilter')
+const version = require('./package.json').version;
+
 global.log = require('simple-node-logger').createSimpleLogger({
     logFilePath: 'jdrssdownloader.log',
     timestampFormat: 'YYYY-MM-DD HH:mm:ss.SSS'
 });
 
 async function main() {
-    let RSSFeedRefreshMins = JSON.parse(fs.readFileSync('config.json')).RSSFeedRefreshMins
+    log.info('Running JDRssDownloader version ' + version)
-    let JDPostLinksMins = JSON.parse(fs.readFileSync('config.json')).JDPostLinksMins
+    try {
-
+        RSSFeedRefreshMins = JSON.parse(fs.readFileSync('config.json')).RSSFeedRefreshMins
+        JDPostLinksMins = JSON.parse(fs.readFileSync('config.json')).JDPostLinksMins
+    } catch (error) {
+        log.error('config.json file is missing.')
+    }
     log.info('Refreshing RSS Items every ' + RSSFeedRefreshMins + ' Minutes')
     log.info('Checking for links and sending to JDdownloader every ' + JDPostLinksMins + ' Minutes')
 
-
     setInterval(await feedUpdater, RSSFeedRefreshMins * 60000);
     setInterval(await filterFeed, JDPostLinksMins * 60000);
 }

checkDownloadHistory.js

@@ -0,0 +1,19 @@
+const fs = require('fs')
+
+function checkDownloadHistory(urlObj) {
+    try {
+        history = JSON.parse(fs.readFileSync('./downloadHistory.json'));
+    } catch (error) {
+        fs.writeFileSync('./downloadHistory.json', JSON.stringify([]));
+    }
+    history = JSON.parse(fs.readFileSync('./downloadHistory.json'));
+    if (history.includes(urlObj.fileName)) {
+        return true
+    } else {
+        history.push(urlObj.fileName)
+        fs.writeFileSync('./downloadHistory.json', JSON.stringify(history));
+        return false
+    }
+}
+
+module.exports = { checkDownloadHistory }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jdrssdownloader",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "main": "JDRssDownloader.js",
   "bin": "JDRssDownloader.js",