duplicity-team team mailing list archive

[Michael Terry <mike@xxxxxxxxxxx>]

Michael Terry has proposed merging lp:~mterry/duplicity/gio-pydrive-fsdecode into lp:duplicity.

Commit message:
Fix gio and pydrive backends to use fsdecode

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~mterry/duplicity/gio-pydrive-fsdecode/+merge/368101

It looks like the gio and pydrive backends have some issues in 0.8.00.

If I'm gathering correctly, backends are given byte string filenames. Both those backends' libraries were expecting unicode, so we have to decode first.

I also added some missing exception imports in pydrive.
-- 
Your team duplicity-team is requested to review the proposed merge of lp:~mterry/duplicity/gio-pydrive-fsdecode into lp:duplicity.

=== modified file 'duplicity/backends/giobackend.py'
--- duplicity/backends/giobackend.py	2018-07-23 14:55:39 +0000
+++ duplicity/backends/giobackend.py	2019-05-29 23:37:47 +0000
@@ -139,12 +139,12 @@
     def _put(self, source_path, remote_filename):
         from gi.repository import Gio  # @UnresolvedImport  # pylint: disable=import-error
         source_file = Gio.File.new_for_path(source_path.name)
-        target_file = self.remote_file.get_child_for_display_name(remote_filename)
+        target_file = self.remote_file.get_child_for_display_name(util.fsdecode(remote_filename))
         self.__copy_file(source_file, target_file)
 
     def _get(self, filename, local_path):
         from gi.repository import Gio  # @UnresolvedImport  # pylint: disable=import-error
-        source_file = self.remote_file.get_child_for_display_name(filename)
+        source_file = self.remote_file.get_child_for_display_name(util.fsdecode(filename))
         target_file = Gio.File.new_for_path(local_path.name)
         self.__copy_file(source_file, target_file)
 
@@ -165,12 +165,12 @@
         return files
 
     def _delete(self, filename):
-        target_file = self.remote_file.get_child_for_display_name(filename)
+        target_file = self.remote_file.get_child_for_display_name(util.fsdecode(filename))
         target_file.delete(None)
 
     def _query(self, filename):
         from gi.repository import Gio  # @UnresolvedImport  # pylint: disable=import-error
-        target_file = self.remote_file.get_child_for_display_name(filename)
+        target_file = self.remote_file.get_child_for_display_name(util.fsdecode(filename))
         info = target_file.query_info(Gio.FILE_ATTRIBUTE_STANDARD_SIZE,
                                       Gio.FileQueryInfoFlags.NONE, None)
         return {u'size': info.get_size()}

=== modified file 'duplicity/backends/pydrivebackend.py'
--- duplicity/backends/pydrivebackend.py	2019-05-19 16:14:00 +0000
+++ duplicity/backends/pydrivebackend.py	2019-05-29 23:37:47 +0000
@@ -23,6 +23,7 @@
 
 import duplicity.backend
 from duplicity import log
+from duplicity import util
 from duplicity.errors import BackendException
 
 
@@ -115,6 +116,10 @@
         self.id_cache = {}
 
     def file_by_name(self, filename):
+        from pydrive.files import ApiRequestError
+
+        filename = util.fsdecode(filename)  # PyDrive deals with unicode filenames
+
         if filename in self.id_cache:
             # It might since have been locally moved, renamed or deleted, so we
             # need to validate the entry.
@@ -164,20 +169,20 @@
         drive_file = self.file_by_name(remote_filename)
         if drive_file is None:
             # No existing file, make a new one
-            drive_file = self.drive.CreateFile({u'title': remote_filename,
+            drive_file = self.drive.CreateFile({u'title': util.fsdecode(remote_filename),
                                                 u'parents': [{u"kind": u"drive#fileLink",
                                                              u"id": self.folder}]})
-            log.Info(u"PyDrive backend: creating new file '%s'" % (remote_filename,))
+            log.Info(u"PyDrive backend: creating new file '%s'" % (util.fsdecode(remote_filename),))
         else:
             log.Info(u"PyDrive backend: replacing existing file '%s' with id '%s'" % (
-                remote_filename, drive_file[u'id']))
-        drive_file.SetContentFile(source_path.name)
+                util.fsdecode(remote_filename), drive_file[u'id']))
+        drive_file.SetContentFile(util.fsdecode(source_path.name))
         drive_file.Upload()
         self.id_cache[remote_filename] = drive_file[u'id']
 
     def _get(self, remote_filename, local_path):
         drive_file = self.file_by_name(remote_filename)
-        drive_file.GetContentFile(local_path.name)
+        drive_file.GetContentFile(util.fsdecode(local_path.name))
 
     def _list(self):
         drive_files = self.drive.ListFile({
@@ -198,7 +203,7 @@
         if file_id != u'':
             self.drive.auth.service.files().delete(fileId=file_id).execute()
         else:
-            log.Warn(u"File '%s' does not exist while trying to delete it" % (filename,))
+            log.Warn(u"File '%s' does not exist while trying to delete it" % (util.fsdecode(filename),))
 
     def _query(self, filename):
         drive_file = self.file_by_name(filename)
@@ -209,6 +214,7 @@
         return {u'size': size}
 
     def _error_code(self, operation, error):
+        from pydrive.files import ApiRequestError, FileNotUploadedError
         if isinstance(error, FileNotUploadedError):
             return log.ErrorCode.backend_not_found
         elif isinstance(error, ApiRequestError):