add maxRedirects MFlocal

webresto · May 1, 2024 · 393ee6a · 393ee6a
1 parent 685eab5
commit 393ee6a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 61 deletions.
diff --git a/adapters/mediafile/default/local.js b/adapters/mediafile/default/local.js
@@ -140,36 +140,18 @@ class LocalMediaFileAdapter extends MediaFileAdapter_1.default {
         const fullPathDl = path.join(prefix, loadMediaFilesProcess.name.origin);
         // Check if file exists
         if (!fs.existsSync(fullPathDl)) {
-            try {
-                const response = await axios_1.default.get(loadMediaFilesProcess.url, { responseType: 'stream', maxRedirects: 0 });
-                if (response.status === 302 && response.headers.location) {
-                    // Redirect detected, follow the new URL
-                    const redirectedResponse = await axios_1.default.get(response.headers.location, { responseType: 'stream' });
-                    fs.mkdirSync(prefix, { recursive: true });
-                    const writer = fs.createWriteStream(fullPathDl);
-                    redirectedResponse.data.pipe(writer);
-                    await new Promise((resolve, reject) => {
-                        writer.on('finish', resolve);
-                        writer.on('error', reject);
-                    });
-                }
-                else {
-                    // No redirect, save the data directly
-                    fs.mkdirSync(prefix, { recursive: true });
-                    const writer = fs.createWriteStream(fullPathDl);
-                    response.data.pipe(writer);
-                    await new Promise((resolve, reject) => {
-                        writer.on('finish', resolve);
-                        writer.on('error', reject);
-                    });
-                }
-            }
-            catch (error) {
-                console.error(`Error downloading file: ${error}`);
-            }
+            const response = await axios_1.default.get(loadMediaFilesProcess.url, { responseType: 'stream', maxRedirects: 5 });
+            sails.log.silly(`MF local > download image: ${fullPathDl}, status: ${response.status}`);
+            fs.mkdirSync(prefix, { recursive: true });
+            const writer = fs.createWriteStream(fullPathDl);
+            response.data.pipe(writer);
+            await new Promise((resolve, reject) => {
+                writer.on('finish', resolve);
+                writer.on('error', reject);
+            });
         }
         else {
-            console.log(`File ${fullPathDl} already exists. Skipping download.`);
+            sails.log.silly(`File ${fullPathDl} already exists. Skipping download.`);
         }
     }
     async loadMediaFiles() {

diff --git a/adapters/mediafile/default/local.ts b/adapters/mediafile/default/local.ts
@@ -161,42 +161,23 @@ export default class LocalMediaFileAdapter extends MediaFileAdapter {
   protected async download(loadMediaFilesProcess: LoadMediaFilesProcess): Promise<void> {
     const prefix = this.getPrefix(loadMediaFilesProcess.type);
     const fullPathDl = path.join(prefix, loadMediaFilesProcess.name.origin);
-  
+
     // Check if file exists
     if (!fs.existsSync(fullPathDl)) {
-      try {
-        const response = await axios.get(loadMediaFilesProcess.url, { responseType: 'stream', maxRedirects: 0 });
-
-        if (response.status === 302 && response.headers.location) {
-          // Redirect detected, follow the new URL
-          const redirectedResponse = await axios.get(response.headers.location, { responseType: 'stream' });
-
-          fs.mkdirSync(prefix, { recursive: true });
-
-          const writer = fs.createWriteStream(fullPathDl);
-          redirectedResponse.data.pipe(writer);
-
-          await new Promise((resolve, reject) => {
-            writer.on('finish', resolve);
-            writer.on('error', reject);
-          });
-        } else {
-          // No redirect, save the data directly
-          fs.mkdirSync(prefix, { recursive: true });
-
-          const writer = fs.createWriteStream(fullPathDl);
-          response.data.pipe(writer);
-
-          await new Promise((resolve, reject) => {
-            writer.on('finish', resolve);
-            writer.on('error', reject);
-          });
-        }
-      } catch (error) {
-        console.error(`Error downloading file: ${error}`);
-      }
+      const response = await axios.get(loadMediaFilesProcess.url, { responseType: 'stream', maxRedirects: 5});
+      sails.log.silly(`MF local > download image: ${fullPathDl}, status: ${response.status}`);
+
+      fs.mkdirSync(prefix, { recursive: true });
+
+      const writer = fs.createWriteStream(fullPathDl);
+      response.data.pipe(writer);
+
+      await new Promise((resolve, reject) => {
+        writer.on('finish', resolve);
+        writer.on('error', reject);
+      });
     } else {
-      console.log(`File ${fullPathDl} already exists. Skipping download.`);
+      sails.log.silly(`File ${fullPathDl} already exists. Skipping download.`);
     }
   }