Merge pull request #22 from michaelb/dev

patch

Author: michaelb

README.md

@@ -1,6 +1,6 @@
 # auto-ytdl
 
-![](https://img.shields.io/badge/Release-v1.2.0-green.svg)
+![](https://img.shields.io/badge/Release-v1.2.1-green.svg)
 
 I know, _yet another_ youtube-dl wrapper. But this one does something others don't: ability to automate your new music downloads, just like package managers automate your updates.
 

autoytdl/metadata_manager.py

@@ -92,18 +92,20 @@ def can_be_music(audio_tuple, config):
 
 def should_add(filepath, config):
     list_tags = openlist(config.path_to_metadata)
+    if config.force:
+        return True
 
     instanceaudio = list(openaudio(str(Path(filepath))))
 
-    if not can_be_music(instanceaudio, config) and not config.force:
+    if not can_be_music(instanceaudio, config):
         print("[probably not a music file, not adding] ", tuple(instanceaudio))
         return False
 
     for i in range(len(instanceaudio)):
         instanceaudio[i] = str(significant_words(str(instanceaudio[i])))
     tuple_audio = tuple(instanceaudio)
 
-    if inlist(tuple_audio, list_tags) and not config.force:
+    if inlist(tuple_audio, list_tags):
         print("[already present in metadata archive, skipping]", tuple_audio)
         return False
     else:

autoytdl/name_cleaner.py

@@ -17,6 +17,11 @@ def remove_brackets(string):
     string = re.sub(r'\(\ \)', '', string)
     string = re.sub(r'\(\ \ \)', '', string)
     string = re.sub(r'\(\ \ \ \)', '', string)
+    string = re.sub(r'\( /\)', '', string)
+    string = re.sub(r'\(/\)', '', string)
+    string = re.sub(r'\(/ \)', '', string)
+
+    string = re.sub(r'【.*】', '', string)
     # dont want to test more compelx regex for this
     string = re.sub("[\{\[].*?[\}\]]", "", string)
     return string

autoytdl/version.py

@@ -1,2 +1,2 @@
 # follows semantic versionning
-__version__ = "1.2.0"
+__version__ = "1.2.1"