Merge 05d1393 into 87c3421

nextcloud · Sep 18, 2017 · 7731f83 · 7731f83
2 parents 87c3421 + 05d1393
commit 7731f83
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 0 deletions.
diff --git a/nextcloudappstore/api/v1/release/info.xsd b/nextcloudappstore/api/v1/release/info.xsd
@@ -55,6 +55,8 @@
                             maxOccurs="1"/>
                 <xs:element name="contactsmenu" type="contactsmenu" minOccurs="0"
                             maxOccurs="1"/>
+                <xs:element name="collaboration" type="collaboration" minOccurs="0"
+                            maxOccurs="1" />
             </xs:sequence>
         </xs:complexType>
         <xs:unique name="uniqueNameL10n">
@@ -432,6 +434,34 @@
         </xs:sequence>
     </xs:complexType>
 
+    <xs:complexType name="collaboration">
+        <xs:sequence>
+            <xs:element name="collaborators" type="collaboration-collaborators" minOccurs="0" maxOccurs="1">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="collaboration-collaborators">
+        <xs:sequence>
+            <xs:element name="searchPlugins" type="collaboration-collaborators-searchPlugins" minOccurs="0" maxOccurs="1">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="collaboration-collaborators-searchPlugins">
+        <xs:sequence>
+            <xs:element name="searchPlugin" type="collaboration-collaborators-searchPlugins-searchPlugin" minOccurs="1" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="collaboration-collaborators-searchPlugins-searchPlugin">
+        <xs:sequence>
+            <xs:element name="class" type="php-class" minOccurs="1" maxOccurs="1"/>
+            <xs:element name="shareType" type="non-empty-string" minOccurs="1" maxOccurs="1"/>
+        </xs:sequence>
+    </xs:complexType>
+
     <!-- dependencies -->
     <xs:complexType name="dependencies">
         <xs:sequence>

diff --git a/nextcloudappstore/api/v1/release/pre-info.xslt b/nextcloudappstore/api/v1/release/pre-info.xslt
@@ -41,6 +41,7 @@
             <xsl:apply-templates select="activity"/>
             <xsl:apply-templates select="navigations"/>
             <xsl:copy-of select="contactsmenu"/>
+            <xsl:copy-of select="collaboration" />
 
             <!-- copy invalid elements to fail if they are present -->
             <xsl:copy-of select="standalone"/>

diff --git a/nextcloudappstore/api/v1/tests/data/infoxmls/collaboration.xml b/nextcloudappstore/api/v1/tests/data/infoxmls/collaboration.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<info xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	  xsi:noNamespaceSchemaLocation="../../../release/info.xsd">
+	<id>circles</id>
+	<name>Circles</name>
+	<summary>Bring cloud-users closer together.</summary>
+	<description><![CDATA[Circles allows your users to create their own groups of users/colleagues/friends.
+Those groups of users (or 'circles') can then be used by any other app for sharing purpose (files, social feed, status update, messaging, ...).
+		]]>
+	</description>
+	<version>0.12.5</version>
+	<licence>agpl</licence>
+	<author>Maxence Lange</author>
+	<documentation>
+		<admin>https://github.com/nextcloud/circles/wiki</admin>
+	</documentation>
+	<category>tools</category>
+	<category>social</category>
+	<website>https://github.com/nextcloud/circles</website>
+	<bugs>https://github.com/nextcloud/circles/issues</bugs>
+	<repository>https://github.com/nextcloud/circles.git</repository>
+	<screenshot>https://raw.githubusercontent.com/nextcloud/circles/master/screenshots/0.12.0.png
+	</screenshot>
+	<dependencies>
+		<nextcloud min-version="12" max-version="13"/>
+	</dependencies>
+
+	<repair-steps>
+		<post-migration>
+			<step>OCA\Circles\Migration\UpdateShareTimeToTimestamp</step>
+			<step>OCA\Circles\Migration\ImportOwncloudCustomGroups</step>
+			<step>OCA\Circles\Migration\GenerateUniqueIdOnCreatedCircle</step>
+			<step>OCA\Circles\Migration\UsingShortenUniqueIdInsteadOfCircleId</step>
+		</post-migration>
+	</repair-steps>
+
+	<commands>
+		<command>OCA\Circles\Command\Clean</command>
+	</commands>
+
+	<activity>
+		<settings>
+			<setting>OCA\Circles\Activity\SettingAsModerator</setting>
+			<setting>OCA\Circles\Activity\SettingAsMember</setting>
+		</settings>
+		<filters>
+			<filter>OCA\Circles\Activity\Filter</filter>
+		</filters>
+		<providers>
+			<provider>OCA\Circles\Activity\Provider</provider>
+		</providers>
+	</activity>
+
+	<collaboration>
+		<collaborators>
+			<searchPlugins>
+				<searchPlugin>
+					<class>OCA\Circles\Collaboration\v1\CollaboratorSearchPlugin</class>
+					<shareType>SHARE_TYPE_CIRCLE</shareType>
+				</searchPlugin>
+			</searchPlugins>
+		</collaborators>
+	</collaboration>
+</info>
diff --git a/nextcloudappstore/api/v1/tests/test_parser.py b/nextcloudappstore/api/v1/tests/test_parser.py
@@ -75,6 +75,13 @@ def test_parse_settings_and_activity_and_nav(self):
                            self.config.pre_info_xslt,
                            self.config.info_xslt)
 
+    def test_parse_collaboration(self):
+        xml = self._get_contents(
+            'data/infoxmls/collaboration.xml')
+        parse_app_metadata(xml, self.config.info_schema,
+                           self.config.pre_info_xslt,
+                           self.config.info_xslt)
+
     def test_parse_pre_release(self):
         xml = self._get_contents('data/infoxmls/prerelease.xml')
         result = parse_app_metadata(xml, self.config.info_schema,