From f24024c0d76f86e786d937d2e2aa68f7fee6b242 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Wed, 19 May 2021 20:51:38 +0200
Subject: [PATCH] Add name_and_ext shortcut

---
 lib/galaxy/tools/wrappers.py        | 4 ++++
 tools/data_export/export_remote.xml | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/galaxy/tools/wrappers.py b/lib/galaxy/tools/wrappers.py
index 9dabe9d2899..94902436ca8 100644
--- a/lib/galaxy/tools/wrappers.py
+++ b/lib/galaxy/tools/wrappers.py
@@ -305,6 +305,10 @@ class DatasetFilenameWrapper(ToolParameterValueWrapper):
     def file_ext(self):
         return getattr(self.unsanitized.datatype, 'file_ext_export_alias', None) or self.dataset.extension
 
+    @property
+    def name_and_ext(self):
+        return f"{self.element_identifier}.{self.file_ext}"
+
     @property
     def is_collection(self):
         return False
diff --git a/tools/data_export/export_remote.xml b/tools/data_export/export_remote.xml
index afb8c742af1..6d9862e7ed1 100644
--- a/tools/data_export/export_remote.xml
+++ b/tools/data_export/export_remote.xml
@@ -10,8 +10,8 @@
                     '$filepath'
                 #end for
                 --names
-                #for $name in $export_type.infiles:
-                    '${name.element_identifier}.${name.file_ext}'
+                #for $infile in $export_type.infiles:
+                    '$infile.name_and_ext'
                 #end for
             #else
                 --infiles