Mise à jour de 'app.py'

Correction d'un problème suite au retrait de deux champs d'entrées sur index.html

.drone.yml

@@ -1,93 +0,0 @@
-kind: pipeline
-name: default
-
-steps:
-- name: docker_gitea  
-  image: plugins/docker
-  settings:
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-    repo: git.netpowa.fr/guillaume/spotdlweb
-    # auto_tag: true
-    registry: git.netpowa.fr
-    tags:
-      - latest
-      - v1.0.1
-  when:
-    branch: main
-
-- name: docker_hub  
-  image: plugins/docker
-  settings:
-    username:
-      from_secret: dockerhub_username
-    password:
-      from_secret: dockerhub_password
-    repo: gu1llaum3/spotdlweb
-    # auto_tag: true
-    tags:
-      - latest
-      - v1.0.1
-  when:
-    branch: main
-
-- name: notify_success
-  image: curlimages/curl
-  environment:
-    NOTIFY_URL:
-      from_secret: ntfy_url
-  commands:
-    - curl -d "La pipeline a réussi" $NOTIFY_URL
-  when:
-      branch: main
-      status: [ success ]
-
-- name: notify_failure
-  image: curlimages/curl
-  environment:
-    NOTIFY_URL:
-      from_secret: ntfy_url
-  commands:
-    - curl -d "La pipeline a échoué" $NOTIFY_URL
-  when:
-    branch: main
-    status: [failure]
-
-- name: docker_gitea  
-  image: plugins/docker
-  settings:
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-    repo: git.netpowa.fr/guillaume/spotdlweb
-    # auto_tag: true
-    registry: git.netpowa.fr
-    tags:
-      - beta
-  when:
-    branch: dev
-
-- name: notify_success
-  image: curlimages/curl
-  environment:
-    NOTIFY_URL:
-      from_secret: ntfy_url
-  commands:
-    - curl -d "La pipeline dev a réussi" $NOTIFY_URL
-  when:
-      branch: dev
-      status: [ success ]
-
-- name: notify_failure
-  image: curlimages/curl
-  environment:
-    NOTIFY_URL:
-      from_secret: ntfy_url
-  commands:
-    - curl -d "La pipeline dev a échoué" $NOTIFY_URL
-  when:
-    branch: dev
-    status: [failure]

app.py

@@ -1,8 +1,6 @@
 from flask import Flask, request, redirect, url_for, send_file, render_template, send_from_directory
 from subprocess import run
-from datetime import datetime
 import os
-import logging
 
 app = Flask(__name__)
 
@@ -13,27 +11,6 @@ def process_file(urls):
     download_param_track = '{artist}/{album}/{artist} - {title}'
 
     os.chdir('downloads')
-    # os.system(f'rm -rf *')
-
-    for url in urls:
-        if url:
-            if "album" in url:
-                run(['python3', '-m', 'spotdl', url, '--output', download_param_album])
-            elif "playlist" in url:
-                run(['python3', '-m', 'spotdl', url, '--output', download_param_playlist])
-            elif "track" in url:
-                run(['python3', '-m', 'spotdl', url, '--output', download_param_track])
-    # os.system(f'zip -r musics.zip ./downloads')
-    # run(['zip', '-r', 'musics.zip', '.'])
-    os.chdir('../')
-
-
-def process_file_local(urls):
-    download_param_album = '{artist}/{album}/{artist} - {title}'
-    download_param_playlist = '{playlist}/{artists}/{album} - {title} {artist}'
-    download_param_track = '{artist}/{album}/{artist} - {title}'
-
-    os.chdir('temp')
     os.system(f'rm -rf *')
 
     for url in urls:
@@ -44,7 +21,6 @@ def process_file_local(urls):
                 run(['python3', '-m', 'spotdl', url, '--output', download_param_playlist])
             elif "track" in url:
                 run(['python3', '-m', 'spotdl', url, '--output', download_param_track])
-    
     run(['zip', '-r', 'musics.zip', '.'])
     os.chdir('../')
 
@@ -53,17 +29,10 @@ def process_file_local(urls):
 def upload_form():
     return render_template('index.html')
 
-# Fonctionne
-# @app.route('/download/<filename>')
-# def download_file(filename):
-#   PATH='file.txt'
-#   return send_file(PATH, as_attachment=True)
-
 
 @app.route('/download', methods=['POST'])
 def download_file():
     if request.method == 'POST':
-        action = request.form.get('action')
         url1 = request.form['url1']
         url2 = request.form['url2']
         url3 = request.form['url3']
@@ -74,30 +43,19 @@ def download_file():
         if not url1 and not url2 and not url3 :
             return render_template('erreur.html')
 
-        if action == 'download':
         # Créer le dossier 'downloads' s'il n'existe pas
-            if not os.path.exists('downloads'):
+        if not os.path.exists('downloads'):
-                os.makedirs('downloads')
+            os.makedirs('downloads')
 
-            process_file(urls)
+        process_file(urls)
 
-            # path = "downloads/musics.zip"
+    # path = "downloads/musics.zip"
-            # return send_file(path, as_attachment=True)
+    # return send_file(path, as_attachment=True)
-            return render_template('finish_server.html')
+    return render_template('finish.html')
-        
-        if action == 'downloadlocal':
-
-            # Créer le dossier 'downloads' s'il n'existe pas
-            if not os.path.exists('temp'):
-                os.makedirs('temp')
-
-            process_file_local(urls)
-
-            return render_template('finish_local.html')
 
 @app.route('/zip', methods=['GET', 'POST'])
 def zip():
-    path = "temp/musics.zip"
+    path = "downloads/musics.zip"
     return send_file(path, as_attachment=True)
 
 @app.errorhandler(404)

docker-compose.yaml

@@ -1,11 +0,0 @@
-version: '3.3'
-services:
-  spotdlweb:
-    image: gu1llaum3/spotdlweb:latest
-    container_name: spotdlweb
-    hostname: spotdlweb
-    ports:
-      - 3000:3000
-    volumes:
-      - ./musics:/app/downloads
-    restart: unless-stopped

static/js/script.js

@@ -1,9 +1,6 @@
 function startDownload() {
   document.getElementById('download-button').innerHTML = 'Téléchargement en cours...';
   }
-function startLocalDownload() {
-  document.getElementById('downloadlocal-button').innerHTML = 'Téléchargement en cours...';
-  }
 function refreshPage() {
   window.location.reload();
   }

templates/finish_server.html

@@ -1,18 +0,0 @@
-{% extends 'layout.html' %}
-
-{% block body %}
-
-    <body>
-    <div class="container">
-        <h1 class="title"> SpotDL Web </h1>
-        <h2> Téléchargement terminé </h2>
-        <button class="btn" onclick="window.location.href = '/';">Accueil</button>
-
-        {% if message %}
-            <p>{{ message }}</p>
-        {% endif %}
-    </div>
-
-    </body>
-
-{% endblock body %}

templates/index.html

@@ -32,15 +32,14 @@
       <div class="form-group">
         <input type="text" class="form-control" name="url3" id="url3" pattern="^https://open\.spotify\.com/(?:album|playlist|track)/[\w-]+(?:\?si=[\w-]+)?$" placeholder="Entrez l'URL d'une Piste, d'un Album ou d'une Playlist">
       </div>
-      <!-- <div class="form-group">
+      <div class="form-group">
         <input type="text" class="form-control" name="url4" id="url4" pattern="^https://open\.spotify\.com/(?:album|playlist|track)/[\w-]+(?:\?si=[\w-]+)?$" placeholder="Entrez l'URL d'une Piste, d'un Album ou d'une Playlist">
       </div>
       <div class="form-group">
         <input type="text" class="form-control" name="url5" id="url5" pattern="^https://open\.spotify\.com/(?:album|playlist|track)/[\w-]+(?:\?si=[\w-]+)?$" placeholder="Entrez l'URL d'une Piste, d'un Album ou d'une Playlist">
-      </div> -->
+      </div>
-      <button type="submit" class="btn" id="download-button" onclick="startDownload()" name="action" value="download">Télécharger sur le serveur</button>
+      <button type="submit" class="btn" id="download-button" onclick="startDownload()">Démarrer</button>
-      <button type="submit" class="btn" id="downloadlocal-button" onclick="startLocalDownload()" name="action" value="downloadlocal">Télécharger en local</button>
+      <button type="reset" class="btn" id="refresh-button" onclick="refreshPage()">Rafraîchir</button>
-      <!-- <button type="reset" class="btn" id="refresh-button" onclick="refreshPage()">Rafraîchir</button> -->
     </form>
   </div>