fix + douyin batch

HoangTran0410 · HoangTran0410 · commit c13298e27ca6 · 2024-08-22T10:42:35.000+07:00
diff --git a/README-en.md b/README-en.md
@@ -69,7 +69,7 @@ Current Versions:
 
 Expected that this useful-script extension will include the functions of [RevealDeletedFBMessages](https://github.com/HoangTran0410/RevealDeletedFBMessages) and [FBMediaDownloader](https://github.com/HoangTran0410/FBMediaDownloader)
 
-[![Star History Chart](https://api.star-history.com/svg?repos=HoangTran0410/useful-script,HoangTran0410/FBMediaDownloader,HoangTran0410/RevealDeletedFBMessages&type=Date)](https://star-history.com/#HoangTran0410/useful-script&HoangTran0410/FBMediaDownloader&HoangTran0410/RevealDeletedFBMessages&Date)
+[![Star History Chart](https://api.star-history.com/svg?repos=Useful-Scripts-Extension/useful-script,HoangTran0410/FBMediaDownloader,HoangTran0410/RevealDeletedFBMessages&type=Date)](https://star-history.com/#Useful-Scripts-Extension/useful-script&HoangTran0410/FBMediaDownloader&HoangTran0410/RevealDeletedFBMessages&Date)
 
 ## For developer (Demo)
 
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@
   - [Dành cho dev (Demo)](#dành-cho-dev-demo)
   - [Contribute](#contribute)
 
-Donate? Muốn hỗ trợ mình 1 ly cafe <3 [Donate tại đây](https://github.com/HoangTran0410/HoangTran0410/blob/main/DONATE.md)
+Donate? Muốn hỗ trợ mình 1 ly cafe <3 [Donate tại đây](https://hoangtran0410.github.io/HoangTran0410/DONATE)
 
 ## Giới thiệu
 
@@ -69,7 +69,7 @@ Phiên bản hiện tại:
 
 Dự kiến extension useful-script này sẽ bao gồm cả chức năng của [RevealDeletedFBMessages](https://github.com/HoangTran0410/RevealDeletedFBMessages) và [FBMediaDownloader](https://github.com/HoangTran0410/FBMediaDownloader)
 
-[![Star History Chart](https://api.star-history.com/svg?repos=HoangTran0410/useful-script,HoangTran0410/FBMediaDownloader,HoangTran0410/RevealDeletedFBMessages&type=Date)](https://star-history.com/#HoangTran0410/useful-script&HoangTran0410/FBMediaDownloader&HoangTran0410/RevealDeletedFBMessages&Date)
+[![Star History Chart](https://api.star-history.com/svg?repos=Useful-Scripts-Extension/useful-script,HoangTran0410/FBMediaDownloader,HoangTran0410/RevealDeletedFBMessages&type=Date)](https://star-history.com/#Useful-Scripts-Extension/useful-script&HoangTran0410/FBMediaDownloader&HoangTran0410/RevealDeletedFBMessages&Date)
 
 ## Dành cho dev (Demo)
 
diff --git a/config.js b/config.js
@@ -1,7 +1,7 @@
 export default {
   version_check:
-    "https://raw.githubusercontent.com/HoangTran0410/useful-script/main/manifest.json",
-  source_code: "https://github.com/HoangTran0410/useful-script",
+    "https://raw.githubusercontent.com/Useful-Scripts-Extension/useful-script/main/manifest.json",
+  source_code: "https://github.com/Useful-Scripts-Extension/useful-script",
   store:
     "https://chrome.google.com/webstore/devconsole/ad27ff83-24b1-4348-810d-9cfdc30a5331/heoejcamgchindphgghdhmjpgmldnepl/edit/status",
 };
diff --git a/index.html b/index.html
@@ -9,7 +9,7 @@
 
 <body>
   <script>
-    window.location.href = "https://hoangtran0410.github.io/useful-script/popup/popup.html"
+    window.location.href = "https://Useful-Scripts-Extension.github.io/useful-script/popup/popup.html"
   </script>
 </body>
 
diff --git a/manifest.json b/manifest.json
@@ -3,7 +3,7 @@
   "manifest_version": 3,
   "name": "Useful Scripts",
   "description": "Scripts that can make your life faster and better",
-  "homepage_url": "https://github.com/HoangTran0410/useful-script",
+  "homepage_url": "https://github.com/Useful-Scripts-Extension/useful-script",
   "version": "1.8",
   "icons": {
     "16": "./assets/icon16.png",
diff --git a/md/CHANGELOGS.md b/md/CHANGELOGS.md
@@ -35,11 +35,11 @@
   - click to disable/enable for current website [source](/scripts/smoothScroll.js)
 
 - Merge request
-  - [fix: 🐛 fix fireship_vip script](https://github.com/HoangTran0410/useful-script/pull/28)
+  - [fix: 🐛 fix fireship_vip script](https://github.com/Useful-Scripts-Extension/useful-script/pull/28)
   - [feat: youglish search
-  ](https://github.com/HoangTran0410/useful-script/pull/30)
-  - [feat: youtube download video UI](https://github.com/HoangTran0410/useful-script/pull/31)
-  - [style: 🪄 beautify ui for viewScriptSource](https://github.com/HoangTran0410/useful-script/pull/32)
+  ](https://github.com/Useful-Scripts-Extension/useful-script/pull/30)
+  - [feat: youtube download video UI](https://github.com/Useful-Scripts-Extension/useful-script/pull/31)
+  - [style: 🪄 beautify ui for viewScriptSource](https://github.com/Useful-Scripts-Extension/useful-script/pull/32)
 - More shortcuts: google trend, time.is, aiforthat, cobalt, nirsoft
 
 </details>
diff --git a/popup/index.js b/popup/index.js
@@ -1046,7 +1046,10 @@ async function initShowDonate() {
       );
     }
     if (res.isDenied) {
-      window.open("https://github.com/HoangTran0410/useful-script", "_blank");
+      window.open(
+        "https://github.com/Useful-Scripts-Extension/useful-script",
+        "_blank"
+      );
     }
   }
 }
diff --git a/popup/popup.html b/popup/popup.html
@@ -25,7 +25,7 @@ <h3>
         <a data-track="donate" target="_blank" href="https://hoangtran0410.github.io/HoangTran0410/DONATE">
             <i class="fa-solid fa-mug-saucer"></i> donate
         </a>
-        <a data-track="github" target="_blank" href="https://github.com/HoangTran0410/useful-script">
+        <a data-track="github" target="_blank" href="https://github.com/Useful-Scripts-Extension/useful-script">
             <i class="fa-solid fa-code"></i> source code
         </a>
         <a data-track="fanpage" target="_blank" href="https://www.facebook.com/groups/1154059318582088">
diff --git a/popup/tabs.js b/popup/tabs.js
@@ -199,9 +199,9 @@ const tabs = [
     ...CATEGORY.tiktok,
     scripts: [
       createTitle("--- Tiktok ---", "--- Tiktok ---"),
+      s.tiktok_batchDownload,
       s.tiktok_downloadWatchingVideo,
       s.tiktok_downloadVideo,
-      s.tiktok_batchDownload,
       createTitle("--- Douyin ---", "--- Douyin ---"),
       s.douyin_batchDownload,
       s.douyin_downloadWachingVideo,
diff --git a/scripts/createInvisibleText.js b/scripts/createInvisibleText.js
@@ -20,7 +20,7 @@ export default {
       },
       onClick: () =>
         window.open(
-          "https://hoangtran0410.github.io/useful-script/scripts/createInvisibleText.html"
+          "https://Useful-Scripts-Extension.github.io/useful-script/scripts/createInvisibleText.html"
         ),
     },
   ],
diff --git a/scripts/douyin_batchDownload.js b/scripts/douyin_batchDownload.js
@@ -10,9 +10,9 @@ export default {
     vi: "Douyin - Tải hàng loạt",
   },
   description: {
-    en: "",
-    vi: "",
-    img: "",
+    en: "Select and download all douyin video (user profile, tiktok explore).<br/><br/> Same as tiktok batch download.",
+    vi: "Tải hàng loạt video douyin (trang người dùng, trang tìm kiếm), có giao diện chọn video muốn tải.<br/><br/> Giống chức năng tải hàng loạt tiktok.",
+    img: "/scripts/douyin_batchDownload.png",
   },
 
   badges: [BADGES.new, BADGES.hot],
@@ -97,7 +97,7 @@ export default {
   <div class="ufs_floating_btn" @click="showModal = true">📥 {{totalCount}}</div>
   <div class="ufs_container" v-if="showModal" @click.self="showModal = false">
     <div class="ufs_popup">
-      <h1 style="text-align:center">Douyin - <a target="_blank" href="https://github.com/HoangTran0410/useful-script">Useful Scripts</a></h1>
+      <h1 style="text-align:center">Douyin - <a target="_blank" href="https://github.com/Useful-Scripts-Extension/useful-script">Useful Scripts</a></h1>
       <h2 style="text-align:center">Found {{totalCount}} videos</h2>
 
       <div class="ufs_popup_header">
@@ -192,7 +192,10 @@ export default {
             search: "",
             sortBy: "index",
             sortDir: "asc",
-            downloading: {},
+            downloading: {
+              video: null,
+              audio: null,
+            },
             selected: {},
           };
         },
@@ -227,7 +230,7 @@ export default {
             return Array.from(result.values());
           },
           videoTitle() {
-            if (this.downloading.video) {
+            if (Number.isInteger(this.downloading.video)) {
               return (
                 "Downloading " +
                 this.downloading.video +
@@ -244,7 +247,7 @@ export default {
             );
           },
           audioTitle() {
-            if (this.downloading.audio) {
+            if (Number.isInteger(this.downloading.audio)) {
               return (
                 "Downloading " +
                 this.downloading.audio +
diff --git a/scripts/douyin_batchDownload.png b/scripts/douyin_batchDownload.png
diff --git a/scripts/tiktok_batchDownload.js b/scripts/tiktok_batchDownload.js
@@ -96,7 +96,7 @@ export default {
   <div class="ufs_floating_btn" @click="showModal = true">📥 {{totalCount}}</div>
   <div class="ufs_container" v-if="showModal" @click.self="showModal = false">
     <div class="ufs_popup">
-      <h1 style="text-align:center">Tiktok - <a target="_blank" href="https://github.com/HoangTran0410/useful-script">Useful Scripts</a></h1>
+      <h1 style="text-align:center">Tiktok - <a target="_blank" href="https://github.com/Useful-Scripts-Extension/useful-script">Useful Scripts</a></h1>
       <h2 style="text-align:center">Found {{totalCount}} videos</h2>
 
       <div class="ufs_popup_header">
@@ -191,7 +191,10 @@ export default {
             search: "",
             sortBy: "index",
             sortDir: "asc",
-            downloading: {},
+            downloading: {
+              video: null,
+              audio: null,
+            },
             selected: {},
           };
         },
@@ -225,7 +228,7 @@ export default {
             return Array.from(result.values());
           },
           videoTitle() {
-            if (this.downloading.video) {
+            if (Number.isInteger(this.downloading.video)) {
               return (
                 "Downloading " +
                 this.downloading.video +
@@ -242,7 +245,7 @@ export default {
             );
           },
           audioTitle() {
-            if (this.downloading.audio) {
+            if (Number.isInteger(this.downloading.audio)) {
               return (
                 "Downloading " +
                 this.downloading.audio +
@@ -313,22 +316,25 @@ export default {
               expectBlobTypes: ["video/mp4", "image/jpeg"],
               data: this.videoToDownload
                 .map((_, i) => {
+                  const all = [];
                   // image
                   const imgs = _.imagePost?.images;
                   if (imgs?.length) {
-                    return imgs.map((img, j) => ({
-                      url:
-                        img.imageURL?.urlList?.[1] ||
-                        img.imageURL?.urlList?.[0],
-                      filename:
-                        i +
-                        1 +
-                        "_" +
-                        (j + 1) +
-                        "_" +
-                        UfsGlobal.Utils.sanitizeName(_.id, false) +
-                        ".jpg",
-                    }));
+                    all.push(
+                      ...imgs.map((img, j) => ({
+                        url:
+                          img.imageURL?.urlList?.[1] ||
+                          img.imageURL?.urlList?.[0],
+                        filename:
+                          i +
+                          1 +
+                          "_" +
+                          (j + 1) +
+                          "_" +
+                          UfsGlobal.Utils.sanitizeName(_.id, false) +
+                          ".jpg",
+                      }))
+                    );
                   }
 
                   // video
@@ -337,15 +343,16 @@ export default {
                       (b) => b.Bitrate === _.video.bitrate
                     )?.PlayAddr?.UrlList || [];
                   const bestUrl = urlList[urlList.length - 1];
-                  return {
+                  all.push({
                     url: bestUrl || _.video.playAddr,
                     filename:
                       i +
                       1 +
                       "_" +
                       UfsGlobal.Utils.sanitizeName(_.id, false) +
                       ".mp4",
-                  };
+                  });
+                  return all;
                 })
                 .flat()
                 .filter((_) => _.url),

Original file line number	Diff line number	Diff line change
`@@ -1046,7 +1046,10 @@ async function initShowDonate() {`
`1046`	`1046`	`);`
`1047`	`1047`	`}`
`1048`	`1048`	`if (res.isDenied) {`
`1049`		`- window.open("https://github.com/HoangTran0410/useful-script", "_blank");`
	`1049`	`+ window.open(`
	`1050`	`+ "https://github.com/Useful-Scripts-Extension/useful-script",`
	`1051`	`+ "_blank"`
	`1052`	`+ );`
`1050`	`1053`	`}`
`1051`	`1054`	`}`
`1052`	`1055`	`}`