Added export of core data, such as users, path_aliases, custom_values.

Added export of node revisions.
2015-11-12 18:19:06 +01:00
parent a5973c9c8a
commit 79d30ee3a7
12 changed files with 298 additions and 15 deletions
--- a/modules/admin/cms_admin_module.e
+++ b/modules/admin/cms_admin_module.e
@@ -105,6 +105,7 @@ feature -- Security
 			Result.force ("admin core caches")
 			Result.force ("clear blocks cache")
 			Result.force ("admin export")
+			Result.force ("export core")
 		end

 feature -- Hooks
--- a/modules/admin/handler/cms_admin_export_handler.e
+++ b/modules/admin/handler/cms_admin_export_handler.e
@@ -64,7 +64,12 @@ feature -- Execution
 				fd.is_valid
 			then
 				if attached fd.string_item ("op") as l_op and then l_op.same_string (text_export_all_data) then
-					create l_exportation_parameters.make (api.site_location.extended ("export").extended ((create {DATE_TIME}.make_now_utc).formatted_out ("yyyy-[0]mm-[0]dd_hh12-[0]mi-[0]ss")))
+					if attached fd.string_item ("folder") as l_folder then
+						create l_exportation_parameters.make (api.site_location.extended ("export").extended (l_folder))
+					else
+						create l_exportation_parameters.make (api.site_location.extended ("export").extended ((create {DATE_TIME}.make_now_utc).formatted_out ("yyyy-[0]mm-[0]dd---hh24-[0]mi-[0]ss")))
+					end
+
 					l_response.hooks.invoke_export_to (Void, l_exportation_parameters, l_response)
 					l_response.add_notice_message ("All data exported (if allowed)!")
 					create s.make_empty
@@ -90,9 +95,16 @@ feature -- Widget

 	exportation_web_form (a_response: CMS_RESPONSE): CMS_FORM
 		local
+			f_name: WSF_FORM_TEXT_INPUT
 			but: WSF_FORM_SUBMIT_INPUT
 		do
 			create Result.make (a_response.url (a_response.location, Void), "export_all_data")
+			Result.extend_raw_text ("Export CMS data to ")
+			create f_name.make_with_text ("folder", (create {DATE_TIME}.make_now_utc).formatted_out ("yyyy-[0]mm-[0]dd---hh24-[0]mi-[0]ss"))
+			f_name.set_label ("Export folder name")
+			f_name.set_description ("Folder name under 'exports' folder.")
+			f_name.set_is_required (True)
+			Result.extend (f_name)
 			create but.make_with_text ("op", text_export_all_data)
 			Result.extend (but)
 		end
--- a/modules/blog/cms_blog_module.e
+++ b/modules/blog/cms_blog_module.e
@@ -188,7 +188,10 @@ feature -- Hooks
 				a_export_id_list = Void
 				or else across a_export_id_list as ic some ic.item.same_string ("blog") end
 			then
-				if attached blog_api as l_blog_api then
+				if
+					a_response.has_permissions (<<"export any node", "export blog">>) and then
+					attached blog_api as l_blog_api
+				then
 					lst := l_blog_api.blogs_order_created_desc
 					a_export_parameters.log ("Exporting " + lst.count.out + " blogs")
 					across
@@ -207,6 +210,30 @@ feature -- Hooks
 							f.put_string (json_to_string (blog_node_to_json (n)))
 							f.close
 						end
+							-- Revisions.
+						if
+							attached node_api as l_node_api and then
+							attached l_node_api.node_revisions (n) as l_revisions and then l_revisions.count > 1
+						then
+							a_export_parameters.log (n.content_type + " " + l_revisions.count.out + " revisions.")
+							p := a_export_parameters.location.extended ("nodes").extended (n.content_type).extended (n.id.out)
+							create d.make_with_path (p)
+							if not d.exists then
+								d.recursive_create_dir
+							end
+							across
+								l_revisions as revs_ic
+							loop
+								if attached {CMS_BLOG} revs_ic.item as l_blog then
+									create f.make_with_path (p.extended ("rev-" + n.revision.out).appended_with_extension ("json"))
+									if not f.exists or else f.is_access_writable then
+										f.open_write
+										f.put_string (json_to_string (blog_node_to_json (l_blog)))
+									end
+									f.close
+								end
+							end
+						end
 					end
 				end
 			end
--- a/modules/node/cms_node_module.e
+++ b/modules/node/cms_node_module.e
@@ -151,6 +151,7 @@ feature -- Access
 		do
 			Result := Precursor
 			Result.force ("create any node")
+			Result.force ("export any node")

 			if attached node_api as l_node_api then
 				across
@@ -177,6 +178,8 @@ feature -- Access
 						Result.force ("view unpublished " + l_type_name)

 						Result.force ("view revisions own " + l_type_name)
+
+						Result.force ("export " + l_type_name)
 					end
 				end
 				Result.force ("view trash")
@@ -375,6 +378,7 @@ feature -- Hooks
 				loop
 					l_node_type := types_ic.item
 					if
+						a_response.has_permissions (<<"export any node", "export " + l_node_type.name>>) and then
 						l_node_type.name.same_string_general ("page") and then
 						(	a_export_id_list = Void
 							or else across a_export_id_list as ic some ic.item.same_string (l_node_type.name) end
@@ -384,17 +388,17 @@ feature -- Hooks
 							-- For now, handle only page from this node module.
 						lst := l_node_api.nodes_of_type (l_node_type)
 						a_export_parameters.log ("Exporting " + lst.count.out + " nodes of type " + l_node_type.name)
+						p := a_export_parameters.location.extended ("nodes").extended (l_node_type.name)
+						create d.make_with_path (p)
+						if not d.exists then
+							d.recursive_create_dir
+						end
 						across
 							lst as ic
 						loop
 							n := l_node_api.full_node (ic.item)
-							a_export_parameters.log (l_node_type.name + " #" + n.id.out)
-							p := a_export_parameters.location.extended ("nodes").extended (l_node_type.name).extended (n.id.out)
-							create d.make_with_path (p.parent)
-							if not d.exists then
-								d.recursive_create_dir
-							end
-							create f.make_with_path (p)
+							a_export_parameters.log (l_node_type.name + " #" + n.id.out + " rev=" + n.revision.out)
+							create f.make_with_path (p.extended (n.id.out).appended_with_extension ("json"))
 							if not f.exists or else f.is_access_writable then
 								f.open_write
 								if attached {CMS_PAGE} n as l_page then
@@ -404,6 +408,30 @@ feature -- Hooks
 								end
 								f.close
 							end
+								-- Revisions.
+							if attached l_node_api.node_revisions (n) as l_revisions and then l_revisions.count > 1 then
+								a_export_parameters.log (l_node_type.name + " " + l_revisions.count.out + " revisions.")
+								p := a_export_parameters.location.extended ("nodes").extended (l_node_type.name).extended (n.id.out)
+								create d.make_with_path (p)
+								if not d.exists then
+									d.recursive_create_dir
+								end
+								across
+									l_revisions as revs_ic
+								loop
+									n := revs_ic.item
+									create f.make_with_path (p.extended ("rev-" + n.revision.out).appended_with_extension ("json"))
+									if not f.exists or else f.is_access_writable then
+										f.open_write
+										if attached {CMS_PAGE} n as l_page then
+											f.put_string (json_to_string (page_node_to_json (l_page)))
+										else
+											f.put_string (json_to_string (node_to_json (n)))
+										end
+										f.close
+									end
+								end
+							end
 						end
 					end
 				end
--- a/modules/node/export/cms_export_node_utilities.e
+++ b/modules/node/export/cms_export_node_utilities.e
@@ -7,12 +7,12 @@ note

 class
 	CMS_EXPORT_NODE_UTILITIES
-	
+
 inherit
 	CMS_EXPORT_JSON_UTILITIES
-	
+
 feature -- Access
-	
+
 	node_to_json (n: CMS_NODE): JSON_OBJECT
 		local
 			jo,j_author: JSON_OBJECT