Updated version for mac, added bin for mac

Author: Etienne Coppin

.gitattributes

@@ -1,2 +1,3 @@
 *.exe filter=lfs diff=lfs merge=lfs -text
 out/make/squirrel.windows/x64/HypLoad-1.0.0[[:space:]]Setup.exe filter=lfs diff=lfs merge=lfs -text
+out/make/HypLoad-1.0.0-arm64.dmg filter=lfs diff=lfs merge=lfs -text

data/config.json

@@ -1,7 +1,7 @@
 {
-  "color_mode": "dark",
+  "color_mode": "light",
   "only_audio": true,
   "video_res": "bv",
   "audio_format": "mp3",
-  "lang": "fr"
+  "lang": "en"
 }

forge.config.js

@@ -29,18 +29,18 @@ module.exports = {
   },
   rebuildConfig: {},
   makers: [
-    {
-      name: '@electron-forge/maker-squirrel',
-      platforms: ['win32'],
-      config: {
-        loadingGif: "./assets/loading.gif",
-        appDirectory: "./",
-        exe: "HypLoad.exe",
-        iconUrl: 'https://github.com/Hypocrate-code/HypLoad/blob/main/assets/icon.ico?raw=true',
-        setupIcon: './assets/icon.ico',
-        noMsi: false
-      },
-    },
+    // {
+    //   name: '@electron-forge/maker-squirrel',
+    //   platforms: ['win32'],
+    //   config: {
+    //     loadingGif: "./assets/loading.gif",
+    //     appDirectory: "./",
+    //     exe: "HypLoad.exe",
+    //     iconUrl: 'https://github.com/Hypocrate-code/HypLoad/blob/main/assets/icon.ico?raw=true',
+    //     setupIcon: './assets/icon.ico',
+    //     noMsi: false
+    //   },
+    // },
     // {
     //   name: '@electron-forge/maker-zip',
     //   platforms: ['darwin'],
@@ -53,15 +53,15 @@ module.exports = {
     //     }
     //   },
     // },
-    // {
-    //   name: '@electron-forge/maker-dmg',
-    //   platforms: ['darwin'],
-    //   config: {
-    //     // background: './assets/icon.png',
-    //     icon: "./assets/icon.icns",
-    //     format: 'ULFO'
-    //   }
-    // },
+    {
+      name: '@electron-forge/maker-dmg',
+      platforms: ['darwin'],
+      config: {
+        // background: './assets/icon.png',
+        icon: "./assets/icon.icns",
+        format: 'ULFO'
+      }
+    },
     // {
     //   name: '@electron-forge/maker-rpm',
     //   config: {},

js/main/loadPlaylist.js

@@ -59,10 +59,9 @@ async function loadPlaylist(e, link) {
     sharedState.currentProcess = cmd.pid;
 
     cmd.stdout.on('data', (data) => {
-        const baseString = iconv.decode(data, 'windows1252').replaceAll(" | \n", " | ");
+        const baseString = data.toString().replaceAll(" | \n", " | ");
         const newData = baseString.split(' | ');
         newData.pop();
-        console.log("new d : ", newData);
         const chuckOfData = chunkArray(newData, size=9)
         chuckOfData.forEach(el => {
             console.log("un el : ", el);

js/main/savedPlaylists.js

@@ -22,16 +22,16 @@ const path = require('node:path');
 const fs = require("fs");
 
 const PLAYLISTS_FILE_PATH = path.join(app.getPath('userData'), "playlists.json");
+console.log(PLAYLISTS_FILE_PATH);
 const PLAYLISTS_DEFAULT_FILE_PATH = path.join(__dirname, "..", "..", "playlists-default.json");
+console.log(PLAYLISTS_DEFAULT_FILE_PATH);
 
 async function setNewLink(e, link, title) {
     const data = await getJSONFile(PLAYLISTS_FILE_PATH);
     data[link] = title;
     saveJSONFile(PLAYLISTS_FILE_PATH, data);
 }
 
-console.log(app.getPath('userData'));
-
 
 async function getPlaylistLinks() {
     try {

js/main/utils_file.js

@@ -20,6 +20,7 @@
 const path = require('node:path');
 const fs = require("fs");
 const { app } = require("electron");
+const { platform } = require('node:os');
 
 const OPTIONS_FILE_PATH = path.join(app.getPath('userData'), "config.json");
 const OPTIONS_DEFAULT_FILE_PATH = path.join(__dirname, "..", "..", "config-default.json");
@@ -72,7 +73,12 @@ function setOptions (options) {
 }
 
 async function isAlreadyDownloaded(e, title, onlyAudio, format, playlistName) {
+  if (platform() === "darwin") {title = sanitizeFilename(title)}
   const isPath = path.join(onlyAudio ? app.getPath('music') : app.getPath('videos'),'HypLoad', sanitizeFolderName(playlistName),`${title}.${format}`);;
+  console.log(isPath);
+  
+  console.log(fs.readdirSync( path.join(app.getPath('music'), "HypLoad", sanitizeFolderName(playlistName) )  ));
+  
   return new Promise((resolve) => {
     fs.access(isPath, fs.constants.F_OK, (err) => {
       if (err) {
@@ -89,19 +95,39 @@ async function isAlreadyDownloaded(e, title, onlyAudio, format, playlistName) {
 
 function sanitizeFolderName(name) {
   console.log('name', name);
-  const forbidden = /[<>:"/\\|?*\x00-\x1F]/g;
-  const reserved = /^(con|prn|aux|nul|com[1-9]|lpt[1-9])$/i;
-  let cleaned = name.replace(forbidden, "_").trim();
-  cleaned = cleaned.replace(/[ .]+$/g, "");
-  if (reserved.test(cleaned)) {
-    cleaned += "_playlist";
-  }
-  if (!cleaned.length) {
-    cleaned = "playlist";
+  if (platform() === "darwin") {return sanitizeFilename(name)}
+  else {
+    const forbidden = /[<>:"/\\|?*\x00-\x1F]/g;
+    const reserved = /^(con|prn|aux|nul|com[1-9]|lpt[1-9])$/i;
+    let cleaned = name.replace(forbidden, "_").trim();
+    cleaned = cleaned.replace(/[ .]+$/g, "");
+    if (reserved.test(cleaned)) {
+      cleaned += "_playlist";
+    }
+    if (!cleaned.length) {
+      cleaned = "";
+    }
+    return cleaned;
   }
-  return cleaned;
 }
 
+function sanitizeFilename(str) {
+  const map = {
+    '/': '／',
+    '\\': '＼',
+    ':': '：',
+    '*': '＊',
+    '?': '？',
+    '"': '＂',
+    '<': '＜',
+    '>': '＞',
+    '|': '｜'
+  };
+
+  return str.replace(/[\/\\:\*\?"<>|]/g, m => map[m]);
+}
+
+
 
 
 module.exports = { getOptions, setOptions, isAlreadyDownloaded, getJSONFile, saveJSONFile, sanitizeFolderName };

out/make/HypLoad-1.0.0-arm64.dmg

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3be16238344095d52703f4dfcf419ffe8ddeb98a0eaf1094500757a11a116349
+size 168426359