From 60628eef38a01e11bb95ca223808deae0ca1b4f1 Mon Sep 17 00:00:00 2001 From: frankdelange Date: Mon, 9 Jan 2017 15:37:24 +0100 Subject: [PATCH] files_opds: v0.7 - compatible with Nextcloud (up to version 12) - new logo --- files_opds/admin.php | 2 +- files_opds/ajax/admin.php | 2 +- files_opds/ajax/clear_bookshelf.php | 2 +- files_opds/ajax/personal.php | 2 +- files_opds/ajax/schedule_rescan.php | 2 +- files_opds/appinfo/app.php | 1 + files_opds/appinfo/info.xml | 8 +- files_opds/img/app.svg | 141 ++++++++++++++++++++++------ files_opds/lib/meta.php | 5 - files_opds/personal.php | 2 +- files_opds/templates/admin.php | 2 +- 11 files changed, 127 insertions(+), 42 deletions(-) diff --git a/files_opds/admin.php b/files_opds/admin.php index f930245..9470298 100644 --- a/files_opds/admin.php +++ b/files_opds/admin.php @@ -10,7 +10,7 @@ namespace OCA\Files_Opds; -$l = new \OC_L10N('files_opds'); +$l = \OC::$server->getL10N('files_opds'); \OCP\Util::addScript('files_opds', 'admin'); \OCP\Util::addStyle('files_opds', 'settings'); diff --git a/files_opds/ajax/admin.php b/files_opds/ajax/admin.php index 500db12..50a7db0 100644 --- a/files_opds/ajax/admin.php +++ b/files_opds/ajax/admin.php @@ -16,7 +16,7 @@ namespace OCA\Files_Opds; \OCP\JSON::checkLoggedIn(); $defaults = new \OC_Defaults(); -$l = new \OC_L10N('files_opds'); +$l = \OC::$server->getL10N('files_opds'); if (isset($_POST['opdsCoverX'])) { // set dimensions, using sane defaults just in case diff --git a/files_opds/ajax/clear_bookshelf.php b/files_opds/ajax/clear_bookshelf.php index 5273c0b..0ba1604 100644 --- a/files_opds/ajax/clear_bookshelf.php +++ b/files_opds/ajax/clear_bookshelf.php @@ -12,7 +12,7 @@ namespace OCA\Files_Opds; -$l = new \OC_L10N('files_opds'); +$l = \OC::$server->getL10N('files_opds'); \OCP\JSON::checkLoggedIn(); \OCP\JSON::callCheck(); diff --git a/files_opds/ajax/personal.php b/files_opds/ajax/personal.php index ec38efa..2d019b8 100644 --- a/files_opds/ajax/personal.php +++ b/files_opds/ajax/personal.php @@ -15,7 +15,7 @@ namespace OCA\Files_Opds; \OCP\JSON::callCheck(); \OCP\JSON::checkLoggedIn(); -$l = new \OC_L10N('files_opds'); +$l = \OC::$server->getL10N('files_opds'); $opdsEnable = isset($_POST['opdsEnable']) ? $_POST['opdsEnable'] : 'false'; $rootPath = isset($_POST['rootPath']) ? $_POST['rootPath'] : '/Library'; diff --git a/files_opds/ajax/schedule_rescan.php b/files_opds/ajax/schedule_rescan.php index c6ed6ba..0f266c3 100644 --- a/files_opds/ajax/schedule_rescan.php +++ b/files_opds/ajax/schedule_rescan.php @@ -12,7 +12,7 @@ namespace OCA\Files_Opds; -$l = new \OC_L10N('files_opds'); +$l = \OC::$server->getL10N('files_opds'); \OCP\JSON::checkLoggedIn(); \OCP\JSON::callCheck(); diff --git a/files_opds/appinfo/app.php b/files_opds/appinfo/app.php index 01c7111..1960e6f 100644 --- a/files_opds/appinfo/app.php +++ b/files_opds/appinfo/app.php @@ -1,4 +1,5 @@ getL10N('files_opds'); \OCP\App::registerPersonal('files_opds', 'personal'); \OCP\App::registerAdmin('files_opds', 'admin'); diff --git a/files_opds/appinfo/info.xml b/files_opds/appinfo/info.xml index 2874200..94feed2 100644 --- a/files_opds/appinfo/info.xml +++ b/files_opds/appinfo/info.xml @@ -10,10 +10,12 @@ The feed is in compliance with the OPDS 1.1 specification according to the online OPDS validator (http://opds-validator.appspot.com/). AGPL - 0.6.16 + 0.7 Frank de Lange false + tools + files https://github.com/Yetangitu/owncloud-apps https://github.com/Yetangitu/owncloud-apps/issues https://github.com/Yetangitu/owncloud-apps @@ -23,7 +25,11 @@ sqlite mysql + + + OCA\Files_Opds\Settings\Admin + 168132 diff --git a/files_opds/img/app.svg b/files_opds/img/app.svg index 6dba3b4..7dd7a20 100644 --- a/files_opds/img/app.svg +++ b/files_opds/img/app.svg @@ -7,25 +7,13 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - height="16" - width="16" version="1.1" - id="svg2" - inkscape:version="0.48.5 r10040" + id="svg4096" + viewBox="0 0 32 32" + height="32" + width="32" + inkscape:version="0.91 r13725" sodipodi:docname="app.svg"> - - - - image/svg+xml - - - - - - + inkscape:current-layer="svg4096" /> + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/files_opds/lib/meta.php b/files_opds/lib/meta.php index c808d48..fc399a1 100644 --- a/files_opds/lib/meta.php +++ b/files_opds/lib/meta.php @@ -227,11 +227,6 @@ class Meta * @param arrayref $meta reference to array of metadata */ public static function pdf($path,&$meta) { - if(\OC_Util::runningOnWindows()) { - /* not supported when running on Windows due to use of exec() */ - return; - } - /* first, try to get metadata through ISBN */ $command = ['pdftotext -l 10 "','" -']; $output=array(); diff --git a/files_opds/personal.php b/files_opds/personal.php index 518f3c2..0ca2465 100644 --- a/files_opds/personal.php +++ b/files_opds/personal.php @@ -12,7 +12,7 @@ namespace OCA\Files_Opds; use OCP\Util; -$l = new \OC_L10N('files_opds'); +$l = \OC::$server->getL10N('files_opds'); \OCP\Util::addScript('files_opds', 'personal'); diff --git a/files_opds/templates/admin.php b/files_opds/templates/admin.php index 9088cce..bd5bf91 100644 --- a/files_opds/templates/admin.php +++ b/files_opds/templates/admin.php @@ -10,7 +10,7 @@ * later. */ -$l = new \OC_L10N('files_opds'); +$l = \OC::$server->getL10N('files_opds'); function checkBox($format) { foreach($format as $name => $enabled) {