Browse Source

move PATH_DEFAULT_IGNORE_REGEX to symuid.Track

Fabian Peter Hammerle 5 years ago
parent
commit
531feffffd
3 changed files with 6 additions and 4 deletions
  1. 1 4
      symuid-sync
  2. 3 0
      symuid/__init__.py
  3. 2 0
      symuid/tag_interface.py

+ 1 - 4
symuid-sync

@@ -4,15 +4,12 @@
 import mutagen
 import mutagen.id3
 import mutagen.mp4
-import os
 import re
 import subprocess
 import sys
 
 import symuid
 
-PATH_DEFAULT_IGNORE_REGEX = r'\.(itdb|itc2|itl|jpg|midi?|plist|xml|zip)$'
-
 
 def generate_uuid():
     return subprocess.check_output(['uuid', '-v', '4', '-F', 'BIN']).strip()
@@ -45,7 +42,7 @@ def _init_argparser():
     argparser.add_argument('path')
     argparser.add_argument(
         '--path-ignore-regex',
-        default=PATH_DEFAULT_IGNORE_REGEX,
+        default=symuid.Track.PATH_DEFAULT_IGNORE_REGEX,
         nargs=1,
         metavar='pattern',
         dest='path_ignore_regex',

+ 3 - 0
symuid/__init__.py

@@ -4,6 +4,7 @@ import datetime as dt
 import dateutil.tz
 import mutagen
 import os
+import re
 
 import symuid.tag_interface
 
@@ -30,6 +31,8 @@ class PlayCount:
 
 class Track:
 
+    PATH_DEFAULT_IGNORE_REGEX = r'\.(itdb|itc2|itl|jpg|midi?|plist|xml|zip)$'
+
     def __init__(self, path):
         mutagen_file = mutagen.File(filename=path)
         if mutagen_file is None:

+ 2 - 0
symuid/tag_interface.py

@@ -34,6 +34,7 @@ class ID3(_mutagen):
     def get_free_int(self, tag_label):
         tags = [t for t in self.get_free_ints(tag_label)]
         if len(tags) == 0:
+            # {}.get('a') == None
             return None
         else:
             assert len(tags) == 1, tags
@@ -97,6 +98,7 @@ class MP4(_mutagen):
         try:
             tags = self._mutagen_file.tags['----:' + tag_label]
         except KeyError:
+            # {}.get('a') == None
             return None
         if len(tags) == 1:
             return tags[0]