mirror of
https://github.com/iKarith/cppo-ng.git
synced 2024-06-01 06:41:27 +00:00
A little more style consistency
Basically cleaning out my stash stack--the stash this came from had been mostly applied elsewhere already, leaving only a few stray ()s. Figured it was a good time to PEP 8 the end-of-line comments just so there was something here to actually commit.
This commit is contained in:
parent
330c90d830
commit
5915060db0
|
@ -187,8 +187,7 @@ def getStartPos(arg1, arg2):
|
|||
if g.dos33:
|
||||
return (ts(arg1) + (35 * (arg2 % 7)) + 11)
|
||||
else: # ProDOS
|
||||
return (
|
||||
(arg1 * 512)
|
||||
return ( (arg1 * 512)
|
||||
+ (39 * ((arg2 + (arg2 > 11)) % 13))
|
||||
+ (4 if arg2 > 11 else 43) )
|
||||
|
||||
|
@ -521,7 +520,7 @@ def process_dir(arg1, arg2=None, arg3=None, arg4=None, arg5=None):
|
|||
entryCount = getDirEntryCount(arg1)
|
||||
if not g.dos33:
|
||||
workingDirName = getWorkingDirName(arg1, arg2).decode("L1")
|
||||
g.DIRPATH = (g.DIRPATH + "/" + workingDirName)
|
||||
g.DIRPATH = g.DIRPATH + "/" + workingDirName
|
||||
if g.PDOSPATH_INDEX:
|
||||
if g.PDOSPATH_INDEX == 1:
|
||||
if ("/" + g.PDOSPATH_SEGMENT.lower()) != g.DIRPATH.lower():
|
||||
|
@ -587,7 +586,7 @@ def processEntry(arg1, arg2):
|
|||
g.DIRPATH = g.DIRPATH.rsplit("/", 1)[0]
|
||||
if not g.PDOSPATH_INDEX:
|
||||
g.target_dir = g.target_dir.rsplit("/", 1)[0]
|
||||
g.appledouble_dir = (g.target_dir + "/.AppleDouble")
|
||||
g.appledouble_dir = g.target_dir + "/.AppleDouble"
|
||||
else: # ProDOS or DOS 3.3 file either from image or ShrinkIt archive
|
||||
dirPrint = ""
|
||||
if g.DIRPATH:
|
||||
|
@ -729,7 +728,7 @@ def processIndexBlock(arg1, arg2=False):
|
|||
processIndexBlock(targetBlock)
|
||||
else:
|
||||
bytesRemaining = (g.activeFileSize - g.activeFileBytesCopied)
|
||||
bs = (bytesRemaining if bytesRemaining < 512 else 512)
|
||||
bs = bytesRemaining if bytesRemaining < 512 else 512
|
||||
copyBlock(targetBlock, bs)
|
||||
pos += 1
|
||||
if pos > 255:
|
||||
|
|
Loading…
Reference in New Issue
Block a user