changes

Seneca-CDOT · Feb 4, 2020 · 4de8ed7 · 4de8ed7
1 parent 1cb9d5a
commit 4de8ed7
Showing 1 changed file with 3 additions and 130 deletions.
diff --git a/src/backend/feed/processor.js b/src/backend/feed/processor.js
@@ -120,10 +120,9 @@ module.exports = async function processor(job) {
   const feed = Feed.parse(job.data);
   let articles = [];
   let info;
-
-  const invalid = feed.isInvalid();
+  const invalid = await feed.isInvalid();
   if (invalid) {
-    logger.info(`Skipping resource at ${feed.url}.  Feed previously marked invalid`);
+    logger.info(`Skipping resource at ${feed.url}. Feed previously marked invalid`);
     return [];
   }
   try {
@@ -188,134 +187,8 @@ module.exports = async function processor(job) {
     } else {
       logger.error({ error }, `Unable to process feed ${feed.url}`);
       throw error;
-=======
-  const invalid = await feed.isInvalid();
-<<<<<<< HEAD
-  if (!invalid) {
->>>>>>> other changes
-    try {
-      info = await getFeedInfo(feed);
-      // If we get no new version info, there's nothing left to do.
-      if (!info.shouldDownload) {
-        // Log some common cases we see, with a general message if none of these
-        switch (info.status) {
-          case 304:
-            logger.debug(`${info.status} Feed is up-to-date: ${feed.url}`);
-            break;
-          case 404:
-            logger.warn(`${info.status} Feed not found: ${feed.url}`);
-            break;
-          case 410:
-            logger.warn(`${info.status} Feed no longer available: ${feed.url}`);
-            break;
-          case 429:
-            logger.warn(`${info.status} Feed requested too many times: ${feed.url}`);
-            break;
-          case 500:
-          case 599:
-            logger.warn(`${info.status} Feed server error: ${feed.url}`);
-            break;
-          default:
-            logger.debug(`${info.status} Feed not downloaded: ${feed.url}`);
-            break;
-        }
-
-        // No posts were processed, return an empty list.
-        return [];
-=======
-  if (invalid) {
-    logger.info(`Skipping resource at ${feed.url}. Feed previously marked invalid.`);
-    return [];
-  }
-  try {
-    info = await getFeedInfo(feed);
-    // If we get no new version info, there's nothing left to do.
-    if (!info.shouldDownload) {
-      // Log some common cases we see, with a general message if none of these
-      switch (info.status) {
-        case 304:
-          logger.debug(`${info.status} Feed is up-to-date: ${feed.url}`);
-          break;
-        case 404:
-          logger.warn(`${info.status} Feed not found: ${feed.url}`);
-          break;
-        case 410:
-          logger.warn(`${info.status} Feed no longer available: ${feed.url}`);
-          break;
-        case 429:
-          logger.warn(`${info.status} Feed requested too many times: ${feed.url}`);
-          break;
-        case 500:
-        case 599:
-          logger.warn(`${info.status} Feed server error: ${feed.url}`);
-          break;
-        default:
-          logger.debug(`${info.status} Feed not downloaded: ${feed.url}`);
-          break;
->>>>>>> some changes
-      }
-
-      // No posts were processed, return an empty list.
-      return [];
-    }
-
-    // Download the updated feed contents
-    logger.debug(`${info.status} Feed has new content: ${feed.url}`);
-    articles = await parse(
-      addHeaders(
-        {
-          url: feed.url,
-          // ms to wait for a connection to be assumed to have failed
-          timeout: 20 * 1000,
-          gzip: true,
-        },
-        feed
-      )
-    );
-    // Transform the list of articles to a list of Post objects
-    articles = articles.map(article => Post.fromArticle(article));
-
-    // Version info for this feed changed, so update the database
-    feed.etag = feed.etag || info.etag;
-    feed.lastModified = feed.lastModified || info.lastModified;
-    await feed.save();
-  } catch (error) {
-    // If the feedparser can't parse this, we get a 'Not a feed' error
-    if (error.message === 'Not a feed') {
-      logger.info(
-        `Skipping resource at ${feed.url}, not a valid feed ${
-          info.contentType ? `(${info.contentType})` : ''
-        }`
-      );
-<<<<<<< HEAD
-      // Transform the list of articles to a list of Post objects
-      articles = articles.map(article => Post.fromArticle(article));
-
-      // Version info for this feed changed, so update the database
-      feed.etag = feed.etag || info.etag;
-      feed.lastModified = feed.lastModified || info.lastModified;
-      await feed.save();
-    } catch (error) {
-      // If the feedparser can't parse this, we get a 'Not a feed' error
-      if (error.message === 'Not a feed') {
-        logger.info(
-          `Skipping resource at ${feed.url}, not a valid feed ${
-            info.contentType ? `(${info.contentType})` : ''
-          }`
-        );
-        articles = [];
-      } else {
-        logger.error({ error }, `Unable to process feed ${feed.url}`);
-        throw error;
-      }
->>>>>>> more changes
-=======
-      articles = [];
-    } else {
-      logger.error({ error }, `Unable to process feed ${feed.url}`);
-      throw error;
->>>>>>> some changes
     }
   }
+
   return articles;
 };