PR #2

ftpretty.py

@@ -8,10 +8,23 @@
     f.put(local, remote)
     f.list(remote)
     f.cd(remote)
+    f.pwd()
+    f.descend(remote, force=True)
+    f.ascend(steps)
     f.delete(remote)
     f.rename(remote_from, remote_to)
     f.close()
-
+    f.mkdir(remote)
+    f.touch(remote)
+    f.is_file(remote)
+    f.is_folder(remote)
+    f.abort()
+
+    You should also be able to do this:
+
+    from ftpretty import ftpretty
+    with ftpretty(host, user, pass, secure=False, timeout=10) as f:
+        [And all of the listed keywords above]
 """
 from __future__ import print_function
 import datetime
@@ -40,9 +53,8 @@ class ftpretty(object):
     tmp_output = None
     relative_paths = set(['.', '..'])
 
-    def __init__(self, host, user, password,
+    def __init__(self, host, user="anonymous", password="",
             secure=False, passive=True, ftp_conn=None, **kwargs):
-
         if 'port' in kwargs:
             self.port = kwargs['port']
             del kwargs['port']
@@ -62,6 +74,12 @@ def __init__(self, host, user, password,
         if not passive:
             self.conn.set_pasv(False)
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self):
+        self.close()
+
     def __getattr__(self, name):
         """ Pass anything we don't know about, to underlying ftp connection """
         def wrapper(*args, **kwargs):
@@ -206,6 +224,20 @@ def list(self, remote='.', extra=False, remove_relative_paths=False):
 
         return directory_list
 
+    def is_file(self, name):
+        for item in self.list(extra=True):
+            if item["name"] == name and item["directory"] == "-":
+                return True
+        else:
+            return False
+
+    def is_folder(self, name):
+        for item in self.list(extra=True):
+            if item["name"] == name and item["directory"] == "d":
+                return True
+        else:
+            return False
+
     def is_not_relative_path(self, path):
         if isinstance(path, dict):
             return path.get('name') not in self.relative_paths
@@ -223,7 +255,14 @@ def descend(self, remote, force=False):
                     self.conn.mkd(directory)
                     self.conn.cwd(directory)
         return self.conn.pwd()
-
+
+    def ascend(self, steps=1):
+        for _ in range(steps):
+            if self.conn.pwd() == "/":
+                break
+            self.conn.cwd("..")
+        return self.conn.pwd()
+
     def delete(self, remote):
         """ Delete a file from server """
         try:
@@ -257,6 +296,14 @@ def mkdir(self, new_dir):
         """ Create directory on the server """
         return self.conn.mkd(new_dir)
 
+    def touch(self, name):
+        """ Create a file on the server """
+        self.put(None, name, contents="")
+
+    def abort(self):
+        """ Aborts any ongoing file transfers """
+        return self.conn.abort()
+
     def close(self):
         """ End the session """
         try: