using LegacyUtil to not depend on OC_Mount_Config if possible, re int…

…roduced makeConfigHash, fixed some minor things

lib/private/Files/External/LegacyUtil.php

@@ -308,4 +308,26 @@ private static function getCipher() {
 		$cipher->setKey(\OC::$server->getConfig()->getSystemValue('passwordsalt', null));
 		return $cipher;
 	}
+
+	/**
+	 * Computes a hash based on the given configuration.
+	 * This is mostly used to find out whether configurations
+	 * are the same.
+	 *
+	 * @param array $config
+	 * @return string
+	 */
+	public static function makeConfigHash($config) {
+		$data = json_encode(
+			array(
+				'c' => $config['backend'],
+				'a' => $config['authMechanism'],
+				'm' => $config['mountpoint'],
+				'o' => $config['options'],
+				'p' => isset($config['priority']) ? $config['priority'] : -1,
+				'mo' => isset($config['mountOptions']) ? $config['mountOptions'] : [],
+			)
+		);
+		return hash('md5', $data);
+	}
 }

lib/private/Files/External/Service/LegacyStoragesService.php

@@ -17,38 +17,41 @@
  *
  * You should have received a copy of the GNU Affero General Public License, version 3,
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
  */
 
 namespace OC\Files\External\Service;
+use OC\Files\External\LegacyUtil;
 use OC\Files\External\StorageConfig;
 use OCP\Files\External\IStoragesBackendService;
+use OCP\Util;
 
 /**
  * Read mount config from legacy mount.json
  */
 class LegacyStoragesService {
-	/** @var IStoragesBackendService */
+	/**
+	 * @var IStoragesBackendService
+	 */
 	protected $backendService;
 
 	/**
-	 * LegacyStoragesService constructor.
-	 *
+	 * @var LegacyUtil
+	 */
+	private $legacyUtil;
+
+	/**
 	 * @param IStoragesBackendService $backendService
 	 */
 	public function __construct(IStoragesBackendService $backendService) {
 		$this->backendService = $backendService;
+		$this->legacyUtil = new LegacyUtil();
 	}
 
-
 	/**
-	 * Read legacy config data
-	 *
 	 * @return array list of mount configs
 	 */
 	protected function readLegacyConfig() {
-		$mountConfig = new \OC_Mount_Config();
-		return $mountConfig->readData();
+		return $this->legacyUtil->readData();
 	}
 
 	/**
@@ -90,13 +93,14 @@ protected function populateStorageConfigWithLegacyOptions(
 			$storageOptions['priority'] = $backend->getPriority();
 		}
 		$storageConfig->setPriority($storageOptions['priority']);
-		if ($mountType === \OC_Mount_Config::MOUNT_TYPE_USER) {
+
+		if ($mountType === LegacyUtil::MOUNT_TYPE_USER) {
 			$applicableUsers = $storageConfig->getApplicableUsers();
 			if ($applicable !== 'all') {
 				$applicableUsers[] = $applicable;
 				$storageConfig->setApplicableUsers($applicableUsers);
 			}
-		} else if ($mountType === \OC_Mount_Config::MOUNT_TYPE_GROUP) {
+		} else if ($mountType === LegacyUtil::MOUNT_TYPE_GROUP) {
 			$applicableGroups = $storageConfig->getApplicableGroups();
 			$applicableGroups[] = $applicable;
 			$storageConfig->setApplicableGroups($applicableGroups);
@@ -151,10 +155,10 @@ public function getAllStorages() {
 					$parts = explode('/', ltrim($rootMountPath, '/'), 3);
 					if (count($parts) < 3) {
 						// something went wrong, skip
-						\OCP\Util::writeLog(
+						Util::writeLog(
 							'files_external',
 							'Could not parse mount point "' . $rootMountPath . '"',
-							\OCP\Util::ERROR
+							Util::ERROR
 						);
 						continue;
 					}
@@ -179,7 +183,7 @@ public function getAllStorages() {
 						// but at this point we don't know the max-id, so use
 						// first group it by config hash
 						$storageOptions['mountpoint'] = $rootMountPath;
-						$configId = \OC_Mount_Config::makeConfigHash($storageOptions);
+						$configId = LegacyUtil::makeConfigHash($storageOptions);
 						if (isset($storagesWithConfigHash[$configId])) {
 							$currentStorage = $storagesWithConfigHash[$configId];
 						}
@@ -202,11 +206,11 @@ public function getAllStorages() {
 							$storagesWithConfigHash[$configId] = $currentStorage;
 						}
 					} catch (\UnexpectedValueException $e) {
-						// dont die if a storage backend doesn't exist
-						\OCP\Util::writeLog(
+						// don't die if a storage backend doesn't exist
+						Util::writeLog(
 							'files_external',
 							'Could not load storage: "' . $e->getMessage() . '"',
-							\OCP\Util::ERROR
+							Util::ERROR
 						);
 					}
 				}