sfc-utils 1.3.33 → 1.3.36

package/copy/sheets.js

@@ -41,18 +41,18 @@ let googleAuth = (project, directory = null, forceStr = false) => {
     var auth = null;
     authObj.authenticate({ fallback: false }).then((resp) => {
       auth = resp;
-      grabSheets(auth, project, directory, forceStr).catch(() => {
+      grabSheets(auth, project, directory, forceStr).then(() => resolveFinal()).catch(() => {
         // If the first attempt failed, then make another req using the fallback
         authObj.authenticate({ fallback: true }).then((resp) => {
           auth = resp;
-          grabSheets(auth, project, directory, forceStr).then(() => {console.log("RES 1"); return resolveFinal();});
+          grabSheets(auth, project, directory, forceStr).then(() => resolveFinal());
         });
-      }).then(() => {console.log("RES 2"); return resolveFinal();});
+      });
     })
     .catch(() => {
       // Failure if we fall back but there's no token
       auth = authObj.task();
-      grabSheets(auth, project, directory, forceStr).then(() => {console.log("RES 3"); return resolveFinal();});
+      grabSheets(auth, project, directory, forceStr).then(() => resolveFinal());
     });
   })
 };
@@ -79,7 +79,6 @@ let grabSheets = (auth, project, directory, forceStr) => {
       });
       promiseStack.push(promiseItem);
     }
-
     Promise.all(promiseStack)
       .then(() => {
         // Resolve the whole thing
@@ -144,8 +143,8 @@ let getSheet = async (resolve, reject, auth, spreadsheetId, directory, forceStr)
     console.log(`Saving sheet to ${file_path}`);
     // grunt.file.write(filename, JSON.stringify(out, null, 2));
     writeFile(file_path, JSON.stringify(out, null, 2));
-    resolve(file_path);
   }
+  resolve("Complete");
 };
 
 module.exports = { googleAuth };

package/example/project-config.json

@@ -2,7 +2,7 @@
   "_comment": "The possible paywall values are 'meter' (hit the paywall after a certain number of free stories), 'paywall' (paywall immediately), 'free' (no wall), or 'meter-no-paywall' (count this against the reader's meter, but never show the paywall on this page)",
   "PAYWALL_SETTING": "meter",
   "EMBEDDED": false,
-  "GOOGLE_SHEETS": [],
+  "GOOGLE_SHEETS": ["1v2U2iG7lEZHaKRgGTeg6xKlyTjZnu_C5uQ1CLSD5iEw"],
   "GOOGLE_DOCS": [],
   
   "_domain_explainer": "NOTE: MAIN_DOMAIN will get swapped out based on the MARKEY_KEY when deployed on the server. If you are building it locally for a repo push, you need to set the domain manually here.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sfc-utils",
-  "version": "1.3.33",
+  "version": "1.3.36",
   "author": "ewagstaff <evanjwagstaff@gmail.com>",
   "dependencies": {
     "archieml": "^0.4.2",

package/settings.js

@@ -19,11 +19,30 @@ let getSettings = function(){
 	settings.PROJECT['ANALYTICS_CREDIT'] = ''
 	// Populate with storySettings if they exist
 	let storySettings
+	let fullAuthors = []
 	try {
-
     try {
     	// Check for classic story_settings sheet
     	[storySettings] = require("../../src/data/story_settings.sheet.json")
+			// If we got story_settings, try structuring the AUTHORS object
+			let authorNames = []
+			let authorLinks = []
+			try {
+				if (storySettings.Byline) {
+					authorNames = storySettings.Byline.split(',')
+				}
+				if (storySettings.Byline_Links) {
+					authorLinks = storySettings.Byline_Links.split(',')
+				}
+				for (let i in authorNames){
+					fullAuthors.push({
+						AUTHOR_NAME: authorNames[i],
+						AUTHOR_PAGE: authorLinks[i] || ""
+					})
+				}
+			} catch(err){
+				// It's ok, we'll fall back
+			}
     } catch(err){
 			try {
 				// May be an Archie doc, try grabbing from there
@@ -53,7 +72,7 @@ let getSettings = function(){
 				"TWITTER_TEXT": storySettings.Twitter_Text,
 				"DATE": storySettings.Publish_Date,
 				"MOD_DATE": storySettings.Mod_Date || storySettings.LastModDate_C2P,
-				"AUTHORS": projectSettings.AUTHORS,
+				"AUTHORS": fullAuthors || projectSettings.AUTHORS,
 				"ANALYTICS_CREDIT": storySettings.Analytics_Credit,
 				"HEARST_CATEGORY": storySettings.Category || storySettings.Analytics_Section || "News",
 				"KEY_SUBJECTS": storySettings.Key_Subjects || "",