HA
/
patool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed lrzip archive handling.

This commit is contained in:
Bastian Kleineidam 2013-02-22 18:34:28 +01:00
parent b11498e8aa
commit 88e72844b1
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patoolib/programs/lrzip.py
View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright (C) 2010-2012 Bastian Kleineidam # Copyright (C) 2010-2013 Bastian Kleineidam
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -19,14 +19,12 @@ from .. import util
def extract_lrzip (archive, compression, cmd, **kwargs): def extract_lrzip (archive, compression, cmd, **kwargs):
"""Extract a LRZIP archive.""" """Extract a LRZIP archive."""
# Since extracted files will be placed in the current directory,
# the cwd argument has to be the output directory.
cmdlist = [cmd, '-d'] cmdlist = [cmd, '-d']
if kwargs['verbose']: if kwargs['verbose']:
cmdlist.append('-v') cmdlist.append('-v')
outfile = util.get_single_outfile(kwargs['outdir'], archive) outfile = util.get_single_outfile(kwargs['outdir'], archive)
cmdlist.extend(["-o", outfile, os.path.abspath(archive)]) cmdlist.extend(["-o", outfile, os.path.abspath(archive)])
return (cmdlist, {'cwd': kwargs['outdir']}) return cmdlist
def test_lrzip (archive, compression, cmd, **kwargs): def test_lrzip (archive, compression, cmd, **kwargs):
"""Test a LRZIP archive.""" """Test a LRZIP archive."""

10
tests/archives/test_lrzip.py
View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright (C) 2010-2012 Bastian Kleineidam # Copyright (C) 2010-2013 Bastian Kleineidam
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -13,7 +13,7 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from . import ArchiveTest from . import ArchiveTest, Content
from .. import needs_program from .. import needs_program
class TestLrzip (ArchiveTest): class TestLrzip (ArchiveTest):
@ -23,8 +23,8 @@ class TestLrzip (ArchiveTest):
@needs_program(program) @needs_program(program)
def test_lrzip(self): def test_lrzip(self):
self.archive_test('t.txt.lrz') self.archive_test('t.txt.lrz')
self.archive_extract('t.txt.lrz') self.archive_extract('t.txt.lrz', check=Content.Singlefile)
self.archive_create('t.txt.lrz', singlefile=True) self.archive_create('t.txt.lrz', check=Content.Singlefile)
# file(1) does not recognize .lrz files # file(1) does not recognize .lrz files
#@needs_program('file') #@needs_program('file')
@ -32,5 +32,5 @@ class TestLrzip (ArchiveTest):
#def test_lrzip_file(self): #def test_lrzip_file(self):
# self.archive_test('t.txt.lrz.foo') # self.archive_test('t.txt.lrz.foo')
# self.archive_extract('t.txt.lrz.foo') # self.archive_extract('t.txt.lrz.foo')
# self.archive_create('t.txt.lrz.foo', format="lrzip", singlefile=True) # self.archive_create('t.txt.lrz.foo', format="lrzip", check=Content.Singlefile)