Refactor player filtering logic in app.py to combine include and remove masks into a single operation. This change simplifies the filtering process, improving code efficiency and maintaining accurate lineup management based on user-defined criteria.

app.py

@@ -1322,14 +1322,12 @@ with tab2:
                         include_mask = parsed_frame[player_columns].apply(
                             lambda row: all(player in list(row) for player in conditional_include_players), axis=1
                         )
-
-                        parsed_frame = parsed_frame[include_mask]
                             
                         remove_mask = parsed_frame[player_columns].apply(
                             lambda row: not all(player in list(row) for player in conditional_remove_players), axis=1
                         )
                             
-                        parsed_frame = parsed_frame[remove_mask]
+                        parsed_frame = parsed_frame[include_mask & remove_mask]
 
                         st.session_state['working_frame'] = parsed_frame.sort_values(by='median', ascending=False).reset_index(drop=True)
                         st.session_state['export_merge'] = st.session_state['working_frame'].copy()
@@ -1344,13 +1342,11 @@ with tab2:
                             lambda row: all(player in list(row) for player in conditional_include_players), axis=1
                         )
                         
-                        parsed_frame = parsed_frame[include_mask]
-
                         remove_mask = parsed_frame[player_columns].apply(
                             lambda row: not all(player in list(row) for player in conditional_remove_players), axis=1
                         )
                             
-                        parsed_frame = parsed_frame[remove_mask]
+                        parsed_frame = parsed_frame[include_mask & remove_mask]
                         
                         st.session_state['export_base'] = parsed_frame.sort_values(by='median', ascending=False).reset_index(drop=True)
                         st.session_state['export_merge'] = st.session_state['export_base'].copy()