Skip to content

Commit 758eb5b

Browse files
committed
Small update
1 parent 6df8257 commit 758eb5b

1 file changed

Lines changed: 21 additions & 13 deletions

File tree

pyfoxfile/pyfoxfile.py

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1332,21 +1332,14 @@ def AppendNullBytes(indata=None, delimiter=None):
13321332
def system_and_major():
13331333
info = platform.uname()
13341334

1335-
# Python 3: info is a namedtuple with .system / .release
1336-
# Python 2: info is a plain tuple (system, node, release, version, machine, processor)
1337-
try:
1338-
system = info.system
1339-
release = info.release
1340-
except AttributeError:
1341-
# Fallback for Python 2
1342-
system = info[0]
1343-
release = info[2]
1335+
system = info.system
1336+
release = info.release
13441337

13451338
# Find the first run of digits in the release string
1346-
m = re.search(r'\d+', release)
1339+
m = re.search(r"\d+", release)
13471340
if m:
1348-
major = m.group(0) # e.g. '11' or '6'
1349-
return u"%s%s" % (system, major) # unicode-safe in Py2
1341+
major = m.group(0)
1342+
return f"{system}{major}"
13501343
else:
13511344
return system
13521345

@@ -10048,6 +10041,21 @@ def BSDTarFileListFiles(infile, formatspecs=__file_format_multi_dict__, verbose=
1004810041
else:
1004910042
ffullmode = member.mode | stat.S_IFREG
1005010043
ftype = 0
10044+
fsize = 0
10045+
zero_length_types = {1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 13}
10046+
if ftype in zero_length_types:
10047+
fsize = 0
10048+
else:
10049+
if(member.size is None):
10050+
fcontents = MkTempFile()
10051+
if(hasattr(member, "get_blocks")):
10052+
for block in member.get_blocks():
10053+
fcontents.write(block)
10054+
elif(hasattr(member, "read")):
10055+
fcontents.write(member.read())
10056+
fsize = fcontents.tell()
10057+
else:
10058+
fsize = member.size
1005110059
if(not verbose):
1005210060
VerbosePrintOut(member.pathname)
1005310061
elif(verbose):
@@ -10075,7 +10083,7 @@ def BSDTarFileListFiles(infile, formatspecs=__file_format_multi_dict__, verbose=
1007510083
else:
1007610084
fgprint = "0"
1007710085
VerbosePrintOut(PrintPermissionString(ffullmode, ftype) + "\t" + str(fuprint) + "/" + str(fgprint) + "\t" + str(
10078-
member.size).rjust(15) + "\t" + datetime.datetime.fromtimestamp(member.mtime).strftime('%Y-%m-%d %H:%M') + "\t" + printfname)
10086+
fsize).rjust(15) + "\t" + datetime.datetime.fromtimestamp(member.mtime).strftime('%Y-%m-%d %H:%M') + "\t" + printfname)
1007910087
lcfi = lcfi + 1
1008010088
if(returnfp):
1008110089
return listarrayfiles['fp']

0 commit comments

Comments
 (0)