@@ -1119,17 +1119,58 @@ def test_extract_always_returns_a_generator_and_not_a_list(self):
11191119 result = extract .extract (test_dir )
11201120 assert isinstance (result , GeneratorType )
11211121
1122- def test_extract_ignore (self ):
1122+ def test_extract_ignore_file (self ):
11231123 test_dir = self .get_test_loc ('extract/ignore' , copy = True )
11241124 expected = [
1125- 'a.zip' ,
1126- 'a.zip-extract/a.txt' ,
1127- 'a.zip-extract/b.zip' ,
1128- 'a.zip-extract/b.zip-extract/b.txt' ,
1129- 'a.zip-extract/c.tar' ,
1130- 'b.tar'
1125+ 'alpha.zip' ,
1126+ 'beta.tar' ,
1127+ 'beta.tar-extract/a.txt' ,
1128+ 'beta.tar-extract/b.txt' ,
1129+ 'beta.tar-extract/c.txt' ,
1130+ 'gamma/gamma.zip' ,
1131+ 'gamma/gamma.zip-extract/c.txt'
11311132 ]
11321133 from extractcode import default_kinds
1133- result = list (extract .extract (test_dir , recurse = True , ignored_extensions = ('*tar ' ,)))
1134+ result = list (extract .extract (test_dir , recurse = True , ignored_extensions = ('alpha.zip ' ,)))
11341135 check_no_error (result )
11351136 check_files (test_dir , expected )
1137+
1138+ def test_extract_ignore_directory (self ):
1139+ test_dir = self .get_test_loc ('extract/ignore' , copy = True )
1140+ expected = [
1141+ 'alpha.zip' ,
1142+ 'alpha.zip-extract/a.txt' ,
1143+ 'alpha.zip-extract/beta.zip' ,
1144+ 'alpha.zip-extract/beta.zip-extract/b.txt' ,
1145+ 'alpha.zip-extract/gamma.tar' ,
1146+ 'alpha.zip-extract/gamma.tar-extract/c.txt' ,
1147+ 'beta.tar' ,
1148+ 'beta.tar-extract/a.txt' ,
1149+ 'beta.tar-extract/b.txt' ,
1150+ 'beta.tar-extract/c.txt' ,
1151+ 'gamma/gamma.zip' ,
1152+ ]
1153+ from extractcode import default_kinds
1154+ result = list (extract .extract (test_dir , recurse = True , ignored_extensions = ('gamma' ,)))
1155+ check_no_error (result )
1156+ check_files (test_dir , expected )
1157+
1158+ def test_extract_ignore_pattern (self ):
1159+ test_dir = self .get_test_loc ('extract/ignore' , copy = True )
1160+ expected = [
1161+ 'alpha.zip' ,
1162+ 'alpha.zip-extract/a.txt' ,
1163+ 'alpha.zip-extract/beta.zip' ,
1164+ 'alpha.zip-extract/gamma.tar' ,
1165+ 'alpha.zip-extract/gamma.tar-extract/c.txt' ,
1166+ 'beta.tar' ,
1167+ 'beta.tar-extract/a.txt' ,
1168+ 'beta.tar-extract/b.txt' ,
1169+ 'beta.tar-extract/c.txt' ,
1170+ 'gamma/gamma.zip' ,
1171+ 'gamma/gamma.zip-extract/c.txt'
1172+ ]
1173+ from extractcode import default_kinds
1174+ result = list (extract .extract (test_dir , recurse = True , ignored_extensions = ('b*.zip' ,)))
1175+ check_no_error (result )
1176+ check_files (test_dir , expected )
0 commit comments