Skip to content

Commit

Permalink
flake8 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
kjc1 committed Apr 2, 2024
1 parent 0e5dd4c commit 03be74f
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 23 deletions.
4 changes: 2 additions & 2 deletions mutagen/_iff.py
Original file line number Diff line number Diff line change
Expand Up @@ -365,9 +365,9 @@ def _pre_load_header(self, fileobj):

@convert_error(IOError, error)
@loadfile(writable=True)
def save(self, filething=None, v2_version=4, v23_sep='/', padding=None, preserve_mtime=False):
def save(self, filething=None, v2_version=4, v23_sep='/',
padding=None, preserve_mtime=False):
"""Save ID3v2 data to the IFF file"""

fileobj = filething.fileobj

if preserve_mtime:
Expand Down
5 changes: 3 additions & 2 deletions mutagen/_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,12 +289,13 @@ def _openfile(instance, filething, filename, fileobj, writable, create):
if hasattr(fileobj, "__restore_mtime__"):
new_atime = time.time_ns()
original_mtime = fileobj.__restore_mtime__
print("\nRetaining original mtime. file={}, atime={}, o_mtime={}".format(filename, new_atime, original_mtime))
print("\nRetaining original mtime. file={}, atime={}, o_mtime={}"
.format(filename, new_atime, original_mtime))
os.utime(filename, ns=(new_atime, original_mtime))

else:
raise TypeError("Missing filename or fileobj argument")


def set_restore_mtime(fileobj):
if fileobj is not None:
original_mtime = os.stat(fileobj.name).st_mtime_ns
Expand Down
3 changes: 2 additions & 1 deletion mutagen/apev2.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@

from mutagen import Metadata, FileType, StreamInfo
from mutagen._util import DictMixin, cdata, delete_bytes, total_ordering, \
MutagenError, loadfile, convert_error, seek_end, get_size, reraise, set_restore_mtime
MutagenError, loadfile, convert_error, seek_end, get_size, reraise, \
set_restore_mtime


def is_valid_apev2_key(key):
Expand Down
3 changes: 2 additions & 1 deletion mutagen/asf/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
__all__ = ["ASF", "Open"]

from mutagen import FileType, Tags, StreamInfo
from mutagen._util import resize_bytes, DictMixin, loadfile, convert_error, set_restore_mtime
from mutagen._util import resize_bytes, DictMixin, loadfile, convert_error, \
set_restore_mtime

from ._util import error, ASFError, ASFHeaderError
from ._objects import HeaderObject, MetadataLibraryObject, MetadataObject, \
Expand Down
3 changes: 2 additions & 1 deletion mutagen/dsf.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,8 @@ def _pre_load_header(self, fileobj):

@convert_error(IOError, error)
@loadfile(writable=True)
def save(self, filething=None, v2_version=4, v23_sep='/', padding=None, preserve_mtime=False):
def save(self, filething=None, v2_version=4, v23_sep='/', padding=None,
preserve_mtime=False):
"""Save ID3v2 data to the DSF file"""

fileobj = filething.fileobj
Expand Down
3 changes: 2 additions & 1 deletion mutagen/easyid3.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ def __init__(self, filename=None):
@loadfile(writable=True, create=True)
def save(self, filething=None, v1=1, v2_version=4, v23_sep='/',
padding=None, preserve_mtime=False):
"""save(filething=None, v1=1, v2_version=4, v23_sep='/', padding=None, preserve_mtime=False)
"""save(filething=None, v1=1, v2_version=4, v23_sep='/', padding=None,
preserve_mtime=False)
Save changes to a file.
See :meth:`mutagen.id3.ID3.save` for more info.
Expand Down
9 changes: 4 additions & 5 deletions mutagen/id3/_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
BitPaddedInt
from ._tags import ID3Tags, ID3Header, ID3SaveConfig
from ._id3v1 import MakeID3v1, find_id3v1
import os.path


@enum
Expand Down Expand Up @@ -223,7 +222,8 @@ def _prepare_data(self, fileobj, start, available, v2_version, v23_sep,
@loadfile(writable=True, create=True)
def save(self, filething=None, v1=1, v2_version=4, v23_sep='/',
padding=None, preserve_mtime=False):
"""save(filething=None, v1=1, v2_version=4, v23_sep='/', padding=None, preserve_mtime=False)
"""save(filething=None, v1=1, v2_version=4, v23_sep='/', padding=None,
preserve_mtime=False)
Save changes to a file.
Expand Down Expand Up @@ -255,7 +255,7 @@ def save(self, filething=None, v1=1, v2_version=4, v23_sep='/',
"""

f = filething.fileobj

if preserve_mtime:
set_restore_mtime(f)

Expand All @@ -276,9 +276,8 @@ def save(self, filething=None, v1=1, v2_version=4, v23_sep='/',
delete_bytes(f, old_size - new_size, new_size)
f.seek(0)
f.write(data)

self.__save_v1(f, v1)


def __save_v1(self, f, v1):
tag, offset = find_id3v1(f)
Expand Down
1 change: 0 additions & 1 deletion mutagen/mp4/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,6 @@ def save(self, filething=None, padding=None, preserve_mtime=False):
except AtomError as err:
reraise(error, err, sys.exc_info()[2])


fileobj = filething.fileobj
if preserve_mtime:
set_restore_mtime(fileobj)
Expand Down
5 changes: 3 additions & 2 deletions mutagen/wave.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,15 @@ def _pre_load_header(self, fileobj):

@convert_error(IOError, error)
@loadfile(writable=True)
def save(self, filething, v1=1, v2_version=4, v23_sep='/', padding=None, preserve_mtime=False):
def save(self, filething, v1=1, v2_version=4, v23_sep='/', padding=None,
preserve_mtime=False):
"""Save ID3v2 data to the Wave/RIFF file"""

fileobj = filething.fileobj

if preserve_mtime:
set_restore_mtime(fileobj)

wave_file = _WaveFile(fileobj)

if u'id3' not in wave_file:
Expand Down
1 change: 1 addition & 0 deletions tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ def get_temp_copy(path):
shutil.copy(path, filename)
return filename


def get_temp_copy_keep_metadata(path):
"""Returns a copy of the file with the same extension"""

Expand Down
19 changes: 12 additions & 7 deletions tests/test_id3.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
save_frame, ID3SaveConfig
from mutagen.id3._id3v1 import find_id3v1

from tests import TestCase, DATA_DIR, get_temp_copy, get_temp_copy_keep_metadata, get_temp_empty
from tests import TestCase, DATA_DIR, get_temp_copy, \
get_temp_copy_keep_metadata, get_temp_empty


def test_id3_module_exports_all_frames():
Expand Down Expand Up @@ -898,26 +899,30 @@ def test_save(self):
def test_retain_mtime(self):

def run_test(label, flag):

file = get_temp_copy_keep_metadata( os.path.join(DATA_DIR, 'silence-44-s-aged-filetime.mp3'))

file = get_temp_copy_keep_metadata(
os.path.join(DATA_DIR, 'silence-44-s-aged-filetime.mp3')
)
audio = ID3(file)

mtime_before = os.stat(file).st_mtime
if flag is False:
time.sleep(0.1)
time.sleep(0.1)
audio.save(v2_version=3, preserve_mtime=flag)
mtime_after = os.stat(file).st_mtime

if flag:
tolerance = 0.1
self.assertTrue(abs(mtime_after - mtime_before) < tolerance, "mtime difference greater than tolerance")
self.assertTrue(
abs(mtime_after - mtime_before) < tolerance,
"mtime difference greater than tolerance"
)
else:
self.assertNotEqual(mtime_before, mtime_after)

run_test("file mtime will be preserved", flag=True)
run_test("file mtime will not be preserved", flag=False)


def test_save_off_spec_frames(self):
# These are not defined in v2.3 and shouldn't be written.
# Still make sure reading them again works and the encoding
Expand Down

0 comments on commit 03be74f

Please sign in to comment.