fix format & cleanup codes in tinytag.py

tinytag · Nov 30, 2023 · 92ca484 · 92ca484
1 parent 2354ae5
commit 92ca484
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 23 deletions.
diff --git a/tinytag/tests/test_all.py b/tinytag/tests/test_all.py
@@ -425,7 +425,7 @@
     # APE
     ('samples/ape-44100-16-1.ape',
         {'extra': {'Copyright': 'nope'}, 'channels': 1,
-         'duration': 1.131, 'filesize': 22990, 'bitrate': 162.666399261963, 'samplerate': 44100, 
+         'duration': 1.131, 'filesize': 22990, 'bitrate': 162.666399261963, 'samplerate': 44100,
          'bitdepth': 16,
          'title': 'ape-44100-16-1', 'artist': 'Ace-Radom', 'album': 'ar', 'albumartist': 'nope',
          'comment': 'Only one sample for tinytag, all metadatas are nonsense',

diff --git a/tinytag/tinytag.py b/tinytag/tinytag.py
@@ -1479,12 +1479,25 @@ def _determine_duration(self, fh):
 
 
 class APE(TinyTag):
+    apetag_mapping = {
+        'title':        'title',
+        'artist':       'artist',
+        'album':        'album',
+        'album artist': 'albumartist',
+        'comment':      'comment',
+        'composer':     'composer',
+        'disc':         'disc',
+        'discnumber':   'disc',
+        'genre':        'genre',
+        'track':        'track',
+        'tracknumber':  'track',
+        'year':         'year'
+    }
+
     def __init__(self, filehandler, filesize, *args, **kwargs):
         TinyTag.__init__(self, filehandler, filesize, *args, **kwargs)
-        self._tags_parsed = False
-
-    _fver = -1
-    _header_parsed = False
+        self._fver = -1
+        self._header_parsed = False
 
     def _parse_header(self, fh):
         fh.seek(0, os.SEEK_SET)
@@ -1561,7 +1574,6 @@ def _parse_tag(self, fh):
                 pos -= 1024
         # find APETAG footer begin pos.
         if pos < 0:
-            self._tags_parsed = True
             return
         # not found
 
@@ -1592,23 +1604,6 @@ def _parse_tag(self, fh):
             # same as before: decode with utf-8 for compatibility
             self._update_meta(this_item_key, this_item_value)
 
-        self._tags_parsed = True
-
-    apetag_mapping = {
-        'title':        'title',
-        'artist':       'artist',
-        'album':        'album',
-        'album artist': 'albumartist',
-        'comment':      'comment',
-        'composer':     'composer',
-        'disc':         'disc',
-        'discnumber':   'disc',
-        'genre':        'genre',
-        'track':        'track',
-        'tracknumber':  'track',
-        'year':         'year'
-    }
-
     def _update_meta(self, key, value):
         # the key name of apetag (especially apev2) is really casual
         # there's no restrictive rules so far as I know