filesystem: include remote file name in filesystem_new_file event

Author: Wenzel

hooks/filesystem.py

@@ -43,7 +43,7 @@ def guestfs_instance(self):
 def guest_local_file(gfs, remote_file):
     with NamedTemporaryFile() as temp:
         gfs.download(remote_file, temp.name)
-        yield temp.name
+        yield remote_file, temp.name
 
 
 class FilesystemHook(Hook):
@@ -101,8 +101,9 @@ def walk_capture(self, node):
         inode = Inode(self.gfs, node, self.inode_checksums)
         # download and execute trigger on local file
         if InodeType(inode.inode_type) == InodeType.REG:
-            with guest_local_file(self.gfs, str(node)) as local_file:
-                self.context.trigger('filesystem_new_file', filepath=local_file, inode=inode)
+            with guest_local_file(self.gfs, str(node)) as (remote_file, local_file):
+                self.context.trigger('filesystem_new_file', guest_filepath=remote_file, local_filepath=local_file,
+                                     inode=inode)
         # walk
         if self.gfs.is_dir(str(node)):
             entries = self.gfs.ls(str(node))
@@ -115,7 +116,7 @@ def walk_capture(self, node):
         return inode
 
     def process_new_file(self, event):
-        filepath = event.filepath
+        filepath = event.local_filepath
         inode = event.inode
         # determine MIME type and update inode
         inode.mime_type = subprocess.check_output(['file', '-bi', filepath]).decode().rstrip()