diff --git a/.DS_Store b/.DS_Store index 85243c2f4ff487f1cc3e991ed19096f1e78e2765..bae10ddde33593a43695304e7070e8f53ccd0eca 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/projet_en_groupe/algorithme_netflix.py b/projet_en_groupe/algorithme_netflix.py index 7fbb293bf04de511da9411176f4f4e3c97392315..95d8900573be2b48770b596b2c0a4728786e9afd 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)