renamed option "asDataURI" to "asBinary"

Former-commit-id: 07805954071be20b9c7f7c15396215201a361cf4

lib/single-file/single-file-core.js

@@ -272,9 +272,9 @@ this.singlefile.lib.core = this.singlefile.lib.core || (() => {
 			this.duplicates = new Map();
 		}
 
-		async addURL(resourceURL, asDataURI, groupDuplicates) {
+		async addURL(resourceURL, asBinary, groupDuplicates) {
 			return new Promise((resolve, reject) => {
-				const requestKey = JSON.stringify([resourceURL, asDataURI]);
+				const requestKey = JSON.stringify([resourceURL, asBinary]);
 				let resourceRequests = this.requests.get(requestKey);
 				if (!resourceRequests) {
 					resourceRequests = [];
@@ -301,12 +301,12 @@ this.singlefile.lib.core = this.singlefile.lib.core || (() => {
 			const resourceURLs = Array.from(this.requests.keys());
 			let indexResource = 0;
 			return Promise.all(resourceURLs.map(async requestKey => {
-				const [resourceURL, asDataURI] = JSON.parse(requestKey);
+				const [resourceURL, asBinary] = JSON.parse(requestKey);
 				const resourceRequests = this.requests.get(requestKey);
 				this.requests.delete(requestKey);
 				try {
 					const content = await util.getContent(resourceURL, {
-						asDataURI,
+						asBinary,
 						maxResourceSize: options.maxResourceSize,
 						maxResourceSizeEnabled: options.maxResourceSizeEnabled,
 						referrerPolicy: options.referrerPolicy,
@@ -371,7 +371,6 @@ this.singlefile.lib.core = this.singlefile.lib.core || (() => {
 			let content;
 			if (!pageContent || this.options.saveRawPage) {
 				content = await util.getContent(this.baseURI, {
-					asDataURI: false,
 					maxResourceSize: this.options.maxResourceSize,
 					maxResourceSizeEnabled: this.options.maxResourceSizeEnabled,
 					charset,
@@ -1083,7 +1082,7 @@ this.singlefile.lib.core = this.singlefile.lib.core || (() => {
 				if (Util.testValidURL(resourceURL)) {
 					this.stats.add("processed", "scripts", 1);
 					const content = await util.getContent(resourceURL, {
-						asDataURI: true,
+						asBinary: true,
 						maxResourceSize: this.options.maxResourceSize,
 						maxResourceSizeEnabled: this.options.maxResourceSizeEnabled,
 						referrerPolicy: this.options.referrerPolicy,
@@ -1362,7 +1361,6 @@ this.singlefile.lib.core = this.singlefile.lib.core || (() => {
 						}
 						if (Util.testValidURL(resourceURL)) {
 							const content = await util.getContent(resourceURL, {
-								asDataURI: false,
 								maxResourceSize: options.maxResourceSize,
 								maxResourceSizeEnabled: options.maxResourceSizeEnabled,
 								validateTextContentType: true,
@@ -1432,7 +1430,6 @@ this.singlefile.lib.core = this.singlefile.lib.core || (() => {
 			resourceURL = Util.normalizeURL(resourceURL);
 			if (resourceURL && resourceURL != baseURI && resourceURL != ABOUT_BLANK_URI) {
 				const content = await util.getContent(resourceURL, {
-					asDataURI: false,
 					maxResourceSize: options.maxResourceSize,
 					maxResourceSizeEnabled: options.maxResourceSizeEnabled,
 					charset: options.charset,

lib/single-file/single-file-util.js

@@ -165,7 +165,7 @@ this.singlefile.lib.util = this.singlefile.lib.util || (() => {
 				let resourceContent, startTime;
 				if (DEBUG) {
 					startTime = Date.now();
-					log("  // STARTED download url =", resourceURL, "asDataURI =", options.asDataURI);
+					log("  // STARTED download url =", resourceURL, "asBinary =", options.asBinary);
 				}
 				try {
 					resourceContent = await util.getResourceContent(resourceURL, {
@@ -173,7 +173,7 @@ this.singlefile.lib.util = this.singlefile.lib.util || (() => {
 						credentials: options.credentials
 					});
 				} catch (error) {
-					return { data: options.asDataURI ? "data:base64," : "", resourceURL };
+					return { data: options.asBinary ? "data:base64," : "", resourceURL };
 				}
 				resourceURL = resourceContent.getUrl();
 				let contentType = resourceContent.getContentType();
@@ -195,7 +195,7 @@ this.singlefile.lib.util = this.singlefile.lib.util || (() => {
 				if (!charset && options.charset) {
 					charset = options.charset;
 				}
-				if (options.asDataURI) {
+				if (options.asBinary) {
 					try {
 						if (DEBUG) {
 							log("  // ENDED   download url =", resourceURL, "delay =", Date.now() - startTime);