diff --git a/musik/__main__.py b/musik/__main__.py index 367c536..43c7c24 100644 --- a/musik/__main__.py +++ b/musik/__main__.py @@ -1,11 +1,5 @@ import argparse -import itertools -import pathlib -import random -import re -from datetime import date, datetime from pathlib import Path -from urllib import parse, request from .list import generate_list, write_blacklist, write_results @@ -38,7 +32,7 @@ parser.add_argument( "--number", type=int, default=NUM_MUS, - help=f"Modifier le nombre de musiques par joueur", + help="Modifier le nombre de musiques par joueur", ) parser.add_argument( "--lists", @@ -95,6 +89,6 @@ write_results(USERS, MUSIK, args.results) # Écriture de la blacklist if not args.no_blacklist: print("> Écriture de la blacklist") - write_blacklist(args.blacklists) + write_blacklist(USERS, MUSIK, args.blacklists) print("--- FIN ---") diff --git a/musik/list.py b/musik/list.py index 5117189..3b00590 100644 --- a/musik/list.py +++ b/musik/list.py @@ -28,7 +28,7 @@ def generate_list(ROOT_PATH, NO_BLACKLIST, NUM_MUS, BLACKLIST): (re.compile(r"[\?\&]v=(\w+)").search(_musik) or ("", _musik))[1] for _musik in f.read().splitlines() ] - _musiks = list(filter(lambda _m: not _m in blacklist, _raw_musiks)) + _musiks = list(filter(lambda _m: _m not in blacklist, _raw_musiks)) assert ( len(_musiks) >= NUM_MUS @@ -45,7 +45,7 @@ def generate_list(ROOT_PATH, NO_BLACKLIST, NUM_MUS, BLACKLIST): return zip(*UM) -def write_blacklist(BLACKLIST): +def write_blacklist(USERS, MUSIK, BLACKLIST): for user, musik in zip(USERS, MUSIK): with bl_path(BLACKLIST, user).open("a") as f: f.write("\n") diff --git a/musik/youtube.py b/musik/youtube.py index bf0b9ce..3b23838 100644 --- a/musik/youtube.py +++ b/musik/youtube.py @@ -29,7 +29,8 @@ def create_playlist(MUSIK): ) pl_response = pl_request.execute() print( - f"> > Playlist créée : https://www.youtube.com/playlist?list={pl_response['id']}" + "> > Playlist créée :", + f"https://www.youtube.com/playlist?list={pl_response['id']}" ) # Insertion des musiques dans la playlist @@ -51,5 +52,5 @@ def create_playlist(MUSIK): } }, ) - response = request.execute() + request.execute() print()