- Timestamp:
- 10 Sep 2012, 11:05:07 (12 years ago)
- Location:
- main/waeup.kofa/branches/uli-async-update
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/waeup.kofa/branches/uli-async-update
- Property svn:mergeinfo changed
-
main/waeup.kofa/branches/uli-async-update/src/waeup/kofa/datacenter.py
r9098 r9169 67 67 return os.path.join(self.storage, 'deleted') 68 68 69 def get Files(self, sort='name'):69 def getPendingFiles(self, sort='name'): 70 70 """Get a list of files stored in `storage`. 71 71 … … 79 79 if not os.path.isfile(fullpath): 80 80 continue 81 if not filename.endswith('.csv'): 82 continue 81 83 result.append(DataCenterFile(fullpath)) 82 84 if sort == 'date': … … 84 86 result = sorted(result, key=lambda x: x.getTimeStamp(), 85 87 reverse=True) 88 return result 89 90 def getFinishedFiles(self): 91 """Get a list of files stored in `finished` subfolder of `storage`. 92 93 Files are unsorted. 94 """ 95 result = [] 96 finished_dir = os.path.join(self.storage, 'finished') 97 if not os.path.exists(finished_dir): 98 return result 99 for filename in sorted(os.listdir(finished_dir)): 100 fullpath = os.path.join(finished_dir, filename) 101 if not os.path.isfile(fullpath): 102 continue 103 if not filename.endswith('.csv'): 104 continue 105 result.append(DataCenterFile(fullpath, 'finished')) 86 106 return result 87 107 … … 144 164 return 145 165 result_path = merge_csv_files(dest, source) 166 os.chmod(result_path, 0664) 146 167 self._moveFile(result_path, dest) 147 168 os.unlink(source) … … 298 319 grok.implements(IDataCenterFile) 299 320 300 def __init__(self, context ):321 def __init__(self, context, folder_name=''): 301 322 self.context = context 302 323 self.name = os.path.basename(self.context) 324 self.rel_path = os.path.join(folder_name, self.name) 303 325 self.size = self.getSize() 304 326 self.uploaddate = self.getDate()
Note: See TracChangeset for help on using the changeset viewer.