diff --git a/src/python/dm/common/utility/ftpUtility.py b/src/python/dm/common/utility/ftpUtility.py index a6a1a130b8f3ed7a8a5d0ce0351d4c7845c0e3ae..8d22e1e48a1a9b2d751be07ea95281dbdecbaa1e 100755 --- a/src/python/dm/common/utility/ftpUtility.py +++ b/src/python/dm/common/utility/ftpUtility.py @@ -10,12 +10,13 @@ import urlparse class FtpUtility: - def __init__(self, host, port, username=None, password=None): + def __init__(self, host, port, username=None, password=None, utcTimeStamps=True): self.host = host self.port = port self.username = username self.password = password self.ftpClient = None + self.utcTimeStamps = utcTimeStamps self.mlsdFileStatDict = {} @classmethod @@ -111,6 +112,8 @@ class FtpUtility: fileInfo['fileSize'] = fileStatDict.get('Size') modifyTime = fileStatDict.get('Modify') modifyTime = time.mktime(time.strptime(modifyTime, '%Y%m%d%H%M%S')) + if self.utcTimeStamps: + modifyTime = TimeUtility.utcToLocalTime(modifyTime) fileInfo['fileModificationTime'] = modifyTime fileInfo['fileModificationTimeStamp'] = TimeUtility.formatLocalTimeStamp(modifyTime) del self.mlsdFileStatDict[fileName]