Fix wrong patches #461

reisxd · Sep 27, 2022 · 35b6ad7 · 35b6ad7
1 parent d6136b5
commit 35b6ad7
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 15 deletions.
diff --git a/public/apps/index.html b/public/apps/index.html
@@ -29,7 +29,7 @@ <h1>Select the app you want to patch</h1>
                 /><label for="app-1">YouTube</label>
               </li>
               <li>
-                <input type="radio" name="app" id="app-2" value="music" /><label
+                <input type="radio" name="app" id="app-2" value="youtube.music" /><label
                   for="app-2"
                   >YouTube Music</label
                 >

diff --git a/public/index.js b/public/index.js
@@ -352,7 +352,7 @@ ws.onmessage = (msg) => {
           }</label></li>`;
         }
 
-        if (message.selectedApp === 'music' && !message.foundDevice)
+        if (message.selectedApp === 'youtube.music' && !message.foundDevice)
           document.getElementById('continue').onclick = () => {
             const version = document.querySelector(
               'input[name="version"]:checked'

diff --git a/utils/PatchListRememberer.js b/utils/PatchListRememberer.js
@@ -1,4 +1,4 @@
-const { existsSync, readFileSync, writeFileSync } = require('node:fs');
+const { existsSync, readFileSync, writeFileSync, rmSync } = require('node:fs');
 
 const defaultPatchesList = JSON.stringify(
   {
@@ -8,7 +8,7 @@ const defaultPatchesList = JSON.stringify(
         patches: []
       },
       {
-        name: 'music',
+        name: 'youtube.music',
         patches: []
       },
       {
@@ -46,6 +46,11 @@ function getPatchesList(pkgName) {
     readFileSync('includedPatchesList.json', 'utf8')
   );
 
+  if (patchesList.packages.find((package) => package.name === 'music')) {
+    rmSync('includedPatchesList.json');
+    return [];
+  }
+
   return patchesList.packages.find((package) => package.name === pkgName)
     .patches;
 }

diff --git a/utils/downloadApp.js b/utils/downloadApp.js
@@ -19,7 +19,7 @@ async function downloadApp(ws) {
         `https://www.apkmirror.com/apk/google-inc/youtube/youtube-${apkMirrorVersionArg}-release/`
       );
       break;
-    case 'music':
+    case 'youtube.music':
       versionDownload = await fetch(
         `https://www.apkmirror.com/apk/google-inc/youtube-music/youtube-music-${apkMirrorVersionArg}-release/`
       );
@@ -61,7 +61,7 @@ async function downloadApp(ws) {
   const $ = load(versionDownloadList);
 
   const dlLink =
-    arch && global.jarNames.selectedApp === 'music'
+    arch && global.jarNames.selectedApp === 'youtube.music'
       ? $(`div:contains("${arch}")`)
           .parent()
           .children('div[class^="table-cell rowheight"]')

diff --git a/utils/mountReVancedInstaller.js b/utils/mountReVancedInstaller.js
@@ -32,7 +32,7 @@ module.exports = async function mountReVancedInstaller(deviceId) {
     case 'youtube':
       pkg = 'com.google.android.youtube';
       break;
-    case 'music':
+    case 'youtube.music':
       pkg = 'com.google.android.apps.youtube.music';
   }
 

diff --git a/wsEvents/getAppVersion.js b/wsEvents/getAppVersion.js
@@ -92,13 +92,13 @@ module.exports = async function getAppVersion(ws, message) {
       case 'youtube':
         pkgName = 'com.google.android.youtube';
         break;
-      case 'music':
+      case 'youtube.music':
         pkgName = 'com.google.android.apps.youtube.music';
     }
 
     const appVersion = await getAppVersion_(pkgName, ws, true);
 
-    if (global.jarNames.selectedApp === 'music') {
+    if (global.jarNames.selectedApp === 'youtube.music') {
       const arch = await getDeviceArch(ws);
 
       global.apkInfo = {
@@ -121,7 +121,7 @@ module.exports = async function getAppVersion(ws, message) {
     case 'youtube':
       versionsList = await getPage(`${APKMIRROR_UPLOAD_BASE}youtube`);
       break;
-    case 'music':
+    case 'youtube.music':
       versionsList = await getPage(`${APKMIRROR_UPLOAD_BASE}youtube-music`);
       break;
     case 'android':

diff --git a/wsEvents/installReVanced.js b/wsEvents/installReVanced.js
@@ -69,7 +69,7 @@ module.exports = async function installReVanced(ws) {
     !global.jarNames.isRooted &&
     global.jarNames.devices[0] &&
     (global.jarNames.selectedApp === 'youtube' ||
-      global.jarNames.selectedApp === 'music')
+      global.jarNames.selectedApp === 'youtube.music')
   ) {
     const currentMicroGVersion = (
       await getDownloadLink({ owner: 'TeamVanced', repo: 'VancedMicroG' })

diff --git a/wsEvents/patchApp.js b/wsEvents/patchApp.js
@@ -17,7 +17,7 @@ async function mount(ws) {
     case 'youtube':
       pkg = 'com.google.android.youtube';
       break;
-    case 'music':
+    case 'youtube.music':
       pkg = 'com.google.android.apps.youtube.music';
   }
 
@@ -76,7 +76,7 @@ async function reinstallReVanced() {
       if (!global.jarNames.isRooted)
         pkgNameToGetUninstalled = 'app.revanced.android.youtube';
       break;
-    case 'music':
+    case 'youtube.music':
       if (!global.jarNames.isRooted)
         pkgNameToGetUninstalled = 'app.revanced.android.apps.youtube.music';
       break;
@@ -109,7 +109,7 @@ function outputName() {
     case 'youtube':
       part2 = 'YouTube';
       break;
-    case 'music':
+    case 'youtube.music':
       part2 = 'YouTube_Music';
       break;
     case 'frontpage':

diff --git a/wsEvents/selectAppVersion.js b/wsEvents/selectAppVersion.js
@@ -9,7 +9,7 @@ module.exports = async function selectAppVersion(message, ws) {
   let arch = message.arch;
 
   if (
-    (global.jarNames.selectedApp === 'music' && global.jarNames.devices[0]) ||
+    (global.jarNames.selectedApp === 'youtube.music' && global.jarNames.devices[0]) ||
     process.platform === 'android'
   ) {
     arch = await getDeviceArch(ws);