Merge pull request #817 from nextcloud/fix/801-trim-name

Remove multiple strings and trim names

CHANGELOG.md

@@ -5,6 +5,8 @@
   [#815](https://github.com/nextcloud/cookbook/pull/815) @christianlupus
 - Correct usage of EXIF data to rotate thumb images accordingly
   [#816](https://github.com/nextcloud/cookbook/pull/816) @christianlupus
+- Trim spaces from names of imported recipes
+  [#817](https://github.com/nextcloud/cookbook/pull/817) @christianlupus
 
 
 ## 0.9.5 - 2021-10-15

lib/Service/RecipeService.php

@@ -1242,18 +1242,23 @@ private function cleanUpString($str, $preserve_newlines = false, $remove_slashes
 		$str = strip_tags($str);
 
 		if (!$preserve_newlines) {
-			$str = str_replace(["\r", "\n"], '', $str);
+			$str = str_replace(["\r", "\n"], ' ', $str);
 		}
 
+		$str = str_replace("\t", ' ', $str);
+		$str = str_replace("\\", '_', $str);
+
 		// We want to remove forward-slashes for the name of the recipe, to tie it to the directory structure, which cannot have slashes
 		if ($remove_slashes) {
-			$str = str_replace(["\t", "\\", "/"], '', $str);
-		} else {
-			$str = str_replace(["\t", "\\"], '', $str);
+			$str = str_replace('/', '_', $str);
 		}
 
 		$str = html_entity_decode($str);
 
+		// Remove duplicated spaces
+		$str = preg_replace('/  */', ' ', $str);
+		$str = trim($str);
+
 		return $str;
 	}
 }