Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/datacenter.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/datacenter.py (modified) (5 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/datacenter.py

@@ -67 +67 @@
         return os.path.join(self.storage, 'deleted')
 
-    def getPendingFiles(self, sort='name'):
+    def getFiles(self, sort='name'):
         """Get a list of files stored in `storage`.
 
@@ -79 +79 @@
             if not os.path.isfile(fullpath):
                 continue
-            if not filename.endswith('.csv'):
-                continue
             result.append(DataCenterFile(fullpath))
         if sort == 'date':
@@ -86 +84 @@
             result = sorted(result, key=lambda x: x.getTimeStamp(),
                             reverse=True)
-        return result
-
-    def getFinishedFiles(self):
-        """Get a list of files stored in `finished` subfolder of `storage`.
-
-        Files are unsorted.
-        """
-        result = []
-        finished_dir = os.path.join(self.storage, 'finished')
-        if not os.path.exists(finished_dir):
-            return result
-        for filename in sorted(os.listdir(finished_dir)):
-            fullpath = os.path.join(finished_dir, filename)
-            if not os.path.isfile(fullpath):
-                continue
-            if not filename.endswith('.csv'):
-                continue
-            result.append(DataCenterFile(fullpath, 'finished'))
         return result
 
@@ -164 +144 @@
             return
         result_path = merge_csv_files(dest, source)
-        os.chmod(result_path, 0664)
         self._moveFile(result_path, dest)
         os.unlink(source)
@@ -319 +298 @@
     grok.implements(IDataCenterFile)
 
-    def __init__(self, context, folder_name=''):
+    def __init__(self, context):
         self.context = context
         self.name = os.path.basename(self.context)
-        self.rel_path = os.path.join(folder_name, self.name)
         self.size = self.getSize()
         self.uploaddate = self.getDate()