creating new directory

[qcg-portal.git] / filex / ftp.py

diff --git a/filex/ftp.py b/filex/ftp.py
index 705c05e..38b23a5 100644 (file)
--- a/filex/ftp.py
+++ b/filex/ftp.py
@@ -1,7 +1,11 @@
+from datetime import datetime
 from Queue import Queue, Empty
+import os
 import re
 from threading import Event
+from urlparse import urlparse
 
+from django.utils.timezone import localtime, UTC
 from gridftp import FTPClient, Buffer, HandleAttr, OperationAttr
 
 
@@ -78,7 +82,29 @@ class FTPOperation:
         while not self.stream.empty():
             result += self.stream.get()
 
-        return result
+        return self._parse_mlst(result)
+
+    @staticmethod
+    def _parse_mlst(listing):
+        for item in listing.strip().splitlines():
+            # we may receive empty string when there are multiple consecutive newlines in listing
+            if item:
+                attrs, name = item.split(' ', 1)
+
+                attrs_dict = {}
+                for attr in attrs.split(';'):
+                    try:
+                        key, value = attr.split('=', 1)
+                        attrs_dict[key] = value
+                    except ValueError:
+                        pass
+
+                yield {
+                    'name': name,
+                    'type': 'directory' if attrs_dict['Type'] == 'dir' else 'file',
+                    'size': int(attrs_dict['Size']),
+                    'date': localtime(datetime.strptime(attrs_dict['Modify'], "%Y%m%d%H%M%S").replace(tzinfo=UTC())),
+                }
 
     def get(self, url):
         self.cli.get(url, self._done, None, self.op_attr)
@@ -101,3 +127,26 @@ class FTPOperation:
         self.cli.move(src, dst, self._done, None, self.op_attr)
 
         self.wait()
+
+    def info(self, url):
+        data = self.listing(url).next()
+
+        if data['name'] == '.':
+            data['name'] = os.path.basename(urlparse(url).path.rstrip('/')) or u'/'
+
+        return data
+
+    def delete(self, url):
+        self.cli.delete(url, self._done, None, self.op_attr)
+
+        self.wait()
+
+    def rmdir(self, url):
+        self.cli.rmdir(url, self._done, None, self.op_attr)
+
+        self.wait()
+
+    def mkdir(self, url):
+        self.cli.mkdir(url, self._done, None, self.op_attr)
+
+        self.wait()