Merge pull request #74 from gonchik/master

Confluence cleaner updates

Author: gonchik

atlassian/confluence.py

@@ -194,6 +194,24 @@ def get_all_draft_pages_from_space(self, space, start=0, limit=500, status='draf
                                                                                                      status=status)
         return (self.get(url) or {}).get('results')
 
+    def get_all_draft_pages_from_space_through_cql(self, space, start=0, limit=500, status='draft'):
+        """
+        Search list of draft pages by space key
+        Use case is cleanup old drafts from Confluence
+        :param space: Space Key
+        :param status: Can be changed
+        :param start: OPTIONAL: The start point of the collection to return. Default: None (0).
+        :param limit: OPTIONAL: The limit of the number of pages to return, this may be restricted by
+                            fixed system limits. Default: 500
+        :return:
+        """
+        url = 'rest/api/content?cql=space=spaceKey={space} and status={status}'.format(space=space,
+                                                                                       status=status)
+        params = {}
+        params['limit'] = limit
+        params['start'] = start
+        return (self.get(url, params=params) or {}).get('results')
+
     def get_all_restictions_for_content(self, content_id):
         """
         Returns info about all restrictions by operation.
@@ -209,16 +227,28 @@ def remove_page_from_trash(self, page_id):
         :param page_id:
         :return:
         """
-        url = 'rest/api/content/{page_id}?status=trashed'.format(page_id=page_id)
-        return self.delete(url)
+        return self.remove_page(page_id=page_id, status='trashed')
 
-    def remove_page(self, page_id):
+    def remove_page_as_draft(self, page_id):
+        """
+        This method removed page from trash
+        :param page_id:
+        :return:
+        """
+        return self.remove_page(page_id=page_id, status='draft')
+
+    def remove_page(self, page_id, status=None):
         """
         This method removed page
         :param page_id:
+        :param status: OPTIONAL: type of page
         :return:
         """
-        url = 'rest/api/content/{page_id}'.format(page_id=page_id)
+        if status is None:
+            url = 'rest/api/content/{page_id}'.format(page_id=page_id)
+        else:
+            url = 'rest/api/content/{page_id}?status={status}'.format(page_id=page_id, status=status)
+
         return self.delete(url)
 
     def create_page(self, space, title, body, parent_id=None, type='page'):

atlassian/rest_client.py

@@ -31,7 +31,7 @@ def log_curl_debug(self, method, path, data=None, headers=None, level=logging.DE
             password=self.password,
             headers=' -H '.join(["'{0}: {1}'".format(key, value) for key, value in headers.items()]),
             data='' if not data else "--data '{0}'".format(json.dumps(data)),
-            url='{0}{1}'.format(self.url, path))
+            url='{0}'.format(urljoin(self.url, path)))
         log.log(level=level, msg=message)
 
     def resource_url(self, resource):

examples/confluence-draft-page-cleaner.py

@@ -27,7 +27,9 @@ def clean_draft_pages_from_space(confluence, space_key, count, date_now):
         last_date = datetime.datetime.strptime(last_date_string.replace(".000", "")[:-6], "%Y-%m-%dT%H:%M:%S")
         if (date_now - last_date) > datetime.timedelta(days=DRAFT_DAYS):
             count += 1
-            print("Removed page with date {}".format(last_date_string))
+            print("Removing page with page id: " + page_id)
+            confluence.remove_page_as_draft(page_id=page_id)
+            print("Removed page with date " + last_date_string)
     return count
 
 

examples/confluence-trash-cleaner.py

@@ -24,8 +24,9 @@ def clean_pages_from_space(confluence, space_key, limit=500):
             flag = False
             print("For space {} trash is empty".format(space_key))
         else:
+            print("Founded in space {} pages as trashed {}".format(space_key, len(values)))
             for value in values:
-                print(value['title'])
+                print("Removing page with title: " + value['title'])
                 confluence.remove_page_from_trash(value['id'])