X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=filex%2Fftp.py;h=2c92f129b6d623923251abd2363169abc8187c30;hb=87c84cec7b5b78b145a61953408b6cadffcd9735;hp=38b23a5eb22b7aaaedf6aac5ffe3fcfc022d3413;hpb=551b5fe34b191fd78106178245dcf3ee8563e8d7;p=qcg-portal.git

diff --git a/filex/ftp.py b/filex/ftp.py
index 38b23a5..2c92f12 100644
--- a/filex/ftp.py
+++ b/filex/ftp.py
@@ -1,15 +1,16 @@
 from datetime import datetime
 from Queue import Queue, Empty
+from itertools import chain
 import os
 import re
 from threading import Event
-from urlparse import urlparse
+from django.utils.http import urlunquote
 
 from django.utils.timezone import localtime, UTC
 from gridftp import FTPClient, Buffer, HandleAttr, OperationAttr
 
 
-class FTPException(Exception):
+class FTPError(Exception):
     pass
 
 
@@ -66,11 +67,14 @@ class FTPOperation:
         self._end.clear()
 
         if self._error is not None:
+            # TODO logging
+            print 'GridFTP ERROR:', self._error
+
             match = re.search(r'A system call failed: (.*)$', self._error.replace('\r\n', '\n'), re.MULTILINE)
 
             msg = match.groups()[0] if match else "Unknown error"
 
-            raise FTPException(msg)
+            raise FTPError(msg)
 
     def listing(self, url):
         self.cli.verbose_list(url, self._done, None, self.op_attr)
@@ -132,7 +136,7 @@ class FTPOperation:
         data = self.listing(url).next()
 
         if data['name'] == '.':
-            data['name'] = os.path.basename(urlparse(url).path.rstrip('/')) or u'/'
+            data['name'] = os.path.basename(os.path.normpath(url))
 
         return data
 
@@ -150,3 +154,49 @@ class FTPOperation:
         self.cli.mkdir(url, self._done, None, self.op_attr)
 
         self.wait()
+
+    @staticmethod
+    def match_ext(archive, *extensions):
+        for ext in extensions:
+            if archive.endswith(ext):
+                return True
+        return False
+
+    def compress(self, server, path, files, archive):
+        self._check_disk_stack_args(*([path, archive] + files))
+
+        if self.match_ext(archive, '.tar.gz', '.tgz'):
+            cmd, args = 'tar', ['cvzf', archive, '-C', path] + files
+        elif self.match_ext(archive, '.tar.bz2', '.tbz'):
+            cmd, args = 'tar', ['cvjf', archive, '-C', path] + files
+        elif self.match_ext(archive, '.zip'):
+            cmd, args = 'jar', (['cvMf', archive] + list(chain.from_iterable(('-C', path, f) for f in files)))
+        else:
+            raise ValueError('Unknown archive type: {}'.format(archive))
+
+        self.op_attr.set_disk_stack('#'.join(["popen:argv=", cmd] + args))
+
+        return self.get(server)
+
+    def extract(self, server, archive, dst):
+        self._check_disk_stack_args(*[archive, dst])
+
+        if self.match_ext(archive, '.tar.gz', '.tgz'):
+            cmd, args = 'tar', ('xvzf', archive, '-C', dst)
+        elif self.match_ext(archive, '.tar.bz2', '.tbz'):
+            cmd, args = 'tar', ('xvjf', archive, '-C', dst)
+        elif self.match_ext(archive, '.zip'):
+            cmd, args = 'unzip', (archive, '-d', dst)
+        else:
+            raise ValueError('Unknown archive type: {}'.format(archive))
+
+        self.op_attr.set_disk_stack('#'.join(("popen:argv=", cmd) + args))
+
+        return self.get(server)
+
+    @staticmethod
+    def _check_disk_stack_args(*args):
+        for char in ['#', ',', ';', '%23', '%3B']:
+            for arg in args:
+                if char in arg:
+                    raise ValueError('Unsupported character `{}` in `{}`!'.format(urlunquote(char), urlunquote(arg)))