deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-09 06:03:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/jay0lee/GAM into main

Browse Source
This commit is contained in:
Jay Lee
2021-11-22 08:08:33 -05:00
parent a2eb5a2483 54178543d6
commit ea2750f970
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gam/display.py
View File

@ -183,6 +183,12 @@ def write_csv_file(csvRows, titles, list_type, todrive):
return False return False
return True return True
def rowDropFilterMatch(filters, columns, row):
for c, filterVal in iter(filters.items()):
if filterMatch(filterVal, columns[c], row):
return True
return False
if GC_Values[GC_CSV_ROW_FILTER] or GC_Values[GC_CSV_ROW_DROP_FILTER]: if GC_Values[GC_CSV_ROW_FILTER] or GC_Values[GC_CSV_ROW_DROP_FILTER]:
if GC_Values[GC_CSV_ROW_FILTER]: if GC_Values[GC_CSV_ROW_FILTER]:
keepColumns = {} keepColumns = {}
@ -215,7 +221,7 @@ def write_csv_file(csvRows, titles, list_type, todrive):
if (((keepColumns is None) or if (((keepColumns is None) or
rowFilterMatch(GC_Values[GC_CSV_ROW_FILTER], keepColumns, row)) and rowFilterMatch(GC_Values[GC_CSV_ROW_FILTER], keepColumns, row)) and
((dropColumns is None) or ((dropColumns is None) or
not rowFilterMatch(GC_Values[GC_CSV_ROW_DROP_FILTER], dropColumns, row))): not rowDropFilterMatch(GC_Values[GC_CSV_ROW_DROP_FILTER], dropColumns, row))):
rows.append(row) rows.append(row)
csvRows = rows csvRows = rows