Skip to content

Added callback parameter to extract and extractall #7

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

Open
nekosaur wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added callback parameter to extract and extractall #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2302e70
Added callback parameter to rarfile.extract and extractall
nekosaur Mar 17, 2015
42bf198
Removed default value for callback parameter on _extract_members
nekosaur Mar 17, 2015
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
14 changes: 9 additions & 5 deletions unrar/rarfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ def testrar(self):
self._close(handle)
return error

def extract(self, member, path=None, pwd=None):
def extract(self, member, path=None, pwd=None, callback=None):
"""Extract a member from the archive to the current working directory,
using its full name. Its file information is extracted as accurately
as possible. `member' may be a filename or a RarInfo object. You can
Expand All @@ -282,27 +282,31 @@ def extract(self, member, path=None, pwd=None):
if path is None:
path = os.getcwd()

self._extract_members([member], path, pwd)
self._extract_members([member], path, pwd, callback)
return os.path.join(path, member)

def extractall(self, path=None, members=None, pwd=None):
def extractall(self, path=None, members=None, pwd=None, callback=None):
"""Extract all members from the archive to the current working
directory. `path' specifies a different directory to extract to.
`members' is optional and must be a subset of the list returned
by namelist().
"""
if members is None:
members = self.namelist()
self._extract_members(members, path, pwd)
self._extract_members(members, path, pwd, callback)

def _extract_members(self, members, targetpath, pwd):
def _extract_members(self, members, targetpath, pwd, callback):
"""Extract the RarInfo objects 'members' to a physical
file on the path targetpath.
"""
archive = unrarlib.RAROpenArchiveDataEx(
self.filename, mode=constants.RAR_OM_EXTRACT)
handle = self._open(archive)

if callback is not None:
c_callback = unrarlib.UNRARCALLBACK(callback)
unrarlib.RARSetCallback(handle, c_callback, 0)

password = pwd or self.pwd
if password is not None:
unrarlib.RARSetPassword(handle, b(password))
Expand Down