eyeD3 0.9.8a1__py3-none-any.whl → 0.9.8a5__py3-none-any.whl

eyed3/__regarding__.py

@@ -22,13 +22,13 @@ class Version:
 
 
 project_name = "eyeD3"
-version = "0.9.8a1"
+version = "0.9.8a5"
 version_info = Version(
     0, 9, 8,
     None,
-    ('a', 1),
+    ('a', 5),
     None,
-    "Refuse/Resist",
+    "With Fear I Kiss the Burning Darkness",
 )
 
 author = "Travis Shirk"

eyed3/core.py

@@ -268,14 +268,27 @@ class Date:
                           "%Y-%m-%d %H:%M:%S",
                           "%Y-00-00",
                           "%Y%m%d",
+                          # Special formats to support ID3v2.3 TDAT and TIME frames.
+                          # See https://github.com/nicfit/eyeD3/pull/623 and frames.Date.date setter
+                          "D%d-%m",
+                          "T%H:%M",
                           ]
     """Valid time stamp formats per ISO 8601 and used by `strptime`."""
 
-    def __init__(self, year, month=None, day=None,
+    @classmethod
+    def __new__(cls, *args, **kwargs):
+        if ([arg for arg in args[1:] if arg is not None] or
+            [kwarg for kwarg in kwargs.values() if kwarg is not None]):
+            return super().__new__(cls)
+        else:
+            return
+
+    def __init__(self, year=None, month=None, day=None,
                  hour=None, minute=None, second=None):
         # Validate with datetime
         from datetime import datetime
-        _ = datetime(year, month if month is not None else 1,
+        _ = datetime(year if year is not None else 1899,
+                     month if month is not None else 1,
                      day if day is not None else 1,
                      hour if hour is not None else 0,
                      minute if minute is not None else 0,
@@ -383,6 +396,8 @@ class Date:
         # Here is the difference with Python date/datetime objects, some
         # of the members can be None
         kwargs = {}
+        if "%Y" in fmt:
+            kwargs["year"] = pdate.tm_year
         if "%m" in fmt:
             kwargs["month"] = pdate.tm_mon
         if "%d" in fmt:
@@ -394,23 +409,35 @@ class Date:
         if "%S" in fmt:
             kwargs["second"] = pdate.tm_sec
 
-        return Date(pdate.tm_year, **kwargs)
+        return Date(**kwargs)
 
     def __str__(self):
         """Returns date strings that conform to ISO-8601.
         The returned string will be no larger than 17 characters."""
-        s = "%d" % self.year
-        if self.month:
-            s += "-%s" % str(self.month).rjust(2, '0')
-            if self.day:
-                s += "-%s" % str(self.day).rjust(2, '0')
-                if self.hour is not None:
-                    s += "T%s" % str(self.hour).rjust(2, '0')
-                    if self.minute is not None:
-                        s += ":%s" % str(self.minute).rjust(2, '0')
-                        if self.second is not None:
-                            s += ":%s" % str(self.second).rjust(2, '0')
-        return s
+        s = ""  # the string
+        c = ""  # the separator character
+        if self.year is not None:  # branch 1, aka "there is a year, maybe more"
+            s += "%d" % self.year
+            c = "-"
+            if self.month is not None:  # there is a month
+                s += c + "%s" % str(self.month).rjust(2, '0')
+                if self.day is not None:  # there is a day
+                    s += c + "%s" % str(self.day).rjust(2, '0')
+        else:  # branch 2, aka "we start without a year" aka "D%d-%m" format
+            c = "D"
+            if (self.day is not None) and (self.month is not None):  # checking both
+                s += c + "%s" % str(self.day).rjust(2, '0')
+                c = "-"
+                s += c + "%s" % str(self.month).rjust(2, '0')
+                return s  # We send a "Ddd-mm" string for 'TDAT'
+        # Here is the 'TIME' part, which starts or continues the string from branch 1
+        c = "T"
+        if self.hour is not None:
+            s += c + "%s" % str(self.hour).rjust(2, '0')
+        c = ":"
+        if self.minute is not None:
+            s += c + "%s" % str(self.minute).rjust(2, '0')
+        return s  # We send either a YYYY-mm-ddTHH:MM, or just a THH:MM (for 'TIME')
 
 
 def parseError(ex) -> None:

eyed3/id3/__init__.py

@@ -130,11 +130,11 @@ class Genre:
                 # valid id will set name
                 if name and name != self.name:
                     log.warning(f"Genre ID takes precedence and remapped '{name}' to '{self.name}'")
-            except ValueError:
+            except ValueError as ex:
                 log.warning(f"Invalid numeric genre ID: {id}")
                 if not name:
                     # Gave an invalid ID and no name to fallback on
-                    raise
+                    raise GenreException from ex
                 self.name = name
                 self.id = None
         else:

eyed3/id3/apple.py

@@ -10,6 +10,8 @@ TKWD_FID = b"TKWD"
 TDES_FID = b"TDES"
 TGID_FID = b"TGID"
 GRP1_FID = b"GRP1"
+MVNM_FID = b"MVNM"
+MVIN_FID = b"MVIN"
 
 
 class PCST(Frame):
@@ -56,3 +58,17 @@ class GRP1(TextFrame):
 
     def __init__(self, _=None, **kwargs):
         super().__init__(GRP1_FID, **kwargs)
+
+
+class MVNM(TextFrame):
+    """Movement name. An Apple extension for classical music."""
+
+    def __init__(self, _=None, **kwargs):
+        super().__init__(MVNM_FID, **kwargs)
+
+
+class MVIN(TextFrame):
+    """Movement index (e.g. "3/9"). An Apple extension for classical music."""
+
+    def __init__(self, _=None, **kwargs):
+        super().__init__(MVIN_FID, **kwargs)

eyed3/id3/frames.py

@@ -319,7 +319,8 @@ class TextFrame(Frame):
     @staticmethod
     def isValidFrameId(fid: bytes) -> bool:
         return (fid[0:1] == b'T' or
-                fid in [b"XSOA", b"XSOP", b"XSOT", b"XDOR", b"WFED", b"GRP1"])
+                fid in [b"XSOA", b"XSOP", b"XSOT", b"XDOR", b"WFED", b"GRP1",
+                        b"MVNM", b"MVIN"])
 
 
 class UserTextFrame(TextFrame):
@@ -411,7 +412,11 @@ class DateFrame(TextFrame):
             self.text = ""
             return
 
-        self.text = str(date)
+        str_date = str(date)
+        if ((DorT := str_date[0]) in ("D", "T")) and (len(str_date) <= 6):  # maxlength 6
+            str_date = str_date.replace(DorT, "", 1)
+            str_date = str_date.replace("-" if DorT == "D" else ":", "")
+        self.text = str_date
 
     def _initEncoding(self):
         # Dates are always latin1 since they are always represented in ISO 8601
@@ -2258,4 +2263,8 @@ NONSTANDARD_ID3_FRAMES = {
               ID3_V2, TextFrame),
     b"GRP1": ("iTunes extension; grouping.",
               ID3_V2, apple.GRP1),
+    b"MVNM": ("iTunes extension; movement name.",
+              ID3_V2, apple.MVNM),
+    b"MVIN": ("iTunes extension; movement index.",
+              ID3_V2, apple.MVIN)
 }

eyed3/id3/tag.py

@@ -556,11 +556,11 @@ class Tag(core.Tag):
                 date = core.Date.parse(date)
             self._setDate(b"TYER", str(date.year))
             if None not in (date.month, date.day):
-                date_str = "%s%s" % (str(date.day).rjust(2, "0"),
+                date_str = "D%s-%s" % (str(date.day).rjust(2, "0"),
                                      str(date.month).rjust(2, "0"))
                 self._setDate(b"TDAT", date_str)
             if None not in (date.hour, date.minute):
-                date_str = "%s%s" % (str(date.hour).rjust(2, "0"),
+                date_str = "T%s:%s" % (str(date.hour).rjust(2, "0"),
                                      str(date.minute).rjust(2, "0"))
                 self._setDate(b"TIME", date_str)
 

eyed3/plugins/mimetype.py

@@ -9,32 +9,6 @@ from eyed3.utils.log import getLogger
 
 log = getLogger(__name__)
 
-# python-magic
-try:
-    import magic
-
-    class MagicTypes(magic.Magic):
-        def __init__(self):
-            magic.Magic.__init__(self, mime=True, mime_encoding=False, keep_going=True)
-
-        def guess_type(self, filename, all_types=False):
-            try:
-                types = self.from_file(filename)
-            except UnicodeEncodeError:
-                # https://github.com/ahupp/python-magic/pull/144
-                types = self.from_file(filename.encode("utf-8", 'surrogateescape'))
-
-            delim = r"\012- "
-            if all_types:
-                return types.split(delim)
-            else:
-                return types.split(delim)[0]
-
-    _python_magic = MagicTypes()
-
-except ImportError:
-    _python_magic = None
-
 
 class MimetypesPlugin(eyed3.plugins.LoaderPlugin):
     NAMES = ["mimetypes"]
@@ -47,16 +21,12 @@ class MimetypesPlugin(eyed3.plugins.LoaderPlugin):
         g.add_argument("--status", action="store_true", help="Print dot status.")
         g.add_argument("--parse-files", action="store_true", help="Parse each file.")
         g.add_argument("--hide-notfound", action="store_true")
-        if _python_magic:
-            g.add_argument("-M", "--use-pymagic", action="store_true",
-                           help="Use python-magic to determine mimetype.")
-        self.magic = None
+
         self.start_t = None
         self.mime_types = Counter()
 
     def start(self, args, config):
         super().start(args, config)
-        self.magic = "pymagic" if self.args.use_pymagic else "filetype"
         self.start_t = time.time()
 
     def handleFile(self, f, *args, **kwargs):
@@ -70,11 +40,7 @@ class MimetypesPlugin(eyed3.plugins.LoaderPlugin):
         else:
             self._num_loaded += 1
 
-            if self.magic == "pymagic":
-                mtype = _python_magic.guess_type(f)
-            else:
-                mtype = guessMimetype(f)
-
+            mtype = guessMimetype(f)
             self.mime_types[mtype] += 1
             if not self.args.hide_notfound:
                 if mtype is None and Path(f).suffix.lower() in (".mp3",):
@@ -87,7 +53,6 @@ class MimetypesPlugin(eyed3.plugins.LoaderPlugin):
         t = time.time() - self.start_t
         print(f"\nVisited {self._num_visited} files")
         print(f"Processed {self._num_loaded} files")
-        print(f"magic: {self.magic}")
         print(f"time: {eyed3.utils.formatTime(t)} seconds")
         if self.mime_types:
             pprint.pprint(self.mime_types)

{eyed3-0.9.8a1.dist-info → eyed3-0.9.8a5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eyeD3
-Version: 0.9.8a1
+Version: 0.9.8a5
 Summary: Python audio data toolkit (ID3 and MP3)
 Author-email: Travis Shirk <travis@pobox.com>
 Project-URL: homepage, https://eyeD3.nicfit.net/
@@ -56,21 +56,16 @@ Status
 .. image:: https://img.shields.io/pypi/v/eyeD3.svg
    :target: https://pypi.python.org/pypi/eyeD3/
    :alt: Latest Version
-.. image:: https://img.shields.io/pypi/status/eyeD3.svg
-   :target: https://pypi.python.org/pypi/eyeD3/
-   :alt: Project Status
-.. image:: https://travis-ci.org/nicfit/eyeD3.svg?branch=master
-   :target: https://travis-ci.org/nicfit/eyeD3
-   :alt: Build Status
 .. image:: https://img.shields.io/pypi/l/eyeD3.svg
    :target: https://pypi.python.org/pypi/eyeD3/
    :alt: License
 .. image:: https://img.shields.io/pypi/pyversions/eyeD3.svg
    :target: https://pypi.python.org/pypi/eyeD3/
    :alt: Supported Python versions
-.. image:: https://coveralls.io/repos/nicfit/eyeD3/badge.svg
-   :target: https://coveralls.io/r/nicfit/eyeD3
-   :alt: Coverage Status
+.. image:: https://img.shields.io/pypi/dm/eyeD3
+   :alt: PyPI - Downloads
+.. image:: https://img.shields.io/github/stars/nicfit/eyeD3
+   :alt: GitHub Repo stars
 
 
 About
@@ -145,7 +140,7 @@ Features
 Get Started
 -----------
 
-Python >= 3.7 is required.
+Python >= 3.9 is required.
 
 For `installation instructions`_ or more complete `documentation`_ see
 http://eyeD3.nicfit.net/

{eyed3-0.9.8a1.dist-info → eyed3-0.9.8a5.dist-info}/RECORD

@@ -1,14 +1,14 @@
 eyed3/__about__.py,sha256=QCoElK7Jl5lwbzVtc3oXYwfo2bwzlCb_S0_oI5HsIyQ,1001
 eyed3/__init__.py,sha256=byYZrNCjfzdoQ8hCaBwoDAfP8DfwmuHK0-tPpFRncuc,1356
-eyed3/__regarding__.py,sha256=dXiMFmtZaWAFF8iRsvyKvP-bwC9c3lbNiEgKz79xdM0,1082
-eyed3/core.py,sha256=ymrKZK2-0QpzZfppQI1xgSFSOe128HcYWwY6NFpSGQg,13657
+eyed3/__regarding__.py,sha256=HmmkZWF0wMtimaLB7KBsCiPG6WjAIGDhN8zvUMsyARo,1106
+eyed3/core.py,sha256=3NCP0GGBG0wMJovy7cK_l0obj-9Zbm_PHDt2zdswEKw,14967
 eyed3/main.py,sha256=mNf2afmfIn19tlnduVMytd9IOAZchNEkVxDVjDjvtP8,10991
 eyed3/mimetype.py,sha256=xFQxSbzERpg8H3XmAyJFEk65myXcUJ64p3e7mUByf8k,3292
-eyed3/id3/__init__.py,sha256=5Gkm7dX_ujY0LHY4DbkhLcMB0ZtQ6uMdbWtipZHUUVQ,13895
-eyed3/id3/apple.py,sha256=nQ1U7u4ObG9XcHSkqjsJaOzlyCJ8b4Kj1R7CiFj4wq4,1431
-eyed3/id3/frames.py,sha256=2H1iWUvZQ07H-uEqqT2t77uCzF4fgpVzlDQ7df6kNNU,83519
+eyed3/id3/__init__.py,sha256=iFb8v_w5bQMOiFsCTg8IvSmnqHvPLTaIubUMO6kxOpo,13924
+eyed3/id3/apple.py,sha256=i7YZivx7Zi8b-6R98HdZQsllshJhcGGU7gdzouDGOZQ,1839
+eyed3/id3/frames.py,sha256=hiNE8AbNBqHeKdOBUM_iaU5kgo4ri6zWGlwl8gh-tbM,83975
 eyed3/id3/headers.py,sha256=VXMln18qzZNopq2UY8lfq7h2tYXKae1Rejp2aaFg2Fc,23981
-eyed3/id3/tag.py,sha256=cr9cCSgPVEaWZ0PoLLPC5Im2Tc_e6_Rc3zlw42SWUUk,73054
+eyed3/id3/tag.py,sha256=gUhtpx8-A44BkJmnyM15BiMbra0cxTK0NsPsw2qbJUw,73058
 eyed3/mp3/__init__.py,sha256=W1MKl7lmOtTD06rsUJaFnWC0PIsUMUhEi5NkLYkWy00,6605
 eyed3/mp3/headers.py,sha256=8b6Bav0ZOB1BQSceQW_SCcU1Z4IZlWpEJrhqsbBzTe8,32592
 eyed3/plugins/__init__.py,sha256=nSEud7L2EjiNy0dvIcEx82G5yPUswKv2i9eXk4YZUAo,7445
@@ -21,7 +21,7 @@ eyed3/plugins/itunes.py,sha256=AkUUbYQZ4SQCDJU77GZ7OPcMN_MY0SEDyi-mLIuxR5o,2033
 eyed3/plugins/jsontag.py,sha256=xPYzZ4sBIaunp5tdwTXAvpMJumuNwzAJ1-paAJPJLsE,4609
 eyed3/plugins/lameinfo.py,sha256=UevBAUViHJppP_qHWCUFM2BteaXCelvkQWDB_eSHHZ0,3576
 eyed3/plugins/lastfm.py,sha256=mcW4ocHCFOxDPk8vbcRsialhdKzH2XEzgXcoJHC9W90,1352
-eyed3/plugins/mimetype.py,sha256=ECwHqQZwE9r3v-W7BLXgVPiNNaQ6JkdJTLPBnLsLwuo,2958
+eyed3/plugins/mimetype.py,sha256=fYkiZAtSd7GPRj_gyusrzm61d7sJ29YNQ20Y6UiHL20,1792
 eyed3/plugins/nfo.py,sha256=9lC-EcgiOLGidOYHgkDoQvTRGt43InT62uC4gn4Bur8,4705
 eyed3/plugins/pymod.py,sha256=05bquce3kRtgn7JIIMH3vkIJ5pVpohHmC3PkxWdJpXY,2559
 eyed3/plugins/stats.py,sha256=fYPSxRyty9qRDimhxwNeM86bU76a95ZdxHs9JfkVYk8,15146
@@ -33,10 +33,10 @@ eyed3/utils/binfuncs.py,sha256=E1UuTFNc5o-tHrUk6g9XytMgGFtk7fOrzlTuFFzBWI4,3955
 eyed3/utils/console.py,sha256=1DllCbtHS0vry218lL6EcHVWvZfUthpnAGimq0zkUX0,17567
 eyed3/utils/log.py,sha256=TESTslOurwATIwmLU45P0rj1kiYf3bXxLNJnc-QrBXg,1484
 eyed3/utils/prompt.py,sha256=56Gbd00LPAsp_k4MzTqhTudu2eOLFA3TSeeTESkKSI0,2735
-eyed3-0.9.8a1.dist-info/licenses/AUTHORS.rst,sha256=FM5ejB4iI-N96B-ZkWTpBV7ZUr344vfkWxc-XuNQ638,1380
-eyed3-0.9.8a1.dist-info/licenses/LICENSE,sha256=yjcqfZJWCx-p9tgytEDovNYtmt-ohwyYKH3qtm2YMQ4,35148
-eyed3-0.9.8a1.dist-info/METADATA,sha256=zSDTH0JI0L43ZwZAV4-FO7-Pe4OiAblcSr3TmZxhMqg,5997
-eyed3-0.9.8a1.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-eyed3-0.9.8a1.dist-info/entry_points.txt,sha256=tNVkF9g-_swrPgCLayGq9N6c_B_wFPsnHFyR4PqlGWU,43
-eyed3-0.9.8a1.dist-info/top_level.txt,sha256=zeurONV1_zm-Vtqv947t4FQnUSmHIFLVzD6SFEa1p4M,6
-eyed3-0.9.8a1.dist-info/RECORD,,
+eyed3-0.9.8a5.dist-info/licenses/AUTHORS.rst,sha256=0rp2QqSd1-fnmPiVkmp9JkP7KTKYtshkjU_V1sW3eKE,1607
+eyed3-0.9.8a5.dist-info/licenses/LICENSE,sha256=yjcqfZJWCx-p9tgytEDovNYtmt-ohwyYKH3qtm2YMQ4,35148
+eyed3-0.9.8a5.dist-info/METADATA,sha256=8LvVxON0D8lAT3f-y8S3fgvHak7EO6OzJ2ORvezsREs,5763
+eyed3-0.9.8a5.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+eyed3-0.9.8a5.dist-info/entry_points.txt,sha256=tNVkF9g-_swrPgCLayGq9N6c_B_wFPsnHFyR4PqlGWU,43
+eyed3-0.9.8a5.dist-info/top_level.txt,sha256=zeurONV1_zm-Vtqv947t4FQnUSmHIFLVzD6SFEa1p4M,6
+eyed3-0.9.8a5.dist-info/RECORD,,

{eyed3-0.9.8a1.dist-info → eyed3-0.9.8a5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.1)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{eyed3-0.9.8a1.dist-info → eyed3-0.9.8a5.dist-info}/licenses/AUTHORS.rst

@@ -37,3 +37,9 @@ and has been contributed to by (ordered by date of first contribution):
   * grun <grunseid@gmail.com>
   * guiweber <guillaume.web@gmail.com>
   * zhu <zhumumu@gmail.com>
+  * Michał Górny <mgorny@gentoo.org>
+  * Jonathan Herlin <Jonte@jherlin.se>
+  * Ramiro Gómez <code@ramiro.org>
+  * Steve Kowalik <steven@wedontsleep.org>
+  * gersonkurz <gerson.kurz@gmail.com>
+  * obskyr <powpowd@gmail.com>