files_opds:

- throw exceptions from epub constructor, catch them in metadata gatherer to avoid problems with bad files
 - change datetime format in metadata to avoid problems with empty database on some installations

files_opds/lib/epub.php

@@ -37,15 +37,12 @@ class Epub {
 		$this->file = $file;
 		$zip = new \ZipArchive();
 		if(!($zip->open($this->file))){
-			\OC_Log::write('epub', "Failed to read epub file", \OC_Log::ERROR);
+			throw new \Exception("Failed to read epub file");
-			return false;
 		}
 
 		// read container data
-		$data = $zip->getFromName('META-INF/container.xml');
+		if(!($data = $zip->getFromName('META-INF/container.xml'))) {
-		if($data == false){
+			throw new \Exception("Failed to access epub container data");
-			\OC_Log::write('epub', "Failed to access epub container data", \OC_Log::ERROR);
-			return false;
 		}
 
 		$xml = new DOMDocument();
@@ -56,17 +53,17 @@ class Epub {
 		$this->meta = $nodes->item(0)->attr('full-path');
 
 		// load metadata
-		$data = $zip->getFromName($this->meta);
+		if(!($data = $zip->getFromName($this->meta))) {
-		if(!$data){
+			throw new \Exception("Failed to access epub metadata");
-			\OC_Log::write('epub', 'Failed to access epub metadata', \OC_Log::ERROR);
-			return false;
 		}
 
 		$this->xml =  new \DOMDocument();
 		$this->xml->registerNodeClass('DOMElement','\OCA\Files_Opds\EPubDOMElement');
 		$this->xml->loadXML($data);
 		$this->xml->formatOutput = true;
-		$this->xpath = new EPubDOMXPath($this->xml);
+		if(!($this->xpath = new EPubDOMXPath($this->xml))) {
+			throw new \Exception("Failed to instantiate xpath");
+		}
 
 		$zip->close();
 	}

files_opds/lib/meta.php

@@ -30,7 +30,7 @@ class Meta
 		 * scanned once, even if they don't contain valid metadate.
 		 */
 		$meta['id'] = $id;
-		$meta['updated'] = date("Y-m-d\TH:i:sP");
+		$meta['updated'] = date("Y-m-d H:i:s");
 		$meta['date'] = '';
 		$meta['author'] = '';
 		$meta['title'] = '';
@@ -189,6 +189,7 @@ class Meta
 	 */
 	public static function epub($path,&$meta) {
 		$success = false;
+		try {
 			$epub = new Epub($path);
 			/* first try ISBN */
 			if(!(($isbn = $epub->ISBN()) && (Isbn::get($isbn, $meta)))) {
@@ -203,6 +204,9 @@ class Meta
 				$meta['isbn'] = $epub->ISBN();
 				$meta['subjects'] = json_encode($epub->Subjects());
 			}
+		} catch (\Exception $e) {
+			\OC_Log::write(get_class(), $e->getMessage(), \OC_LOG::ERROR);
+		}
 	}
 
 	/**