Merge pull request #8 from prsnbrg/v1.3.7

Prepare release v1.3.7

.gitignore

@@ -1,3 +1,5 @@
+appinfo/signature.json
+
 .DS_Store
 # Logs
 logs

CHANGELOG.md

@@ -1,4 +1,9 @@
 
+## 1.3.7
+
+- Improved performances
+- Add logging	
+
 ## 1.3.6
 
 - NC27 support

appinfo/info.xml

@@ -4,7 +4,7 @@
     <id>extract</id>
     <name>Extract</name>
     <summary>Extract archive from the web interface</summary>
-    <screenshot>https://raw.githubusercontent.com/PaulLereverend/NextcloudExtract/master/img/extract.png</screenshot>
+    <screenshot>https://raw.githubusercontent.com/prsnbrg/NextcloudExtract/master/img/extract.png</screenshot>
     <description><![CDATA[Extract archives.
 
 *  **Supported :**
@@ -27,20 +27,18 @@
     * p7zip (sudo apt-get install p7zip p7zip-full)
 
 *  **Note :** Encrypted files are not supported yet
-
-*  Fork from Nextcloud App extract
 ]]></description>
 
-    <version>1.3.6</version>
+    <version>1.3.7</version>
     <licence>agpl</licence>
-    <author mail="[email protected]">Paul Lereverend</author>
+    <author>Paul Lereverend, Paul Rosenberg</author>
     <namespace>Extract</namespace>
     <category>files</category>
     <category>tools</category>
     <website>https://github.com/prsnbrg/NextcloudExtract</website>
     <bugs>https://github.com/prsnbrg/NextcloudExtract/issues</bugs>
     <dependencies>
         <nextcloud min-version="20" max-version="27"/>
-	    <owncloud min-version="10" max-version="10"/>
+	<owncloud min-version="10" max-version="10"/>
     </dependencies>
 </info>

lib/Controller/ExtractionController.php

@@ -15,15 +15,11 @@
 use OCP\Files\File;
 use OCP\Files\Folder;
 
-use OCP\IConfig;
 use OCP\IL10N;
 use OCP\Share\IManager;
 use OCP\EventDispatcher\IEventDispatcher;
 
-//use Psr\Log\LoggerInterface;
-//use Psr\Log\LogLevel;
-//use OCP\ILogger\LoggerInterface;
-//use OCP\ILogger\LogLevel;
+use \OCP\ILogger;
 
 //use OCP\App\IAppManager;
 
@@ -35,7 +31,7 @@ class ExtractionController extends Controller {
 	private $l;
 
 	/** @var LoggerInterface */
-//	private $logger;
+	private $logger;
 
 	/** @var IRootFolder */
 	private $rootFolder;
@@ -55,13 +51,14 @@ public function __construct(
 		, ExtractionService $extractionService
 		, IRootFolder $rootFolder
 		, IL10N $l
-//		, LoggerInterface $logger
-//		, IManager $encryptionManager
+		, ILogger $logger
+		//, IManager $encryptionManager
 		, $UserId
 	){
 		parent::__construct($AppName, $request);
 		$this->l = $l;
-//		$this->logger = $logger;
+		$this->logger = $logger;
+		//$this->encryptionManager = $encryptionManager;
 		$this->userId = $UserId;
 		$this->extractionService = $extractionService;
 		$this->rootFolder = $rootFolder;
@@ -92,19 +89,19 @@ private function postExtract(string $fileName, string $directory, string $extrac
 		foreach ($iterator as $file) {
 			/** @var \SplFileInfo $file */
 			if (Filesystem::isFileBlacklisted($file->getBasename())) {
-//				$this->logger->warning(__METHOD__ . ': removing blacklisted file: ' . $file->getPathname());
+				$this->logger->warning(__METHOD__ . ': removing blacklisted file: ' . $file->getPathname());
 				// remove it
 				unlink($file->getPathname());
 			}
 		}
 
 		$NCDestination = $directory . '/' . $fileName;
-		if($tmpPath){
+		if($tmpPath != ""){
 			$tmpFolder = $this->rootFolder->get($tmpPath);
 			$tmpFolder->move($this->userFolder->getFullPath($NCDestination));
 		}else{
-			// This seems to be enough to trigger a files-cache refresh
-			$this->userFolder->get($NCDestination);
+			$scanner = new \OC\Files\Utils\Scanner($this->userId, \OC::$server->getDatabaseConnection(), \OC::$server->getLogger());
+			$scanner->scan($this->userFolder->getFullPath($NCDestination));
 		}
 	}
 
@@ -114,6 +111,7 @@ private function postExtract(string $fileName, string $directory, string $extrac
 	 * @NoAdminRequired
 	 */
 	public function extract($nameOfFile, $directory, $external, $type){
+		$this->logger->warning(\OC::$server->getEncryptionManager()->isEnabled());
 		if (\OC::$server->getEncryptionManager()->isEnabled()) {
 			$response = array();
 			$response = array_merge($response, array("code" => 0, "desc" => $this->l->t("Encryption is not supported yet")));
@@ -125,28 +123,34 @@ public function extract($nameOfFile, $directory, $external, $type){
 		$fileName = pathinfo($nameOfFile, PATHINFO_FILENAME);
 		$extractTo = $dir . '/' . $fileName;
 
-		$appPath = $this->userId . '/' . $this->appName;
-		try {
-			$appDirectory = $this->rootFolder->get($appPath);
-		} catch (\OCP\Files\NotFoundException $e) {
-			$appDirectory = $this->rootFolder->newFolder($appPath);
-		}
-		if(pathinfo($fileName, PATHINFO_EXTENSION) == "tar"){
-			$archiveDir = pathinfo($fileName, PATHINFO_FILENAME);
-		} else {
-			$archiveDir = $fileName;
-		}
+		// if the file is un external storage
+		if($external){
 
-		// remove temporary directory if exists from interrupted previous runs
-		try {
-			$appDirectory->get($archiveDir)->delete();
-		} catch (\OCP\Files\NotFoundException $e) {
-			// ok
-		}
+			$appPath = $this->userId . '/' . $this->appName;
+			try {
+				$appDirectory = $this->rootFolder->get($appPath);
+			} catch (\OCP\Files\NotFoundException $e) {
+				$appDirectory = $this->rootFolder->newFolder($appPath);
+			}
+			if(pathinfo($fileName, PATHINFO_EXTENSION) == "tar"){
+				$archiveDir = pathinfo($fileName, PATHINFO_FILENAME);
+			} else {
+				$archiveDir = $fileName;
+			}
 
-		$tmpPath = $appDirectory->getPath() . '/' . $archiveDir;
-		$extractTo = $appDirectory->getStorage()->getLocalFile($appDirectory->getInternalPath()) . '/' . $archiveDir;
+			// remove temporary directory if exists from interrupted previous runs
+			try {
+				$appDirectory->get($archiveDir)->delete();
+			} catch (\OCP\Files\NotFoundException $e) {
+				// ok
+			}
 
+			$tmpPath = $appDirectory->getPath() . '/' . $archiveDir;
+			$extractTo = $appDirectory->getStorage()->getLocalFile($appDirectory->getInternalPath()) . '/' . $archiveDir;
+		} else {
+			$tmpPath = "";
+		}
+
 		switch ($type) {
 			case 'zip':
 				$response = $this->extractionService->extractZip($file, $fileName, $extractTo);

lib/Service/ExtractionService.php

@@ -22,8 +22,7 @@
 
 namespace OCA\Extract\Service;
 
-//use Psr\Log\LoggerInterface;
-//use Psr\Log\LogLevel;
+use \OCP\ILogger;
 use OCP\IL10N;
 
 use ZipArchive;
@@ -39,10 +38,10 @@ class ExtractionService {
 
 	public function __construct(
 		IL10N $l
-//		, LoggerInterface $logger
+		, ILogger $logger
 	) {
 		$this->l = $l;
-//		$this->logger = $logger;
+		$this->logger = $logger;
 	}
 
 	public function extractZip($file, $filename, $extractTo){
@@ -96,7 +95,7 @@ public function extractOther($file, $filename, $extractTo){
 
 		if(sizeof($output) <= 5){
 			$response = array_merge($response, array("code" => 0, "desc" => $this->l->t("Oops something went wrong. Check that you have p7zip installed")));
-//			$this->logger->log(LogLevel::ERROR, __METHOD__ . ': ' . $output);
+			$this->logger->error(__METHOD__ . ': ' . $output);
 			return $response;
 		}
 		$response = array_merge($response, array("code" => 1));