eyeD3 0.9.8a1__tar.gz → 0.9.8a5__tar.gz

eyed3-0.9.8a5/.readthedocs.yaml

@@ -0,0 +1,17 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+
+sphinx:
+  configuration: docs/conf.py
+
+python:
+  install:
+    - method: pip
+      path: .[dev]

{eyed3-0.9.8a1 → eyed3-0.9.8a5}/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>

{eyed3-0.9.8a1 → eyed3-0.9.8a5}/MANIFEST.in

@@ -7,6 +7,7 @@ include Makefile
 include tox.ini
 include setup.py
 include pdm.lock
+include .readthedocs.yaml
 
 graft docs
 prune docs/_build
@@ -25,8 +26,6 @@ recursive-include requirements *.txt
 recursive-include eyed3 *.py
 recursive-include examples *
 
-exclude fabfile.py
-exclude mkenv.sh
-exclude pavement.py
+exclude pdm.lock
 prune etc
 

{eyed3-0.9.8a1 → eyed3-0.9.8a5}/Makefile

@@ -88,10 +88,13 @@ clean-local:
 ### Test
 .PHONY: test
 test:  ## Run tests with default python
-	tox -e py
+	tox -e py,lint
 
+SKIP_TEST_ALL ?= no
 test-all:  ## Run tests with all supported versions of Python
-	tox --parallel=all
+	@if [ "$(SKIP_TEST_ALL)" != yes ]; then \
+	    tox --parallel=all ;\
+	fi
 
 test-data:
 	# Move these to eyed3.nicfit.net
@@ -146,10 +149,9 @@ docs:  ## Generate project documentation with Sphinx
 	$(MAKE) -C docs html
 	-rm example.id3
 
+DOCS_DIST := $(PROJECT_NAME)-$(VERSION)-docs.tar.gz
 docs-dist: docs
-	test -d dist || mkdir dist
-	cd docs/_build && \
-	    tar czvf ../../dist/$(PROJECT_NAME)-$(VERSION)-docs.tar.gz html
+	cd docs/_build && tar czvf ./$(DOCS_DIST) html
 
 docs-view: docs
 	$(BROWSER) docs/_build/html/index.html
@@ -164,12 +166,13 @@ clean-docs:
 dist: clean-dist lint all docs-dist ## Create source and binary distribution files
 
 _dist-md5:
-	@# The cd dist keeps the dist/ prefix out of the md5sum files
+	@# The cd dist/docs keeps the dist/ prefix out of the md5sum files
+	cd docs/_build/ &&  md5sum $(DOCS_DIST) >| $(DOCS_DIST).md5
 	@cd dist && \
 	for f in $$(ls -I '*.md5'); do \
 		md5sum $${f} >| $${f}.md5; \
 	done
-	@ls -l dist
+	@ls -l docs/_build/$(DOCS_DIST)* dist
 
 
 clean-dist:  ## Clean distribution artifacts (included in `clean`)
@@ -185,17 +188,18 @@ release-tag: _check-clean-repo _check-version-tag _check-main-branch
     fi
 	git push origin $(RELEASE_TAG)
 
-#authors:
-#	@git authors --list | while read auth ; do \
-#  		email=`echo "$$auth" | awk 'match($$0, /.*<(.*)>/, m)  {print m[1]}'`;\
-#		echo "Checking $$email...";\
-#  		if echo "$$email" | grep -v 'users.noreply.github.com'\
-#  		                  | grep -v 'github-bot@pyup.io' \
-#  		                  > /dev/null ; then \
-#			grep "$$email" AUTHORS.rst > /dev/null || echo "  * $$auth" >> AUTHORS.rst;\
-#		fi;\
-#	done
-#
+authors:
+	@# requires git-extras
+	@git authors --list | while read auth ; do \
+  		email=`echo "$$auth" | awk 'match($$0, /.*<(.*)>/, m)  {print m[1]}'`;\
+		echo "Checking $$email...";\
+  		if echo "$$email" | grep -v 'users.noreply.github.com'\
+  		                  | grep -v 'github-bot@pyup.io' \
+  		                  > /dev/null ; then \
+			grep "$$email" AUTHORS.rst > /dev/null || echo "  * $$auth" >> AUTHORS.rst;\
+		fi;\
+	done
+
 
 ## Install
 install:  ## Install project and dependencies
@@ -211,36 +215,34 @@ install-all: install install-extra install-dev
 
 
 ## Release
-release: _check-on-release-tag _check-clean-repo _check-gh _check-pypi pre-release upload-release
+.PHONY: release
+release: _check-on-release-tag _check-clean-repo _check-gh _check-pypi dist publish-release
 
-pre-release: dist check-manifest test-all _check-clean-repo
-#pre-release: #	         authors changelog
+pre-release: _check-version-tag dist check-manifest test-all requirements authors _check-clean-repo
+#pre-release: #	         changelog
 
-upload-release: _pypi-release _web-release _github-release
+# Order is import here
+publish-release: _pypi-publish _web-publish _github-publish _docs-publish
+
+_pypi-publish:
+	pdm publish --no-build -r $(PYPI_REPO) --skip-existing  --dest ./dist
+
+_web-publish: _dist-md5
+	for f in `find ./dist -type f`; do \
+	    scp $$f eyed3.nicfit.net:./data1/eyeD3-releases/`basename $$f`; \
+	done
 
-_pypi-release:
-	pdm publish -r ${PYPI_REPO}
+_docs-publish:
+	# TODO: READTHEDOCS
 
-_github-release:
+_github-publish:
 	@# TODO: --prerelease if appropriate
 	@# TODO: --notes-file when release notes are available
 	@# TODO: --latest=false when prerelease is used
 	gh release --repo nicfit/eyeD3 create $(RELEASE_TAG) --verify-tag \
                --title "$(RELEASE_TAG) ($(RELEASE_NAME))" \
-               --draft --prerelease \
-               --generate-notes ./dist/*.tar.gz
-
-#    prerelease=""; \
-#    if echo "${RELEASE_TAG}" | grep '[^v0-9\.]'; then \
-#        prerelease="--pre-release"; \
-#    fi; \
-#    echo "NAME: $$name"; \
-#    echo "PRERELEASE: $$prerelease"; \
-
-_web-release:
-	for f in `find ./dist -type f`; do \
-	    scp $$f eyed3.nicfit.net:./data1/eyeD3-releases/`basename $$f`; \
-	done
+               --draft \
+               --generate-notes ./dist/*.tar.gz ./dist/*.whl
 
 #changelog:
 #	@last=`git tag -l --sort=version:refname | grep '^v[0-9]' | tail -n1`;\
@@ -331,21 +333,13 @@ _check-pypi:
 	@(test -n "${PDM_PUBLISH_USERNAME}" && test -n "${PDM_PUBLISH_PASSWORD}") || \
 	 	(echo "PDM_BUBLISH_* not set, needed for PyPI publish" && false)
 
-#bump-release: requirements
+#bump-release:
 #	@# TODO: is not a pre-release, clear release_name
 #	poetry version $(BUMP)
 
 .PHONY: requirements
 requirements:
-	pdm outdated
-	pdm update --unconstrained --update-all -d
-#	poetry update --lock
-#	poetry export -f requirements.txt --without-hashes\
-#		--output requirements/requirements.txt
-#	poetry export -f requirements.txt --without-hashes\
-# 		--output requirements/test-requirements.txt -E test
-#	poetry export -f requirements.txt --without-hashes --output requirements/dev-requirements.txt --with dev
-#	poetry export -f requirements.txt --without-hashes\
-# 		--output requirements/extra-requirements.txt \
-#		-E art-plugin -E yaml-plugin
-#	$(MAKE) build
+	pdm lock -G:all
+	pdm export --prod --no-hashes >| requirements/requirements.txt
+	pdm export -G test,dev --no-hashes  >| requirements/dev-requirements.txt
+	pdm export -G yaml-plugim,art-plugin --no-hashes  >| requirements/plugin-requirements.txt

{eyed3-0.9.8a1/eyeD3.egg-info → eyed3-0.9.8a5}/PKG-INFO

@@ -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 → eyed3-0.9.8a5}/README.rst

@@ -3,21 +3,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
@@ -92,7 +87,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 → eyed3-0.9.8a5/eyeD3.egg-info}/PKG-INFO

@@ -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 → eyed3-0.9.8a5}/eyeD3.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+.readthedocs.yaml
 AUTHORS.rst
 CONTRIBUTING.rst
 HISTORY.rst
@@ -5,7 +6,6 @@ LICENSE
 MANIFEST.in
 Makefile
 README.rst
-pdm.lock
 pyproject.toml
 setup.py
 tox.ini
@@ -94,6 +94,9 @@ eyed3/utils/binfuncs.py
 eyed3/utils/console.py
 eyed3/utils/log.py
 eyed3/utils/prompt.py
+requirements/dev-requirements.txt
+requirements/plugin-requirements.txt
+requirements/requirements.txt
 tests/__init__.py
 tests/conftest.py
 tests/pytest.ini

{eyed3-0.9.8a1 → eyed3-0.9.8a5}/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-0.9.8a1 → eyed3-0.9.8a5}/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-0.9.8a1 → eyed3-0.9.8a5}/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-0.9.8a1 → eyed3-0.9.8a5}/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-0.9.8a1 → eyed3-0.9.8a5}/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-0.9.8a1 → eyed3-0.9.8a5}/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-0.9.8a1 → eyed3-0.9.8a5}/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 → eyed3-0.9.8a5}/pyproject.toml

@@ -6,10 +6,10 @@ build-backend = "setuptools.build_meta"
 
 [tool.regarding]
 years = "2002-2025"
-release_name = "Refuse/Resist"
+release_name = "With Fear I Kiss the Burning Darkness"
 
 [project]
-version = "0.9.8a1"
+version = "0.9.8a5"
 name = "eyeD3"
 description = "Python audio data toolkit (ID3 and MP3)"
 readme = "README.rst"
@@ -77,6 +77,7 @@ dev = [
     "Paver>=1.3.4",
     "nicfit-py[cookiecutter]>=0.8.7",
     "regarding>=0.2.0",
+    #"git+https://github.com/nicfit/gitchangelog.git@nicfit.py",
 ]
 
 [tool.pdm]
@@ -84,7 +85,3 @@ distribution = true
 
 [tool.coverage.html]
 directory = "build/tests/coverage"
-
-######### OLD #################
-# FIXME: https://github.com/nicfit/eyeD3/issues/615
-#gitchangelog = {git = "https://github.com/nicfit/gitchangelog.git", rev = "nicfit.py"}