From 6e8afd92f19b11bba1cba0681ff0a281564e76ac Mon Sep 17 00:00:00 2001 From: Adrienucl <adrien.payen@student.uclouvain.be> Date: Sat, 23 Dec 2023 23:46:01 +0100 Subject: [PATCH] last update --- .DS_Store | Bin 6148 -> 6148 bytes projet_en_groupe/algorithme_netflix.py | 14 ++++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.DS_Store b/.DS_Store index 85243c2f4ff487f1cc3e991ed19096f1e78e2765..bae10ddde33593a43695304e7070e8f53ccd0eca 100644 GIT binary patch delta 75 zcmZoMXfc@J&&atkU^g=(=Vl%jMP_|2h7yKUhGK?HhCGIJ20eykAiK;nCqFqUCqIdS ZfkA+Qfw3D%&-)Js6AM>wX6N|J4*=Z#7Zd;h delta 27 jcmZoMXfc@J&&aVcU^g=($7UWDMdpcRw>GnL{N)D#c4-K& diff --git a/projet_en_groupe/algorithme_netflix.py b/projet_en_groupe/algorithme_netflix.py index 7fbb293..95d8900 100644 --- a/projet_en_groupe/algorithme_netflix.py +++ b/projet_en_groupe/algorithme_netflix.py @@ -150,13 +150,20 @@ def duration(data_1): sort_order = str(input("Entrez le numéro du type de tri : ")) if not type_data.empty: + type_data['duration'] = type_data['duration'].str.extract('(\d+)').astype(int) + if sort_order.lower() == '1': - type_data_sorted = type_data.sort_values(by='duration', ascending=True) + type_data_sorted = type_data.sort_values(by=['type', 'duration'], ascending=[True, True]) elif sort_order.lower() == '2': - type_data_sorted = type_data.sort_values(by='duration', ascending=False) + type_data_sorted = type_data.sort_values(by=['type', 'duration'], ascending=[True, False]) else: print("Invalid sort order. Defaulting to ascending order.") - type_data_sorted = type_data.sort_values(by='duration', ascending=True) + type_data_sorted = type_data.sort_values(by=['type', 'duration'], ascending=[True, True]) + + type_data_sorted['duration'] = type_data_sorted.apply( + lambda row: f"{row['duration']} min" if row['type'].lower() == 'movie' else f"{row['duration']} Season", axis=1 + ) + print(type_data_sorted) save_to_csv(type_data_sorted) @@ -164,7 +171,6 @@ def duration(data_1): print(f"No movies or series found for the type {type_input}.") - def director(data_1): filtered_data = filter_media_type(data_1) -- GitLab