Apple-2-SW/a2server
1
0
Fork 0
mirror of https://github.com/RasppleII/a2server.git synced 2025-08-07 11:25:48 +00:00
Code Issues Projects Releases Wiki Activity

cppo properly handles archived disk images (.sdk files)

Browse Source
This commit is contained in:
Ivan X
2016-01-11 01:00:01 -05:00
parent 631ad8a2e2
commit ec0bf3b9d5
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/tools/cppo.txt
View File

@@ -59,8 +59,7 @@ g.activeFileName = None
g.activeFileSize = None g.activeFileSize = None
g.activeFileBytesCopied = 0 g.activeFileBytesCopied = 0
g.resourceFork = 0 g.resourceFork = 0
g.shk_hasrf = "" g.shk_hasrf = False
g.shk_rfork = 0
g.PDOSPATH = [] g.PDOSPATH = []
g.PDOSPATH_INDEX = 0 g.PDOSPATH_INDEX = 0
@@ -570,7 +569,8 @@ def processEntry(arg1, arg2):
if (not g.extractFile or if (not g.extractFile or
(os.path.basename(g.extractFile.lower()) == (os.path.basename(g.extractFile.lower()) ==
origFileName.split('#')[0].lower())): origFileName.split('#')[0].lower())):
print(dirPrint + g.activeFileName.split("#")[0] + filePrint = g.activeFileName.split("#")[0]
print(dirPrint + filePrint +
("+" if (g.shk_hasrf or ("+" if (g.shk_hasrf or
(not g.SHK and getStorageType(arg1, arg2) == 5)) (not g.SHK and getStorageType(arg1, arg2) == 5))
else "") + else "") +
@@ -1236,14 +1236,27 @@ if g.SHK:
if g.AD: if g.AD:
makedirs(g.ADdir) makedirs(g.ADdir)
for fname in sorted(fileList): for fname in sorted(fileList):
g.shk_hasrf = "" g.shk_hasrf = False
g.shk_rfork = False rfork = False
disk_image = False
if (fname[-1:] == "r" and if (fname[-1:] == "r" and
os.path.isfile(os.path.join(dirName, fname[:-1]))): os.path.isfile(os.path.join(dirName, fname[:-1]))):
g.shk_rfork = True rfork = True
elif (fname[-1:] == "i"):
disk_image = True
elif (os.path.isfile(os.path.join(dirName, (fname + "r")))): elif (os.path.isfile(os.path.join(dirName, (fname + "r")))):
g.shk_hasrf = "+" g.shk_hasrf = True
if not g.shk_rfork: elif (os.path.isfile(os.path.join(dirName, (fname + "i")))):
# disk image; remove shell image
os.remove(os.path.join(dirName, fname))
imagePath = os.path.join(dirName, fname).split("#")[0]
new_name = (imagePath +
("" if (fname.lower().endswith(".po") or
fname.lower().endswith(".hdv"))
else ".po") + "#e00005")
os.rename((os.path.join(dirName, fname) + "i"), new_name)
fname = os.path.basename(new_name)
if not rfork and not disk_image:
processEntry(dirName, fname) processEntry(dirName, fname)
shutil.rmtree(unshkdir, True) shutil.rmtree(unshkdir, True)
syncExit() syncExit()