From e8926869704f9e4bfe33808b25c919637b165bf5 Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Tue, 22 Aug 2023 02:45:14 +0800 Subject: [PATCH 01/27] nothing --- .../__pycache__/download_file.cpython-310.pyc | Bin 1370 -> 1370 bytes .../files_information.cpython-310.pyc | Bin 5854 -> 5854 bytes .../__pycache__/handle_csv.cpython-310.pyc | Bin 1399 -> 1399 bytes .../__pycache__/share_file.cpython-310.pyc | Bin 3505 -> 3505 bytes .../update_cell_color.cpython-310.pyc | Bin 2960 -> 2960 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Sharely/__pycache__/download_file.cpython-310.pyc b/Sharely/__pycache__/download_file.cpython-310.pyc index b9e3f85bd7b7a80a0c94505748fc77121589e53d..3f1218a542d778434df219fa696de8f203aa1a97 100644 GIT binary patch delta 20 acmcb`b&HETpO=@50SLU-KHkXf&k6uI>jhB& delta 20 acmcb`b&HETpO=@50SKm8Jle?Z&k6uIE(Ik3 diff --git a/Sharely/__pycache__/files_information.cpython-310.pyc b/Sharely/__pycache__/files_information.cpython-310.pyc index 1a810210a1375bf7a0998ba19bd82fb355e8a547..8cadc934fe81b02ef2284c50008e03a918290451 100644 GIT binary patch delta 85 zcmcbodry};pO=@50SMaHKihqPc96Km&>-H(wFuVgvw-Z5lEF delta 85 zcmcbodry};pO=@50SLZ4f3T7Jt%%Sqejk(gvdom!{P@h2_>|1#Ta&p&6&a%@>xe1| a-xBaKG(?k46wPIm0UA&wv-yfB7b5`m{v28W diff --git a/Sharely/__pycache__/handle_csv.cpython-310.pyc b/Sharely/__pycache__/handle_csv.cpython-310.pyc index d1022ad5d9d996667d14eb879a7ca2f6dfeb84e8..1e9f5aeefbc42860d82ddf247c6e9d3b2a8e6e11 100644 GIT binary patch delta 20 acmey)^_`15pO=@50SLU-KHkWk!wLXBa|NgX delta 20 acmey)^_`15pO=@50SHdLwA{#@!wLXD2?e?U diff --git a/Sharely/__pycache__/share_file.cpython-310.pyc b/Sharely/__pycache__/share_file.cpython-310.pyc index c3622d430516bcc3951b2c3059c3fdbb651d838b..93841f1fe926c0c5262a51cd46c98529f82f12ee 100644 GIT binary patch delta 20 acmdley-}JwpO=@50SLU-KHkW^j28ek?*)JW delta 20 acmdley-}JwpO=@50SKm8Jle>;j28ekG6hrs diff --git a/Sharely/__pycache__/update_cell_color.cpython-310.pyc b/Sharely/__pycache__/update_cell_color.cpython-310.pyc index b1ab85a0c2afc6a3c93af2caf6057c4d7e697f43..47d67a4573fa58689380adf2be8a42ae24b85f71 100644 GIT binary patch delta 20 acmbOrK0%y2pO=@50SLU-KHkXP$_)T8H3bs@ delta 20 acmbOrK0%y2pO=@50SKm8Jle?J$_)T7cm(GF From 020be5633c27d4bad499331685e69e0c2a4c8a0f Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Wed, 23 Aug 2023 02:39:36 +0800 Subject: [PATCH 02/27] comment update --- .../__pycache__/download_file.cpython-310.pyc | Bin 1370 -> 1381 bytes .../files_information.cpython-310.pyc | Bin 5854 -> 5854 bytes .../__pycache__/handle_csv.cpython-310.pyc | Bin 1399 -> 1399 bytes .../__pycache__/share_file.cpython-310.pyc | Bin 3505 -> 3505 bytes .../update_cell_color.cpython-310.pyc | Bin 2960 -> 2960 bytes Sharely/download_file.py | 13 ++++++++----- Sharely/share_file.py | 3 +-- main.py | 4 +++- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Sharely/__pycache__/download_file.cpython-310.pyc b/Sharely/__pycache__/download_file.cpython-310.pyc index 3f1218a542d778434df219fa696de8f203aa1a97..c2bb61cddbc4630d7b1d789e85640433d4e0d4bc 100644 GIT binary patch delta 64 zcmcb`^^}V*pO=@50SFksJV_B{+sHSQnNzShGcP?SHNJTAdgjMsMnFj+Wp{)*- diff --git a/Sharely/__pycache__/files_information.cpython-310.pyc b/Sharely/__pycache__/files_information.cpython-310.pyc index 8cadc934fe81b02ef2284c50008e03a918290451..b8771abd9f8f36a6069feae016441e5b4871252e 100644 GIT binary patch delta 22 ccmcbodry})pO=@50SK1AdXjQ;Bkx5q092I-4gdfE delta 22 ccmcbodry})pO=@50SMaHKTdhIk@un)08#4)!vFvP diff --git a/Sharely/__pycache__/handle_csv.cpython-310.pyc b/Sharely/__pycache__/handle_csv.cpython-310.pyc index 1e9f5aeefbc42860d82ddf247c6e9d3b2a8e6e11..f2b0437885ab3150d73d266db41350549940d61f 100644 GIT binary patch delta 20 acmey)^_`15pO=@50SFF1d$N%`hZO)q9R^zf delta 20 acmey)^_`15pO=@50SLU-KHkWk!wLXBa|NgX diff --git a/Sharely/__pycache__/share_file.cpython-310.pyc b/Sharely/__pycache__/share_file.cpython-310.pyc index 93841f1fe926c0c5262a51cd46c98529f82f12ee..8a1ea911f4bb682f3000b014462284b4a407850a 100644 GIT binary patch delta 20 acmdley-}JwpO=@50SFF1d$N&x87}}jnFcce delta 20 acmdley-}JwpO=@50SLU-KHkW^j28ek?*)JW diff --git a/Sharely/__pycache__/update_cell_color.cpython-310.pyc b/Sharely/__pycache__/update_cell_color.cpython-310.pyc index 47d67a4573fa58689380adf2be8a42ae24b85f71..642b3e01b3afbcf73265cb334a219bda4014b42a 100644 GIT binary patch delta 20 acmbOrK0%y2pO=@50SFF1d$N(cl^Xyw-v!11 delta 20 acmbOrK0%y2pO=@50SLU-KHkXP$_)T8H3bs@ diff --git a/Sharely/download_file.py b/Sharely/download_file.py index e1339ba..da8b0ce 100644 --- a/Sharely/download_file.py +++ b/Sharely/download_file.py @@ -7,27 +7,30 @@ SCOPES = ['https://www.googleapis.com/auth/drive'] -def update_file(spreadsheet_name, spreadsheet_id, singleSheet_name): +def update_file(spreadsheet_name, spreadsheet_id, single_sheet_name): # Authenticate with the Google Sheets API using the credentials creds = Credentials.from_authorized_user_file(f_i.project_path + '/OAuth_client_ID_credentials/token.json', SCOPES) sheets_service = build('sheets', 'v4', credentials=creds) # Get the sheet ID of the specified sheet name - sheets_metadata = sheets_service.spreadsheets().get(spreadsheetId=spreadsheet_id, ranges=[], includeGridData=False).execute() + sheets_metadata = sheets_service\ + .spreadsheets()\ + .get(spreadsheetId=spreadsheet_id, ranges=[], includeGridData=False)\ + .execute() sheets = sheets_metadata['sheets'] sheet_id = None for sheet in sheets: - if sheet['properties']['title'] == singleSheet_name: + if sheet['properties']['title'] == single_sheet_name: sheet_id = sheet['properties']['sheetId'] break if sheet_id is None: - raise ValueError("Sheet with name '{}' not found in the spreadsheet.".format(singleSheet_name)) + raise ValueError("Sheet with name '{}' not found in the spreadsheet.".format(single_sheet_name)) # Get the data from the specified sheet - range_name = singleSheet_name + range_name = single_sheet_name result = sheets_service.spreadsheets().values().get(spreadsheetId=spreadsheet_id, range=range_name).execute() rows = result.get('values', []) diff --git a/Sharely/share_file.py b/Sharely/share_file.py index 4da201e..9761c62 100644 --- a/Sharely/share_file.py +++ b/Sharely/share_file.py @@ -48,9 +48,8 @@ def callback(request_id, response, exception): if offset == -2: offset = 0 expire_date = f"{date.today()+timedelta(days=1 + offset)}T23:59:59+08:00:00" - # print(expire_date) # test - # print(datetime.now().isoformat()) # test + # Availability batch = service.new_batch_http_request(callback=callback) user_permission = {'type': 'user', 'role': 'reader', diff --git a/main.py b/main.py index 8ad9679..3f0653f 100644 --- a/main.py +++ b/main.py @@ -10,7 +10,9 @@ # Update csv files for index, spreadsheet_name in enumerate(f_i.spreadsheet_id_dic): - download_file.update_file(spreadsheet_name, f_i.spreadsheet_id_dic.get(spreadsheet_name), f_i.singleSheet_namelist[index]) + download_file.update_file( + spreadsheet_name, f_i.spreadsheet_id_dic.get(spreadsheet_name), f_i.singleSheet_namelist[index] + ) # Access csv files pandas.set_option("display.max_rows", 100, "display.max_columns", 20, ) From 8603ef503aa55ee0ecfc1959b66e0f8bf428b798 Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Wed, 23 Aug 2023 02:42:46 +0800 Subject: [PATCH 03/27] comment update --- Sharely/share_file.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Sharely/share_file.py b/Sharely/share_file.py index 9761c62..99d08fd 100644 --- a/Sharely/share_file.py +++ b/Sharely/share_file.py @@ -71,6 +71,8 @@ def callback(request_id, response, exception): email_message += "\n\n助教聯絡方式：\nEmail: hectopascal.citrus@g.ncu.edu.tw\ \nFB: https://www.facebook.com/people/Robin-Hsieh/100004677013672/" + # See method details in: + # https://developers.google.com/resources/api-libraries/documentation/drive/v3/python/latest/drive_v3.permissions.html batch.add(service.permissions().create(fileId=file_id, emailMessage=email_message, body=user_permission, From 2a8ee45af14ddff825eb1fb81d629b87d264c9d1 Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Wed, 23 Aug 2023 02:44:01 +0800 Subject: [PATCH 04/27] comment update --- Sharely/share_file.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Sharely/share_file.py b/Sharely/share_file.py index 99d08fd..345fd9e 100644 --- a/Sharely/share_file.py +++ b/Sharely/share_file.py @@ -49,8 +49,10 @@ def callback(request_id, response, exception): offset = 0 expire_date = f"{date.today()+timedelta(days=1 + offset)}T23:59:59+08:00:00" - # Availability batch = service.new_batch_http_request(callback=callback) + + # See availability about setting an expiration date for file access in: + # https://workspaceupdates.googleblog.com/2022/10/expiring-access-controls-google-drive.html user_permission = {'type': 'user', 'role': 'reader', "expirationTime": expire_date, From 3091f1075090f2bf4f8043ebc811f5558f39a36c Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Thu, 24 Aug 2023 01:13:24 +0800 Subject: [PATCH 05/27] bug fix --- .../__pycache__/download_file.cpython-310.pyc | Bin 1381 -> 1381 bytes .../__pycache__/handle_csv.cpython-310.pyc | Bin 1399 -> 1399 bytes .../__pycache__/share_file.cpython-310.pyc | Bin 3505 -> 3505 bytes .../update_cell_color.cpython-310.pyc | Bin 2960 -> 2960 bytes Sharely/update_cell_color.py | 43 +++++++++++------- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/Sharely/__pycache__/download_file.cpython-310.pyc b/Sharely/__pycache__/download_file.cpython-310.pyc index c2bb61cddbc4630d7b1d789e85640433d4e0d4bc..578bd8232cad36bd95a57197cdcd64fd3f42a243 100644 GIT binary patch delta 20 acmaFL^^}V{pO=@50SG2qKHJD0#R>p9>jg*v delta 20 acmaFL^^}V{pO=@50SFksJlV({#R>pAQw4DV diff --git a/Sharely/__pycache__/handle_csv.cpython-310.pyc b/Sharely/__pycache__/handle_csv.cpython-310.pyc index f2b0437885ab3150d73d266db41350549940d61f..fc794acae5690532f6d5144e0ac08c58476710bb 100644 GIT binary patch delta 20 acmey)^_`15pO=@50SG2qKHJEh!wLXAy9Is# delta 20 acmey)^_`15pO=@50SFF1d$N%`hZO)q9R^zf diff --git a/Sharely/__pycache__/share_file.cpython-310.pyc b/Sharely/__pycache__/share_file.cpython-310.pyc index 8a1ea911f4bb682f3000b014462284b4a407850a..eeb9e6f5dc3ac3d18c32b07d22dbbb31dbce8fa5 100644 GIT binary patch delta 54 zcmdley-}JkpO=@50SG2qK1&f1*vMDKBgw?X!o&!IY=5QLI9OSLEUy0?tbDAS7xD-& F0stf239|qI delta 54 zcmdley-}JkpO=@50SFF1dy*o~zmczsN0Nn!5dzu%O0jXUvH*Ep|2bIsm^Uxv5nu!W DM!yP= diff --git a/Sharely/__pycache__/update_cell_color.cpython-310.pyc b/Sharely/__pycache__/update_cell_color.cpython-310.pyc index 642b3e01b3afbcf73265cb334a219bda4014b42a..fe18cf7f0e098fc4aca73eb8def6088ceae094f5 100644 GIT binary patch delta 20 acmbOrK0%y2pO=@50SG2qKHJFM$_)T7eFW(M delta 20 acmbOrK0%y2pO=@50SFF1d$N(cl^Xyw-v!11 diff --git a/Sharely/update_cell_color.py b/Sharely/update_cell_color.py index 88016da..9c45e73 100644 --- a/Sharely/update_cell_color.py +++ b/Sharely/update_cell_color.py @@ -4,16 +4,16 @@ from googleapiclient.errors import HttpError from Sharely import files_information as f_i - # 設置API憑證 SERVICE_ACCOUNT_FILE = f_i.project_path + '/token.json' SCOPES = ['https://www.googleapis.com/auth/drive'] # Google Sheet信息 -RANGE_NAME = 'A1:Z100' # 例如：'Sheet1' +RANGE_NAME = 'A1:Z150' # 例如：'Sheet1' # 建立憑證 -credentials = Credentials.from_authorized_user_file(f_i.project_path + '/OAuth_client_ID_credentials/token.json', SCOPES) +credentials = Credentials.from_authorized_user_file(f_i.project_path + '/OAuth_client_ID_credentials/token.json', + SCOPES) # 建立Google Sheets API客戶端 sheets_service = discovery.build('sheets', 'v4', credentials=credentials) @@ -23,8 +23,9 @@ # 獲取內部的Sheet ID -def get_sheet_id(sheet_name, SPREADSHEET_ID): - sheets_metadata = sheets_service.spreadsheets().get(spreadsheetId=SPREADSHEET_ID, fields='sheets(properties)').execute() +def get_sheet_id(sheet_name, spreadsheet_id): + sheets_metadata = sheets_service.spreadsheets().get(spreadsheetId=spreadsheet_id, + fields='sheets(properties)').execute() sheets = sheets_metadata.get('sheets', '') sheet_id = None for sheet in sheets: @@ -35,8 +36,8 @@ def get_sheet_id(sheet_name, SPREADSHEET_ID): # 更新Google Sheet單元格顏色 -def update_cell_color(row, col, red, green, blue, SPREADSHEET_ID, SHEET_NAME): - sheet_id = get_sheet_id(SHEET_NAME, SPREADSHEET_ID) +def update_cell_color(row, col, red, green, blue, spreadsheet_id, sheet_name): + sheet_id = get_sheet_id(sheet_name, spreadsheet_id) body = { "requests": [ { @@ -69,17 +70,17 @@ def update_cell_color(row, col, red, green, blue, SPREADSHEET_ID, SHEET_NAME): ] } try: - sheets_service.spreadsheets().batchUpdate(spreadsheetId=SPREADSHEET_ID, body=body).execute() + sheets_service.spreadsheets().batchUpdate(spreadsheetId=spreadsheet_id, body=body).execute() except HttpError as error: print(f"An error occurred: {error}") # 更新Google Sheet單元格顏色(update boundary color) -def update_cells_color(row, col, red, green, blue, SPREADSHEET_ID, SHEET_NAME): - sheet_id = get_sheet_id(SHEET_NAME, SPREADSHEET_ID) +def update_cells_color(row, col, red, green, blue, spreadsheet_id, sheet_name): + sheet_id = get_sheet_id(sheet_name, spreadsheet_id) # Prepare a list of cell values with the desired background color - cell_values = [{"userEnteredFormat": {"backgroundColor": {"red": red, "green": green, "blue": blue}}}] * 100 + cell_values = [{"userEnteredFormat": {"backgroundColor": {"red": red, "green": green, "blue": blue}}}] * 150 # Create a list of rows, each containing one cell value rows = [{"values": cell_value} for cell_value in cell_values] @@ -93,7 +94,7 @@ def update_cells_color(row, col, red, green, blue, SPREADSHEET_ID, SHEET_NAME): "range": { "sheetId": sheet_id, "startRowIndex": row, - "endRowIndex": row + 100, + "endRowIndex": row + 150, "startColumnIndex": col, "endColumnIndex": col + 1 } @@ -102,15 +103,25 @@ def update_cells_color(row, col, red, green, blue, SPREADSHEET_ID, SHEET_NAME): ] } try: - sheets_service.spreadsheets().batchUpdate(spreadsheetId=SPREADSHEET_ID, body=body).execute() + sheets_service.spreadsheets().batchUpdate(spreadsheetId=spreadsheet_id, body=body).execute() except HttpError as error: print(f"An error occurred: {error}") # 讀取單元格顏色 -def get_cell_color(row, col, SPREADSHEET_ID): - request = sheets_service.spreadsheets().get(spreadsheetId=SPREADSHEET_ID, ranges=RANGE_NAME, - fields='sheets(data(rowData(values(userEnteredFormat(backgroundColor)))))') +def get_cell_color(row, col, spreadsheet_id): + request = sheets_service.spreadsheets().get(spreadsheetId=spreadsheet_id, ranges=RANGE_NAME, + fields='sheets(' + 'data(' + 'rowData(' + 'values(' + 'userEnteredFormat(' + 'backgroundColor' + ')' + ')' + ')' + ')' + ')') result = request.execute() sheet_data = result['sheets'][0]['data'][0]['rowData'][row]['values'][col] From 23da79e5a5ccc5003873926d392b53f2b2ca1f1f Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Thu, 24 Aug 2023 16:20:48 +0800 Subject: [PATCH 06/27] add comment --- Sharely/handle_csv.py | 10 +++++----- Sharely/share_file.py | 1 + test/list_filename.py | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Sharely/handle_csv.py b/Sharely/handle_csv.py index bed9469..1a8b9f3 100644 --- a/Sharely/handle_csv.py +++ b/Sharely/handle_csv.py @@ -3,7 +3,7 @@ from Sharely import share_file -def send_mail(data, file_ids_dic, SPREADSHEET_ID, SHEET_NAME): +def send_mail(data, file_ids_dic, spreadsheet_id, sheet_name): # Processing required information row_size = data.shape[0] column_size = data.shape[1] @@ -21,23 +21,23 @@ def send_mail(data, file_ids_dic, SPREADSHEET_ID, SHEET_NAME): if date == today_str: if file_ids_dic.get(column): - red, green, blue = up_color.get_cell_color(row + 1, column, SPREADSHEET_ID) + red, green, blue = up_color.get_cell_color(row + 1, column, spreadsheet_id) if (red, green, blue) == (1, 1, 1) or (red, green, blue) == (0, 0, 0): # if cell's color is white file_ids.append(file_ids_dic.get(column)) offset += 2 - up_color.update_cell_color(row + 1, column, 1, 1, 0, SPREADSHEET_ID, SHEET_NAME) # yellow + up_color.update_cell_color(row + 1, column, 1, 1, 0, spreadsheet_id, sheet_name) # yellow elif (red, green, blue) == (1, 1, 0): # if cell's color is yellow file_ids.append(file_ids_dic.get(column)) offset += 2 - up_color.update_cell_color(row + 1, column, 0, 1, 0, SPREADSHEET_ID, SHEET_NAME) # green + up_color.update_cell_color(row + 1, column, 0, 1, 0, spreadsheet_id, sheet_name) # green elif (red, green, blue) == (0, 1, 0): # if cell's color is green max_date = max_date + data.columns[column] + " " file_ids.append(file_ids_dic.get(column)) offset += 2 - up_color.update_cell_color(row + 1, column, 0, 1, 1, SPREADSHEET_ID, SHEET_NAME) # blue + up_color.update_cell_color(row + 1, column, 0, 1, 1, spreadsheet_id, sheet_name) # blue if offset != -2: print(row, gmail) diff --git a/Sharely/share_file.py b/Sharely/share_file.py index 345fd9e..05dfaa5 100644 --- a/Sharely/share_file.py +++ b/Sharely/share_file.py @@ -53,6 +53,7 @@ def callback(request_id, response, exception): # See availability about setting an expiration date for file access in: # https://workspaceupdates.googleblog.com/2022/10/expiring-access-controls-google-drive.html + # https://stackoverflow.com/questions/75423531/google-service-account-drive-api-unable-to-set-expirationtime-python user_permission = {'type': 'user', 'role': 'reader', "expirationTime": expire_date, diff --git a/test/list_filename.py b/test/list_filename.py index 0c6abf8..2b6a7f4 100644 --- a/test/list_filename.py +++ b/test/list_filename.py @@ -54,4 +54,4 @@ def main(): if __name__ == '__main__': - main() \ No newline at end of file + main() From 7c615427129208bf9c35baa2027190f9beed97e7 Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Fri, 25 Aug 2023 00:46:02 +0800 Subject: [PATCH 07/27] update --- .../__pycache__/download_file.cpython-310.pyc | Bin 1381 -> 1381 bytes .../files_information.cpython-310.pyc | Bin 5854 -> 5855 bytes .../__pycache__/handle_csv.cpython-310.pyc | Bin 1399 -> 1399 bytes .../__pycache__/share_file.cpython-310.pyc | Bin 3505 -> 3505 bytes .../update_cell_color.cpython-310.pyc | Bin 2960 -> 2965 bytes main.py | 18 +++++++++--------- test/list_filename.py | 8 ++++---- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Sharely/__pycache__/download_file.cpython-310.pyc b/Sharely/__pycache__/download_file.cpython-310.pyc index 578bd8232cad36bd95a57197cdcd64fd3f42a243..2bd8c0f158597ad765415572f69b41a4a91875d4 100644 GIT binary patch delta 20 acmaFL^^}V{pO=@50SFY6pKs)jVg&#<+yw&w delta 20 acmaFL^^}V{pO=@50SG2qKHJD0#R>p9>jg*v diff --git a/Sharely/__pycache__/files_information.cpython-310.pyc b/Sharely/__pycache__/files_information.cpython-310.pyc index b8771abd9f8f36a6069feae016441e5b4871252e..7d135ab1b5a78c7605cc86d474429708fe1c0773 100644 GIT binary patch delta 37 rcmcbodta9~pO=@50SKP7Jx{s4k$1Kzr)Y6zUV2VyeDUTDqI!$~?^F!W delta 36 qcmcbwdry})pO=@50SK1AdXjQ;Bkycc4w2%_y!4#Z;LRIF^%w!=oJ~JhX3&P4v%uStqnK_$L gYO+1cN=BKhFKHcHM3l2r3$mGQpL7xKI6Tp zqZA#3ZX8Gnd_B2-Xlrv6XC&t&Us_x)>aDb!vejUJFV^$crBkoi)mq`iJ?LJ$A4V=* z@kw9`mUvI_UP6-arLJzlm1qgag2(z((S*Pvx$ct%=vM_e1 za{G2Wb*G9pY^Qjq0f7SC=bq`; F{R=Q(gaQBn delta 658 zcmZ9J-AWr#5XU{6-MHDtkdM|FKR14)Nvbwluqq)Sx}bt0MnQ5DLUO2vO*foPEO_H9 zsEhYLfgt+;eT|YrFAF|{h|WK`$m$;W?VMp|&irR?<5%&JH8i9R(09G|zjhOO2yHT! za}Sxp#!H%g%6Y5&v(n(5Q1Rf<*w`v=8^%$2XUlP=EQ>q;r26PbN*-oGCNq_V=`WEb zJ{iuk zGz-Vh?%=n}QRI#RGr%k`2c&=u@CBGBWP)N5_E$g$-bxfX_@J%yq2GcnKEn;QVhQkS zCA$;#h_!oa_uZJvSsKDF6k+{Z*Dn+r!@4f|1JF^c*MM^uNJSUup3yuV#+*Nabiosb z1n=YYcIXGKygy}<qdRi}k;#l2g#0P7+9523CMP(67_Ax?5B84Xf5Rd4W-cjV-BE VsCP8k&tzZJ7p9}iYEVrFldorkf@=T( diff --git a/main.py b/main.py index 3f0653f..415e915 100644 --- a/main.py +++ b/main.py @@ -11,7 +11,7 @@ # Update csv files for index, spreadsheet_name in enumerate(f_i.spreadsheet_id_dic): download_file.update_file( - spreadsheet_name, f_i.spreadsheet_id_dic.get(spreadsheet_name), f_i.singleSheet_namelist[index] + spreadsheet_name, f_i.spreadsheet_id_dic.get(spreadsheet_name), f_i.single_sheet_namelist[index] ) # Access csv files @@ -22,19 +22,19 @@ data_L1 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L1.csv", sep=",") # Update cells (fill color in sheet boundary) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.singleSheet_namelist[2]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.singleSheet_namelist[3]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.singleSheet_namelist[8]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.singleSheet_namelist[9]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.single_sheet_namelist[2]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[3]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[8]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[9]) # Send mail -handle_csv.send_mail(data_L6, f_i.L6_video_id_dic, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.singleSheet_namelist[2]) +handle_csv.send_mail(data_L6, f_i.L6_video_id_dic, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.single_sheet_namelist[2]) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") -handle_csv.send_mail(data_L9, f_i.L9_video_id_dic, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.singleSheet_namelist[3]) +handle_csv.send_mail(data_L9, f_i.L9_video_id_dic, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[3]) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") -handle_csv.send_mail(data_L14, f_i.L14_video_id_dic, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.singleSheet_namelist[8]) +handle_csv.send_mail(data_L14, f_i.L14_video_id_dic, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[8]) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") -handle_csv.send_mail(data_L1, f_i.L1_video_id_dic, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.singleSheet_namelist[9]) +handle_csv.send_mail(data_L1, f_i.L1_video_id_dic, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[9]) print("~End~====================================================================================================", handle_csv.today_str) diff --git a/test/list_filename.py b/test/list_filename.py index 2b6a7f4..d12f0ed 100644 --- a/test/list_filename.py +++ b/test/list_filename.py @@ -20,18 +20,18 @@ def main(): # The file token.json stores the user's access and refresh tokens, and is # created automatically when the authorization flow completes for the first # time. - if os.path.exists('token.json'): - creds = Credentials.from_authorized_user_file('token.json', SCOPES) + if os.path.exists('../OAuth_client_ID_credentials/token.json'): + creds = Credentials.from_authorized_user_file('../OAuth_client_ID_credentials/token.json', SCOPES) # If there are no (valid) credentials available, let the user log in. if not creds or not creds.valid: if creds and creds.expired and creds.refresh_token: creds.refresh(Request()) else: flow = InstalledAppFlow.from_client_secrets_file( - 'credentials.json', SCOPES) + '../OAuth_client_ID_credentials/credentials.json', SCOPES) creds = flow.run_local_server(port=0) # Save the credentials for the next run - with open('token.json', 'w') as token: + with open('../OAuth_client_ID_credentials/token.json', 'w') as token: token.write(creds.to_json()) try: From 865c31450115948245e49f7cbf9592171ab863a1 Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Mon, 28 Aug 2023 23:53:49 +0800 Subject: [PATCH 08/27] update --- Sharely/download_file.py | 2 +- Sharely/share_file.py | 2 +- Sharely/update_cell_color.py | 2 +- main.py | 2 +- test/list_filename.py | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Sharely/download_file.py b/Sharely/download_file.py index da8b0ce..e92cff8 100644 --- a/Sharely/download_file.py +++ b/Sharely/download_file.py @@ -10,7 +10,7 @@ def update_file(spreadsheet_name, spreadsheet_id, single_sheet_name): # Authenticate with the Google Sheets API using the credentials - creds = Credentials.from_authorized_user_file(f_i.project_path + '/OAuth_client_ID_credentials/token.json', SCOPES) + creds = Credentials.from_authorized_user_file(f_i.project_path + '/OAuth_client_ID_credentials_desktop/token.json', SCOPES) sheets_service = build('sheets', 'v4', credentials=creds) # Get the sheet ID of the specified sheet name diff --git a/Sharely/share_file.py b/Sharely/share_file.py index 05dfaa5..bd59a80 100644 --- a/Sharely/share_file.py +++ b/Sharely/share_file.py @@ -25,7 +25,7 @@ def share_file(real_file_id, real_user, offset, max_date): for guides on implementing OAuth2 for the application. """ # creds, _ = google.auth.default() - creds = Credentials.from_authorized_user_file(f_i.project_path + '/OAuth_client_ID_credentials/token.json', SCOPES) + creds = Credentials.from_authorized_user_file(f_i.project_path + '/OAuth_client_ID_credentials_desktop/token.json', SCOPES) try: # create drive api client diff --git a/Sharely/update_cell_color.py b/Sharely/update_cell_color.py index 9c45e73..190a0e0 100644 --- a/Sharely/update_cell_color.py +++ b/Sharely/update_cell_color.py @@ -12,7 +12,7 @@ RANGE_NAME = 'A1:Z150' # 例如：'Sheet1' # 建立憑證 -credentials = Credentials.from_authorized_user_file(f_i.project_path + '/OAuth_client_ID_credentials/token.json', +credentials = Credentials.from_authorized_user_file(f_i.project_path + '/OAuth_client_ID_credentials_desktop/token.json', SCOPES) # 建立Google Sheets API客戶端 diff --git a/main.py b/main.py index 415e915..dd41c96 100644 --- a/main.py +++ b/main.py @@ -15,7 +15,7 @@ ) # Access csv files -pandas.set_option("display.max_rows", 100, "display.max_columns", 20, ) +pandas.set_option("display.max_rows", 150, "display.max_columns", 20, ) data_L6 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L6.csv", sep=",") data_L9 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L9.csv", sep=",") data_L14 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L14.csv", sep=",") diff --git a/test/list_filename.py b/test/list_filename.py index d12f0ed..76be36d 100644 --- a/test/list_filename.py +++ b/test/list_filename.py @@ -20,18 +20,18 @@ def main(): # The file token.json stores the user's access and refresh tokens, and is # created automatically when the authorization flow completes for the first # time. - if os.path.exists('../OAuth_client_ID_credentials/token.json'): - creds = Credentials.from_authorized_user_file('../OAuth_client_ID_credentials/token.json', SCOPES) + if os.path.exists('../OAuth_client_ID_credentials_desktop/token.json'): + creds = Credentials.from_authorized_user_file('../OAuth_client_ID_credentials_desktop/token.json', SCOPES) # If there are no (valid) credentials available, let the user log in. if not creds or not creds.valid: if creds and creds.expired and creds.refresh_token: creds.refresh(Request()) else: flow = InstalledAppFlow.from_client_secrets_file( - '../OAuth_client_ID_credentials/credentials.json', SCOPES) + '../OAuth_client_ID_credentials_desktop/credentials.json', SCOPES) creds = flow.run_local_server(port=0) # Save the credentials for the next run - with open('../OAuth_client_ID_credentials/token.json', 'w') as token: + with open('../OAuth_client_ID_credentials_desktop/token.json', 'w') as token: token.write(creds.to_json()) try: From 2b52d35448acdbebd95629e19fa71251a8f41f35 Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Tue, 29 Aug 2023 00:59:39 +0800 Subject: [PATCH 09/27] update --- .gitignore | 16 ++++++++++------ OAuth_client_ID_credentials_desktop/.gitkeep | 0 Service_account_credentials/.gitkeep | 0 .../__pycache__/download_file.cpython-310.pyc | Bin 1381 -> 1389 bytes .../__pycache__/handle_csv.cpython-310.pyc | Bin 1399 -> 1399 bytes .../__pycache__/share_file.cpython-310.pyc | Bin 3505 -> 3513 bytes .../update_cell_color.cpython-310.pyc | Bin 2965 -> 2973 bytes data/.gitkeep | 0 log/.gitkeep | 0 9 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 OAuth_client_ID_credentials_desktop/.gitkeep create mode 100644 Service_account_credentials/.gitkeep create mode 100644 data/.gitkeep create mode 100644 log/.gitkeep diff --git a/.gitignore b/.gitignore index 64e520c..58f3bb2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,12 @@ .DS_Store -credentials.json -token.json -data Sharely/files_information.py -logfile.log -logfile230325_230624.log -main_previous.py \ No newline at end of file +OAuth_client_ID_credentials_desktop/* +!OAuth_client_ID_credentials_desktop/.gitkeep +OAuth_client_ID_credentials_webapp/* +!OAuth_client_ID_credentials_webapp/.gitkeep +Service_account_credentials/* +!Service_account_credentials/.gitkeep +data/* +!data/.gitkeep +log/* +!log/.gitkeep \ No newline at end of file diff --git a/OAuth_client_ID_credentials_desktop/.gitkeep b/OAuth_client_ID_credentials_desktop/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/Service_account_credentials/.gitkeep b/Service_account_credentials/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/Sharely/__pycache__/download_file.cpython-310.pyc b/Sharely/__pycache__/download_file.cpython-310.pyc index 2bd8c0f158597ad765415572f69b41a4a91875d4..eb497d75e03c702c12280bb504653fa73a9d5853 100644 GIT binary patch delta 42 wcmaFL^_Gh_pO=@50SNvaev=}*k@qnpqyFTNj4~YYDXGQTCHV!Ld6^=Z0VUE6qyPW_ delta 33 ncmaFM^^}V@pO=@50SFY6pQng!tOYp$ diff --git a/Sharely/__pycache__/share_file.cpython-310.pyc b/Sharely/__pycache__/share_file.cpython-310.pyc index 00ca5dee952e44a24b12914c7889c568287bad84..fc1a891edcb994dcdf71c82b19e9ffc99f049a32 100644 GIT binary patch delta 65 zcmdley;GVupO=@50SNvaev>j|BX0zYs=mIzV`)i7d~!}^YF*j&h{!UX`UP!=Wt delta 57 zcmbO$K2@AIpO=@50SFY6pQku( Date: Wed, 30 Aug 2023 15:14:15 +0800 Subject: [PATCH 10/27] nothing --- .../__pycache__/download_file.cpython-310.pyc | Bin 1389 -> 1389 bytes .../files_information.cpython-310.pyc | Bin 5855 -> 5855 bytes .../__pycache__/handle_csv.cpython-310.pyc | Bin 1399 -> 1399 bytes .../__pycache__/share_file.cpython-310.pyc | Bin 3513 -> 3513 bytes .../update_cell_color.cpython-310.pyc | Bin 2973 -> 2973 bytes main.py | 4 ++++ 6 files changed, 4 insertions(+) diff --git a/Sharely/__pycache__/download_file.cpython-310.pyc b/Sharely/__pycache__/download_file.cpython-310.pyc index eb497d75e03c702c12280bb504653fa73a9d5853..bd00b8eac5a95d86cddb6fbf0c1e17be7e7cf859 100644 GIT binary patch delta 20 acmaFM^_Gh}pO=@50SL0i-)-bhVg&#>eFY!@ delta 20 acmaFM^_Gh}pO=@50SNvaezTD~i4_1rat2!f diff --git a/Sharely/__pycache__/files_information.cpython-310.pyc b/Sharely/__pycache__/files_information.cpython-310.pyc index 7d135ab1b5a78c7605cc86d474429708fe1c0773..56e57eddf93b950faa4cc3c26512c41e990ca9ee 100644 GIT binary patch delta 77 zcmcbwdtaA3pO=@50SJyReLInRhrHSxo+#E7`xJ*1#}ua&=M})yOzmmtAdgt$^_4H(VT>OL?-m0Na%r{r~^~ delta 77 zcmcbwdtaA3pO=@50SKP7J)g+EL*9N4PZVp4LyBXHQ;KtnONwiXTZ%x6dx}SjXNp&f g{l-TZIVbC~t4*#I5T2aN!?AfAR~_T#BA#3>0MHK^RsaA1 diff --git a/Sharely/__pycache__/handle_csv.cpython-310.pyc b/Sharely/__pycache__/handle_csv.cpython-310.pyc index 31f7aea9408d16146334bba7bebee00f5f8b5475..aff9a570282ccb7eeb346329a0e0f2992e412aad 100644 GIT binary patch delta 20 acmey)^_`15pO=@50SL0i-)-d1VFds?4Fx^` delta 20 acmey)^_`15pO=@50SNvaezTD~hZO)r0tR^i diff --git a/Sharely/__pycache__/share_file.cpython-310.pyc b/Sharely/__pycache__/share_file.cpython-310.pyc index fc1a891edcb994dcdf71c82b19e9ffc99f049a32..5fbfb92b7a8a9d8b5d90d1c40443f769976a280f 100644 GIT binary patch delta 20 acmdlfy;GVypO=@50SL0i-)-bx#|r>7$ptO| delta 20 acmdlfy;GVypO=@50SNvaezTE#9WMYpz6NOk diff --git a/Sharely/__pycache__/update_cell_color.cpython-310.pyc b/Sharely/__pycache__/update_cell_color.cpython-310.pyc index 25ed5e6194e05ab263ad7e94144f73f9f8b7145e..8583bb789f7e1c4afd25ed5b693df387a0d01e81 100644 GIT binary patch delta 20 acmbO$K3AMOpO=@50SL0i-)-cc#0>y1*96c2 delta 20 acmbO$K3AMOpO=@50SNvaezTE#5;p)h%mxbp diff --git a/main.py b/main.py index dd41c96..5c43e25 100644 --- a/main.py +++ b/main.py @@ -18,12 +18,14 @@ pandas.set_option("display.max_rows", 150, "display.max_columns", 20, ) data_L6 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L6.csv", sep=",") data_L9 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L9.csv", sep=",") +data_L11 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L11.csv", sep=",") data_L14 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L14.csv", sep=",") data_L1 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L1.csv", sep=",") # Update cells (fill color in sheet boundary) up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.single_sheet_namelist[2]) up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[3]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L11.csv"), f_i.single_sheet_namelist[5]) up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[8]) up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[9]) @@ -32,6 +34,8 @@ print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") handle_csv.send_mail(data_L9, f_i.L9_video_id_dic, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[3]) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") +handle_csv.send_mail(data_L11, f_i.L11_video_id_dic, f_i.spreadsheet_id_dic.get("L11.csv"), f_i.single_sheet_namelist[5]) +print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") handle_csv.send_mail(data_L14, f_i.L14_video_id_dic, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[8]) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") handle_csv.send_mail(data_L1, f_i.L1_video_id_dic, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[9]) From 3264f79617af76c8edd73ab06d216ec8df216691 Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Thu, 31 Aug 2023 03:38:39 +0800 Subject: [PATCH 11/27] update --- .../__pycache__/download_file.cpython-310.pyc | Bin 1389 -> 1389 bytes .../__pycache__/handle_csv.cpython-310.pyc | Bin 1399 -> 1399 bytes .../__pycache__/share_file.cpython-310.pyc | Bin 3513 -> 3513 bytes .../update_cell_color.cpython-310.pyc | Bin 2973 -> 2973 bytes main.py | 20 +++++++++++------- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Sharely/__pycache__/download_file.cpython-310.pyc b/Sharely/__pycache__/download_file.cpython-310.pyc index bd00b8eac5a95d86cddb6fbf0c1e17be7e7cf859..c6c391e8211069a36ba5dc76a39ee47dcea58d46 100644 GIT binary patch delta 20 acmaFM^_Gh}pO=@50SI{f-f!eiVg&#=GX(hn delta 20 acmaFM^_Gh}pO=@50SL0i-)-bhVg&#>eFY!@ diff --git a/Sharely/__pycache__/handle_csv.cpython-310.pyc b/Sharely/__pycache__/handle_csv.cpython-310.pyc index aff9a570282ccb7eeb346329a0e0f2992e412aad..9d5f59371e19ab76387320114bc911c2c4783a52 100644 GIT binary patch delta 20 acmey)^_`15pO=@50SI{f-f!g2VFds=!vz-r delta 20 acmey)^_`15pO=@50SL0i-)-d1VFds?4Fx^` diff --git a/Sharely/__pycache__/share_file.cpython-310.pyc b/Sharely/__pycache__/share_file.cpython-310.pyc index 5fbfb92b7a8a9d8b5d90d1c40443f769976a280f..48df2f677ef9dcfe52a06b5d9957f2b9f7092f8a 100644 GIT binary patch delta 20 acmdlfy;GVypO=@50SI{f-f!ey#|r>6e+35s delta 20 acmdlfy;GVypO=@50SL0i-)-bx#|r>7$ptO| diff --git a/Sharely/__pycache__/update_cell_color.cpython-310.pyc b/Sharely/__pycache__/update_cell_color.cpython-310.pyc index 8583bb789f7e1c4afd25ed5b693df387a0d01e81..b402d7f9802c4a2e78cde6829568366a2435c6c2 100644 GIT binary patch delta 20 acmbO$K3AMOpO=@50SI{f-f!fd#0>y0jRdIx delta 20 acmbO$K3AMOpO=@50SL0i-)-cc#0>y1*96c2 diff --git a/main.py b/main.py index 5c43e25..8901a77 100644 --- a/main.py +++ b/main.py @@ -17,6 +17,7 @@ # Access csv files pandas.set_option("display.max_rows", 150, "display.max_columns", 20, ) data_L6 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L6.csv", sep=",") +data_L7 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L7.csv", sep=",") data_L9 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L9.csv", sep=",") data_L11 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L11.csv", sep=",") data_L14 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L14.csv", sep=",") @@ -24,21 +25,24 @@ # Update cells (fill color in sheet boundary) up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.single_sheet_namelist[2]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[3]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L11.csv"), f_i.single_sheet_namelist[5]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[8]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[9]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L7.csv"), f_i.single_sheet_namelist[3]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[4]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L11.csv"), f_i.single_sheet_namelist[6]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[9]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[10]) # Send mail handle_csv.send_mail(data_L6, f_i.L6_video_id_dic, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.single_sheet_namelist[2]) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") -handle_csv.send_mail(data_L9, f_i.L9_video_id_dic, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[3]) +handle_csv.send_mail(data_L7, f_i.L7_video_id_dic, f_i.spreadsheet_id_dic.get("L7.csv"), f_i.single_sheet_namelist[3]) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") -handle_csv.send_mail(data_L11, f_i.L11_video_id_dic, f_i.spreadsheet_id_dic.get("L11.csv"), f_i.single_sheet_namelist[5]) +handle_csv.send_mail(data_L9, f_i.L9_video_id_dic, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[4]) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") -handle_csv.send_mail(data_L14, f_i.L14_video_id_dic, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[8]) +handle_csv.send_mail(data_L11, f_i.L11_video_id_dic, f_i.spreadsheet_id_dic.get("L11.csv"), f_i.single_sheet_namelist[6]) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") -handle_csv.send_mail(data_L1, f_i.L1_video_id_dic, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[9]) +handle_csv.send_mail(data_L14, f_i.L14_video_id_dic, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[9]) +print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") +handle_csv.send_mail(data_L1, f_i.L1_video_id_dic, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[10]) print("~End~====================================================================================================", handle_csv.today_str) From 16bf597be7613c91a931fe03c76f6324e74ace73 Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Sat, 2 Sep 2023 03:10:51 +0900 Subject: [PATCH 12/27] nothing --- .../files_information.cpython-310.pyc | Bin 5855 -> 6413 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Sharely/__pycache__/files_information.cpython-310.pyc b/Sharely/__pycache__/files_information.cpython-310.pyc index 56e57eddf93b950faa4cc3c26512c41e990ca9ee..0294ea40997ddfc95bec39574a34928dcc8da8ac 100644 GIT binary patch delta 867 zcmXYw%X8ag6vd-7F_6R#rFpajIuoWd3{#x3Y}vA)P-Huj?f7lkip0ZII+7o;C0Rm# zXhC?tTk6qLrEZDPSUE%4sIcMga`@47ZJ&oRvN6c_|VVJvPR-a`0dQzj6>HeSY6yn<`k!7lc&kL$RBS1-2Y)rECEgf|0sW$|GDJh8NE zppZlgG}2)34&KEbyodL3cbTr^1F*;-iyV%@fkz$%6mhalLnxt)3aY4~jz+My2>~s% zAqGocz$qli_z)lAV|;=RKE*vKP?xhWZUNAsql@0fntwzbth>R`hF>H0=`WX+O?-u~ z@eRJkclaJZ;79y~pYaRsFVn5=3LZQn4fBOsb9Z$0!sCmtTjZ<7^ua5mJHG)jDo z8;hy7B{BtNq=OuED7o!Pg)vW4tUKs(;$Wm?5;JaI z8EQdAV|(KC_f4HL2eeGLW8NX@RymIzj2k?ya+8x(w!k}1vUVP8 z=G-b3!q_D9y{KCn`Hh z7)h=bC7Y!}Rd#0qWlReidpw_HDwYAM?wWnUK56T6R>`pQTBr3tWkeT-_o%b-dCczc zd{P&LeAJWWk?r>5vc*;c3?1W)#DHa{;|$sDn66_{<&KcH1XFd@mcj>>QRB2&*TtkX zl`>3|6O6OQoQ$U#Pgc5dPn!glPGMZ?l_#mGXE6@SaSBe#7A;XW%`U5vw{pQXB-Lf& zW^2yQEYLA!oE7rDS+UkT&JUxMEh?AWFa5beZ2JFPyGzji)tx_xZU66`O5ktq#)!ZC l>h2ezgW&7f2mX^?op|iu*}D;1B|`tLh5g0eO~1c4c?P8B6kGrR delta 357 zcmZ9Ixk>|J6ovCoRwk3UCX=WH1yOXj=VPcFh zY91bAoCzkGGE)cB%rHxwITFmXK$1n4SpM5}vcf8B7_4V)hKmh0* Date: Sat, 2 Sep 2023 03:16:35 +0900 Subject: [PATCH 13/27] update time --- Sharely/share_file.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Sharely/share_file.py b/Sharely/share_file.py index bd59a80..bdc3cdf 100644 --- a/Sharely/share_file.py +++ b/Sharely/share_file.py @@ -1,6 +1,6 @@ from __future__ import print_function -from datetime import date, datetime, timedelta +from datetime import datetime, timedelta from googleapiclient.discovery import build from googleapiclient.errors import HttpError from google.oauth2.credentials import Credentials @@ -43,11 +43,12 @@ def callback(request_id, response, exception): ids.append(response.get('id')) # pylint: disable=maybe-no-member - this_month = datetime.now().month - today = datetime.now().day + if offset == -2: offset = 0 - expire_date = f"{date.today()+timedelta(days=1 + offset)}T23:59:59+08:00:00" + + current_date_utc8 = datetime.utcnow() + timedelta(hours=8) + expire_date_utc8 = current_date_utc8 + timedelta(days=1 + offset) batch = service.new_batch_http_request(callback=callback) @@ -56,11 +57,11 @@ def callback(request_id, response, exception): # https://stackoverflow.com/questions/75423531/google-service-account-drive-api-unable-to-set-expirationtime-python user_permission = {'type': 'user', 'role': 'reader', - "expirationTime": expire_date, + "expirationTime": f"{expire_date_utc8.strftime('%Y-%m-%d')}T23:59:59+08:00:00", 'emailAddress': real_user } - email_message = f"觀看時間至{this_month}月{today + 1 + offset}日 23:59\n\n【智慧財產權】\ + email_message = f"觀看時間至{expire_date_utc8.month}月{expire_date_utc8.day}日 23:59\n\n【智慧財產權】\ \n請本人在觀看雲端影片時，嚴禁下載、翻錄雲端影片內容，或是提供給第三人做使用。\n\n【貼心提醒】\n若覺得不清楚的話，\ 建議改用筆電或電腦(螢幕較大之設備)觀看，並且把畫質調成1080p(點選「設置」→「畫質」→「1080p」，若無自動調整請重複操作一次)，會比較清楚。\ \n\n【問題排除】\n如遇播放影片時發生問題，請改用「無痕模式」(或「私密瀏覽」...等)試試看，如仍無法觀看請與助教聯繫。" From c8ea16a9d21c726da71c2139f324c8ea645b257f Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Sat, 2 Sep 2023 03:20:34 +0900 Subject: [PATCH 14/27] update time --- main.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index 8901a77..5b677ea 100644 --- a/main.py +++ b/main.py @@ -3,10 +3,17 @@ from Sharely import update_cell_color as up_color # Files information from Sharely import files_information as f_i +from datetime import datetime, timedelta +# Get time +current_date_utc8 = datetime.utcnow() + timedelta(hours=8) +this_month = current_date_utc8.month +today = current_date_utc8.day +today_str = str(this_month) + "/" + str(today) + print("Start----------------------------------------------------------------------------------------------------", - handle_csv.today_str) + today_str) # Update csv files for index, spreadsheet_name in enumerate(f_i.spreadsheet_id_dic): @@ -45,4 +52,4 @@ handle_csv.send_mail(data_L1, f_i.L1_video_id_dic, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[10]) print("~End~====================================================================================================", - handle_csv.today_str) + today_str) From 250c761f02553774ba78a381b25b1e587d74523c Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Sat, 2 Sep 2023 03:22:11 +0900 Subject: [PATCH 15/27] update time --- Sharely/handle_csv.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Sharely/handle_csv.py b/Sharely/handle_csv.py index 1a8b9f3..eb0e72e 100644 --- a/Sharely/handle_csv.py +++ b/Sharely/handle_csv.py @@ -1,9 +1,16 @@ -from datetime import datetime +from datetime import datetime, timedelta from Sharely import update_cell_color as up_color from Sharely import share_file def send_mail(data, file_ids_dic, spreadsheet_id, sheet_name): + + # Get time + current_date_utc8 = datetime.utcnow() + timedelta(hours=8) + this_month = current_date_utc8.month + today = current_date_utc8.day + today_str = str(this_month) + "/" + str(today) + # Processing required information row_size = data.shape[0] column_size = data.shape[1] @@ -45,9 +52,3 @@ def send_mail(data, file_ids_dic, spreadsheet_id, sheet_name): for file_id in file_ids: share_file.share_file(file_id, gmail, offset, max_date) print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~") - - -# Get time -this_month = datetime.now().month -today = datetime.now().day -today_str = str(this_month) + "/" + str(today) From 49d053260256e1d4de7288f2902f9f4126be941b Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Mon, 30 Oct 2023 23:43:44 +0800 Subject: [PATCH 16/27] update --- .../__pycache__/download_file.cpython-310.pyc | Bin 1389 -> 1389 bytes .../files_information.cpython-310.pyc | Bin 6413 -> 6971 bytes .../__pycache__/handle_csv.cpython-310.pyc | Bin 1399 -> 1472 bytes .../__pycache__/share_file.cpython-310.pyc | Bin 3513 -> 3530 bytes .../update_cell_color.cpython-310.pyc | Bin 2973 -> 2973 bytes Sharely/share_file.py | 2 +- main.py | 37 +++++++++++------- 7 files changed, 24 insertions(+), 15 deletions(-) diff --git a/Sharely/__pycache__/download_file.cpython-310.pyc b/Sharely/__pycache__/download_file.cpython-310.pyc index c6c391e8211069a36ba5dc76a39ee47dcea58d46..ad8114f7ab1a6f5d1e8795d61c1ac91cd594fcbc 100644 GIT binary patch delta 20 acmaFM^_Gh}pO=@50SKmOf7-~M#0mgAC=`DQHw7WsutFdqEBxxcfxy6@0Gh1}-;{*^8A?l`Dc z@b=n$MBQ7za4QP;<(@*}0M~FG58+`vf*Ux52VOji$8eLl+c?7Gcmhx2DIDWz+`==s zjc4&3o+qwjec!Va+(_s8ThHpnjeGzcqTnGQhBy*P;v6ZYk=eK|WRXK2A_^#?M0zEZ zQ9%_oLfnB21$Xcg?&4+C@d{Kl&;&NKyJ(?}4!Y=FI+X{}hlT-k7%(x!=oDj2FvSdW zg1Q0=3tV7{SMeHN#~WDTO}vG-H>j)jkn)7@ZS)@A#eJ;t9&Egi5AY#A!pHaopKjd! z&K5rVic;LTR1QFuwoX3(`U`5?ubc)lNsdwcv++Er7tD#j++oxl9gODtwd`4Q9`DUA zX01k}&2+fP$)5eC-h8fN;wYX<&L#5)X+RuYMrS`j15`0l(Z_S(%1@@ zd&}d1UhntBDlISNehQjgOg1J=)NB|&)|?BorbQ^_K4T2Zx)f9l`h0*GD-I_8L?&T{ z*;u*4ON3Hhmd0Yb=i_2@I+B~zxNL595o~JbJfE4Tr| z2&9_He)hZ+;c&)4*L0>5?+}cnFA9=a5Gq}xr(zIkCHQ!q^I5&Ns7s+zjZj9(WrELY zB9|CelL3um<7P)N9cktK_n>Ds1T|2W~%YLcXpls0gtvOZ2$lO delta 387 zcmW-dw@*TG6h?WECp<+^Y!AT-*63u6akTf2^(oe4FW7tEE#$X2FzIeg98FC83*3xO zF3!3+IQigCC%HM_z4@LhF3KE1yFJciOz`Fhi#O!RkXAw^zM8O2mvE3kB2JP>CWTbe z&~TBCI~=dec*r1=EV9WV7cV~Y$ftlpV{4`;bgfwCQ}OlPvn0#KHt}r^Jo=SSXN2FiH}T@CloG_B>qC5{7g{_{2C61m W7H95M^RHqTlBYtvx^+dhs>(l5B6i&X diff --git a/Sharely/__pycache__/handle_csv.cpython-310.pyc b/Sharely/__pycache__/handle_csv.cpython-310.pyc index 9d5f59371e19ab76387320114bc911c2c4783a52..8bfebc99331bc40f5b0528336f74ffaac4040a77 100644 GIT binary patch literal 1472 zcmbspO^X~ww5s}ZdS-e)vSEzm;6=kAI2S>|AVS285(2?XqcokV+L_Mw$81%#aYMDN zj8`Fd6=uA75WMImS5M|26!D~c7(D5553a9zb~Y<`2v|kEdf)xttM|I>b^`?KmskIy zfBFdhW{As+0PzkS@j3vCD9%uhB9!9@V?&dSL`2s~Qb?>6Fw*gBu zCfcWoWHQZ}ZW%~fCX+GNgKA*}@swp*JT0@512YiwgtK@*&Dhj7_UG#=+-*3w;E1Of zA&FLajU=I%k}vTH)wZ(lTeSnwu3hOUXNjpbLV&qTBli@#?^633s{ICY0BcE4`AhsR z`uOKM0IshB>h2Sev}dU9P_OP%zYe8GTdK7rp!cZmfnG}ms@LfCRbP1rgg;Su1-v!p zPh@-50YAm#ck)WiCU8mOVVvTxDgfQZ=z)duU&RcF=Rd00b%RhM?&Ky?>< zg*#u=fo&_IthI;H;ae9Ty5Qm4=kfs0^Pe8VCW8<%>#5!~G(yyeiiOYZ)43E?mwE>l z|3mhnM(riR2(XUo8ccPdfdJ;iD zIP-b;(QNZEXHhnF*+AuA5Vns4 z`~ta7`hZ=>;l(|~hVvpO$36)_$HzlB bcnQ1$QtjW&OIl^@ZPSXvj6@%GFl_4|G~|%% literal 1399 zcmbtT&5ImG6t9o|?w-l+UM7iq5N~tPIeG~qBzO^)KnO^oG@YrMna=jdY*mlRhU%~| zx#SklD$E=e1PSORNBs*t7I@M<%*lHWuCID`Hj5wxtfpT5-mCY1{p!`Ly4Q;kjO5@i z{#Ag`A6B_KC@3GpRG)$1h~om4h#_n-DR4;`?Jx!GFbA;1-Dilo03HR@zVXy&qG{h$0StFXf6o7XZbE~CeQ55O8E@}zJNX;@S(n(&3 zv15ZS#xATe%-b;4_ZT6K9zwP^Q0sJv0CF3woh815zWBBEz)G~o>BR2%Q`83BX+!R| zQ3DxjcS*qSMH_=3)t-(!zeFdEb4cV%jaROY*I2%6yp<0;WPo(6$(nvn+g{smuj!ud z>uVFr{X?P-F0}xnXF6B~TZT2pNQXT95Vaw2gr#en~V zA?{8P!O0>W-#`Pz-2rN&x8@{QvI@C#Nab%$3^nqX1S3F!4lU9FR4{6Hnq-ye9qsE- zM{DSiqhFesCrdc@QJ*8Y{oa9u3qu<#7JC+b{p$3G7n|izf4=(p^qU_~zdhOfeRg*C z8o#@7VS7lWUET;V*w{B>L;me%_qT3cur)ln_4I#?Vb8eGjdNjKnN?F^NY)sdg9w|N zXUC~(q@h#Mm|!tKZ(!C3^-4nT;^3HZGR7UjRUVBV~K6~ zH0LVi`PlT;T#AgVnE<|=Gk6vjRaq%mAnQk|%AW`ppA&Y9p&~-wH;h;1DH+sF?GhSP14{#D0h5O-S(dr=$ByNHvo6gS?ulT+Bvy zWj&QyS?1MrboaQK)z#>BQ7`x>aD;pI{T9cg?K;aU4hI{nFF%+cn@~YDQk$a(-0BX9 zh(tJ{ec})YJGc*DfFpdJ?2{cp`?!C(?qO@WiOER-F%jTBnB>IyUGCdV@#tXKleRUC zfARaS@Nx%CU9~$uL#z6cam%`DW-MxExk@{1C|s&>ySp_ME?4$#oGro?@s6brZk07( W6yhV>Wy-oGD8UI1X!Jhhj{gBY?REeF diff --git a/Sharely/__pycache__/share_file.cpython-310.pyc b/Sharely/__pycache__/share_file.cpython-310.pyc index 48df2f677ef9dcfe52a06b5d9957f2b9f7092f8a..2a5f219c2f406cf0de2128eaf5c91bb76c0466e4 100644 GIT binary patch delta 896 zcmYLG%}*0S6rY*>=ypHaQc4jKM5UUBPzgpsVu%4T(ZrJ&!zQv>I}0uBvUPSh2${-3 z51PoK*@H3Aq&@Hl7*5_ic=G0T@0xh^ZsN>xV0Y%d-|xMd_cdQfe~cQwVW@z8`T4*2 zd&d}CUuOgZ3|-(s6GD!Wi#%i^PcVg)3$Ex%rj%mQmA#CaNwMTAUe?T}SawxUGj)bD zo6t0{g0t^{nd^KUhp6+#&*fMeo>*Wzn2c+%4BdDIUOk`)XSNZ!f|WK3HH zX`ShzuGH44fXmwgc|mnNOa*4W&^-|50CVVgB-Luqpi(c_2U~e6Q=Mw~A|5>y`)n{& z?G^d}g6H5pcnU-i4(xRxXd4jh7s4XGM2#cRMQ`~C$3C!AYfQI|HwHg_hIZjDsE*qr z0$|Aw>y3$)Lr$CMM0ldGsZ?PiHT;MKf8ZGtvAq{mAsJ#c5u?B%iA)?DJ7iy}tW8(E z=?dO2uFl?CxP6zcshRnOnHjd?W%<$IW0vIir;~})JMnCFd20Ujvpgq4E&i$A7Y0ct zE@=x7Bo>?SH%a6utnc`{MC7Erxqc* zFa7c&?=dNF`u?Wt*sW&WZL*ST4k11X2(LRCIdj&0I|>`KwK{PyJJPh>fQ@O%m|eNX mLsq!p`AAysxhU}%%017=k?Sn-*9!_v=%9dfnEpscy6_)=lhvjG delta 884 zcmYLG%TLrm7@wIww%gY(%fiaTM*s~Q5+oRcqCsQC=s_=-5PR7armzd`7N@g8NGk_D z;DH0_K@%j|jWLF+octHOdF{=MS8v`-{HB=LnSS$|`M%%x{5JA+#0o7-NAQ_Xf6@0x z*2UFTxKKo~j{@vqEHLp&AURS%91_TmoWDuF5~z-vW7#hRnxo}d@r!}(=s8w>BQPBc zaA5;GHq~hH4RT6H2bT&`CR3MtN1wy1B?u@|kl>FdF+v=5F(;c6#Wlp`9!ccAc6u9+ z?Q^wT=%Gz5(f*-gQj7^LY!Nm^wS;iJYxEE|DZJJY)ephJF`~u^N%UCRwBiCa4{>5p zi`uasV_NzkCnhb&8d&wkMOv&O!Gv4oL`kezqWxPEYs40<#?tXVq5~(=JOYJ92lLbD z+Og6tK~m*djjhXO8I$0R^s!>XY53o!s9)1#&f>h+fI318785S0=kHjy!;NOWDt8lX|YL?Ku# z_0Mqn#k@8?2e$QcrZ*bv9o_*i4F*-7SCJ!FN)H#!HqE7@I80CwdS|HHlOww z3t7ZO8QIXeayoQ7yg56)#ykopE!U5rJImJW(wOi&A%qCZ@*@6=yb|qB5YmqCEs7yU QWe_H+5)y0jRdIx diff --git a/Sharely/share_file.py b/Sharely/share_file.py index bdc3cdf..899242f 100644 --- a/Sharely/share_file.py +++ b/Sharely/share_file.py @@ -61,7 +61,7 @@ def callback(request_id, response, exception): 'emailAddress': real_user } - email_message = f"觀看時間至{expire_date_utc8.month}月{expire_date_utc8.day}日 23:59\n\n【智慧財產權】\ + email_message = f"觀看時間至{expire_date_utc8.month}月{expire_date_utc8.day}日 23:59 UTC+8\n\n【智慧財產權】\ \n請本人在觀看雲端影片時，嚴禁下載、翻錄雲端影片內容，或是提供給第三人做使用。\n\n【貼心提醒】\n若覺得不清楚的話，\ 建議改用筆電或電腦(螢幕較大之設備)觀看，並且把畫質調成1080p(點選「設置」→「畫質」→「1080p」，若無自動調整請重複操作一次)，會比較清楚。\ \n\n【問題排除】\n如遇播放影片時發生問題，請改用「無痕模式」(或「私密瀏覽」...等)試試看，如仍無法觀看請與助教聯繫。" diff --git a/main.py b/main.py index 5b677ea..e006571 100644 --- a/main.py +++ b/main.py @@ -23,33 +23,42 @@ # Access csv files pandas.set_option("display.max_rows", 150, "display.max_columns", 20, ) +data_L4 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L4.csv", sep=",") data_L6 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L6.csv", sep=",") data_L7 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L7.csv", sep=",") -data_L9 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L9.csv", sep=",") -data_L11 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L11.csv", sep=",") -data_L14 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L14.csv", sep=",") +# data_L9 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L9.csv", sep=",") +# data_L11 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L11.csv", sep=",") +# data_L14 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L14.csv", sep=",") data_L1 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L1.csv", sep=",") +data_L2 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L2.csv", sep=",") # Update cells (fill color in sheet boundary) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L4.csv"), f_i.single_sheet_namelist[0]) up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.single_sheet_namelist[2]) up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L7.csv"), f_i.single_sheet_namelist[3]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[4]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L11.csv"), f_i.single_sheet_namelist[6]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[9]) +# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[4]) +# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L11.csv"), f_i.single_sheet_namelist[6]) +# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[9]) up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[10]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L2.csv"), f_i.single_sheet_namelist[11]) + # Send mail +handle_csv.send_mail(data_L4, f_i.L4_video_id_dic, f_i.spreadsheet_id_dic.get("L4.csv"), f_i.single_sheet_namelist[0]) +print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L06 is below") handle_csv.send_mail(data_L6, f_i.L6_video_id_dic, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.single_sheet_namelist[2]) -print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") +print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L07 is below") handle_csv.send_mail(data_L7, f_i.L7_video_id_dic, f_i.spreadsheet_id_dic.get("L7.csv"), f_i.single_sheet_namelist[3]) -print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") -handle_csv.send_mail(data_L9, f_i.L9_video_id_dic, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[4]) -print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") -handle_csv.send_mail(data_L11, f_i.L11_video_id_dic, f_i.spreadsheet_id_dic.get("L11.csv"), f_i.single_sheet_namelist[6]) -print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") -handle_csv.send_mail(data_L14, f_i.L14_video_id_dic, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[9]) -print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<|") +# print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L09 is below") +# handle_csv.send_mail(data_L9, f_i.L9_video_id_dic, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[4]) +# print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L11 is below") +# handle_csv.send_mail(data_L11, f_i.L11_video_id_dic, f_i.spreadsheet_id_dic.get("L11.csv"), f_i.single_sheet_namelist[6]) +# print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L14 is below") +# handle_csv.send_mail(data_L14, f_i.L14_video_id_dic, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[9]) +print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L01 is below") handle_csv.send_mail(data_L1, f_i.L1_video_id_dic, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[10]) +print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L02 is below") +handle_csv.send_mail(data_L2, f_i.L2_video_id_dic, f_i.spreadsheet_id_dic.get("L2.csv"), f_i.single_sheet_namelist[11]) print("~End~====================================================================================================", today_str) From 44f7e2eba1af1f9f6556dd8fc5313f7e86f6eef0 Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Tue, 31 Oct 2023 00:31:04 +0000 Subject: [PATCH 17/27] requirements.txt update --- requirements.txt | 29 +++-------------------------- requirements2.txt | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 26 deletions(-) create mode 100644 requirements2.txt diff --git a/requirements.txt b/requirements.txt index a73c2f6..f300f3c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,26 +1,3 @@ -cachetools==5.3.0 -certifi==2022.12.7 -charset-normalizer==3.1.0 -google-api-core==2.11.0 -google-api-python-client==2.81.0 -google-auth==2.16.2 -google-auth-httplib2==0.1.0 -google-auth-oauthlib==1.0.0 -googleapis-common-protos==1.58.0 -httplib2==0.21.0 -idna==3.4 -numpy==1.24.2 -oauthlib==3.2.2 -pandas==1.5.3 -protobuf==4.22.1 -pyasn1==0.4.8 -pyasn1-modules==0.2.8 -pyparsing==3.0.9 -python-dateutil==2.8.2 -pytz==2022.7.1 -requests==2.28.2 -requests-oauthlib==1.3.1 -rsa==4.9 -six==1.16.0 -uritemplate==4.1.1 -urllib3==1.26.15 +google_api_python_client==2.97.0 +pandas==1.3.4 +protobuf==3.19.1 diff --git a/requirements2.txt b/requirements2.txt new file mode 100644 index 0000000..a73c2f6 --- /dev/null +++ b/requirements2.txt @@ -0,0 +1,26 @@ +cachetools==5.3.0 +certifi==2022.12.7 +charset-normalizer==3.1.0 +google-api-core==2.11.0 +google-api-python-client==2.81.0 +google-auth==2.16.2 +google-auth-httplib2==0.1.0 +google-auth-oauthlib==1.0.0 +googleapis-common-protos==1.58.0 +httplib2==0.21.0 +idna==3.4 +numpy==1.24.2 +oauthlib==3.2.2 +pandas==1.5.3 +protobuf==4.22.1 +pyasn1==0.4.8 +pyasn1-modules==0.2.8 +pyparsing==3.0.9 +python-dateutil==2.8.2 +pytz==2022.7.1 +requests==2.28.2 +requests-oauthlib==1.3.1 +rsa==4.9 +six==1.16.0 +uritemplate==4.1.1 +urllib3==1.26.15 From 0e3c1a4120c3e12cf8a4958d80e0a39f7d3dac59 Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Thu, 2 Nov 2023 03:30:34 +0800 Subject: [PATCH 18/27] prevent RATE_LIMIT_EXCEEDED --- main.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/main.py b/main.py index e006571..d05a4e8 100644 --- a/main.py +++ b/main.py @@ -4,6 +4,7 @@ # Files information from Sharely import files_information as f_i from datetime import datetime, timedelta +import time # Get time @@ -45,10 +46,13 @@ # Send mail handle_csv.send_mail(data_L4, f_i.L4_video_id_dic, f_i.spreadsheet_id_dic.get("L4.csv"), f_i.single_sheet_namelist[0]) +time.sleep(3) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L06 is below") handle_csv.send_mail(data_L6, f_i.L6_video_id_dic, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.single_sheet_namelist[2]) +time.sleep(3) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L07 is below") handle_csv.send_mail(data_L7, f_i.L7_video_id_dic, f_i.spreadsheet_id_dic.get("L7.csv"), f_i.single_sheet_namelist[3]) +time.sleep(3) # print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L09 is below") # handle_csv.send_mail(data_L9, f_i.L9_video_id_dic, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[4]) # print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L11 is below") @@ -57,6 +61,7 @@ # handle_csv.send_mail(data_L14, f_i.L14_video_id_dic, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[9]) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L01 is below") handle_csv.send_mail(data_L1, f_i.L1_video_id_dic, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[10]) +time.sleep(3) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L02 is below") handle_csv.send_mail(data_L2, f_i.L2_video_id_dic, f_i.spreadsheet_id_dic.get("L2.csv"), f_i.single_sheet_namelist[11]) From 71aaf6c868da3ebad0bb436aa8a07681409ed992 Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Wed, 15 Nov 2023 16:45:50 +0800 Subject: [PATCH 19/27] update --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index d05a4e8..f3802ce 100644 --- a/main.py +++ b/main.py @@ -52,7 +52,7 @@ time.sleep(3) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L07 is below") handle_csv.send_mail(data_L7, f_i.L7_video_id_dic, f_i.spreadsheet_id_dic.get("L7.csv"), f_i.single_sheet_namelist[3]) -time.sleep(3) +time.sleep(10) # print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L09 is below") # handle_csv.send_mail(data_L9, f_i.L9_video_id_dic, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[4]) # print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L11 is below") From 4b928fd7740a608cfb9b533b7236ff313fa5a5c6 Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Mon, 20 Nov 2023 11:13:09 +0800 Subject: [PATCH 20/27] update --- main.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/main.py b/main.py index f3802ce..5821dcb 100644 --- a/main.py +++ b/main.py @@ -18,13 +18,14 @@ # Update csv files for index, spreadsheet_name in enumerate(f_i.spreadsheet_id_dic): - download_file.update_file( - spreadsheet_name, f_i.spreadsheet_id_dic.get(spreadsheet_name), f_i.single_sheet_namelist[index] - ) + if index in to_download: + download_file.update_file( + spreadsheet_name, f_i.spreadsheet_id_dic.get(spreadsheet_name), f_i.single_sheet_namelist[index] + ) # Access csv files pandas.set_option("display.max_rows", 150, "display.max_columns", 20, ) -data_L4 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L4.csv", sep=",") +# data_L4 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L4.csv", sep=",") data_L6 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L6.csv", sep=",") data_L7 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L7.csv", sep=",") # data_L9 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L9.csv", sep=",") @@ -34,7 +35,7 @@ data_L2 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L2.csv", sep=",") # Update cells (fill color in sheet boundary) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L4.csv"), f_i.single_sheet_namelist[0]) +# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L4.csv"), f_i.single_sheet_namelist[0]) up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.single_sheet_namelist[2]) up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L7.csv"), f_i.single_sheet_namelist[3]) # up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[4]) @@ -45,8 +46,8 @@ # Send mail -handle_csv.send_mail(data_L4, f_i.L4_video_id_dic, f_i.spreadsheet_id_dic.get("L4.csv"), f_i.single_sheet_namelist[0]) -time.sleep(3) +# handle_csv.send_mail(data_L4, f_i.L4_video_id_dic, f_i.spreadsheet_id_dic.get("L4.csv"), f_i.single_sheet_namelist[0]) +# time.sleep(3) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L06 is below") handle_csv.send_mail(data_L6, f_i.L6_video_id_dic, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.single_sheet_namelist[2]) time.sleep(3) From 55ebd3c0f91cf7c888ae8a0725c1f21d269b2fa1 Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Tue, 21 Nov 2023 00:15:04 +0800 Subject: [PATCH 21/27] update --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 5821dcb..054f125 100644 --- a/main.py +++ b/main.py @@ -18,7 +18,7 @@ # Update csv files for index, spreadsheet_name in enumerate(f_i.spreadsheet_id_dic): - if index in to_download: + if index in f_i.to_download: download_file.update_file( spreadsheet_name, f_i.spreadsheet_id_dic.get(spreadsheet_name), f_i.single_sheet_namelist[index] ) From 21003d3787c20a4f77f98bda5e6a82fd6d096ff2 Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Sat, 25 Nov 2023 03:54:50 +0000 Subject: [PATCH 22/27] main.py update --- .gitignore | 3 ++- Sharely/__pycache__/__init__.cpython-310.pyc | Bin 166 -> 149 bytes .../__pycache__/download_file.cpython-310.pyc | Bin 1389 -> 1372 bytes .../files_information.cpython-310.pyc | Bin 6971 -> 6982 bytes .../__pycache__/handle_csv.cpython-310.pyc | Bin 1472 -> 1455 bytes .../__pycache__/share_file.cpython-310.pyc | Bin 3530 -> 3513 bytes .../update_cell_color.cpython-310.pyc | Bin 2973 -> 2956 bytes main.py | 8 ++++++-- 8 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 58f3bb2..9201c02 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ Service_account_credentials/* data/* !data/.gitkeep log/* -!log/.gitkeep \ No newline at end of file +!log/.gitkeep +venv diff --git a/Sharely/__pycache__/__init__.cpython-310.pyc b/Sharely/__pycache__/__init__.cpython-310.pyc index 2efd633d5bb477ac9bedc5752f4b4cca337afed7..a3bb63c0f0283590459bfe3da98b7ac90761f2aa 100644 GIT binary patch delta 44 ycmZ3+IF*qnpO=@50SG3xhNMp9u@{6I0SP3FXz#^U4AIse&S-9LCGn)i#wDAe{DJ;d# z2eBB$H}C}n#kq?`wwRq^=KFoK`xSnKQPFOPTXJ5X?%*XFId1OQTj#yW?()3vupPSH z6KeRi&Ak@&k9)Dl5tRrkr5S)B z_NHLij=iJ9j@Ys<`kcLlmfTpOHh^p&z3v0=Y^Y+L@-FFonn7G+;#|#vg9ITZnXJh% z0WNg{-1)EPU{oqwVo({i)GnhHR)+S|@5vYZ`h(uS)Ob*ZYM^FpgrOY= F$A696ifjM? delta 414 zcmYk2&q~8U5XNnqv^J!zf{K5z1#d+(7eVMnC(WORjM-VI z1ll!PCr}|jjZi{Uq(L$b@sdQ?_mvO!gt7^e5-4*^36&t|2jikt(QihN)jvje3miEi z^g|gVDw&rfRG_cQhr2bl%}v&)c{z}?yfP=DkU&3`TaVCKQF$VSO)1hSL9f7gsXs=r z0>V)8WrBjS=qh--`1ZPD8HJG#r(u-mG-*S+qW zL88ioKR^Tz5)9 zhNBGS7=e)(g@|yi7>x>y!B~t#CB~x))tG>Zn8a>w=89^sWogSiQFkw7X-6IEu?UN? z1Py2udzWGvmSY80ibMyZScTPCgC;a%En;XvD*%mW^RNzWh$DgZ{nltcHXw<1Y=n+Y z*o+j?=s+j7pi3k&tSlz776N^WtW&@=8m+@bM;EitI!ov`tSz}zACVguJjwcM?pk|_hEgsgWGfc+ z8rxC9yEf{4Z==}?J8`p}DyQvpCKpnBkf0I<5kiFDIi$h@S%p*)p_ou&1RQfkM3aMp zdK?t`ko59JJ6H14@6EYCx%_fTYt zd4_qzb6Hf{ytMq8w>&VwDlzQiVIL2(zQOtx^QVu7+x+An@&A3=fxgcG2h9e=L9?{k zG(P%iRaF6nH5QQWV||PHhG_}V!eoHltITf!>MtrJPG`oL`wOY(G1D6)cS4XV-9but z$DFTHC8G-W+I7_}HI-Gy^>(eYHPMmkOvjR1I-Q7B&P?i^n4L&!4e?k?OLj+mrmUw; ze|l3&iy_$U;~Hh5nPOi&G`zs{E~u*h w$GsS8FWp5SkMN^*fTI{w!qXggh3m+XWuqq?aLAJFi$k$m45_Hbcp6Ur0uTt7t^fc4 delta 1321 zcma)(OHhqr7{~k0rE|Y@>U5MsB{?cbsf2Q?D3Zwai%I-HozGN<@3@sqLT(ZH$~9wH zS-8xw(2NBuw#JMWv0!018w+EDae1F-#*8s7oW*bc=l?wK|9Rf;eOB_g#1(P5>~Z4P zXq1$qepkBG*Pk0Sz|+5RT-T6OHXse@n1G3xgbZXN3zLzJDagT8Q8glnX~;z$@-ZDD z%s>GOF%v~xHK7pnIi&pO&yf!8WuY40XsP+pt|PlX!PK_F^A8(24yx zfP*-ME*wTTj_?Erj^Y@4a2zLa5~pw)y*Puj=;Nvr=WrhVxBwjk7{o))k(!JvV-&TvZbouN^%+(`Pl zaX?TrWeN^5hfP&N|74wECcn}g7QD;)g?aPj7`;}^L2we>1P{SWNDz?q)$zUJ(A#(l zFj^?GhI!6H&I3zzsX_EY$t6bWqO+cI-~_^O^O`sFQl$u>Qr& zbWu+gGtBIDQO_6F0XL;>a#PP?cXru-T$?`V-#4be^cBR@aafLrBHKI^d7k-@IpVn| zoE|R?|K!b18e^2K=Opmq1U}4qg!NZunvV|m_^5i@_xHAAz0Vkn#*)OMF+Xo>OQcaN z5-Ch$Jm>)=Oc4^GWD!XCg)PJNVpK77&Sn~ z{eUPwd>L>{TZ%(#qKXy`X^|~zdpN2p;ZVI6Y0;Y7+SK-zP<_X)aHKs{(Hhx}#cHe4 z5N_6#){dZe)DVe|`l35Dr5Vw%qU>r?(FAp??5Qnk+M_~={4w--DHUSok(8`N*;`vs o_)m2>r7e_3???Ey>VMYJD^km)r+RnlM1#q#KTRF4KS@3D8xJmR`2YX_ diff --git a/Sharely/__pycache__/handle_csv.cpython-310.pyc b/Sharely/__pycache__/handle_csv.cpython-310.pyc index 8bfebc99331bc40f5b0528336f74ffaac4040a77..f3bd931330132fcc18e4adb8e6791abf7ceb8ea0 100644 GIT binary patch delta 235 zcmX@Wy`GyVpO=@50SG3xhNN!fS<1|KYw{*$OCb4%Sr$lgvDnn#;wZ{5k1x)wO1;IM zoS##gn+M@A1BGv~rspPR=G@{)%gjlQ&rB)4#g?CzR-9ULiz7F&B0eRtB=r^>MAI!6 zFps$?H3g`vC^a?j7E4l2Y3eO@sNR(fMTS6^{Ib%|$j?pHPtGhUDlJaTVNESA&P<$q vo27%%cybD>rm-VFVPr#bJ}1pHiBWYR3rV6>|Uy0R|pMAY=vrnITOa delta 226 zcmZ3_eSn)MpO=@50SHcMe@fZNvy_=JYVsy#OCb4%Sr$lgvDnl{aTMj3#}{W-rABcl z=jW8>=7Bl4n1RAktm(OlnK@A$X_+~x@tG;bx7hO2(uz|{qBwFBE8Ofs!tw@C0ly;GVepO=@50SGp?hNN!fiDH$x#hjT^yprLUm3~HkZmNEAW=T%*=_;1=^jMo_dQlwWuh+s7M58NRbeT5S?7f6VK>4`6f>-(9&>TJ$Vg~ Tuoj4L1QB4R2tsu75?(a`_H|H? delta 263 zcmdlfeM*`qpO=@50SNdlKBa8riDK1_V$Mt{UdiywTR*fowWwIXC_gDPFQYg!HA6q3 zC_lX@F*i3eFI_*NvLquvZ*miB7o+H8UN&>~D3+r9oYbhz-fUegoKb9PnK`MRDN&Q} zaqVD?nmnCblRt{5C^a!B9wZT;36wd{Z6+ZKwE31`a%oXfYF^EfW*`Er6hVkgp3JKT09L0@^#A|> diff --git a/Sharely/__pycache__/update_cell_color.cpython-310.pyc b/Sharely/__pycache__/update_cell_color.cpython-310.pyc index e556c03a7292ea7ec29e84cab08092f87fc136fb..014b15aa1d6b37a2e2cb1c0bc7e48ecfc07f7cdf 100644 GIT binary patch delta 275 zcmbO$-XqSF&&$ij00f&`LsB>L++z}P)X&JzP1R4%EGa52PRvOyF3wEc%+I`dXI@Hb#VzjCyc9S`04(R6pHrHf2a%rqk|m7s)?^1(4@UjTovdYy=9}2G z7=a?%?8P$LKr4&%K!gE^Fa#2sJVhoTw&~10ts|Ta@o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L07 is below") handle_csv.send_mail(data_L7, f_i.L7_video_id_dic, f_i.spreadsheet_id_dic.get("L7.csv"), f_i.single_sheet_namelist[3]) time.sleep(10) +print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L08 is below") +handle_csv.send_mail(data_L8, f_i.L8_video_id_dic, f_i.spreadsheet_id_dic.get("L8.csv"), f_i.single_sheet_namelist[4]) # print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L09 is below") # handle_csv.send_mail(data_L9, f_i.L9_video_id_dic, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[4]) # print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L11 is below") From 9d1bf4ebc487d17450e4a1437b5ce0bb7eedb21b Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Sun, 26 Nov 2023 16:43:36 +0000 Subject: [PATCH 23/27] update main.py --- .../files_information.cpython-310.pyc | Bin 6982 -> 7565 bytes main.py | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Sharely/__pycache__/files_information.cpython-310.pyc b/Sharely/__pycache__/files_information.cpython-310.pyc index 6a6370aaf892190746bb4d26d7ca4a2cdcbab725..54aea9b250ef3a98945db3e222d849b18810c7cb 100644 GIT binary patch delta 1282 zcma)4OK%%h7|p~^nl`bUMwODd2~bt2EooA};+fDE>NtMCJ>$e4pvLyGJ!6k!d&ZC0 zw3tH6qfj82H{n&@Woe0JL0$9*u%n0tVwF8&Q8wH$5>yonu5^#S@1FCWdv(9>mhI}P zg^EtMZ-^}8Pw5CR#gMejHn9ql2e#9vAR5x_AZ`@hqOhCE_%J%Xl6y z;6=QID|i{N;3{6lYj~X-Sn05hH_*eIcnfdi9lVS8@IF4k&Vbe9Lwtmf@d-Y~HGGE8 z@ddubSNM9s?kE5H4f)qeT;~sfVuy}@+q*^GSh{_}WVR;a1qT;w=JFeXxDu}lK9AYx zMuTnF`MOvRnYf5u$ghUWt^TFq8b#@Pe`t1qr$8T1{DseFsH)bN)qi3qIvb~J{9ioo5%c`?(M^-cGQ=Z zLJ4O=VxmEzmCDv#oMXl9&WIfe{&tK=Ds)pRS&hM>l5rO^b&fB0cz3>Jwk}(km|%By z4x6%3rL#zfQx4f1js-p8j1`hIuh`6GhlFfynYe7YJrQBOWi|$Ahs+sECVQv5nR0fr zVRLG$f+kIDsuAm=Eht1IcE7Xgg2I_BHl@~FWwLyeR~$02X&2J1W!_t)8`hd7mNuH? zj@7oIG&~7T_M6g0B4OBKGtU(R@t~;0;++*wjbV7s&gRyv8?LlbBo`$^Qf`awG6MXo zMlie>%r_(LGE1k!j90QOMv0BLw&n46xC$o+=#V$nU{cnk91bUtSr1uP13n^2uu)Id zD;64QS!!kSjbN*q+$<@uM|s)CSp*_+CsVe%B8pPh)mT}vh?#20nGq8$DP9zg(pwe> z(Nt+;DcF+Z(F7+jTxYo?6C(F=k%fsX6W8ucO!^0~VdYF0J_rj>GGFF9-<*?g&KYm}+|rcvc#0e{>b{!M z&U%OAha!K6N0JVCQWKe``jV_+YJ(0+-)p85Z>HZ@C^IesnK9o@dDB@%6RTN6GeOp} zj`eI{Bb#WHY5^^5rj;#hrHyU0vz;Au(3w{Y*-3~ly6IsTyV=8DdfCVRyt;@39OMv( z=_AY$$~ej~j&p*Ova=hL?o*uR4E>zt91+el07Ub}i@CrcG2#qmb+d?zBpBurNiH*j zMT$|sdyw9 zN+i?t#1qkQEMi3y*BY0IT7N>k^M9s+8xT(4?(&q&qna5}}Os`7$aw?}u0 QNT5Nq2TDavU`W${0bgFok^lez diff --git a/main.py b/main.py index 34bbcd4..a6e7733 100644 --- a/main.py +++ b/main.py @@ -65,10 +65,10 @@ # print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L14 is below") # handle_csv.send_mail(data_L14, f_i.L14_video_id_dic, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[9]) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L01 is below") -handle_csv.send_mail(data_L1, f_i.L1_video_id_dic, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[10]) +handle_csv.send_mail(data_L1, f_i.L1_video_id_dic, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[11]) time.sleep(3) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L02 is below") -handle_csv.send_mail(data_L2, f_i.L2_video_id_dic, f_i.spreadsheet_id_dic.get("L2.csv"), f_i.single_sheet_namelist[11]) +handle_csv.send_mail(data_L2, f_i.L2_video_id_dic, f_i.spreadsheet_id_dic.get("L2.csv"), f_i.single_sheet_namelist[12]) print("~End~====================================================================================================", today_str) From d1d9ccae88a6a9c1d5f0a4f3885a401ac7de5e1d Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Mon, 19 Feb 2024 16:45:07 +0000 Subject: [PATCH 24/27] main.py update --- .../files_information.cpython-310.pyc | Bin 7565 -> 3501 bytes main.py | 58 ++++++++++-------- 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/Sharely/__pycache__/files_information.cpython-310.pyc b/Sharely/__pycache__/files_information.cpython-310.pyc index 54aea9b250ef3a98945db3e222d849b18810c7cb..186c3ea3bc46570c5b88f42bf835b50326c60617 100644 GIT binary patch delta 1491 zcmYk5OOM-B6vrnsX*!)prw`gr=K%}_+M$y+@gsI9g*u6yIF94Qb`r;`6gfFg>?BS+ zj`J8Vm<3x9LYCOj73vCvkXo_jOCVKG$yR|Fs!ho&@jY)zVi-+o#WBYNWRWm%fdt%diIPumPKJ8MfdG zT!m|J9o~Q&aP!%Qx&pUg8*al6?7|-G!<+CHybTBN&UrQpci>%k58j8na1RdQ1Go=I z5Qhin*$eOx5|9K0&}UIK1{mOw0s=^2)9@iYf{)-ad<>tQi!Z_xpdbTT$N>!um8 z6oEU>t_EgHf!RyIt7{OEmJZ8j;qR6G*>dZCg}@{f>vhXUzuWCDP8yn25}a(W;!N6H z8Sfv*lVU|2Y8Wy0pROeRThaRo?-O2WbyRE=rp}# zK}X+k3S zao_ELj1#Qm9VFukkCpEnyLtPR}teK3GG)Z zJjzlveW2TVP1FJjp06P3f^|Yu1td*3r^inAR4a~5wkNcOc*Qyi%m7(!&HBfS!9plh z-3iqg$yUDS!OR`aoKj&LNUVm!3*^Y9Z49Z)NFzbAWQ8M*_K;Tx3NMFMGUIAWui4!W zYZu)@!VvU|&Zvm3;qzHp9tLI*quj3aPm9%fpD|f^X637kCSGas6jCir=&Tf$Ar@|K zZgRSm%1kJ(L|G@pRMwaiXu-e`FEnE+{2*CuwdK5Pdi;;R&X%C2LD5<)~ zqmm$5WzC#A3fD4qet;E~6HZg{yMo#ZH9a#gbi|>~(;1#sWlSvVf|z3GYV9OtbxFnl z?An*t!^S#SLtG1SJ#3<|{cjU(yNA(byY5-+pfO1nq{+N#*!`+FF7(G*lp3!ydTKHmW*tq&F=vp-D2${Od8a=Msth_brwPMssxy&LWyX3boS4?^VB$J# z$7>ovm2A0Nuf$IgZh$Qoc_-!8ag#vkk?PphKCj~GpiHVKxt+Z2)$m4{NocjSITQP= zmF7`3H_j#@ka(GTIk21W;~lilF#~(jYe8M&y6OD5kj_+tFI5!~lgy04KrYssl$kcf zwiTxl%N@&yI$1*k4WpTHi?HXa#86t_%NcV;9cP-e_(>6ElLr{I7Q|-wsEy zg#7v4i`PGYe)i3aKfeEQdLBak*E^3R>;9eHd;X`pnEz^b%ir0%y0TS5{rx>WmJb`B x_m#cYb~`w(E-lBFBf%33_t;;nH=^6VwtsImx*v_i{*K=Ellwc-)r+e){{e8}y)^&; literal 7565 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 T^5yq~{}}tmZ@=~CTVMP?gz~@O diff --git a/main.py b/main.py index a6e7733..194e5af 100644 --- a/main.py +++ b/main.py @@ -25,50 +25,58 @@ # Access csv files pandas.set_option("display.max_rows", 150, "display.max_columns", 20, ) -# data_L4 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L4.csv", sep=",") -data_L6 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L6.csv", sep=",") +# 週三班 data_L7 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L7.csv", sep=",") data_L8 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L8.csv", sep=",") -# data_L9 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L9.csv", sep=",") +data_L9 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L9.csv", sep=",") + +# 週一班 # data_L11 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L11.csv", sep=",") + +# 週二班 # data_L14 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L14.csv", sep=",") -data_L1 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L1.csv", sep=",") +# data_L1 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L1.csv", sep=",") data_L2 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L2.csv", sep=",") +data_L3 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L3.csv", sep=",") + # Update cells (fill color in sheet boundary) -# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L4.csv"), f_i.single_sheet_namelist[0]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.single_sheet_namelist[2]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L7.csv"), f_i.single_sheet_namelist[3]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L8.csv"), f_i.single_sheet_namelist[4]) -# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[4]) +# 週三班 +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L7.csv"), f_i.single_sheet_namelist[0]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L8.csv"), f_i.single_sheet_namelist[1]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[2]) + +# 週一班 # up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L11.csv"), f_i.single_sheet_namelist[6]) + +# 週二班 # up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[9]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[11]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L2.csv"), f_i.single_sheet_namelist[12]) +# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[11]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L2.csv"), f_i.single_sheet_namelist[4]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L3.csv"), f_i.single_sheet_namelist[5]) # Send mail -# handle_csv.send_mail(data_L4, f_i.L4_video_id_dic, f_i.spreadsheet_id_dic.get("L4.csv"), f_i.single_sheet_namelist[0]) +# print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L06 is below") +# handle_csv.send_mail(data_L6, f_i.L6_video_id_dic, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.single_sheet_namelist[2]) # time.sleep(3) -print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L06 is below") -handle_csv.send_mail(data_L6, f_i.L6_video_id_dic, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.single_sheet_namelist[2]) -time.sleep(3) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L07 is below") -handle_csv.send_mail(data_L7, f_i.L7_video_id_dic, f_i.spreadsheet_id_dic.get("L7.csv"), f_i.single_sheet_namelist[3]) -time.sleep(10) +handle_csv.send_mail(data_L7, f_i.L7_video_id_dic, f_i.spreadsheet_id_dic.get("L7.csv"), f_i.single_sheet_namelist[0]) +time.sleep(5) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L08 is below") -handle_csv.send_mail(data_L8, f_i.L8_video_id_dic, f_i.spreadsheet_id_dic.get("L8.csv"), f_i.single_sheet_namelist[4]) -# print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L09 is below") -# handle_csv.send_mail(data_L9, f_i.L9_video_id_dic, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[4]) -# print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L11 is below") -# handle_csv.send_mail(data_L11, f_i.L11_video_id_dic, f_i.spreadsheet_id_dic.get("L11.csv"), f_i.single_sheet_namelist[6]) +handle_csv.send_mail(data_L8, f_i.L8_video_id_dic, f_i.spreadsheet_id_dic.get("L8.csv"), f_i.single_sheet_namelist[1]) +print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L09 is below") +handle_csv.send_mail(data_L9, f_i.L9_video_id_dic, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[2]) + # print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L14 is below") # handle_csv.send_mail(data_L14, f_i.L14_video_id_dic, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[9]) -print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L01 is below") -handle_csv.send_mail(data_L1, f_i.L1_video_id_dic, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[11]) +# print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L01 is below") +# handle_csv.send_mail(data_L1, f_i.L1_video_id_dic, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[11]) time.sleep(3) print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L02 is below") -handle_csv.send_mail(data_L2, f_i.L2_video_id_dic, f_i.spreadsheet_id_dic.get("L2.csv"), f_i.single_sheet_namelist[12]) +handle_csv.send_mail(data_L2, f_i.L2_video_id_dic, f_i.spreadsheet_id_dic.get("L2.csv"), f_i.single_sheet_namelist[4]) +print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L03 is below") +handle_csv.send_mail(data_L3, f_i.L3_video_id_dic, f_i.spreadsheet_id_dic.get("L3.csv"), f_i.single_sheet_namelist[5]) print("~End~====================================================================================================", today_str) From ce542df67ebe5ddcdb5b41f6207bf85e82e0395f Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Wed, 15 Jan 2025 12:05:59 +0000 Subject: [PATCH 25/27] code change, main.py --- .../files_information.cpython-310.pyc | Bin 3501 -> 2095 bytes .../__pycache__/share_file.cpython-310.pyc | Bin 3513 -> 3523 bytes main.py | 79 ++++++++++++------ 3 files changed, 52 insertions(+), 27 deletions(-) diff --git a/Sharely/__pycache__/files_information.cpython-310.pyc b/Sharely/__pycache__/files_information.cpython-310.pyc index 186c3ea3bc46570c5b88f42bf835b50326c60617..bb12c7afdf86d0528352cf4cf9bb43d9913e4bf7 100644 GIT binary patch literal 2095 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 B4!ZyV diff --git a/main.py b/main.py index 194e5af..bccdf1c 100644 --- a/main.py +++ b/main.py @@ -26,9 +26,13 @@ # Access csv files pandas.set_option("display.max_rows", 150, "display.max_columns", 20, ) # 週三班 -data_L7 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L7.csv", sep=",") -data_L8 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L8.csv", sep=",") -data_L9 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L9.csv", sep=",") +# data_L7 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L7.csv", sep=",") +# data_L8 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L8.csv", sep=",") +# data_L9 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L9.csv", sep=",") +# data_L10 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L10.csv", sep=",") +# data_L11 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L11.csv", sep=",") +data_L0 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L0.csv", sep=",") +data_L1 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L1.csv", sep=",") # 週一班 # data_L11 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L11.csv", sep=",") @@ -36,47 +40,68 @@ # 週二班 # data_L14 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L14.csv", sep=",") # data_L1 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L1.csv", sep=",") -data_L2 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L2.csv", sep=",") -data_L3 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L3.csv", sep=",") +# data_L2 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L2.csv", sep=",") +# data_L3 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L3.csv", sep=",") +# data_L4 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L4.csv", sep=",") +# data_L5 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L5.csv", sep=",") +data_L6 = pandas.read_csv(filepath_or_buffer=f_i.project_path + "/data/L6.csv", sep=",") # Update cells (fill color in sheet boundary) # 週三班 -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L7.csv"), f_i.single_sheet_namelist[0]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L8.csv"), f_i.single_sheet_namelist[1]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[2]) +# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L8.csv"), f_i.single_sheet_namelist[0]) +# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[0]) +# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L10.csv"), f_i.single_sheet_namelist[1]) +# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L11.csv"), f_i.single_sheet_namelist[0]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L0.csv"), f_i.single_sheet_namelist[0]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[1]) # 週一班 -# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L11.csv"), f_i.single_sheet_namelist[6]) +# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L11.csv"), f_i.single_sheet_namelist[]) # 週二班 -# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[9]) -# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[11]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L2.csv"), f_i.single_sheet_namelist[4]) -up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L3.csv"), f_i.single_sheet_namelist[5]) +# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[]) +# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[]) +# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L2.csv"), f_i.single_sheet_namelist[4]) +# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L3.csv"), f_i.single_sheet_namelist[3]) +# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L4.csv"), f_i.single_sheet_namelist[2]) +# up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L5.csv"), f_i.single_sheet_namelist[3]) +up_color.update_cells_color(0, 23, 0.8, 0.8, 0.8, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.single_sheet_namelist[2]) # Send mail # print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L06 is below") # handle_csv.send_mail(data_L6, f_i.L6_video_id_dic, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.single_sheet_namelist[2]) # time.sleep(3) -print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L07 is below") -handle_csv.send_mail(data_L7, f_i.L7_video_id_dic, f_i.spreadsheet_id_dic.get("L7.csv"), f_i.single_sheet_namelist[0]) -time.sleep(5) -print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L08 is below") -handle_csv.send_mail(data_L8, f_i.L8_video_id_dic, f_i.spreadsheet_id_dic.get("L8.csv"), f_i.single_sheet_namelist[1]) -print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L09 is below") -handle_csv.send_mail(data_L9, f_i.L9_video_id_dic, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[2]) +# print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L08 is below") +# handle_csv.send_mail(data_L8, f_i.L8_video_id_dic, f_i.spreadsheet_id_dic.get("L8.csv"), f_i.single_sheet_namelist[0]) +# print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L09 is below") +# handle_csv.send_mail(data_L9, f_i.L9_video_id_dic, f_i.spreadsheet_id_dic.get("L9.csv"), f_i.single_sheet_namelist[0]) +# print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L10 is below") +# handle_csv.send_mail(data_L10, f_i.L10_video_id_dic, f_i.spreadsheet_id_dic.get("L10.csv"), f_i.single_sheet_namelist[1]) +# print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L11 is below") +# handle_csv.send_mail(data_L11, f_i.L11_video_id_dic, f_i.spreadsheet_id_dic.get("L11.csv"), f_i.single_sheet_namelist[0]) +print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L00 is below") +handle_csv.send_mail(data_L0, f_i.L0_video_id_dic, f_i.spreadsheet_id_dic.get("L0.csv"), f_i.single_sheet_namelist[0]) +print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L01 is below") +handle_csv.send_mail(data_L1, f_i.L1_video_id_dic, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[1]) # print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L14 is below") -# handle_csv.send_mail(data_L14, f_i.L14_video_id_dic, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[9]) +# handle_csv.send_mail(data_L14, f_i.L14_video_id_dic, f_i.spreadsheet_id_dic.get("L14.csv"), f_i.single_sheet_namelist[]) # print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L01 is below") -# handle_csv.send_mail(data_L1, f_i.L1_video_id_dic, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[11]) -time.sleep(3) -print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L02 is below") -handle_csv.send_mail(data_L2, f_i.L2_video_id_dic, f_i.spreadsheet_id_dic.get("L2.csv"), f_i.single_sheet_namelist[4]) -print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L03 is below") -handle_csv.send_mail(data_L3, f_i.L3_video_id_dic, f_i.spreadsheet_id_dic.get("L3.csv"), f_i.single_sheet_namelist[5]) +# handle_csv.send_mail(data_L1, f_i.L1_video_id_dic, f_i.spreadsheet_id_dic.get("L1.csv"), f_i.single_sheet_namelist[]) +time.sleep(5) +# print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L02 is below") +# handle_csv.send_mail(data_L2, f_i.L2_video_id_dic, f_i.spreadsheet_id_dic.get("L2.csv"), f_i.single_sheet_namelist[4]) +# print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L03 is below") +# handle_csv.send_mail(data_L3, f_i.L3_video_id_dic, f_i.spreadsheet_id_dic.get("L3.csv"), f_i.single_sheet_namelist[3]) +# print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L04 is below") +# handle_csv.send_mail(data_L4, f_i.L4_video_id_dic, f_i.spreadsheet_id_dic.get("L4.csv"), f_i.single_sheet_namelist[2]) +# time.sleep(5) +# print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L05 is below") +# handle_csv.send_mail(data_L5, f_i.L5_video_id_dic, f_i.spreadsheet_id_dic.get("L5.csv"), f_i.single_sheet_namelist[3]) +print("@.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o< @.@ *_* >o<| L06 is below") +handle_csv.send_mail(data_L6, f_i.L6_video_id_dic, f_i.spreadsheet_id_dic.get("L6.csv"), f_i.single_sheet_namelist[2]) print("~End~====================================================================================================", today_str) From a3b54f91dd60646d08d771ccb7e1700e3fb50a4d Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Wed, 15 Jan 2025 12:49:28 +0000 Subject: [PATCH 26/27] change .gitignore --- .gitignore | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.gitignore b/.gitignore index bdc059e..9201c02 100644 --- a/.gitignore +++ b/.gitignore @@ -1,22 +1,13 @@ .DS_Store Sharely/files_information.py -<<<<<<< HEAD OAuth_client_ID_credentials_desktop/* !OAuth_client_ID_credentials_desktop/.gitkeep OAuth_client_ID_credentials_webapp/* !OAuth_client_ID_credentials_webapp/.gitkeep -======= -OAuth_client_ID_credentials/* -!OAuth_client_ID_credentials/.gitkeep ->>>>>>> main Service_account_credentials/* !Service_account_credentials/.gitkeep data/* !data/.gitkeep log/* -<<<<<<< HEAD !log/.gitkeep venv -======= -!log/.gitkeep ->>>>>>> main From 03571f8b5ba2c875dc4a7a45e28be9423a511389 Mon Sep 17 00:00:00 2001 From: RobinHsieh Date: Wed, 15 Jan 2025 13:12:18 +0000 Subject: [PATCH 27/27] change, auto-share-file.yml --- .github/workflows/auto-share-file.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-share-file.yml b/.github/workflows/auto-share-file.yml index 4542bf4..ffc1e10 100644 --- a/.github/workflows/auto-share-file.yml +++ b/.github/workflows/auto-share-file.yml @@ -1,7 +1,7 @@ name: Auto Share File in Google Drive run-name: ${{ github.actor }} is sharing file by using crontab 🚀 on: - push +# push # schedule: # - cron: '0 16 * * *'