diff --git a/.gitignore b/.gitignore
index 2c40e63..faacab1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
.vscode/settings.json
autorename-workspace.code-workspace
+/lib/TwitterAPI/TwitterAPIKey.js
\ No newline at end of file
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index d922a98..d52f20d 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -94,6 +94,10 @@
"message": "About"
},
+ "common_section_downloads": {
+ "message": "Downloads"
+ },
+
"common_section_file_name": {
"message": "File Name"
},
@@ -250,6 +254,10 @@
"message": "The Date/Time Format you entered is either empty or invalid"
},
+ "error_download_queue_invalid_file_name": {
+ "message": "You have entered an invalid file name"
+ },
+
"error_validation_prefix": {
"message": "The Prefix you entered contains special characters"
},
@@ -339,6 +347,10 @@
"message": "Enable notification when extension is updated"
},
+ "general_settings_store_images_to_custom_folder": {
+ "message": "Store Images to AutoRename Folder"
+ },
+
"twitter_settings_desciption": {
"message": "Customize File Name Format for Twitter"
},
@@ -359,6 +371,10 @@
"message": "Include Website Title [Twitter]"
},
+ "twitter_settings_save_image_to_folder_based_on_username": {
+ "message": "Save image to folder based on username"
+ },
+
"lineblog_settings_description": {
"message": "Customize File Name Format for LINE BLOG"
},
@@ -397,5 +413,75 @@
"reddit_settings_include_date": {
"message": "Include Date (Based on System Date)"
+ },
+
+ "downloads_section_description": {
+ "message": "View files that are pending for download"
+ },
+
+ "downloads_section_dialog_empty_queue_title": {
+ "message": "Download Queue is Empty"
+ },
+
+ "downloads_section_empty_queue": {
+ "message": "Download queue is empty. To get started, right click on an image > AutoRename > Add to Download Queue"
+ },
+
+ "downloads_section_dialog_remove_from_queue_title": {
+ "message": "Remove from Queue"
+ },
+
+ "downloads_section_dialog_enter_zip_name": {
+ "message": "Enter name for ZIP file"
+ },
+
+ "downloads_section_dialog_queue_cleared": {
+ "message": "Download Queue Cleared"
+ },
+
+ "downloads_section_dialog_enter_zip_name_button_create": {
+ "message": "Create ZIP"
+ },
+
+ "downloads_section_dialog_remove_from_queue_body": {
+ "message": "Are you sure you want to remove this?"
+ },
+
+ "downloads_section_count_label": {
+ "message": "Download Queue -"
+ },
+
+ "downloads_section_button_remove": {
+ "message": "Remove"
+ },
+
+ "downloads_section_button_download": {
+ "message": "Download"
+ },
+
+ "downloads_section_button_clear_queue": {
+ "message": "Clear Queue"
+ },
+
+ "downloads_section_saving_file": {
+ "message": "Saving file:"
+ },
+
+ "downloads_section_saving_file_2": {
+ "message": "to ZIP -",
+ "description": "Dash is required since the percentage is after that"
+ },
+
+ "downloads_section_saving_file_3": {
+ "message": "Your files are currently downloading. Please wait..."
+ },
+
+ "downloads_section_downlaod_in_progress": {
+ "message": "Download in progress"
+ },
+
+ "downloads_section_downlaod_complete_title": {
+ "message": "Download Complete"
}
+
}
\ No newline at end of file
diff --git a/assets/icons8-clock-48.png b/assets/icons8-clock-48.png
new file mode 100644
index 0000000..500da44
Binary files /dev/null and b/assets/icons8-clock-48.png differ
diff --git a/assets/icons8-data-pending-48.png b/assets/icons8-data-pending-48.png
new file mode 100644
index 0000000..dfe28b5
Binary files /dev/null and b/assets/icons8-data-pending-48.png differ
diff --git a/assets/icons8-download-48.png b/assets/icons8-download-48.png
new file mode 100644
index 0000000..31a8275
Binary files /dev/null and b/assets/icons8-download-48.png differ
diff --git a/css/stylesheet.css b/css/stylesheet.css
index 42592bc..11e730a 100644
--- a/css/stylesheet.css
+++ b/css/stylesheet.css
@@ -1,6 +1,6 @@
body {
- background: #fff;
- font-family: 'Segoe UI', 'Roboto', '-apple-system', 'BlinkMacSystemFont', 'Arial', sans-serif !important;
+ background: #eeeeee3b;
+ font-family: 'Segoe UI Variable Display', 'Segoe UI', 'Roboto', '-apple-system', 'BlinkMacSystemFont', 'Arial', sans-serif !important;
font-size: 1.1em;
margin: 0;
padding: 0;
@@ -364,12 +364,75 @@ a:-webkit-any-link {
grid-template-columns: auto auto;
margin-top: 20px;
}
+
+.download-card {
+ align-items: center;
+ background-color: #fff;
+ box-shadow: 1px 1px 4px #e5e5e5;
+ border-radius: 5px;
+ display: flex;
+ flex-direction: row;
+ margin-bottom: 5px;
+ padding: 3px;
+}
+
+.download-card .download-card-actions {
+ visibility: hidden;
+}
+
+.download-card:hover .download-card-actions {
+ visibility: visible;
+}
+
+.image-thumbnail {
+ width: 40px;
+ height: 40px;
+ margin: 5px 5px 5px 5px;
+ object-fit: cover;
+}
+
+.download-card-site {
+ background-color: #000;
+ border-radius: 5px;
+ color: #fff;
+ display: inline-flex;
+ margin-top: 5px;
+ padding: 2px;
+ font-size: 12px;
+}
+
+.download-card-actions {
+ margin-left: auto;
+}
+
+.download-card-actions-button-primary {
+ background-color: #03B4D3;
+ color: #fff;
+ margin-right: 10px;
+
+}
+
+
+.download-card-actions-button-secondary {
+ background-color: #fff0;
+ margin-right: 1px;
+}
+
+.beta_tag {
+ padding: 4px;
+ background-color: #FFCD03;
+ color: black;
+ border-radius: 6px;
+ margin-left: 5px;
+ font-weight: 600;
+}
+
/** EVERYTHING BELOW IS FOR DARK MODE ONLY **/
@media (prefers-color-scheme: dark) {
body {
- background-color: #121212;
+ background-color: #161616;
}
hr {
@@ -377,7 +440,7 @@ a:-webkit-any-link {
}
.navbar {
- background-color: #121212;
+ background-color: #181818;
border-right: 1px solid #1f1f1f;
color: #fff;
}
@@ -414,6 +477,46 @@ a:-webkit-any-link {
background: #242424;
box-shadow: 0 0 28px #00000059;
}
+
+ .download_card_container {
+ color: #B0B0B0;
+ }
+
+ .download-card {
+ background-color: #222222;
+ box-shadow: 1px 1px 4px #000;
+ }
+
+ .download-card-site {
+ color: #fff;
+ margin-top: 5px;
+ font-size: 12px;
+ }
+
+ .download-card-actions {
+ margin-left: auto;
+ }
+
+ .download-card-actions-button-primary {
+ background-color: #03B4D3;
+ color: #fff;
+ margin-right: 10px;
+
+ }
+
+ .download-card-actions-button-secondary {
+ background-color: #fff0;
+ color: #B0B0B0;
+ margin-right: 1px;
+ }
+
+ .download-card-file {
+ color: #B0B0B0;
+ }
+
+ .download-card-info {
+ color: #B0B0B0;
+ }
}
/** ANIMATION **/
diff --git a/js/BackgroundService.js b/js/BackgroundService.js
new file mode 100644
index 0000000..5f8b9a0
--- /dev/null
+++ b/js/BackgroundService.js
@@ -0,0 +1,43 @@
+/** MIT License
+ *
+ * Copyright (c) 2023 Dasutein
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+ * is furnished to do so, subject to the following conditions:
+ *
+ * See more: https://github.com/ddasutein/AutoRename/blob/master/LICENSE
+ *
+ */
+
+const GLOBAL_VARIABLES = {
+
+ UA_HEADER: `${navigator.userAgent} ${chrome.runtime.getManifest().name}/${chrome.runtime.getManifest().version}`
+
+}
+
+const Backgroundscripts = [
+ "/js/Settings.js",
+ "/js/Runtime.js",
+ "/lib/Moment/moment.js",
+ "/lib/Moment/moment-with-locales.js",
+ "/js/Common/Utility.js",
+ "/js/Common/Debugger.js",
+ "/js/Common/SetTimeDate.js",
+ "/js/Twitter/TwitterContent.js",
+ "/js/LINE BLOG/LineBlogContent.js",
+ "/js/Reddit/RedditContent.js",
+ "/js/DownloadManager.js",
+ "/js/SaveAsEventHandle.js"
+]
+
+try {
+ Backgroundscripts.forEach((x)=>{
+ importScripts(x);
+ });
+
+}catch(e){
+ console.error(e);
+}
\ No newline at end of file
diff --git a/js/Common/Utility.js b/js/Common/Utility.js
index fa8a5b8..37573a9 100644
--- a/js/Common/Utility.js
+++ b/js/Common/Utility.js
@@ -75,6 +75,27 @@ let Utility = {
}
break;
}
+ }),
+
+ SetBadgeText : ((str)=>{
+ if (str == 0 || str == null){
+ chrome.action.setBadgeText({
+ text: ""
+ });
+ } else if (str > 0){
+ chrome.action.setBadgeText({
+ text: str.toString()
+ });
+ }
+
+ }),
+
+ CreateNewTab : ((url)=>{
+ return chrome.tabs.create({
+ url: url
+ });
})
+
+
}
\ No newline at end of file
diff --git a/js/DownloadManager.js b/js/DownloadManager.js
index 932b92d..4e24b51 100644
--- a/js/DownloadManager.js
+++ b/js/DownloadManager.js
@@ -1,6 +1,6 @@
/** MIT License
*
- * Copyright (c) 2021 Dasutein
+ * Copyright (c) 2023 Dasutein
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software
* and associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -12,64 +12,111 @@
*
*/
-/**
- * Start downloading files
- *
- * @param {object} downloadQueue Images that are in queue to download
- */
-function StartDownload(downloadQueue){
-
- Object.values(Settings.Load().General.map((key, index)=>{
- switch (index){
-
- // global_enable_save_as_window
- case 1:
- if (key.value == true){
- downloadQueue.forEach((dq)=>{
- chrome.downloads.download({
- url: dq.url,
- filename: dq.filename,
- saveAs: true
- });
- });
- } else {
- downloadQueue.forEach((dq)=>{
- chrome.downloads.download({
- url: dq.url,
- filename: dq.filename,
- saveAs: false
- });
- });
- }
- break;
+var DownloadManager = {
+
+ UpdateBadge: (async ()=>{
+ generalSettings = Settings.Load().General.map((data) => {
+ return {
+ "key": data.key,
+ "value": data.value
+ }
+ }).reduce((obj, data) => {
+ obj[data.key] = data;
+ return obj;
+ }, {});
+
+ let downloadData = generalSettings["global_download_queue_data"].value;
+ if (downloadData.length > 0) {
+ downloadData = JSON.parse(downloadData)
+ } else {
+ downloadData = [];
}
- }));
-}
-chrome.downloads.onChanged.addListener(function (downloadDelta) {
- chrome.storage.local.get({
- showDownloadFolderCheckbox: false
- }, function (items) {
- if (downloadDelta.state && downloadDelta.state.current == "complete") {
+ Utility.SetBadgeText(downloadData.length);
+ }),
+
+ AddDownloadQueue: ((data) => {
- if (DevMode){
- const DEBUG_TAG = "downloadsOnChangedListener => ";
- console.log(DEBUG_TAG + downloadDelta.state.current);
+ generalSettings = Settings.Load().General.map((data) => {
+ return {
+ "key": data.key,
+ "value": data.value
}
+ }).reduce((obj, data) => {
+ obj[data.key] = data;
+ return obj;
+ }, {});
- let generalSettings = Settings.Load().General;
+ let downloadData = generalSettings["global_download_queue_data"].value;
+ if (downloadData.length > 0) {
+ downloadData = JSON.parse(downloadData)
+ } else {
+ downloadData = [];
+ }
- generalSettings.map((key, index) => {
- switch (index){
- case 0:
- if (key.value){
- chrome.downloads.showDefaultFolder();
- }
- break;
- }
+ data.forEach((x) => {
+ downloadData.push({
+ filename: x.filename,
+ url: x.url,
+ website: x.website
});
+ });
+
+ Utility.SetBadgeText(downloadData.length);
+ Settings.Save("global_download_queue_data", JSON.stringify(downloadData));
+
+ }),
+
+ ClearDownloadQueue: (() => {
+ Settings.Save("global_download_queue_data", "");
+ Utility.SetBadgeText(null);
+ }),
+
+ StartDownload: ((data) => {
+
+ let fileData = {};
+
+ generalSettings = Settings.Load().General.map((data) => {
+ return {
+ "key": data.key,
+ "value": data.value
+ }
+ }).reduce((obj, data) => {
+ obj[data.key] = data;
+ return obj;
+ }, {});
+
+ data.forEach((x) => {
+ chrome.downloads.download({
+ url: x.url,
+ filename: `${x.filename}`,
+ saveAs: generalSettings["global_enable_save_as_window"].value
+ }, ((id) => {
+
+ chrome.downloads.onChanged.addListener((delta) => {
+
+ if (id == delta.id) {
+
+ if (delta.state && delta.state.current == "in_progress") {
+ fileData["size"] = delta.fileSize.current;
+ fileData["url"] = delta.url.current;
+ fileData["id"] = delta.id;
+ fileData["name"] = x.filename;
+ }
+
+ if (delta.state && delta.state.current == "complete") {
+ generalSettings["global_show_download_folder"].value ? chrome.downloads.showDefaultFolder() : null;
+ tmp = [];
+ tmp.push(fileData);
+ Settings.Save("global_download_history_data", JSON.stringify(tmp));
+ DownloadManager.UpdateBadge();
+ }
+ }
+ });
+
+ }));
+ });
+ }),
+
+}
- return;
- }
- });
-});
\ No newline at end of file
diff --git a/js/ExtensionInfo.js b/js/ExtensionInfo.js
index 15dfe58..26e22f7 100644
--- a/js/ExtensionInfo.js
+++ b/js/ExtensionInfo.js
@@ -18,37 +18,37 @@
/**
* Loads extension data from Manifest
*/
-function LoadExtensionData(){
- let request = new XMLHttpRequest();
-
- request.onload = function (e) {
- if (request.readyState === 4) {
- if (request.readyState === 200) {
- console.log(request.responseText);
- } else {
- let jsonConfig = this.responseText;
- let jsonParse = JSON.parse(jsonConfig);
- document.getElementById("main_extension_name").textContent = jsonParse.short_name;
-
- if ((jsonParse.version).split(".")[3] >= 1000) {
- document.getElementById("main_extension_version").textContent = `${jsonParse.version} (dev-build)`;
-
- } else if ((jsonParse.version).split(".")[3] == undefined) {
- document.getElementById("main_extension_version").textContent = `${jsonParse.version}`;
+function LoadExtensionData() {
+ let request = new XMLHttpRequest();
+
+ request.onload = function (e) {
+ if (request.readyState === 4) {
+ if (request.readyState === 200) {
+ console.log(request.responseText);
+ } else {
+ let jsonConfig = this.responseText;
+ let jsonParse = JSON.parse(jsonConfig);
+ document.getElementById("main_extension_name").textContent = jsonParse.short_name;
+
+ if ((jsonParse.version).split(".")[3] >= 1000) {
+ document.getElementById("main_extension_version").textContent = `${jsonParse.version} (dev-build)`;
+
+ } else if ((jsonParse.version).split(".")[3] == undefined) {
+ document.getElementById("main_extension_version").textContent = `${jsonParse.version}`;
+ }
+
+ // document.getElementById("extension_description").innerHTML = jsonParse.description;
+ console.log("AND IT SHALL BE BESTOWNED UPON YOU, THE STAR WHICH YOU HAVE LONGED FOR—");
+ console.log("Status: " + request.statusText + "👍");
+ }
}
-
- // document.getElementById("extension_description").innerHTML = jsonParse.description;
- console.log("AND IT SHALL BE BESTOWNED UPON YOU, THE STAR WHICH YOU HAVE LONGED FOR—");
- console.log("Status: " + request.statusText + "👍");
- }
}
- }
- request.open('GET', chrome.extension.getURL('manifest.json'), true);
- request.onerror = function (e) {
- console.error(request.statusText);
- };
-
- request.send(null);
+ request.open('GET', chrome.runtime.getURL('manifest.json'), true);
+ request.onerror = function (e) {
+ console.error(request.statusText);
+ };
+
+ request.send(null);
}
@@ -57,124 +57,139 @@ function LoadExtensionData(){
*/
function GetSystemInfo() {
- let appVersion = navigator.appVersion;
- let platformData = {};
-
- function isChromium() {
- for (brand_version_pair of navigator.userAgentData.brands) {
- if (brand_version_pair.brand == "Chromium") {
- return true;
- }
- }
- return false;
- }
-
- function queryOtherOS(av){
- console.log(av)
- function getMacOS(av){
- let macVersion = av.substring(31, av.lastIndexOf("OS X") + 12);
- return `macOS ${macVersion.replace(/_/gi, ".")}`;
- }
-
- function getChromeOS(av){
- let chromeOSVersion = av.substring(31, av.lastIndexOf("CrOS") + 5);
- return `Chrome OS ${chromeOSVersion}`
- }
-
- if (av.includes("Windows NT 6.1")){
- return "Windows 7";
- } else if (av.includes("Windows NT 6.2")){
- return "Windows 8";
- } else if (av.includes("Windows NT 6.3")){
- return "Windows 8.1";
- } else if (av.includes("Macintosh")){
- return getMacOS(av);
- } else if (av.includes("CrOS")){
- return getChromeOS(av);
- } else {
- return null;
- }
-
- }
-
- if (isChromium() == true) {
- navigator.userAgentData.getHighEntropyValues(
- ["architecture", "model", "platform", "platformVersion", "uaFullVersion"])
- .then(ua => {
-
- if (!!ua.uaFullVersion){
- platformData["browserVersion"] = `(${ua.uaFullVersion})`;
- }
-
- if (ua.platform == "Windows"){
- switch (ua.platformVersion){
-
- case "0.0.0":
- // Fallback to legacy OS query
- queryOtherOS(appVersion);
- break;
-
- case "1.0.0":
- platformData["os"] = "Windows 10 version 1507";
- break;
-
- case "2.0.0":
- platformData["os"] = "Windows 10 version 1511";
- break;
-
- case "3.0.0":
- platformData["os"] = "Windows 10 version 1607";
- break;
-
- case "4.0.0":
- platformData["os"] = "Windows 10 version 1703";
- break;
-
- case "5.0.0":
- platformData["os"] = "Windows 10 version 1709";
- break;
-
- case "6.0.0":
- platformData["os"] = "Windows 10 version 1803";
- break;
-
- case "7.0.0":
- platformData["os"] = "Windows 10 version 1809";
- break;
-
- case "8.0.0":
- platformData["os"] = "Windows 10 version 1903/1909";
- break;
-
- case "10.0.0":
- platformData["os"] = "Windows 10 version 2004/20H2/21H1";
- break;
-
- case "14.0.0":
- platformData["os"] = "Windows 11 version 21H2";
- break;
-
- default:
- platformData["os"] = "-";
- break;
-
- }
- } else {
- platformData["os"] = queryOtherOS(appVersion);
- }
-
-
- if (ua.architecture == "x86"){
- if (ua.platform == "Windows"){
- platformData["architecture"] = `${ua.platform} - Intel/AMD x86-64`;
- }
- }
- document.getElementById("system_information_platform_value").innerHTML = platformData.architecture;
- document.getElementById("system_information_os_value").innerHTML = platformData.os;
- document.getElementById("system_information_browser_value").innerHTML = `${ua.brands[1].brand} ${platformData.browserVersion}`;
-
- });
- }
+ let appVersion = navigator.appVersion;
+ let platformData = {};
+
+ function isChromium() {
+ for (brand_version_pair of navigator.userAgentData.brands) {
+ if (brand_version_pair.brand == "Chromium") {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ function queryOtherOS(av) {
+ console.log(av)
+
+ function getMacOS(av) {
+ let macVersion = av.substring(31, av.lastIndexOf("OS X") + 12);
+ return `macOS ${macVersion.replace(/_/gi, ".")}`;
+ }
+
+ function getChromeOS(av) {
+ let chromeOSVersion = av.substring(31, av.lastIndexOf("CrOS") + 5);
+ return `Chrome OS ${chromeOSVersion}`
+ }
+
+ if (av.includes("Windows NT 6.1")) {
+ return "Windows 7";
+ } else if (av.includes("Windows NT 6.2")) {
+ return "Windows 8";
+ } else if (av.includes("Windows NT 6.3")) {
+ return "Windows 8.1";
+ } else if (av.includes("Macintosh")) {
+ return getMacOS(av);
+ } else if (av.includes("CrOS")) {
+ return getChromeOS(av);
+ } else {
+ return null;
+ }
+
+ }
+
+ if (isChromium() == true) {
+ navigator.userAgentData.getHighEntropyValues(
+ ["architecture", "model", "platform", "platformVersion", "uaFullVersion"])
+ .then(ua => {
+
+ if (!!ua.uaFullVersion) {
+ platformData["browserVersion"] = `(${ua.uaFullVersion})`;
+ }
+
+ if (ua.platform == "Windows") {
+ switch (ua.platformVersion) {
+
+ case "0.0.0":
+ // Fallback to legacy OS query
+ queryOtherOS(appVersion);
+ break;
+
+ case "1.0.0":
+ platformData["os"] = "Windows 10 version 1507";
+ break;
+
+ case "2.0.0":
+ platformData["os"] = "Windows 10 version 1511";
+ break;
+
+ case "3.0.0":
+ platformData["os"] = "Windows 10 version 1607";
+ break;
+
+ case "4.0.0":
+ platformData["os"] = "Windows 10 version 1703";
+ break;
+
+ case "5.0.0":
+ platformData["os"] = "Windows 10 version 1709";
+ break;
+
+ case "6.0.0":
+ platformData["os"] = "Windows 10 version 1803";
+ break;
+
+ case "7.0.0":
+ platformData["os"] = "Windows 10 version 1809";
+ break;
+
+ case "8.0.0":
+ platformData["os"] = "Windows 10 version 1903/1909";
+ break;
+
+ case "10.0.0":
+ platformData["os"] = "Windows 10 version 2004/20H2/21H1";
+ break;
+
+ case "14.0.0":
+ platformData["os"] = "Windows 11 version 21H2";
+ break;
+
+ case "15.0.0":
+ platformData["os"] = "Windows 11 version 22H2";
+ break;
+
+ default:
+ platformData["os"] = "-";
+ break;
+
+ }
+ } else {
+ platformData["os"] = queryOtherOS(appVersion);
+ }
+
+
+ if (ua.architecture == "x86") {
+ if (ua.platform == "Windows") {
+ platformData["architecture"] = `${ua.platform} - Intel/AMD x86-64`;
+ } else if (ua.platform == "macOS"){
+ platformData["architecture"] = `${ua.platform} - Intel/AMD x86-64`;
+ }
+ }
+
+ if (ua.architecture == "arm"){
+ if (ua.platform == "macOS"){
+ platformData["architecture"] = `${ua.platform} - Apple Silicon`;
+ } else if (ua.platform == "Windows"){
+ platformData["architecture"] = `${ua.platform} - ARM`;
+ }
+ }
+ document.getElementById("system_information_platform_value").innerHTML = platformData.architecture;
+ document.getElementById("system_information_os_value").innerHTML = platformData.os;
+ document.getElementById("system_information_browser_value").innerHTML = `${ua.brands[1].brand} ${platformData.browserVersion}`;
+
+ });
+ }
}
diff --git a/js/LINE BLOG/LineBlogContent.js b/js/LINE BLOG/LineBlogContent.js
index 46e9bb5..200b187 100644
--- a/js/LINE BLOG/LineBlogContent.js
+++ b/js/LINE BLOG/LineBlogContent.js
@@ -12,7 +12,7 @@
*
*/
-function SaveLINEBlogMedia(tabUrl, url, customObj){
+function SaveLINEBlogMedia(tabUrl, url, linkUrl, customObj){
if (BrowserTabInfo.URL.match(Website.LINE_BLOG)){
lineblogTitle = BrowserTabInfo.Title.split("-")[1] != undefined ? BrowserTabInfo.Title.split("-")[1].trim().toString() : "";
@@ -114,7 +114,11 @@ function SaveLINEBlogMedia(tabUrl, url, customObj){
filename: buildFileName(fileNameObj) + ".jpg",
url: url
});
-
- StartDownload(lineBlogImageFile);
+ console.log(customObj);
+ if (customObj.download_queue == true){
+ AddToDownloadQueue(lineBlogImageFile[0].url, lineBlogImageFile[0].filename, "LINE BLOG")
+ } else {
+ StartDownload(lineBlogImageFile);
+ }
}
\ No newline at end of file
diff --git a/js/OptionsPage.js b/js/OptionsPage.js
index cc1e4b7..7c31083 100644
--- a/js/OptionsPage.js
+++ b/js/OptionsPage.js
@@ -1,6 +1,6 @@
/** MIT License
*
- * Copyright (c) 2022 Dasutein
+ * Copyright (c) 2023 Dasutein
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software
* and associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -21,7 +21,7 @@ const messageBox = {
Save: (() => {
- return swal ({
+ return swal({
title: "",
text: chrome.i18n.getMessage("context_save_success"),
icon: "success",
@@ -31,7 +31,7 @@ const messageBox = {
});
}),
- Warning : ((title, message)=>{
+ Warning: ((title, message) => {
return swal({
title: title,
text: message,
@@ -54,18 +54,18 @@ const specialCharacters = new RegExp(/[?!@#$%^&*(),';\:*"<>|/]/g);
* @param {*} dateString Date string
* @returns
*/
-function ValidateDateTimeFormat(settingsKey, dateString){
+function ValidateDateTimeFormat(settingsKey, dateString) {
let output = {};
- if (dateString == "" || dateString == null || dateString == undefined){
+ if (dateString == "" || dateString == null || dateString == undefined) {
output["title"] = chrome.i18n.getMessage("error_title_invalid");
output["message"] = chrome.i18n.getMessage("error_validation_date_time_format");
output["is_error"] = true;
} else {
// Check for special characters that are not allowed by the operating system
- if (dateString.match(specialCharacters)){
+ if (dateString.match(specialCharacters)) {
isValidDateFormat = false;
output["title"] = chrome.i18n.getMessage("error_title_invalid");
@@ -76,9 +76,9 @@ function ValidateDateTimeFormat(settingsKey, dateString){
output["is_error"] = false;
}
- }
+ }
- if (output.is_error){
+ if (output.is_error) {
return output;
} else {
Settings.Save(settingsKey, dateString);
@@ -93,10 +93,10 @@ function ValidateDateTimeFormat(settingsKey, dateString){
* @param {*} prefixString
* @returns
*/
-function ValidatePrefix(settingsKey, prefixString){
+function ValidatePrefix(settingsKey, prefixString) {
let output = {};
- if (prefixString.match(specialCharacters)){
+ if (prefixString.match(specialCharacters)) {
output["title"] = chrome.i18n.getMessage("error_title_invalid");
output["message"] = chrome.i18n.getMessage("error_validation_prefix");
output["is_error"] = true;
@@ -104,7 +104,7 @@ function ValidatePrefix(settingsKey, prefixString){
output["is_error"] = false;
}
- if (output.is_error){
+ if (output.is_error) {
return output;
} else {
Settings.Save(settingsKey, prefixString);
@@ -128,6 +128,9 @@ document.onreadystatechange = () => {
case "global_notifications_updated":
document.getElementById("general_settings_notification_updated").checked = x.value
break;
+ case "global_use_autorename_folder":
+ document.getElementById("general_settings_use_autorename_folder").checked = x.value;
+ break;
}
});
@@ -167,6 +170,10 @@ document.onreadystatechange = () => {
case "twitter_settings_custom_prefix":
document.getElementById("twitter_settings_custom_prefix").value = x.value;
break;
+
+ case "twitter_save_image_to_folder_based_on_username":
+ document.getElementById("twitter_settings_save_to_folder_by_username").checked = x.value;
+ break;
}
});
@@ -249,7 +256,7 @@ document.onreadystatechange = () => {
}
- });
+ });
}
}
@@ -260,19 +267,44 @@ document.onreadystatechange = () => {
* Perform execution after page has loaded
*
*/
-document.addEventListener("DOMContentLoaded", (()=>{
+document.addEventListener("DOMContentLoaded", (() => {
//#region Tab Switching Logic
const tabs = document.querySelectorAll("[data-tab-target]");
const tabContents = document.querySelectorAll("[data-tab-content]");
- tabs.forEach((tab) => {
- tab.addEventListener("click", () => {
- const target = document.querySelector(tab.dataset.tabTarget);
- tabContents.forEach(tabContent => tabContent.classList.remove("active"));
- tabs.forEach(tabContent => tabContent.classList.remove("active"));
- tab.classList.add("active");
- target.classList.add("active");
+ const optionsConfig = Settings.Load().OptionsUI.map((data)=>{
+ return {
+ "key": data.key,
+ "value": data.value
+ }
+ }).reduce((obj, data)=>{
+ obj[data.key] = data;
+ return obj;
+ }, {});
+
+ createDownloadCardItem();
+
+ tabs.forEach((tab, idx) => {
+
+ if (idx == optionsConfig["optionsUITabIndexNumber"].value){
+ const target = document.querySelector(optionsConfig["optionsUITabName"].value);
+ tabContents.forEach(tabContent => tabContent.classList.remove("active"));
+ tabs.forEach(tabContent => tabContent.classList.remove("active"));
+ tab.classList.add("active");
+ target.classList.add("active");
+
+ }
+
+ tab.addEventListener("click", () => {
+ const target = document.querySelector(tab.dataset.tabTarget);
+ tabContents.forEach(tabContent => tabContent.classList.remove("active"));
+ tabs.forEach(tabContent => tabContent.classList.remove("active"));
+ tab.classList.add("active");
+ target.classList.add("active");
+
+ Settings.Save("optionsUITabName", tab.dataset.tabTarget);
+ Settings.Save("optionsUITabIndexNumber", idx);
});
});
@@ -304,65 +336,71 @@ document.addEventListener("DOMContentLoaded", (()=>{
*/
switch (buttons.id) {
-
+
+ // case "download-primary":
+ // buttons.addEventListener("click", (() => {
+ // alert("TEST " + buttons.id)
+ // }));
+ // break;
+
case "button_help_twitter":
- buttons.addEventListener("click", (()=>{
+ buttons.addEventListener("click", (() => {
chrome.tabs.create({
url: "https://github.com/ddasutein/AutoRename/wiki/%E2%9A%99-Settings#twitter"
})
}));
break;
-
+
case "button_help_lineblog":
- buttons.addEventListener("click", (()=>{
+ buttons.addEventListener("click", (() => {
chrome.tabs.create({
url: "https://github.com/ddasutein/AutoRename/wiki/%E2%9A%99-Settings#line-blog"
})
}));
break;
-
+
case "button_help_reddit":
- buttons.addEventListener("click", (()=>{
+ buttons.addEventListener("click", (() => {
chrome.tabs.create({
url: "https://github.com/ddasutein/AutoRename/wiki/%E2%9A%99-Settings#reddit"
})
}));
break;
-
case "button_save_general":
buttons.addEventListener("click", (() => {
Settings.Save("global_show_download_folder", document.getElementById("general_settings_auto_show_download_folder").checked);
Settings.Save("global_enable_save_as_window", document.getElementById("general_settings_enable_save_as_window").checked);
Settings.Save("global_notifications_updated", document.getElementById("general_settings_notification_updated").checked);
+ Settings.Save("global_use_autorename_folder", document.getElementById("general_settings_use_autorename_folder").checked)
messageBox.Save();
}));
-
+
break;
-
+
case "button_save_twitter":
-
+
buttons.addEventListener("click", (() => {
try {
-
- if (temp.length > 0){
+
+ if (temp.length > 0) {
temp = [];
errorCode = {};
}
- if (document.getElementById("twitter_settings_include_date_checkbox").checked && !document.getElementById("twitter_settings_prefer_locale_format").checked && document.getElementById("twitter_settings_select_date_format").value == "custom"){
+ if (document.getElementById("twitter_settings_include_date_checkbox").checked && !document.getElementById("twitter_settings_prefer_locale_format").checked && document.getElementById("twitter_settings_select_date_format").value == "custom") {
temp.push(ValidateDateTimeFormat("twitter_settings_custom_date_format", document.getElementById("twitter_settings_custom_date_format").value));
}
temp.push(ValidatePrefix("twitter_settings_custom_prefix", document.getElementById("twitter_settings_custom_prefix").value));
- temp.forEach((x)=>{
- if (x.is_error == true){
+ temp.forEach((x) => {
+ if (x.is_error == true) {
errorCode["title"] = x.title;
errorCode["message"] = x.message;
throw errorCode;
- }
+ }
});
-
+
Settings.Save("twitter_include_mention_symbol", document.getElementById("twitter_settings_include_mention_symbol").checked);
Settings.Save("twitter_include_tweet_id", document.getElementById("twitter_settings_include_tweet_id").checked);
Settings.Save("twitter_include_date", document.getElementById("twitter_settings_include_date_checkbox").checked);
@@ -370,46 +408,46 @@ document.addEventListener("DOMContentLoaded", (()=>{
Settings.Save("twitter_random_string_length", document.getElementById("twitter_settings_string_length").value);
Settings.Save("twitter_include_website_title", document.getElementById("twitter_settings_site_title").checked);
Settings.Save("twitter_prefer_locale_format", document.getElementById("twitter_settings_prefer_locale_format").checked);
+ Settings.Save("twitter_save_image_to_folder_based_on_username", document.getElementById("twitter_settings_save_to_folder_by_username").checked);
// See dev note #1
Settings.Save("twitter_settings_custom_date_format", document.getElementById("twitter_settings_custom_date_format").value);
messageBox.Save();
-
- } catch(e){
+
+ } catch (e) {
console.error(e);
messageBox.Warning(e.title, e.message);
}
-
+
}));
-
+
break;
-
+
case "button_save_lineblog":
buttons.addEventListener("click", (() => {
-
+
try {
- if (temp.length > 0){
+ if (temp.length > 0) {
temp = [];
errorCode = {};
}
- if (document.getElementById("lineblog_settings_include_date").checked && !document.getElementById("lineblog_settings_prefer_locale_format").checked && document.getElementById("lineblog_settings_select_date_format").value == "custom"){
+ if (document.getElementById("lineblog_settings_include_date").checked && !document.getElementById("lineblog_settings_prefer_locale_format").checked && document.getElementById("lineblog_settings_select_date_format").value == "custom") {
temp.push(ValidateDateTimeFormat("lineblogCustomDateFormat", document.getElementById("lineblog_settings_custom_date_format").value));
}
-
+
temp.push(ValidatePrefix("lineblogCustomPrefix", document.getElementById("lineblog_settings_custom_prefix").value));
- temp.forEach((x)=>{
- if (x.is_error == true){
+ temp.forEach((x) => {
+ if (x.is_error == true) {
errorCode["title"] = x.title;
errorCode["message"] = x.message;
throw errorCode;
- }
+ }
});
- console.log( document.getElementById("lineblog_settings_custom_date_format").value)
Settings.Save("lbPrefIncludeWebsiteTitle", document.getElementById("lineblog_settings_include_site_title").checked);
Settings.Save("lbPrefIncludeBlogTitle", document.getElementById("lineblog_include_blog_title").checked);
Settings.Save("lbPrefUseDate", document.getElementById("lineblog_settings_include_date").checked);
@@ -417,45 +455,45 @@ document.addEventListener("DOMContentLoaded", (()=>{
Settings.Save("lineblog_convert_title_romaji", document.getElementById("lineblog_settings_convert_title_romaji").checked);
Settings.Save("lineblogDateFormat", document.getElementById("lineblog_settings_select_date_format").value);
Settings.Save("lineblogCustomPrefix", document.getElementById("lineblog_settings_custom_prefix").value);
-
+
// See dev note #1
Settings.Save("lineblogCustomDateFormat", document.getElementById("lineblog_settings_custom_date_format").value);
messageBox.Save();
-
- } catch(e){
+
+ } catch (e) {
console.error(e)
messageBox.Warning(e.title, e.message);
}
-
+
}));
-
+
break;
-
+
case "button_save_reddit":
buttons.addEventListener("click", (() => {
try {
- if (temp.length > 0){
+ if (temp.length > 0) {
temp = [];
errorCode = {};
}
- if (document.getElementById("reddit_settings_include_date").checked && !document.getElementById("reddit_settings_prefer_locale_format").checked &&document.getElementById("reddit_settings_custom_date_format").value == "custom"){
+ if (document.getElementById("reddit_settings_include_date").checked && !document.getElementById("reddit_settings_prefer_locale_format").checked && document.getElementById("reddit_settings_custom_date_format").value == "custom") {
ValidateDateTimeFormat("redditCustomDateFormat", document.getElementById("reddit_settings_custom_date_format").value);
}
temp.push(ValidatePrefix("redditCustomPrefix", document.getElementById("reddit_settings_custom_prefix").value));
- temp.forEach((x)=>{
- if (x.is_error == true){
+ temp.forEach((x) => {
+ if (x.is_error == true) {
errorCode["title"] = x.title;
errorCode["message"] = x.message;
throw errorCode;
- }
+ }
});
-
+
Settings.Save("redditIncludeWebsite", document.getElementById("reddit_settings_site_title").checked);
Settings.Save("redditIncludePostID", document.getElementById("reddit_settings_subreddit_post_id").checked);
Settings.Save("redditIncludeDate", document.getElementById("reddit_settings_include_date").checked);
@@ -467,15 +505,15 @@ document.addEventListener("DOMContentLoaded", (()=>{
Settings.Save("redditCustomDateFormat", document.getElementById("reddit_settings_custom_date_format").value);
messageBox.Save();
- } catch(e){
+ } catch (e) {
console.error(e);
messageBox.Warning(e.title, e.message);
}
}));
-
+
break;
-
+
case "button_help_general":
buttons.addEventListener("click", (() => {
chrome.tabs.create({
@@ -483,7 +521,6 @@ document.addEventListener("DOMContentLoaded", (()=>{
});
}));
break;
-
case "button_help_twitter":
buttons.addEventListener("click", (() => {
chrome.tabs.create({
@@ -491,7 +528,6 @@ document.addEventListener("DOMContentLoaded", (()=>{
});
}));
break;
-
case "button_help_lineblog":
buttons.addEventListener("click", (() => {
chrome.tabs.create({
@@ -499,7 +535,6 @@ document.addEventListener("DOMContentLoaded", (()=>{
});
}));
break;
-
case "button_help_reddit":
buttons.addEventListener("click", (() => {
chrome.tabs.create({
@@ -507,16 +542,120 @@ document.addEventListener("DOMContentLoaded", (()=>{
});
}));
break;
-
-
+
+ case "button_download_all":
+ buttons.addEventListener("click", (()=>{
+ let isDone = false;
+ function createZip(zipName){
+
+ let downloadJSONData = Settings.Load().General;
+ downloadJSONData = downloadJSONData.filter((x) => x.key == "global_download_queue_data").map((x) => x.value)[0];
+ if (typeof downloadJSONData == "string" && downloadJSONData.length == 0) {
+ return swal({
+ title: chrome.i18n.getMessage("downloads_section_dialog_empty_queue_title"),
+ text: chrome.i18n.getMessage("downloads_section_empty_queue"),
+ icon: "error",
+ buttons: false,
+ dangerMode: false
+ });
+ }
+
+ downloadJSONData = JSON.parse(downloadJSONData);
+
+ let zip = new JSZip();
+ downloadJSONData.forEach((x)=>{
+ zip.file(x.filename, urlToPromise(x.url), { binary: true});
+ });
+ zip.generateAsync({
+ type: "blob",streamFiles: true
+ }, function updateCallback(metaData){
+
+ if(metaData.currentFile) {
+
+ if (metaData.percent > 0){
+ msg = `${chrome.i18n.getMessage("downloads_section_saving_file")} ${metaData.currentFile} ${chrome.i18n.getMessage("downloads_section_saving_file_2")} ${metaData.percent.toFixed(2)}%`;
+ } else if (metaData.percent == 0){
+ msg = `${chrome.i18n.getMessage("downloads_section_saving_file_3")}`
+ }
+
+ swal({
+ title: chrome.i18n.getMessage("downloads_section_downlaod_in_progress"),
+ text: `${msg}`,
+ closeOnClickOutside: false,
+ buttons: false
+ })
+
+ }
+
+ }).then(function callback(blob){
+ saveAs(blob, zipName)
+ swal({
+ title: chrome.i18n.getMessage("downloads_section_downlaod_complete_title"),
+ text: zipName,
+ icon: "success"
+ }).then(()=>{
+ Settings.Save("global_download_queue_data", "");
+ window.location.reload();
+ DownloadManager.UpdateBadge();
+ Utility.SetBadgeText(0);
+ });
+
+ });
+ return isDone;
+ }
+
+
+ swal({
+ text: chrome.i18n.getMessage("downloads_section_dialog_enter_zip_name"),
+ content: "input",
+ button: {
+ text: chrome.i18n.getMessage("downloads_section_dialog_enter_zip_name_button_create"),
+ closeModal: false,
+ },
+ })
+ .then(name => {
+ if (!name) throw null;
+
+ return createZip(name);
+ }).catch(error =>{
+ if (error == null){
+ swal({
+ title: chrome.i18n.getMessage("error_title"),
+ text: chrome.i18n.getMessage("error_download_queue_invalid_file_name"),
+ icon: "warning",
+ })
+ }
+ console.error(error);
+ })
+
+
+ }));
+ break;
+
+ case "button_clear_queue":
+ buttons.addEventListener("click", (()=>{
+ swal({
+ title: "",
+ text: chrome.i18n.getMessage("downloads_section_dialog_queue_cleared"),
+ icon: "success",
+ buttons: false,
+ dangerMode: false,
+ timer: messageBox.autoCloseTimer
+ });
+ DownloadManager.ClearDownloadQueue();
+ window.location.reload();
+ }));
+ break;
+
+
}
});
- document.querySelectorAll("input[type=checkbox]").forEach((input) => {
-
- switch (input.id){
+ document.querySelectorAll("input[type=checkbox]").forEach((input) => {
+
+ switch (input.id) {
case "twitter_settings_include_date_checkbox":
- input.addEventListener("change", (()=>{
+ input.addEventListener("change", (() => {
Utility.UpdateFieldDisplay("checkbox", input.checked, "twitter_settings_prefer_locale_format");
Utility.UpdateFieldDisplay("checkbox", input.checked, "twitter_settings_select_date_format");
@@ -526,7 +665,7 @@ document.addEventListener("DOMContentLoaded", (()=>{
break;
case "lineblog_settings_include_date":
- input.addEventListener("change", (()=>{
+ input.addEventListener("change", (() => {
Utility.UpdateFieldDisplay("checkbox", input.checked, "lineblog_settings_prefer_locale_format");
Utility.UpdateFieldDisplay("checkbox", input.checked, "lineblog_settings_select_date_format");
Utility.UpdateFieldDisplay("checkbox", input.checked, "lineblog_settings_custom_date_format");
@@ -534,7 +673,7 @@ document.addEventListener("DOMContentLoaded", (()=>{
break;
case "reddit_settings_include_date":
- input.addEventListener("change", (()=>{
+ input.addEventListener("change", (() => {
Utility.UpdateFieldDisplay("checkbox", input.checked, "reddit_settings_prefer_locale_format");
Utility.UpdateFieldDisplay("checkbox", input.checked, "reddit_settings_select_date_format");
Utility.UpdateFieldDisplay("checkbox", input.checked, "reddit_settings_custom_date_format");
@@ -543,4 +682,180 @@ document.addEventListener("DOMContentLoaded", (()=>{
}
});
-}));
\ No newline at end of file
+}));
+
+function urlToPromise(url) {
+ return new Promise(function (resolve, reject) {
+ JSZipUtils.getBinaryContent(url, function (err, data) {
+ if (err) {
+ reject(err);
+ } else {
+ resolve(data);
+ }
+ });
+ });
+}
+
+function createDownloadCardItem(indexNumber, objData){
+
+ let download_card_container = document.getElementById("download_card_container");
+ let download_card_container_history = document.getElementById("download_card_container_history");
+ let download_queue_label = document.getElementById("download-queue-label");
+ download_queue_label.textContent = `${chrome.i18n.getMessage("downloads_section_count_label")} (0)`;
+
+ let downloadJSONData = Settings.Load().General;
+ downloadJSONData = downloadJSONData.filter((x) => x.key == "global_download_queue_data").map((x) => x.value)[0];
+
+ /**
+ * This scenario triggers on a fresh installation as by default, it is a string value.
+ */
+ if (typeof downloadJSONData == "string" && downloadJSONData.length == 0){
+ download_card_container.innerHTML += `${chrome.i18n.getMessage("downloads_section_empty_queue")}
${chrome.i18n.getMessage("downloads_section_empty_queue")}
+
+
+
${x.website}
+
${x.filename}
+
+
+
+
+
+
${chrome.i18n.getMessage("downloads_section_empty_queue")}
${chrome.i18n.getMessage("downloads_section_empty_queue")}
+
+
+
${x.website}
+
${x.filename}
+
+
+
+
+
+
+
+
@@ -43,11 +53,6 @@
- -
-
-
-
@@ -250,6 +259,10 @@
+
+ |
+ |
+
@@ -677,7 +690,7 @@
AutoRename |
- | Copyright © 2022 Dasutein |
+ Copyright © 2023 Dasutein |
MIT License |
@@ -746,9 +759,17 @@
| https://momentjs.com |
- | SweetAlert (version 2.1.4) |
+ SweetAlert (version 2.1.3) |
https://github.com/t4t5/sweetalert |
+
+ | JSZip (version 3.10.1) |
+ https://github.com/Stuk/jszi |
+
+
+ | FileSaver (version 2.0.4) |
+ https://github.com/eligrey/FileSaver.js/ |
+
@@ -784,6 +805,54 @@
+
+
+
+
+
+
+ |
+ |
+
+
+  |
+
+
+
+
+
+
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+