guillaume/spotdlweb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: guillaume:main
Branches Tags
guillaume:main
guillaume:dev
guillaume:ddl
guillaume:dev_download
guillaume:prev_download
...
pull from: guillaume:ddl
Branches Tags
guillaume:main
guillaume:dev
guillaume:ddl
guillaume:dev_download
guillaume:prev_download

2 Commits
main ... ddl

Author SHA1 Message Date
guillaume
2924550be6 Mise à jour de 'app.py' 
Correction d'un problème suite au retrait de deux champs d'entrées sur index.html
 2023-06-05 22:30:23 +02:00
Guillaume
9b04348b32 On branch ddl 
Changes to be committed:
	modified:   app.py
	modified:   templates/finish.html
	modified:   templates/index.html
Téléchargement direct d'un fichier zip puis supprime le dossier.
 2023-05-29 12:31:01 +02:00
3 changed files with 11 additions and 22 deletions
Show Stats Expand all files Collapse all files

28
app.py
View File

@ -1,8 +1,6 @@
from flask import Flask, request, redirect, url_for, send_file, render_template, send_from_directory from flask import Flask, request, redirect, url_for, send_file, render_template, send_from_directory
from subprocess import run from subprocess import run
from datetime import datetime
import os import os
import logging
app = Flask(__name__) app = Flask(__name__)
@ -13,7 +11,7 @@ def process_file(urls):
download_param_track = '{artist}/{album}/{artist} - {title}' download_param_track = '{artist}/{album}/{artist} - {title}'
os.chdir('downloads') os.chdir('downloads')
# os.system(f'rm -rf *') os.system(f'rm -rf *')
for url in urls: for url in urls:
if url: if url:
@ -23,8 +21,7 @@ def process_file(urls):
run(['python3', '-m', 'spotdl', url, '--output', download_param_playlist]) run(['python3', '-m', 'spotdl', url, '--output', download_param_playlist])
elif "track" in url: elif "track" in url:
run(['python3', '-m', 'spotdl', url, '--output', download_param_track]) run(['python3', '-m', 'spotdl', url, '--output', download_param_track])
# os.system(f'zip -r musics.zip ./downloads') run(['zip', '-r', 'musics.zip', '.'])
# run(['zip', '-r', 'musics.zip', '.'])
os.chdir('../') os.chdir('../')
@ -32,31 +29,18 @@ def process_file(urls):
def upload_form(): def upload_form():
return render_template('index.html') 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']) @app.route('/download', methods=['POST'])
def download_file(): def download_file():
# votre code de téléchargement ici
# now = datetime.now()
# date_time = now.strftime("%Y-%m-%d %H-%M-%S")
# with open(f"file.txt", "w") as file:
# file.write(date_time)
if request.method == 'POST': if request.method == 'POST':
url1 = request.form['url1'] url1 = request.form['url1']
url2 = request.form['url2'] url2 = request.form['url2']
url3 = request.form['url3'] url3 = request.form['url3']
url4 = request.form['url4']
url5 = request.form['url5']
urls = [url1, url2, url3, url4, url5] urls = [url1, url2, url3]
# Vérifier si au moins un champ est vide # Vérifier si au moins un champ est vide
if not url1 and not url2 and not url3 and not url4 and not url5: if not url1 and not url2 and not url3 :
return render_template('erreur.html') return render_template('erreur.html')
# Créer le dossier 'downloads' s'il n'existe pas # Créer le dossier 'downloads' s'il n'existe pas
@ -69,6 +53,10 @@ def download_file():
# return send_file(path, as_attachment=True) # return send_file(path, as_attachment=True)
return render_template('finish.html') return render_template('finish.html')
@app.route('/zip', methods=['GET', 'POST'])
def zip():
path = "downloads/musics.zip"
return send_file(path, as_attachment=True)
@app.errorhandler(404) @app.errorhandler(404)
def page_not_found(error): # error est necessaire def page_not_found(error): # error est necessaire

3
templates/finish.html
View File

@ -5,7 +5,8 @@
<body> <body>
<div class="container"> <div class="container">
<h1 class="title"> SpotDL Web </h1> <h1 class="title"> SpotDL Web </h1>
<h2> Téléchargement terminé </h2> <h2>Votre musique est prête à être téléchargée</h2>
<button class="btn" onclick="window.location.href = '/zip';">Télécharger</button>
<button class="btn" onclick="window.location.href = '/';">Accueil</button> <button class="btn" onclick="window.location.href = '/';">Accueil</button>
{% if message %} {% if message %}

2
templates/index.html
View File

@ -38,7 +38,7 @@
<div class="form-group"> <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"> <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()">Télécharger</button> <button type="submit" class="btn" id="download-button" onclick="startDownload()">Démarrer</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> </form>
</div> </div>