- files_opds v0.8.7: need separate dist files for NC and OC due to

signature incompatibilities

files_opds/appinfo/info.xml

@@ -19,7 +19,7 @@ See [README] for more information on (mis)features of this app.
     ]]>
     </description>
     <licence>AGPL</licence>
-	<version>0.8.6</version>
+	<version>0.8.7</version>
     <author>Frank de Lange</author>
 	<category>tools</category>
 	<category>files</category>

files_opds/appinfo/signature.json

@@ -9,7 +9,7 @@
         "ajax\/schedule_rescan.php": "876591efaf712e356f0a01f01e89673980715789ca365ad7afc14f79eee5447fa11f0dba095d738d8200f1840ca564c2a5a68b7d8fca2886b597bd471a6cd30b",
         "appinfo\/app.php": "785be08e5107e30eac9800ccb080d9b27a762f42b51034ff399c7a23534278fc1cacfb2e332e5e6854b5f8f4e07df1149dc37fa10abb1c97df3be096d66a579f",
         "appinfo\/database.xml": "010b78a70f71f6e5bfc566325b310013bdfe1efd74bbcf3416ebb1fd19d033f6736918df72d7c4389645cc018d653b00791b849306a9983de79a5bc7f994bd2e",
-        "appinfo\/info.xml": "05c9e16bb3a232b839ab1a7795920c5d6907569f1c0e3b27f47f319c7f42ff91b12d986b366eedf790aa89c75416647d475c4f11c7035a9ba70fd4d207dd7da5",
+        "appinfo\/info.xml": "1367e2dc1bcc9a1cfe2ebd6c501ac41aadf71592e124e48ca8835fef2a1f1ae07be63e95fe6d31668471d5f3ac5c3083df37448458045b5873a1ce02b14d6483",
         "appinfo\/routes.php": "0b2e8d1ab81907421c98f620644e1482c25e2b9bbbcca2111218307ee7db027123ba23ab6a5afe51c393943cd3ca05d7eceb28645cc5eeeaf363d7e8cc535fde",
         "css\/settings.css": "b697ffbe3151d13d324fb8666c5c7d165820842f81245cde8719852ed58ac7ce473288747ea353827b66e66528bb6543fbddbd2dda76676f4740094a44b8edb0",
         "img\/app.svg": "5057300b0689688be83c4b040c76e7b3c85d665f301e51b122c2aeaf9fecbefe82c917352c2dbac6eb468d7d77df99a70d5ade7f20055bd8a6f67e5656432902",
@@ -32,12 +32,13 @@
         "lib\/util.php": "74e636ad6a5023711c4539dc287b42129cb5df6e8a8717614f236fbd32134a648b26e7291db68d9d9a831a97d936c5b3e8347b69b220ada90c097505eeaad28e",
         "personal.php": "7184f7908e1ddfbb4a7f2d3dd48f46c4d82911ce802be635430d09f80ea511244f784fa06f94cf12551d1a49db25a8a5942cfa585454c976c47f402bdf1e7f5e",
         "templates\/admin.php": "a60fe76b3bdf4a9007578143cba59cd90aa070dea439d195cee849b85cf7057e50fda391eb86b5f4252c0dba13fa6ecab7b3465d88f0f38acca26950b29f6dc9",
-        "templates\/feed.php": "4cd48c9fa2c92e8db22b13642b3b1278af8b58ddec2c42650cb0b99f2050fc17845f11c49a929fab77fabbcd75597889260cc2f3c607d7523878a699d3b9a7c4",
+        "templates\/feed.php": "35f2066a623144bdcc959dcba21129685ad18dd07642ee8cfb1e66f21268996e246d86ec3c9dff0f5f6cfcebe6f5f31418284422b15a80fa6302ed2579f37d87",
         "templates\/part.feed.acquisition.php": "db543db58993cd17742f04d27ea2e1b609d5ca5afb7be2f10450593582b5d517cc6ad531a7ea1a03bea2a3050cfdb456bba57ace5b90955610a5c241ee652f1d",
         "templates\/part.feed.navigation.php": "956d32d3c5bc96a704e6b842bf80a2f3ed1cfd5c2e879d29873a635a198a27a3adab6fd1ad31a91b364fbf46643340af1a0ec501ead312aa0c43ad01272f1894",
         "templates\/part.feed.root.php": "74e72cc83d5c046f9e3e381ffce76d7b98dfd45fe069d007abae6ca45fb9f9359f244db1b183a875eacb642ac9cc3d1813b9f229f98cd3b4ae3dbf568ccff0e6",
-        "templates\/personal.php": "4a9d0f34660bc3b6915c81c2b4f0ef14e83cac342eda03d4219de917852d621f525045bcac5c7bf4d22ebe3d0c40418ed433f456fb4900360c05c32cc7e550ee"
+        "templates\/personal.php": "4a9d0f34660bc3b6915c81c2b4f0ef14e83cac342eda03d4219de917852d621f525045bcac5c7bf4d22ebe3d0c40418ed433f456fb4900360c05c32cc7e550ee",
+        "templates\/search.php": "9b290d549c98834c92bb98049dac81223400a165f86c394191285f1c5a794bb3c6fa033d19cff21b7f47750ea748859f1c253023f9538bf8dc69cd70b0cafe4c"
     },
-    "signature": "iTlZLhHCvmD2O34YbU+QNc0Y5NjzVPFQ4R\/PTddnamBVImo7NulumgpPDkyDmyCVa426ZngT+W+wGwoqZvIHh\/\/qdkTBk51hSGORN+QJ+2XL2PQTUe+h0FucCLMubKeUUlBY6WuH4Kv\/QtaRVlhyXii7oK4tqfGSdrokPBGB6Nx+hw5MzBeMgZoQrnbKut+pYuaLLfkuqw2FIIy2fGFvhLifdgWkhzNYjxHV+RqW7t2szf64RTfQ3nIzIF8RxtWezwB6Yqmer1a7j9xY\/TIwz9vdmSJOOvAL+2gVR6MsFqarSGk7YWBhikpaK4IgaWJLq7HlS1U8IozAwJKeuNtZ\/S97pYY5wkQif7rWU8+XD1jvk2rry2PtE8V3nVTTbY48zURuFSuJjv2cHuzXcRL3cKwwUtQMJBC14ahmUAPBWAzpb2uXUlQ2qldddJdWGF378DNi27JO+EId74N1ILmEO2ALMQ8+xzHfygZKjiQeNjWRsPmM1CFyVtg3GYDibjXrHBMyl5X81o5w+ASLTNvpaBmEv+o3WocjobQhMuiQYBnz6pXVM6wuG8nxbVLUoAFckmNq8DlSeSm8jsq+pfZMYR3y\/By4\/QrhfGRAXQmgvl94EqPJwC2nKfcGHZ5RPgOj9eJFSYq1w1Ig16kq7zvXO5ZxzkOE1XbKgwQrnqgVJhA=",
+    "signature": "vBJyRyHecHmFiCxEaOmu28lAOV909Qgv1bRIwtQk7JLW717C7CozVSdghwUoQ9Q5YpM701LNHmYJ6gImKrpelgOVwr+AFkR1LMgGqWJaQ\/pJ7mfIKQSE1zFxVRTaOu6RfWiH7c4w\/aF3uUhRuvYlnEjLlVp6qS\/xekflmwt\/tbSqHj1xrh0miZzXbz3MLVGSsojf1JmJuNgv8FUiZLL4XLqR+cpuiGijg8hjC\/4kPPyPzi4zg73TG3GxuijZMXKseLl\/Wn4NGyyW3bZV+1wJnu5f7l9DPGgHJVmbXm7owjd2\/jFFgFMXsWMcQgzsR7hoRcQUifLiXEhvWI3VAHT2LtI9ZhICkAQjUxTCIJ0qBT3yediVlMdn1jwPZQO4lvidNpiRmKVkUEEo+FSyuu76f8lHI2UzUTYrGxORtti3u2776BcqqDUN729RbQE3IcwyjxcEaYXezSn81Zjteeg+MvgyFCS9y6THGb2WlSB5eoHjZ70kT3kUQ\/aUd\/\/fWnmoXaarQ9VT26YGsUDvAxTeDf8eo+qGKBJ1XdIq3j0\/VDltekBNUN1WBDdJnAeYb3TOm\/xT5DkpKoIJM7MWUkoxCl1zqOx\/bFBnK1CQiF1u1G4zeLEUNd70\/7v+qJrmwPRjeP1fjWx7dRcPyaWaqa5\/aZ\/mw67QNP2X62Qrdtq08eA=",
     "certificate": "-----BEGIN CERTIFICATE-----\r\nMIIE9zCCAt8CAhBOMA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNVBAYTAlVTMQ8wDQYD\r\nVQQIDAZCb3N0b24xFjAUBgNVBAoMDW93bkNsb3VkIEluYy4xNTAzBgNVBAMMLG93\r\nbkNsb3VkIENvZGUgU2lnbmluZyBJbnRlcm1lZGlhdGUgQXV0aG9yaXR5MB4XDTE4\r\nMDExODIxMzI0NFoXDTI4MDExNjIxMzI0NFowFTETMBEGA1UEAwwKZmlsZXNfb3Bk\r\nczCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAND\/ZZATXas40Gv5RSGI\r\n3iiLtjmZMREy791rlbdN2k5Yfo2MtQePJLaaJPkrQ5uHNKTu0TkgTrAxzCV5tNVZ\r\nB+UTun6+kPowjcyQN7zhQt2m+4wtmmRvKr\/\/lb4wZfORjClbVKfSYjO+D\/cQ+k4m\r\ngsntBqoUUUZ7D8TN7M9gFTyK9m9reUEWZDEUdu9iuNRE3fGh7tiJnRpkYtoZPm+R\r\nhv5S3ni2m47848L3VvAfVBirD0OQfCWJZnxMmRkMztT5F66lnrETGE1dROxFpM8+\r\nd9HwE5r0pmPR7L3bEZ23axwiHgJH7nBypqUtQM5foMYb\/T6Rm\/+Pjbq1AvcuN4wg\r\nolBXlG45nEdEjxKjsJcKdzGipTEnpAwSYtZ1WGjh5Ph3cv2f++fIphqZ1UjohMbR\r\nJvloeiPAliITFPBUlqJjaXowCzHko1XVyL5DBCZ38xQKIYa8A3mQQJucm2gxSP5z\r\npW0u8VxDCSleaG7waBGDVU+v5u3X1U9q2Bzeflk5jVjUe2rsVIXW1YyXBNLEbYkh\r\nS9+1qKuyuL58gZ\/JTGVqdJkSHQX+Pcq4RgUljzybeU38PtFYB9mNW1LBJvuwHAVB\r\nnmBpcJH7eSZuaeAez4Ta1cJnKcXgPvrSNeYJ5iZOSFFwdVo2SWmRq7UI\/LsBOThU\r\nPqKwVFHvCkQYi5G10ka+AdAzAgMBAAEwDQYJKoZIhvcNAQELBQADggIBALQhLQrF\r\nsUZDJS6S95sr5kJgUIGSwxx27jbCxSCl1lMg7Nnlf9eQnfB6BNtKhmiQ7K45lwae\r\n5rfs4L\/SEv0uQVhLTM42Jkj9WmfhF8kXrhuwaYZKFg+sI2c5roY2xtHmnVWZlYnk\r\nnMa45iI0XccSBSX4pFR\/H6Wi4\/cXAENG44XqmPh7+FSC0kaVy1f0VDTd87tw8cRB\r\nenWJXn9fTh5RscM7eFeq3VdzL8baFSaJwj+vlgOTT7SpzzRdO6ujWfgGY9MrAj1C\r\nYfP78OHgk6oO4iAbOkpDPfdXimW\/uQs6UZbQKWorh8kxSNUnKOWgvVSYb6MzYYfd\r\nLn+\/NDrHfGTTuupjbkLC8B9ZdcisOhYQ3bVN18iNQTmeTMSP3r2H1T+RyE0lWyVr\r\nPeD1ZSV5MaYSA7IfSrUEkYHf4\/VCcI8OGVdNBbkjq1LrZ4SQvNkvn0wEVgPiy5qR\r\nS+k6GDFjlxL6cdaFRFjvfD8xvUG2aXEBBpp9lqVPdH7t5fAnlcqcN\/MKHGSWlZ+n\r\nurMpIEEi\/JmVvXJO+BmZUq8RHf0YITu+qBoH69A6TPO1e4qeZdZEJBorEPr2b5OU\r\nA5lveN6B+NxrtgQ8kV5zz9qRDzcLFeq31Iv4Puep5JGx1C6Zoac9rKfbzXu1Pd3V\r\n6Xa9917Q9zAakEzBfKFY0c4cVKw0Z+miT0mB\r\n-----END CERTIFICATE-----"
 }

files_opds/templates/feed.php

@@ -50,9 +50,13 @@ switch ($_['type']) {
 		foreach ($_['bookshelf'] as $file) {
 			print_unescaped($this->inc('part.feed.acquisition', [ 'file' => $file ]));
 		}
-		break;
+        break;
 
-	/* intentional fall-through for 'directory' */
+
+	/* intentional fall-through */
+    case 'author':
+    case 'title':
+    case 'genre':
 	case 'directory':
 	default:
 		foreach ($_['files'] as $file) {

files_opds/templates/search.php

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * next/ownCloud - Files_Opds App
+ *
+ * @author Frank de Lange
+ * @copyright 2017 Frank de Lange
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ */
+
+ /** @var OCP\IURLGenerator $urlGenerator */
+$urlGenerator = $_['urlGenerator'];
+
+echo '<?xml version="1.0" encoding="UTF-8"?>';
+?>
+
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+   <ShortName>OPDS Catalog Search</ShortName>
+   <Description>Search <?php p($_['feed_title']); ?></Description>
+   <Tags><?php p($_['feed_subtitle']); ?></Tags>
+   <Contact><?php p($_['contact']); ?></Contact>
+   <Url type="application/atom+xml"
+        template="<?php p($urlGenerator->linkTo('files_opds','?query={searchTerms}&amp;author={atom:author}&amp;contributor={atom:contributor}&amp;title={atom:title}&amp;pw={startPage?}&amp;format=atom"/>
+   <Url type="application/rss+xml"
+        template="http://example.com/?q={searchTerms}&amp;pw={startPage?}&amp;format=rss"/>
+   <Url type="text/html" 
+        template="http://example.com/?q={searchTerms}&amp;pw={startPage?}"/>
+   <LongName>Search <?php p($_['feed_title']); ?> - <?php p($_['feed_subtitle']); ?></LongName>
+   <Image height="64" width="64" type="image/svg"><?php p($urlGenerator->linkTo('files_opds', 'img/app.svg')) ?></Image>
+   <Query role="example" searchTerms="epub" />
+   <Developer>Example.com Development Team</Developer>
+   <Language>en-us</Language>
+   <OutputEncoding>UTF-8</OutputEncoding>
+   <InputEncoding>UTF-8</InputEncoding>
+</OpenSearchDescription>