Skip to content

Refactor the sequence interface #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bastibe merged 1 commit into from
Feb 25, 2014
Merged

Refactor the sequence interface #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 18 additions & 27 deletions pysoundfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,25 +423,25 @@ def __len__(self):
self.seek_absolute(curr)
return(length)

def _get_slice_bounds(self, frame):
# get start and stop index from slice, asserting step==1
if not isinstance(frame, slice):
frame = slice(frame, frame + 1)
start, stop, step = frame.indices(len(self))
if step != 1:
raise RuntimeError("Step size must be 1!")
if start > stop:
stop = start
return start, stop

def __getitem__(self, frame):
# access the file as if it where a one-dimensional Numpy
# array. Data must be in the form (frames x channels).
# Both open slice bounds and negative values are allowed.
if not isinstance(frame, slice):
frame = slice(frame, frame+1)
if frame.start is None:
frame = slice(0, frame.stop)
if frame.stop is None:
frame = slice(frame.start, len(self))
if frame.start < 0:
frame = slice(len(self)+frame.start, frame.stop)
if frame.stop < 0:
frame = slice(frame.start, len(self)+frame.stop)
if frame.start > frame.stop:
frame = slice(frame.stop, frame.start)
start, stop = self._get_slice_bounds(frame)
curr = self.seek(0)
self.seek_absolute(frame.start)
data = self.read(frame.stop-frame.start)
self.seek_absolute(start)
data = self.read(stop - start)
self.seek(curr)
return data

Expand All @@ -451,22 +451,13 @@ def __setitem__(self, frame, data):
# Both open slice bounds and negative values are allowed.
if self._file_mode == read_mode:
raise RuntimeError("Can not write to read-only file")
if not isinstance(frame, slice):
frame = slice(frame, frame+1)
if frame.start is None:
frame = slice(0, frame.stop)
if frame.stop is None:
frame = slice(frame.start, len(self))
if frame.start < 0:
frame = slice(len(self)+frame.start, frame.stop)
if frame.stop < 0:
frame = slice(frame.start, len(self)+frame.stop)
if frame.stop-frame.start != len(data):
start, stop = self._get_slice_bounds(frame)
if stop - start != len(data):
raise IndexError(
"Could not fit data of length %i into slice of length %i" %
(len(data), frame.stop-frame.start))
(len(data), stop - start))
curr = self.seek(0)
self.seek_absolute(frame.start)
self.seek_absolute(start)
self.write(data)
self.seek(curr)
return data
Expand Down