Gildas 5 лет назад
Родитель
Сommit
3b7e1f079e
1 измененных файлов с 8 добавлено и 6 удалено
  1. 8 6
      extension/core/bg/business.js

+ 8 - 6
extension/core/bg/business.js

@@ -30,6 +30,8 @@ singlefile.extension.core.bg.business = (() => {
 	const ERROR_CONNECTION_LOST_GECKO = "Message manager disconnected";
 	const ERROR_CONNECTION_LOST_GECKO = "Message manager disconnected";
 	const INJECT_SCRIPTS_STEP = 1;
 	const INJECT_SCRIPTS_STEP = 1;
 	const EXECUTE_SCRIPTS_STEP = 2;
 	const EXECUTE_SCRIPTS_STEP = 2;
+	const TASK_PENDING_STATE = "pending";
+	const TASK_PROCESSING_STATE = "processing";
 
 
 	const extensionScriptFiles = [
 	const extensionScriptFiles = [
 		"common/index.js",
 		"common/index.js",
@@ -93,7 +95,7 @@ singlefile.extension.core.bg.business = (() => {
 			Object.keys(options).forEach(key => tabOptions[key] = options[key]);
 			Object.keys(options).forEach(key => tabOptions[key] = options[key]);
 			tabOptions.autoClose = true;
 			tabOptions.autoClose = true;
 			tabOptions.extensionScriptFiles = extensionScriptFiles;
 			tabOptions.extensionScriptFiles = extensionScriptFiles;
-			tasks.push({ id: currentTaskId, status: "pending", tab: { url }, options: tabOptions, method: "content.save" });
+			tasks.push({ id: currentTaskId, status: TASK_PENDING_STATE, tab: { url }, options: tabOptions, method: "content.save" });
 			currentTaskId++;
 			currentTaskId++;
 		}));
 		}));
 		runTasks();
 		runTasks();
@@ -113,7 +115,7 @@ singlefile.extension.core.bg.business = (() => {
 			tabOptions.extensionScriptFiles = extensionScriptFiles;
 			tabOptions.extensionScriptFiles = extensionScriptFiles;
 			if (options.autoSave) {
 			if (options.autoSave) {
 				if (autosave.isEnabled(tab)) {
 				if (autosave.isEnabled(tab)) {
-					const taskInfo = { id: currentTaskId, status: "processing", tab, options: tabOptions, method: "content.autosave" };
+					const taskInfo = { id: currentTaskId, status: TASK_PROCESSING_STATE, tab, options: tabOptions, method: "content.autosave" };
 					tasks.push(taskInfo);
 					tasks.push(taskInfo);
 					runTask(taskInfo);
 					runTask(taskInfo);
 					currentTaskId++;
 					currentTaskId++;
@@ -123,7 +125,7 @@ singlefile.extension.core.bg.business = (() => {
 				const scriptsInjected = await singlefile.extension.injectScript(tabId, tabOptions);
 				const scriptsInjected = await singlefile.extension.injectScript(tabId, tabOptions);
 				if (scriptsInjected) {
 				if (scriptsInjected) {
 					ui.onStart(tabId, EXECUTE_SCRIPTS_STEP);
 					ui.onStart(tabId, EXECUTE_SCRIPTS_STEP);
-					tasks.push({ id: currentTaskId, status: "pending", tab, options: tabOptions, method: "content.save" });
+					tasks.push({ id: currentTaskId, status: TASK_PENDING_STATE, tab, options: tabOptions, method: "content.save" });
 					currentTaskId++;
 					currentTaskId++;
 				} else {
 				} else {
 					ui.onForbiddenDomain(tab);
 					ui.onForbiddenDomain(tab);
@@ -144,9 +146,9 @@ singlefile.extension.core.bg.business = (() => {
 	}
 	}
 
 
 	function runTasks() {
 	function runTasks() {
-		const processingCount = tasks.filter(taskInfo => taskInfo.status == "processing").length;
+		const processingCount = tasks.filter(taskInfo => taskInfo.status == TASK_PROCESSING_STATE).length;
 		for (let index = 0; index < Math.min(tasks.length - processingCount, (maxParallelWorkers - processingCount)); index++) {
 		for (let index = 0; index < Math.min(tasks.length - processingCount, (maxParallelWorkers - processingCount)); index++) {
-			const taskInfo = tasks.find(taskInfo => taskInfo.status == "pending");
+			const taskInfo = tasks.find(taskInfo => taskInfo.status == TASK_PENDING_STATE);
 			if (taskInfo) {
 			if (taskInfo) {
 				runTask(taskInfo);
 				runTask(taskInfo);
 			}
 			}
@@ -157,7 +159,7 @@ singlefile.extension.core.bg.business = (() => {
 		const ui = singlefile.extension.ui.bg.main;
 		const ui = singlefile.extension.ui.bg.main;
 		const tabs = singlefile.extension.core.bg.tabs;
 		const tabs = singlefile.extension.core.bg.tabs;
 		const taskId = taskInfo.id;
 		const taskId = taskInfo.id;
-		taskInfo.status = "processing";
+		taskInfo.status = TASK_PROCESSING_STATE;
 		taskInfo.done = () => {
 		taskInfo.done = () => {
 			tasks.splice(tasks.findIndex(taskInfo => taskInfo.id == taskId), 1);
 			tasks.splice(tasks.findIndex(taskInfo => taskInfo.id == taskId), 1);
 			runTasks();
 			runTasks();