Fix uploading files under a different name

Author: jbaiter

chdkptp/device.py

@@ -8,6 +8,8 @@
 from chdkptp.lua import LuaContext, PTPError, global_lua, parse_table
 import chdkptp.util as util
 
+from lupa import LuaError
+
 
 DISTANCE_RE = re.compile('(\d+(?:.\d+)?)(mm|cm|m|ft|in)')
 DISTANCE_FACTORS = {
@@ -219,12 +221,13 @@ def upload_file(self, local_path, remote_path='A/', skip_checks=False):
         if os.path.isdir(local_path):
             raise ValueError("`local_path` must be a file, not a directory.")
         if not skip_checks:
-            status, error = self._lua.call("con:stat", remote_path)
-            if not status:
-                raise Exception("Stat on remote path '{0}' failed: {1}"
-                                .format(remote_path, error))
             if remote_path.endswith("/"):
-                if not status.is_dir:
+                try:
+                    status = parse_table(
+                        self._lua.call("con:stat", remote_path))
+                except LuaError:
+                    status = {'is_dir': False}
+                if not status['is_dir']:
                     raise ValueError("Remote path '{0}' is not a directory. "
                                      "Please leave out the trailing slash if "
                                      "you are refering to a file")

test.py

@@ -42,3 +42,13 @@
     imgdata = dev.shoot(stream=False, download_after=True, remove_after=True)
     with open(fpath, 'wb') as fp:
         fp.write(imgdata)
+
+print "Checking file upload"
+with open('/tmp/test.txt', 'w') as fp:
+    fp.write('test')
+dev.upload_file('/tmp/test.txt', 'A/')
+assert 'a/test.txt' in [x.lower() for x in dev.list_files()]
+
+print "Checking file removal"
+dev.delete_files('A/test.txt')
+assert 'a/test.txt' not in [x.lower() for x in dev.list_files()]