Refactor file type checks in loading functions: update conditions in load_dk_fd_file.py, load_file.py, and load_ss_file.py to use substring checks for file extensions, improving readability and maintainability. Remove debug print statements from load_dk_fd_file.py and app.py to clean up the code.

app.py

@@ -88,7 +88,6 @@ with tab1:
                     st.session_state['portfolio'] = st.session_state['portfolio'].reset_index(drop=True)
                 elif upload_toggle == 'Draftkings/Fanduel (Names + IDs)':
                     st.session_state['export_portfolio'], st.session_state['portfolio'] = load_dk_fd_file(portfolio_file, st.session_state['csv_file'])
-                    print(st.session_state['export_portfolio'])
                     st.session_state['export_portfolio'] = st.session_state['export_portfolio'].dropna(how='all')
                     st.session_state['export_portfolio'] = st.session_state['export_portfolio'].reset_index(drop=True)
                     st.session_state['portfolio'] = st.session_state['portfolio'].dropna(how='all')

global_func/load_dk_fd_file.py

@@ -10,13 +10,12 @@ def load_dk_fd_file(lineups, csv_file):
         name_dict = dict(zip(df['Name + ID'], df['Name']))
     except:
         name_dict = dict(zip(df['Id'], df['Nickname']))
-    print(name_dict)
 
     # Now load and process the lineups file
     try:
-        if lineups.name.endswith('.csv'):
+        if '.csv' in lineups.name:
             lineups_df = pd.read_csv(lineups)
-        elif lineups.name.endswith(('.xls', '.xlsx')):
+        elif any(ext in lineups.name for ext in ['.xls', '.xlsx']):
             lineups_df = pd.read_excel(lineups)
         else:
             st.error('Please upload either a CSV or Excel file for lineups')
@@ -30,9 +29,6 @@ def load_dk_fd_file(lineups, csv_file):
             pass
 
         export_df = lineups_df.copy()
-
-        print(lineups_df)
-        print(export_df)
         
         # Map the IDs to names
         for col in lineups_df.columns:

global_func/load_file.py

@@ -10,13 +10,13 @@ from global_func.clean_player_name import clean_player_name
 def load_file(upload):
     if upload is not None:
         try:
-            if upload.name.endswith('.csv'):
+            if '.csv' in upload.name:
                 df = pd.read_csv(upload)
-            elif upload.name.endswith(('.xls', '.xlsx')):
+            elif any(ext in upload.name for ext in ['.xls', '.xlsx']):
                 df = pd.read_excel(upload)
             else:
-                st.error('Please upload either a CSV or Excel file')
-                return None
+                st.error('Please upload either a CSV or Excel file for lineups')
+                return None, None
             
             export_df = df.copy()
             

global_func/load_ss_file.py

@@ -13,9 +13,9 @@ def load_ss_file(lineups, csv_file):
 
     # Now load and process the lineups file
     try:
-        if lineups.name.endswith('.csv'):
+        if '.csv' in lineups.name:
             lineups_df = pd.read_csv(lineups)
-        elif lineups.name.endswith(('.xls', '.xlsx')):
+        elif any(ext in lineups.name for ext in ['.xls', '.xlsx']):
             lineups_df = pd.read_excel(lineups)
         else:
             st.error('Please upload either a CSV or Excel file for lineups')