From 30ad5a510d9767f4d08821f0c45dc6b2352ecb67 Mon Sep 17 00:00:00 2001
From: Drugsosos <44712637+Drugsosos@users.noreply.github.com>
Date: Fri, 10 Jun 2022 20:17:34 +0300
Subject: [PATCH] fixes in regex in name_normalize

---
 video_creation/final_video.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/video_creation/final_video.py b/video_creation/final_video.py
index 27a351d..f2acf74 100644
--- a/video_creation/final_video.py
+++ b/video_creation/final_video.py
@@ -21,8 +21,11 @@ def name_normalize(
         name: str
 ) -> str:
     name = re.sub(r'[?\\"%*:|<>]', '', name)
-    name = re.sub(r'(\D+)/(\D+)', r'\1 or\ \2', name)
-    name = re.sub(r'(\d+)/(\d+)', r'\1 of\ \2', name)
+    name = re.sub(r'( [w,W]\s?\/\s?[o,O,0])', r' without', name)
+    name = re.sub(r'( [w,W]\s?\/)', r' with', name)
+    name = re.sub(r'([0-9]+)\s?\/\s?([0-9]+)', r'\1 of \2', name)
+    name = re.sub(r'(\w+)\s?\/\s?(\w+)', r'\1 or \2', name)
+    name = re.sub(r'\/', r'', name)
     return name