Merge branch 'MartinFechner-add-compatibility-for-non-expath-repos'

README.md

@@ -17,7 +17,6 @@ Synchronizes your data collection with GitHub and GitLab.
 
 -  [node](https://nodejs.org/en/): `v12+`
 -  [exist-db](https://www.exist-db.org): `v5.3.0+` (works with Version [GITSHA: 4a8124](https://github.com/eXist-db/exist#4a8124))
--  the data xar containing the target collection must be installed prior to using Tuttle
 -  Authtoken for git repository to use
 
 ## Building and Installation
@@ -117,7 +116,9 @@ With incremental update only the changes to the database collection are applied.
 2) click on 'full' to trigger a full deployment from git to existdb
 3) now you can update your collection with a click on 'incremental'
 
-**REMARK: A valid expath-pkg.xml and repo.xml must be present**
+Repositories from which a valid XAR (existing expath-pkg.xml and repo.xml) package can be generated are installed as a package, all others are created purely on the DB.
+
+**REMARK: Note that there may be index problems if a collection is not installed as a package.**
 
 **REMARK: Only use it with data collections**
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tuttle",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "tuttle - a Git-integration for eXist-db",
   "scripts": {
     "test": "gulp install && mocha --exit",

src/expath-pkg.xml

@@ -2,7 +2,7 @@
 <package 
   xmlns="http://expath.org/ns/pkg"
   name="http://e-editiones.org/tuttle"
-  abbrev="tuttle" version="1.1.2" spec="1.0">
+  abbrev="tuttle" version="1.1.3" spec="1.0">
   <title>Tuttle - Git for eXist-db</title>
   <dependency processor="http://exist-db.org" semver-min="5.3.0"/>
   <dependency package="http://e-editiones.org/roaster" semver-min="1.0.0"/>

src/modules/api.xql

@@ -208,8 +208,15 @@ declare function api:git-deploy($request as map(*)) {
                     let $write-lock := app:lock-write($collection-destination, "deploy")
                     let $xar-list := xmldb:get-child-resources($collection-staging-uri)
                     let $xar-check := if (not($xar-list = "expath-pkg.xml" and $xar-list = "repo.xml")) then (
+                            let $cleanup-col := app:cleanup-collection($git-collection, config:prefix())
+                            let $cleanup-res := app:cleanup-resources($git-collection, config:prefix())
+                            let $move-col := app:move-collections($collection-staging, $git-collection, config:prefix())
+                            let $move-res := app:move-resources($collection-staging, $git-collection, config:prefix())
+                            let $set-permissions := app:set-permission($git-collection)
+                            return 
                             map {
-                                        "message" : "no expath-pkg.xml or repo.xml in repo"
+                                        "sha" : app:production-sha($git-collection),
+                                        "message" : "success"
                                 }
                         )
                         else (

src/modules/app.xql

@@ -56,6 +56,63 @@ declare function app:unzip-filter($path as xs:string, $data-type as xs:string, $
             true()
 };
 
+(:~
+ : Move staging collection to final collection
+ :)
+declare function app:move-collections($collection-source as xs:string, $collection-target as xs:string, $prefix as xs:string) {
+    let $fullpath-collection-source :=  $prefix || "/" || $collection-source
+    let $fullpath-collection-target :=  $prefix || "/" || $collection-target
+
+    return
+        for $child in xmldb:get-child-collections($fullpath-collection-source) 
+            let $fullpath-child-source := $fullpath-collection-source || "/" || $child
+            let $fullpath-child-target := $fullpath-collection-target || "/" 
+            return 
+                xmldb:move($fullpath-child-source, $fullpath-child-target)
+};
+
+(:~
+ : Move staging collection to final collection
+ :)
+declare function app:move-resources($collection-source as xs:string, $collection-target as xs:string, $prefix as xs:string) {
+    let $fullpath-collection-source :=  $prefix || "/" || $collection-source
+    let $fullpath-collection-target :=  $prefix || "/" || $collection-target
+
+    return
+        for $child in xmldb:get-child-resources($fullpath-collection-source) 
+            return 
+                xmldb:move($fullpath-collection-source, $fullpath-collection-target, $child)
+};
+
+(:~ 
+ : Cleanup destination collection - delete collections from target collection
+ :)
+declare function app:cleanup-collection($collection as xs:string, $prefix as xs:string) {
+    let $blacklist := [config:blacklist(), config:lock()]
+    let $fullpath-collection :=  $prefix || "/" || $collection 
+
+    return
+        for $child in xmldb:get-child-collections($fullpath-collection)
+            where not(contains($child, $blacklist))
+                let $fullpath-child := $fullpath-collection || "/" || $child
+                return 
+                    xmldb:remove($fullpath-child)
+};
+
+(:~
+ : Cleanup destination collection - delete resources from target collection
+ :)
+declare function app:cleanup-resources($collection as xs:string, $prefix as xs:string) {
+    let $blacklist := config:blacklist()
+    let $fullpath-collection :=  $prefix || "/" || $collection 
+
+    return
+        for $child in xmldb:get-child-resources($fullpath-collection)
+            where not(contains($child, $blacklist))
+            return 
+                xmldb:remove($fullpath-collection, $child)
+};
+
 (:~
  : Random apikey generator
  :)