From 86788c4dec382776f547ca37679df54b7f150286 Mon Sep 17 00:00:00 2001
From: Ben Newton <istairbn@users.noreply.github.com>
Date: Wed, 18 Oct 2017 10:36:27 +0100
Subject: [PATCH 1/3] Improve Get All Versions

Get All Versions task needs two extra features:
 - Add recursion (allows it to recurse through child directories, defaults to False, which is standard behaviour
 - Populate a list box. Allows users to get all versions and add to a list box
---
 src/main/resources/synthetic.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/synthetic.xml b/src/main/resources/synthetic.xml
index 1e1c749..1d580ce 100644
--- a/src/main/resources/synthetic.xml
+++ b/src/main/resources/synthetic.xml
@@ -134,8 +134,9 @@
         <property name="scriptLocation" default="xlr_xldeploy/getAllVersionsTask.py" hidden="true"/>
         <property name="applicationId" category="input" label="Application ID" required="true"/>
         <!-- <property name="stripApplications" category="input" kind="boolean" /> -->
-        <property name="throwOnFail" category="input" kind="boolean" label="Throw on Fail"
-                  description="If True, the Task will fail if the CI doesn't exist" default="false"/>
+        <property name="throwOnFail" category="input" kind="boolean" label="Throw on Fail" description="If True, the Task will fail if the CI doesn't exist" default="false"/>
+        <property name="recurse" category="input" kind="boolean" label="Recursive" description="If True, recurses through child directories" default="false"/>
+        <property name="target_list_box" category="input" kind="string" label="List Box" description="If you wish to populate a List Box, provide the existing release variable name here (without ${ or })"/>
 
         <property name="packageIds" category="output" kind="list_of_string" label="Package IDs"/>
     </type>

From 4bcda568af84aab08f5d29e30f02bcada0fa3ad3 Mon Sep 17 00:00:00 2001
From: Ben Newton <istairbn@users.noreply.github.com>
Date: Wed, 18 Oct 2017 10:38:17 +0100
Subject: [PATCH 2/3] Improve GetAllVersions

Allows Get All Versions to complete a list box rather than a list
---
 src/main/resources/xlr_xldeploy/getAllVersionsTask.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/resources/xlr_xldeploy/getAllVersionsTask.py b/src/main/resources/xlr_xldeploy/getAllVersionsTask.py
index e7c7349..c399d30 100644
--- a/src/main/resources/xlr_xldeploy/getAllVersionsTask.py
+++ b/src/main/resources/xlr_xldeploy/getAllVersionsTask.py
@@ -24,3 +24,8 @@
 
 if throwOnFail and len(packageIds) == 0:
 	raise Exception(applicationId + " exists but has no versions")
+
+if target_list_box:
+    target = getCurrentRelease().variablesByKeys[target_list_box]
+    target.valueProvider.setValues(packageIds)
+    releaseApi.updateVariable(target)

From 43900332ce3e5aaff575b367472e4bccbd80fbe7 Mon Sep 17 00:00:00 2001
From: Ben Newton <istairbn@users.noreply.github.com>
Date: Wed, 18 Oct 2017 10:40:11 +0100
Subject: [PATCH 3/3] Add recursion

get_all_package_version has the recurse option, allowing it to search through child directories
---
 .../resources/xlr_xldeploy/XLDeployClient.py  | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/xlr_xldeploy/XLDeployClient.py b/src/main/resources/xlr_xldeploy/XLDeployClient.py
index 95d595b..8d547f3 100644
--- a/src/main/resources/xlr_xldeploy/XLDeployClient.py
+++ b/src/main/resources/xlr_xldeploy/XLDeployClient.py
@@ -303,15 +303,34 @@ def get_latest_package_version(self, application_id):
             latest_package = items[-1].attrib['ref']
         return latest_package
 
-    def get_all_package_version(self, application_id):
-        query_task = "/deployit/repository/query?parent=%s&resultsPerPage=-1" % application_id
-        query_task_response = self.http_request.get(query_task, contentType='application/xml')
-        root = ET.fromstring(query_task_response.getResponse())
-        items = root.findall('ci')
+    def get_all_package_version(self, application_id,recurse=False):
+        noMoreDirectories = False
         all_package = list()
-        for item in items:
-            all_package.append(item.attrib['ref'])
-        return all_package
+        directories = list()
+        if recurse == False:
+            query_task = "/deployit/repository/query?parent=%s&resultsPerPage=-1" % application_id
+            query_task_response = self.http_request.get(query_task, contentType='application/xml')
+            root = ET.fromstring(query_task_response.getResponse())
+            items = root.findall('ci')
+            for item in items:
+                all_package.append(item.attrib['ref'])
+            return all_package
+        else:
+            while noMoreDirectories == False:
+                query_task = "/deployit/repository/query?parent=%s&resultsPerPage=-1" % application_id
+                query_task_response = self.http_request.get(query_task, contentType='application/xml')
+                root = ET.fromstring(query_task_response.getResponse())
+                items = root.findall('ci')
+                for item in items:
+                    if item.attrib['type'] == 'core.Directory':
+                        directories.append(item.attrib['ref'])
+                    else:
+                        all_package.append(item.attrib['ref'])
+                if len(directories) >= 1:
+                    application_id = directories.pop(0)
+                else:
+                    noMoreDirectories = True
+            return all_package
 
     def get_latest_deployed_version(self, environment_id, application_name):
         query_task_response = self.get_ci("%s/%s" % (environment_id, application_name), 'xml')