deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-04 12:51:36 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fixed bug introduced in 7.30.00 that caused errors when reading CSV files.

Browse Source
This commit is contained in:
Ross Scroggs
2025-12-12 10:25:21 -08:00
parent 97d5ede378
commit d730e96c15
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/GamUpdate.txt
View File

@@ -1,5 +1,7 @@
7.30.01 7.30.01
Fixed bug introduced in 7.30.00 that caused errors when reading CSV files.
Added the following options to `gam <UserTypeEntity> create focustime|outofoffice`: Added the following options to `gam <UserTypeEntity> create focustime|outofoffice`:
``` ```
((date yyyy-mm-dd)| ((date yyyy-mm-dd)|

6
src/gam/__init__.py
View File

@@ -2909,6 +2909,8 @@ def cleanFilename(filename):
def setFilePath(filename, cfgDir): def setFilePath(filename, cfgDir):
if filename.startswith('./') or filename.startswith('.\\'): if filename.startswith('./') or filename.startswith('.\\'):
return os.path.join(os.getcwd(), filename[2:]) return os.path.join(os.getcwd(), filename[2:])
if filename == '-':
return filename
filename = os.path.expanduser(filename) filename = os.path.expanduser(filename)
if os.path.isabs(filename): if os.path.isabs(filename):
return filename return filename
@@ -3763,7 +3765,7 @@ def SetGlobalVariables():
def _getCfgDirectory(sectionName, itemName): def _getCfgDirectory(sectionName, itemName):
dirPath = os.path.expanduser(_stripStringQuotes(GM.Globals[GM.PARSER].get(sectionName, itemName))) dirPath = os.path.expanduser(_stripStringQuotes(GM.Globals[GM.PARSER].get(sectionName, itemName)))
if (not dirPath) and (itemName in {GC.GMAIL_CSE_INCERT_DIR, GC.GMAIL_CSE_INKEY_DIR}): if (not dirPath) and (itemName in {GC.GMAIL_CSE_INCERT_DIR, GC.GMAIL_CSE_INKEY_DIR, GC.INPUT_DIR}):
return dirPath return dirPath
if (not dirPath) or (not os.path.isabs(dirPath) and dirPath != '.'): if (not dirPath) or (not os.path.isabs(dirPath) and dirPath != '.'):
if (sectionName != configparser.DEFAULTSECT) and (GM.Globals[GM.PARSER].has_option(sectionName, itemName)): if (sectionName != configparser.DEFAULTSECT) and (GM.Globals[GM.PARSER].has_option(sectionName, itemName)):
@@ -3839,7 +3841,7 @@ def SetGlobalVariables():
for itemName, itemEntry in GC.VAR_INFO.items(): for itemName, itemEntry in GC.VAR_INFO.items():
if itemEntry[GC.VAR_TYPE] == GC.TYPE_DIRECTORY: if itemEntry[GC.VAR_TYPE] == GC.TYPE_DIRECTORY:
dirPath = GC.Values[itemName] dirPath = GC.Values[itemName]
if (not dirPath) and (itemName in {GC.GMAIL_CSE_INCERT_DIR, GC.GMAIL_CSE_INKEY_DIR}): if (not dirPath) and (itemName in {GC.GMAIL_CSE_INCERT_DIR, GC.GMAIL_CSE_INKEY_DIR, GC.INPUT_DIR}):
return return
if (itemName != GC.CACHE_DIR or not GC.Values[GC.NO_CACHE]) and not os.path.isdir(dirPath): if (itemName != GC.CACHE_DIR or not GC.Values[GC.NO_CACHE]) and not os.path.isdir(dirPath):
writeStderr(formatKeyValueList(WARNING_PREFIX, writeStderr(formatKeyValueList(WARNING_PREFIX,