2017-06-21 02:48:22 +00:00
|
|
|
#!/usr/bin/env python3
|
2017-06-21 02:27:38 +00:00
|
|
|
# vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=python:
|
|
|
|
|
2017-07-07 13:29:19 +00:00
|
|
|
# Copyright (C) 2013-2016 Ivan Drucker
|
|
|
|
# Copyright (C) 2017 T. Joseph Carter
|
|
|
|
#
|
|
|
|
# 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 the
|
|
|
|
# Free Software Foundation; either version 2 of the License, or (at your
|
|
|
|
# option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful, but
|
|
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
|
|
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
|
# for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License along
|
|
|
|
# with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# If interested, please see the file HISTORY.md for information about both the
|
|
|
|
# technical and licensing decisions that have gone into the rewriting of cppo.
|
|
|
|
|
2017-06-21 02:27:38 +00:00
|
|
|
"""cppo: Copy/catalog files from a ProDOS/DOS 3.3/ShrinkIt image/archive.
|
|
|
|
|
|
|
|
copy all files: cppo [options] imagefile target_directory
|
|
|
|
copy one file : cppo [options] imagefile /extract/path target_path
|
|
|
|
catalog image : cppo -cat [options] imagefile
|
|
|
|
|
|
|
|
options:
|
|
|
|
-shk: ShrinkIt archive as source (also auto-enabled by filename).
|
|
|
|
-ad : Netatalk-compatible AppleDouble metadata files and resource forks.
|
|
|
|
-e : Nulib2-compatible filenames with type/auxtype and resource forks.
|
|
|
|
-uc : Copy GS/OS mixed case filenames as uppercase.
|
|
|
|
-pro: Adapt DOS 3.3 names to ProDOS and remove addr/len from file data.
|
|
|
|
|
|
|
|
/extract/path examples:
|
|
|
|
/FULL/PRODOS/PATH (ProDOS image source)
|
|
|
|
"MY FILENAME" (DOS 3.3 image source)
|
|
|
|
Dir:SubDir:FileName (ShrinkIt archive source)
|
|
|
|
|
|
|
|
+ after a file name indicates a GS/OS or Mac OS extended (forked) file.
|
|
|
|
Wildcard matching (*) is not supported and images are not validated.
|
|
|
|
ShrinkIt support requires Nulib2. cppo requires Python 2.6+ or 3.0+."""
|
|
|
|
|
|
|
|
# cppo by Ivan X, ivan@ivanx.com, ivanx.com/appleii
|
|
|
|
|
|
|
|
# Does anyone want to rewrite/refactor this? It works, but it's a mess.
|
|
|
|
|
|
|
|
import sys
|
|
|
|
import os
|
|
|
|
import datetime
|
|
|
|
import shutil
|
|
|
|
import errno
|
2017-07-08 11:01:57 +00:00
|
|
|
import uuid # for temp directory
|
2017-06-21 02:27:38 +00:00
|
|
|
import subprocess
|
2017-07-08 11:01:57 +00:00
|
|
|
#import tempfile # not used, but should be for temp directory?
|
2017-06-30 21:30:31 +00:00
|
|
|
import struct
|
2017-06-21 02:43:29 +00:00
|
|
|
from binascii import a2b_hex, b2a_hex
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-07-08 12:52:34 +00:00
|
|
|
from . import diskimg
|
2017-07-18 18:18:39 +00:00
|
|
|
from .logging import LOG
|
2017-07-07 09:21:42 +00:00
|
|
|
|
2017-06-21 02:48:22 +00:00
|
|
|
class Globals:
|
2017-06-21 02:27:38 +00:00
|
|
|
pass
|
|
|
|
|
|
|
|
g = Globals()
|
|
|
|
|
2017-06-22 08:33:40 +00:00
|
|
|
g.out_data = bytearray(b'')
|
|
|
|
g.ex_data = None
|
2017-06-21 02:27:38 +00:00
|
|
|
|
|
|
|
g.activeDirBlock = None
|
|
|
|
g.activeFileName = None
|
|
|
|
g.activeFileSize = None
|
|
|
|
g.activeFileBytesCopied = 0
|
|
|
|
g.resourceFork = 0
|
|
|
|
g.shk_hasrf = False
|
|
|
|
|
|
|
|
g.PDOSPATH = []
|
|
|
|
g.PDOSPATH_INDEX = 0
|
|
|
|
g.PDOSPATH_SEGMENT = None
|
|
|
|
g.DIRPATH = ""
|
|
|
|
|
2017-06-22 09:30:05 +00:00
|
|
|
g.target_name = None
|
|
|
|
g.target_dir = ""
|
|
|
|
g.appledouble_dir = None
|
2017-07-07 15:07:20 +00:00
|
|
|
g.image_file = None
|
2017-06-22 08:33:40 +00:00
|
|
|
g.extract_file = None
|
2017-06-21 02:27:38 +00:00
|
|
|
|
|
|
|
# runtime options
|
2017-06-30 09:50:32 +00:00
|
|
|
g.use_appledouble = False # -ad (AppleDouble headers + resource forks)
|
|
|
|
g.use_extended = False # -e (extended filenames + resource forks)
|
|
|
|
g.catalog_only = False # -cat (catalog only, no extract)
|
|
|
|
g.casefold_upper = False # -uc (GS/OS mixed case filenames extract as uppercase)
|
|
|
|
g.src_shk = False # -shk (ShrinkIt archive source)
|
|
|
|
g.prodos_names = False # -pro (adapt DOS 3.3 names to ProDOS)
|
|
|
|
g.afpsync_msg = True # -s (sets False to suppress afpsync message at end)
|
|
|
|
g.extract_in_place = False # -n (don't create parent dir for SHK, extract files in place)
|
|
|
|
g.dos33 = False # (DOS 3.3 image source, selected automatically)
|
2017-06-21 02:27:38 +00:00
|
|
|
|
|
|
|
# functions
|
|
|
|
|
2017-07-01 10:45:53 +00:00
|
|
|
def pack_u24be(buf: bytearray, offset: int, val: int):
|
2017-06-30 21:30:31 +00:00
|
|
|
lo16 = val & 0xffff
|
|
|
|
hi8 = (val >> 16) & 0xff
|
|
|
|
struct.pack_into('>BH', buf, offset, hi8, lo16)
|
|
|
|
|
2017-07-01 10:45:53 +00:00
|
|
|
def pack_u32be(buf: bytearray, offset: int, val: int):
|
2017-06-30 21:30:31 +00:00
|
|
|
# Currently unused, will be needed for resource fork dates later
|
|
|
|
struct.pack_into('>L', buf, offset, val)
|
|
|
|
|
|
|
|
def unpack_u16le(buf: bytes, offset: int = 0) -> int:
|
|
|
|
return struct.unpack_from('<H', buf, offset)[0]
|
|
|
|
|
|
|
|
def unpack_u24le(buf: bytes, offset: int = 0) -> int:
|
|
|
|
lo16, hi8 = struct.unpack_from('<HB', buf, offset)
|
|
|
|
return lo16 | (hi8 << 16)
|
|
|
|
|
2017-07-01 10:45:53 +00:00
|
|
|
|
2017-06-25 09:27:27 +00:00
|
|
|
def date_prodos_to_unix(prodos_date: bytes) -> int:
|
|
|
|
"""Returns a UNIX timestamp given a raw ProDOS date"""
|
2017-06-26 13:56:19 +00:00
|
|
|
"""The ProDOS date consists of two 16-bit words stored little-
|
|
|
|
endian. We receive them as raw bytes with this layout:
|
2017-06-25 09:27:27 +00:00
|
|
|
|
|
|
|
mmmddddd yyyyyyym 00MMMMMM 000HHHHH
|
|
|
|
|
|
|
|
where:
|
2017-06-26 13:56:19 +00:00
|
|
|
|
2017-06-25 09:27:27 +00:00
|
|
|
year yyyyyyy
|
|
|
|
month m mmm
|
|
|
|
day ddddd
|
|
|
|
hour HHHHH
|
|
|
|
minute MMMMMM
|
|
|
|
|
2017-06-26 13:56:19 +00:00
|
|
|
Some notes about that:
|
2017-06-25 09:27:27 +00:00
|
|
|
|
|
|
|
- The high bit of the month is the low bit of prodos_date[1], the rest of
|
|
|
|
lower bits are found in prodos_date[0].
|
|
|
|
- The two-digit year treats 40-99 as being 19xx, else 20xx.
|
|
|
|
- ProDOS has only minute-precision for its timestamps. Data regarding
|
|
|
|
seconds is lost.
|
|
|
|
- ProDOS dates are naive in the sense they lack a timezone. We (naively)
|
|
|
|
assume these timestamps are in local time.
|
|
|
|
- The unused bits in the time fields are masked off, just in case they're
|
|
|
|
ever NOT zero. 2040 is coming.
|
|
|
|
"""
|
|
|
|
try:
|
|
|
|
year = (prodos_date[1] & 0xfe)>>1
|
|
|
|
year += 1900 if year >= 40 else 2000
|
|
|
|
month = ((prodos_date[1] & 0x01)<<4) | ((prodos_date[0] & 0xe0)>>5)
|
|
|
|
day = prodos_date[0] & 0x1f
|
|
|
|
hour = prodos_date[3] & 0x1f
|
|
|
|
minute = prodos_date[2] & 0x3f
|
|
|
|
|
|
|
|
return int(datetime.datetime(year, month, day,
|
|
|
|
hour, minute).timestamp())
|
|
|
|
except:
|
|
|
|
# <NO DATE> is always an option
|
|
|
|
return None
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-06-26 13:56:19 +00:00
|
|
|
APPLE_EPOCH_OFFSET = 946684800
|
|
|
|
"""The number of seconds between 1970-01-01 amd 2000-01-01"""
|
|
|
|
# $ date --date="2000-01-01 00:00:00 GMT" +%s
|
|
|
|
# 946684800
|
|
|
|
|
2017-06-25 23:15:39 +00:00
|
|
|
def date_unix_to_appledouble(unix_date):
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
""" convert UNIX date to Apple epoch (2000-01-01) """
|
2017-06-21 02:27:38 +00:00
|
|
|
# input: seconds since Unix epoch (1-Jan-1970 00:00:00 GMT)
|
|
|
|
# output: seconds since Netatalk epoch (1-Jan-2000 00:00:00 GMT),
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
# in 4 bytes
|
2017-06-26 13:56:19 +00:00
|
|
|
adDate = int(unix_date - APPLE_EPOCH_OFFSET)
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
# Think: "UNIX dates have 30 years too many seconds to be Apple dates,
|
|
|
|
# so we need to subtract 30 years' worth of seconds."
|
2017-06-22 11:17:23 +00:00
|
|
|
if adDate < 0:
|
2017-07-08 11:01:57 +00:00
|
|
|
adDate += 1<<32 # to get negative hex number
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
return adDate.to_bytes(4, 'big')
|
2017-06-21 02:27:38 +00:00
|
|
|
|
|
|
|
# cppo support functions:
|
|
|
|
# arg1: directory block or [T,S] containing file entry, or shk file dir path
|
|
|
|
# arg2: file index in overall directory (if applicable), or shk file name
|
|
|
|
|
|
|
|
# returns byte position in disk image file
|
|
|
|
def getStartPos(arg1, arg2):
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.dos33:
|
2017-06-21 02:27:38 +00:00
|
|
|
return (ts(arg1) + (35 * (arg2 % 7)) + 11)
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # ProDOS
|
|
|
|
return ( (arg1 * 512)
|
2017-06-26 13:56:19 +00:00
|
|
|
+ (39 * ((arg2 + (arg2 > 11)) % 13))
|
|
|
|
+ (4 if arg2 > 11 else 43) )
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def getStorageType(disk, arg1, arg2):
|
2017-06-21 02:27:38 +00:00
|
|
|
start = getStartPos(arg1, arg2)
|
2017-07-20 06:05:11 +00:00
|
|
|
firstByte = disk.buffer.read1(start)
|
2017-06-22 09:30:05 +00:00
|
|
|
return (int(firstByte != 255)*2 if g.dos33 else (firstByte//16))
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def getFileName(disk, arg1, arg2):
|
2017-06-21 02:27:38 +00:00
|
|
|
start = getStartPos(arg1, arg2)
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.dos33:
|
2017-06-21 02:27:38 +00:00
|
|
|
fileNameLo = bytearray()
|
2017-07-20 06:05:11 +00:00
|
|
|
fileNameHi = disk.buffer.read(start + 3, 30)
|
2017-06-21 02:27:38 +00:00
|
|
|
for b in fileNameHi:
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
fileNameLo.append(b & 0x7f)
|
2017-06-21 02:27:38 +00:00
|
|
|
fileName = bytes(fileNameLo).rstrip()
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # ProDOS
|
2017-07-20 06:05:11 +00:00
|
|
|
firstByte = disk.buffer.read1(start)
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
entryType = firstByte//16
|
|
|
|
nameLength = firstByte - entryType*16
|
2017-07-20 06:05:11 +00:00
|
|
|
fileName = disk.buffer.read(start + 1, nameLength)
|
|
|
|
caseMask = getCaseMask(disk, arg1, arg2)
|
2017-06-22 11:17:23 +00:00
|
|
|
if caseMask and not g.casefold_upper:
|
2017-06-22 11:37:34 +00:00
|
|
|
fileName = bytearray(fileName)
|
2017-06-21 02:27:38 +00:00
|
|
|
for i in range(0, len(fileName)):
|
2017-06-22 11:17:23 +00:00
|
|
|
if caseMask[i] == "1":
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
fileName[i:i+1] = fileName[i:i+1].lower()
|
2017-06-22 11:37:34 +00:00
|
|
|
fileName = bytes(fileName)
|
2017-06-21 02:27:38 +00:00
|
|
|
return fileName
|
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def getCaseMask(disk, arg1, arg2):
|
2017-06-21 02:27:38 +00:00
|
|
|
start = getStartPos(arg1, arg2)
|
2017-07-20 06:05:11 +00:00
|
|
|
caseMaskDec = unpack_u16le(disk.buffer.read(start + 28, 2))
|
2017-06-22 11:17:23 +00:00
|
|
|
if caseMaskDec < 32768:
|
2017-06-21 02:27:38 +00:00
|
|
|
return None
|
|
|
|
else:
|
2017-07-14 02:35:47 +00:00
|
|
|
return format(caseMaskDec - 32768, '015b')
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def getFileType(disk, arg1, arg2):
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.src_shk:
|
2017-06-21 02:27:38 +00:00
|
|
|
return arg2.split('#')[1][0:2]
|
|
|
|
start = getStartPos(arg1, arg2)
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.dos33:
|
2017-07-20 06:05:11 +00:00
|
|
|
d33fileType = disk.buffer.read1(start + 2)
|
2017-06-22 11:17:23 +00:00
|
|
|
if (d33fileType & 127) == 4:
|
2017-07-08 11:01:57 +00:00
|
|
|
return '06' # BIN
|
2017-06-22 11:17:23 +00:00
|
|
|
elif (d33fileType & 127) == 1:
|
2017-07-08 11:01:57 +00:00
|
|
|
return 'FA' # INT
|
2017-06-22 11:17:23 +00:00
|
|
|
elif (d33fileType & 127) == 2:
|
2017-07-08 11:01:57 +00:00
|
|
|
return 'FC' # BAS
|
2017-06-21 02:27:38 +00:00
|
|
|
else:
|
2017-07-08 11:01:57 +00:00
|
|
|
return '04' # TXT or other
|
|
|
|
else: # ProDOS
|
2017-07-20 06:05:11 +00:00
|
|
|
return format(disk.buffer.read1(start + 16), '02x')
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def getAuxType(disk, arg1, arg2):
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.src_shk:
|
2017-06-21 02:27:38 +00:00
|
|
|
return arg2.split('#')[1][2:6]
|
|
|
|
start = getStartPos(arg1, arg2)
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.dos33:
|
2017-07-20 06:05:11 +00:00
|
|
|
fileType = getFileType(disk, arg1, arg2)
|
2017-07-08 11:01:57 +00:00
|
|
|
if fileType == '06': # BIN (B)
|
2017-06-21 02:27:38 +00:00
|
|
|
# file address is in first two bytes of file data
|
2017-07-20 06:05:11 +00:00
|
|
|
fileTSlist = list(disk.buffer.read(start, 2))
|
|
|
|
fileStart = list(disk.buffer.read(ts(fileTSlist)+12, 2))
|
|
|
|
file_addr = unpack_u16le(disk.buffer.read(ts(fileStart), 2))
|
|
|
|
return format(file_addr, '04x')
|
2017-07-08 11:01:57 +00:00
|
|
|
elif fileType == 'FC': # BAS (A)
|
2017-06-21 02:27:38 +00:00
|
|
|
return '0801'
|
2017-07-08 11:01:57 +00:00
|
|
|
elif fileType == 'FA': # INT (I)
|
2017-06-21 02:27:38 +00:00
|
|
|
return '9600'
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # TXT (T) or other
|
2017-06-21 02:27:38 +00:00
|
|
|
return '0000'
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # ProDOS
|
2017-07-20 06:05:11 +00:00
|
|
|
return format(unpack_u16le(disk.buffer.read(start + 31, 2)) , '04x')
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def getKeyPointer(disk, arg1, arg2):
|
2017-06-21 02:27:38 +00:00
|
|
|
start = getStartPos(arg1, arg2)
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.dos33:
|
2017-07-20 06:05:11 +00:00
|
|
|
return list(disk.buffer.read(start, 2))
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # ProDOS
|
2017-07-20 06:05:11 +00:00
|
|
|
return unpack_u16le(disk.buffer.read(start + 17, 2))
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def getFileLength(disk, arg1, arg2):
|
2017-06-21 02:27:38 +00:00
|
|
|
start = getStartPos(arg1, arg2)
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.dos33:
|
2017-07-20 06:05:11 +00:00
|
|
|
fileType = getFileType(disk, arg1, arg2)
|
|
|
|
fileTSlist = list(disk.buffer.read(start, 2))
|
|
|
|
fileStart = list(disk.buffer.read(ts(fileTSlist) + 12, 2))
|
2017-07-08 11:01:57 +00:00
|
|
|
if fileType == '06': # BIN (B)
|
2017-06-21 02:27:38 +00:00
|
|
|
# file length is in second two bytes of file data
|
2017-07-20 06:05:11 +00:00
|
|
|
file_size = unpack_u16le(disk.buffer.read(ts(fileStart) + 2, 2)) + 4
|
2017-07-08 11:01:57 +00:00
|
|
|
elif fileType == 'FC' or fileType == 'FA': # BAS (A) or INT (I)
|
2017-06-21 02:27:38 +00:00
|
|
|
# file length is in first two bytes of file data
|
2017-07-20 06:05:11 +00:00
|
|
|
file_size = unpack_u16le(disk.buffer.read(ts(fileStart), 2)) + 2
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # TXT (T) or other
|
2017-06-21 02:27:38 +00:00
|
|
|
# sadly, we have to walk the whole file
|
|
|
|
# length is determined by sectors in TSlist, minus wherever
|
|
|
|
# anything after the first zero in the last sector
|
2017-06-30 21:30:31 +00:00
|
|
|
file_size = 0
|
2017-06-21 02:27:38 +00:00
|
|
|
lastTSpair = None
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
prevTSpair = [0,0]
|
2017-06-21 02:27:38 +00:00
|
|
|
nextTSlistSector = fileTSlist
|
|
|
|
endFound = False
|
|
|
|
while not endFound:
|
|
|
|
pos = ts(nextTSlistSector)
|
|
|
|
for tsPos in range(12, 256, 2):
|
2017-07-20 06:05:11 +00:00
|
|
|
cur_ts_pair = list(disk.buffer.read(pos + tsPos, 2))
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
if ts(cur_ts_pair) != 0:
|
2017-06-30 21:30:31 +00:00
|
|
|
file_size += 256
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
prevTSpair = cur_ts_pair
|
2017-06-21 02:27:38 +00:00
|
|
|
else:
|
|
|
|
lastTSpair = prevTSpair
|
|
|
|
endFound = True
|
|
|
|
break
|
|
|
|
if not lastTSpair:
|
2017-07-20 06:05:11 +00:00
|
|
|
nextTSlistSector = list(disk.buffer.read(pos + 1, 2))
|
2017-06-22 11:17:23 +00:00
|
|
|
if nextTSlistSector[0]+nextTSlistSector[1] == 0:
|
2017-06-21 02:27:38 +00:00
|
|
|
lastTSpair = prevTSpair
|
|
|
|
endFound = True
|
|
|
|
break
|
2017-06-30 21:30:31 +00:00
|
|
|
file_size -= 256
|
2017-06-21 02:27:38 +00:00
|
|
|
pos = ts(prevTSpair)
|
|
|
|
# now find out where the file really ends by finding the last 00
|
|
|
|
for offset in range(255, -1, -1):
|
2017-07-14 06:38:19 +00:00
|
|
|
#print("pos: {#b}".format(pos))
|
2017-07-20 06:05:11 +00:00
|
|
|
if disk.buffer.read1(pos + offset) != 0:
|
2017-06-30 21:30:31 +00:00
|
|
|
file_size += (offset + 1)
|
2017-06-21 02:27:38 +00:00
|
|
|
break
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # ProDOS
|
2017-07-20 06:05:11 +00:00
|
|
|
file_size = unpack_u24le(disk.buffer.read(start + 21, 3))
|
2017-06-30 21:30:31 +00:00
|
|
|
|
|
|
|
return file_size
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def getCreationDate(disk, arg1, arg2):
|
2017-06-21 02:27:38 +00:00
|
|
|
#outputs prodos creation date/time as Unix time
|
|
|
|
# (seconds since Jan 1 1970 GMT)
|
|
|
|
#or None if there is none
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.src_shk:
|
2017-06-21 02:27:38 +00:00
|
|
|
return None
|
2017-06-22 09:30:05 +00:00
|
|
|
elif g.dos33:
|
2017-06-21 02:27:38 +00:00
|
|
|
return None
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # ProDOS
|
2017-06-21 02:27:38 +00:00
|
|
|
start = getStartPos(arg1, arg2)
|
2017-07-20 06:05:11 +00:00
|
|
|
return date_prodos_to_unix(disk.buffer.read(start + 24, 4))
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def getModifiedDate(disk, arg1, arg2):
|
2017-06-21 02:27:38 +00:00
|
|
|
#outputs prodos modified date/time as Unix time
|
|
|
|
# (seconds since Jan 1 1970 GMT)
|
|
|
|
#or None if there is none
|
|
|
|
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.src_shk:
|
2017-06-25 23:15:39 +00:00
|
|
|
return int(os.path.getmtime(os.path.join(arg1, arg2)))
|
2017-06-22 09:30:05 +00:00
|
|
|
elif g.dos33:
|
2017-06-25 23:15:39 +00:00
|
|
|
return None
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # ProDOS
|
2017-06-21 02:27:38 +00:00
|
|
|
start = getStartPos(arg1, arg2)
|
2017-07-20 06:05:11 +00:00
|
|
|
return date_prodos_to_unix(disk.buffer.read(start + 33, 4))
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def getVolumeName(disk):
|
|
|
|
return getWorkingDirName(disk, 2)
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def getWorkingDirName(disk, arg1, arg2=None):
|
2017-06-21 02:27:38 +00:00
|
|
|
# arg1:block, arg2:casemask (optional)
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
start = arg1 * 512
|
2017-07-20 06:05:11 +00:00
|
|
|
firstByte = disk.buffer.read1(start + 4)
|
|
|
|
entryType = firstByte // 16
|
|
|
|
nameLength = firstByte - entryType * 16
|
|
|
|
workingDirName = disk.buffer.read(start + 5, nameLength)
|
2017-07-08 11:01:57 +00:00
|
|
|
if entryType == 15: # volume directory, get casemask from header
|
2017-07-20 06:05:11 +00:00
|
|
|
caseMaskDec = unpack_u16le(disk.buffer.read(start + 26, 2))
|
2017-06-22 11:17:23 +00:00
|
|
|
if caseMaskDec < 32768:
|
2017-06-21 02:27:38 +00:00
|
|
|
caseMask = None
|
|
|
|
else:
|
2017-07-14 02:35:47 +00:00
|
|
|
caseMask = format(caseMaskDec - 32768,'015b')
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # subdirectory, get casemask from arg2 (not available in header)
|
2017-06-21 02:27:38 +00:00
|
|
|
caseMask = arg2
|
2017-06-22 11:37:34 +00:00
|
|
|
if caseMask and not g.casefold_upper:
|
|
|
|
workingDirName = bytearray(workingDirName)
|
2017-06-21 02:27:38 +00:00
|
|
|
for i in range(0, len(workingDirName)):
|
2017-06-22 11:17:23 +00:00
|
|
|
if caseMask[i] == "1":
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
workingDirName[i:i+1] = workingDirName[i:i+1].lower()
|
2017-06-22 11:37:34 +00:00
|
|
|
workingDirName = bytes(workingDirName)
|
2017-06-21 02:27:38 +00:00
|
|
|
return workingDirName
|
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def getDirEntryCount(disk, arg1):
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.dos33:
|
2017-06-21 02:27:38 +00:00
|
|
|
entryCount = 0
|
|
|
|
nextSector = arg1
|
|
|
|
while True:
|
|
|
|
top = ts(nextSector)
|
|
|
|
pos = top+11
|
|
|
|
for e in range(0, 7):
|
2017-07-20 06:05:11 +00:00
|
|
|
if disk.buffer.read1(pos) == 0:
|
2017-07-08 11:01:57 +00:00
|
|
|
return entryCount # no more file entries
|
2017-06-21 02:27:38 +00:00
|
|
|
else:
|
2017-07-20 06:05:11 +00:00
|
|
|
if disk.buffer.read1(pos) != 255:
|
2017-07-08 11:01:57 +00:00
|
|
|
entryCount += 1 # increment if not deleted file
|
2017-06-21 02:27:38 +00:00
|
|
|
pos += 35
|
2017-07-20 06:05:11 +00:00
|
|
|
nextSector = list(disk.buffer.read(top + 1, 2))
|
2017-07-08 11:01:57 +00:00
|
|
|
if nextSector == [0,0]: # no more catalog sectors
|
2017-06-21 02:27:38 +00:00
|
|
|
return entryCount
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # ProDOS
|
2017-06-22 11:17:23 +00:00
|
|
|
start = arg1 * 512
|
2017-07-20 06:05:11 +00:00
|
|
|
return unpack_u16le(disk.buffer.read(start + 37, 2))
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def getDirNextChunkPointer(disk, arg1):
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.dos33:
|
2017-06-21 02:27:38 +00:00
|
|
|
start = ts(arg1)
|
2017-07-20 06:05:11 +00:00
|
|
|
return list(disk.buffer.read(start + 1, 2))
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # ProDOS
|
2017-06-22 11:17:23 +00:00
|
|
|
start = arg1 * 512
|
2017-07-20 06:05:11 +00:00
|
|
|
return unpack_u16le(disk.buffer.read(start + 2, 2))
|
2017-06-21 02:27:38 +00:00
|
|
|
|
|
|
|
def toProdosName(name):
|
2017-06-30 22:13:52 +00:00
|
|
|
i = 0
|
2017-07-08 11:01:57 +00:00
|
|
|
if name[0] == '.': # eliminate leading period
|
2017-06-21 02:27:38 +00:00
|
|
|
name = name[1:]
|
|
|
|
for c in name:
|
2017-06-22 11:17:23 +00:00
|
|
|
if c != '.' and not c.isalnum():
|
2017-06-21 02:27:38 +00:00
|
|
|
name = name[:i] + '.' + name[i+1:]
|
2017-06-30 22:13:52 +00:00
|
|
|
i += 1
|
2017-06-22 11:17:23 +00:00
|
|
|
name = name[:15]
|
2017-06-21 02:27:38 +00:00
|
|
|
return name
|
|
|
|
|
|
|
|
def ts(track, sector=None):
|
|
|
|
# returns offset; track and sector can be dec, or hex-ustr
|
|
|
|
# can also supply as [t,s] for convenience
|
2017-06-22 11:17:23 +00:00
|
|
|
if sector == None:
|
|
|
|
(track, sector) = track
|
2017-07-08 11:01:57 +00:00
|
|
|
if isinstance(track, str): # hex-ustr
|
2017-06-21 02:27:38 +00:00
|
|
|
track = int(track, 16)
|
2017-07-08 11:01:57 +00:00
|
|
|
if isinstance(sector, str): # hex-ustr
|
2017-06-21 02:27:38 +00:00
|
|
|
sector = int(sector, 16)
|
2017-06-22 11:17:23 +00:00
|
|
|
return track*16*256 + sector*256
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-06-22 08:33:40 +00:00
|
|
|
def sli(start, length=1, ext=None):
|
|
|
|
"""return a slice object from an offset and length"""
|
|
|
|
return slice(start, start + length, ext)
|
|
|
|
|
2017-06-21 02:27:38 +00:00
|
|
|
# --- main logic functions
|
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def copyFile(arg1, arg2, disk):
|
2017-06-21 02:27:38 +00:00
|
|
|
#arg1/arg2:
|
|
|
|
# ProDOS : directory block / file index in overall directory
|
|
|
|
# DOS 3.3 : [track, sector] / file index in overall VTOC
|
|
|
|
# ShrinkIt: directory path / file name
|
2017-06-22 08:33:40 +00:00
|
|
|
# copies file or dfork to g.out_data, rfork if any to g.ex_data
|
2017-06-21 02:27:38 +00:00
|
|
|
g.activeFileBytesCopied = 0
|
|
|
|
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.src_shk:
|
2017-06-21 02:27:38 +00:00
|
|
|
with open(os.path.join(arg1, arg2), 'rb') as infile:
|
2017-06-22 08:33:40 +00:00
|
|
|
g.out_data += infile.read()
|
2017-06-21 02:27:38 +00:00
|
|
|
if g.shk_hasrf:
|
|
|
|
print(" [data fork]")
|
2017-06-22 11:17:23 +00:00
|
|
|
if g.use_extended or g.use_appledouble:
|
2017-06-21 02:27:38 +00:00
|
|
|
print(" [resource fork]")
|
2017-06-22 11:17:23 +00:00
|
|
|
if g.ex_data == None:
|
2017-06-22 08:33:40 +00:00
|
|
|
g.ex_data = bytearray(b'')
|
2017-06-21 02:27:38 +00:00
|
|
|
with open(os.path.join(arg1, (arg2 + "r")), 'rb') as infile:
|
2017-06-22 08:33:40 +00:00
|
|
|
g.ex_data += infile.read()
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # ProDOS or DOS 3.3
|
2017-07-20 06:05:11 +00:00
|
|
|
storageType = getStorageType(disk, arg1, arg2)
|
|
|
|
keyPointer = getKeyPointer(disk, arg1, arg2)
|
|
|
|
fileLen = getFileLength(disk, arg1, arg2)
|
2017-07-08 11:01:57 +00:00
|
|
|
if storageType == 1: #seedling
|
2017-07-20 06:05:11 +00:00
|
|
|
copyBlock(disk, keyPointer, fileLen)
|
2017-07-08 11:01:57 +00:00
|
|
|
elif storageType == 2: #sapling
|
2017-07-20 06:05:11 +00:00
|
|
|
processIndexBlock(disk, keyPointer)
|
2017-07-08 11:01:57 +00:00
|
|
|
elif storageType == 3: #tree
|
2017-07-20 06:05:11 +00:00
|
|
|
processMasterIndexBlock(disk, keyPointer)
|
2017-07-08 11:01:57 +00:00
|
|
|
elif storageType == 5: #extended (forked)
|
2017-07-20 06:05:11 +00:00
|
|
|
processForkedFile(disk, keyPointer)
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.prodos_names:
|
2017-06-21 02:27:38 +00:00
|
|
|
# remove address/length data from DOS 3.3 file data if ProDOS target
|
2017-07-20 06:05:11 +00:00
|
|
|
if getFileType(disk, arg1, arg2) == '06':
|
2017-06-22 08:33:40 +00:00
|
|
|
g.out_data = g.out_data[4:]
|
2017-07-20 06:05:11 +00:00
|
|
|
elif (getFileType(disk, arg1, arg2) == 'FA'
|
|
|
|
or getFileType(disk, arg1, arg2) == 'FC'):
|
2017-06-22 08:33:40 +00:00
|
|
|
g.out_data = g.out_data[2:]
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def copyBlock(disk, arg1, arg2):
|
2017-06-21 02:27:38 +00:00
|
|
|
#arg1: block number or [t,s] to copy
|
|
|
|
#arg2: bytes to write (should be 256 (DOS 3.3) or 512 (ProDOS),
|
|
|
|
# unless final block with less)
|
|
|
|
#print(arg1 + " " + arg2 + " " + g.activeFileBytesCopied)
|
2017-06-22 11:17:23 +00:00
|
|
|
if arg1 == 0:
|
|
|
|
outBytes = bytes(arg2)
|
2017-06-21 02:27:38 +00:00
|
|
|
else:
|
2017-07-20 06:05:11 +00:00
|
|
|
if g.dos33:
|
|
|
|
outBytes = disk.buffer.read(ts(arg1), arg2)
|
|
|
|
else:
|
|
|
|
outBytes = disk.buffer.read(arg1 * 512, arg2)
|
|
|
|
# FIXME: Sort out the read-one vs. read-many problem later
|
|
|
|
if type(outBytes) == int:
|
|
|
|
outBytes = bytes((outBytes))
|
2017-06-22 11:17:23 +00:00
|
|
|
if g.resourceFork > 0:
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.use_appledouble or g.use_extended:
|
|
|
|
offset = (741 if g.use_appledouble else 0)
|
2017-06-22 11:17:23 +00:00
|
|
|
if g.ex_data == None:
|
2017-06-22 08:33:40 +00:00
|
|
|
g.ex_data = bytearray(b'')
|
2017-06-26 13:56:19 +00:00
|
|
|
g.ex_data[
|
|
|
|
g.activeFileBytesCopied + offset
|
|
|
|
: g.activeFileBytesCopied + offset + arg2
|
|
|
|
] = outBytes
|
2017-06-21 02:27:38 +00:00
|
|
|
else:
|
2017-06-26 13:56:19 +00:00
|
|
|
g.out_data[
|
|
|
|
g.activeFileBytesCopied
|
|
|
|
: g.activeFileBytesCopied + arg2
|
|
|
|
] = outBytes
|
2017-06-21 02:27:38 +00:00
|
|
|
g.activeFileBytesCopied += arg2
|
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def process_dir(disk, arg1, arg2=None, arg3=None, arg4=None, arg5=None):
|
2017-06-21 02:27:38 +00:00
|
|
|
# arg1: ProDOS directory block, or DOS 3.3 [track,sector]
|
|
|
|
# for key block (with directory header):
|
|
|
|
# arg2: casemask (optional), arg3:None, arg4:None, arg5:None
|
|
|
|
# for secondary directory blocks (non-key block):
|
|
|
|
# arg2/3/4/5: for non-key chunks: entryCount, entry#,
|
|
|
|
# workingDirName, processedEntryCount
|
|
|
|
|
|
|
|
entryCount = None
|
|
|
|
e = None
|
|
|
|
pe = None
|
|
|
|
workingDirName = None
|
|
|
|
|
|
|
|
if arg3:
|
|
|
|
entryCount = arg2
|
|
|
|
e = arg3
|
|
|
|
workingDirName = arg4
|
|
|
|
pe = arg5
|
|
|
|
else:
|
|
|
|
e = 0
|
|
|
|
pe = 0
|
2017-07-20 06:05:11 +00:00
|
|
|
entryCount = getDirEntryCount(disk, arg1)
|
2017-06-22 09:30:05 +00:00
|
|
|
if not g.dos33:
|
2017-07-20 06:05:11 +00:00
|
|
|
workingDirName = getWorkingDirName(disk, arg1, arg2).decode("L1")
|
2017-07-08 11:01:57 +00:00
|
|
|
g.DIRPATH = g.DIRPATH + "/" + workingDirName
|
2017-06-21 02:27:38 +00:00
|
|
|
if g.PDOSPATH_INDEX:
|
2017-06-22 11:17:23 +00:00
|
|
|
if g.PDOSPATH_INDEX == 1:
|
|
|
|
if ("/" + g.PDOSPATH_SEGMENT.lower()) != g.DIRPATH.lower():
|
2017-06-21 02:27:38 +00:00
|
|
|
print("ProDOS volume name does not match disk image.")
|
Logging, unStudlyCapping, main()
Replaced some of the commented out print lines with calls to a logger object.
These are currently always turned on, which we don't want, but they don't hurt
anything and are short.
Oh, and new logging system! The setup is a bit more verbose than it could be
because logging predates str.format and uses the str % tuple syntax that now
exists mostly to avoid breaking older code. You can override this, and I did.
It's not done yet because we might want to actually make some of the existing
print calls into log.info's. Y'know, just as soon as I set that up so ONLY
logging.INFO goes to stdout, unadorned, and everything higher than that goes to
stderr, depending on your logging level, with pretty formatting.
Yeah, logging can do all of that and chew bubblegum at the same time, I just
haven't set it up yet because I want to do it right.
A little more unStudlyCapping of things. I'm going to have to start actually
creating classes soon which is going to bring back the capitals, but I've been
working to get rid of them so that it becomes less confusing when we get there.
I dunno if it's helped any.
I also added a few comments about our imports and checked that we actually used
everything we imported. No, we don't. But we maybe should switch what we are
using for what we aren't at some point?
2017-06-26 12:35:46 +00:00
|
|
|
quit_now(2)
|
2017-06-21 02:27:38 +00:00
|
|
|
else:
|
|
|
|
g.PDOSPATH_INDEX += 1
|
|
|
|
g.PDOSPATH_SEGMENT = g.PDOSPATH[g.PDOSPATH_INDEX]
|
2017-06-21 02:49:40 +00:00
|
|
|
#else: print(g.DIRPATH)
|
2017-06-22 11:17:23 +00:00
|
|
|
while pe < entryCount:
|
2017-07-20 06:05:11 +00:00
|
|
|
if getStorageType(disk, arg1, e) > 0:
|
2017-06-21 02:27:38 +00:00
|
|
|
#print(pe, e, entryCount)
|
2017-07-20 06:05:11 +00:00
|
|
|
processEntry(disk, arg1, e)
|
2017-06-21 02:27:38 +00:00
|
|
|
pe += 1
|
|
|
|
e += 1
|
2017-06-22 11:17:23 +00:00
|
|
|
if not (e + (0 if g.dos33 else (e>11)) ) % (7 if g.dos33 else 13):
|
2017-06-26 13:56:19 +00:00
|
|
|
process_dir(
|
2017-07-20 06:05:11 +00:00
|
|
|
disk,
|
|
|
|
getDirNextChunkPointer(disk, arg1), entryCount, e,
|
2017-06-21 02:27:38 +00:00
|
|
|
workingDirName, pe)
|
|
|
|
break
|
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def processEntry(disk, arg1, arg2):
|
2017-06-22 09:30:05 +00:00
|
|
|
# arg1=block number, [t,s] if g.dos33=True, or subdir name if g.src_shk=1
|
|
|
|
# arg2=index number of entry in directory, or file name if g.src_shk=1
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
#print(getFileName(disk, arg1, arg2), getStorageType(disk, arg1, arg2),
|
|
|
|
# getFileType(disk, arg1, arg2), getKeyPointer(disk, arg1, arg2),
|
|
|
|
# getFileLength(disk, arg1, arg2), getAuxType(disk, arg1, arg2),
|
|
|
|
# getCreationDate(disk, arg1, arg2), getModifiedDate(disk, arg1, arg2))
|
2017-06-21 02:27:38 +00:00
|
|
|
|
|
|
|
eTargetName = None
|
2017-06-22 08:33:40 +00:00
|
|
|
g.ex_data = None
|
|
|
|
g.out_data = bytearray(b'')
|
2017-07-08 11:01:57 +00:00
|
|
|
if g.src_shk: # ShrinkIt archive
|
2017-06-22 09:30:05 +00:00
|
|
|
g.activeFileName = (arg2 if g.use_extended else arg2.split('#')[0])
|
|
|
|
if g.casefold_upper:
|
2017-06-21 02:27:38 +00:00
|
|
|
g.activeFileName = g.activeFileName.upper()
|
|
|
|
origFileName = g.activeFileName
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # ProDOS or DOS 3.3 image
|
2017-07-20 06:05:11 +00:00
|
|
|
g.activeFileName = getFileName(disk, arg1 ,arg2).decode("L1")
|
2017-06-21 02:27:38 +00:00
|
|
|
origFileName = g.activeFileName
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.prodos_names:
|
2017-06-21 02:27:38 +00:00
|
|
|
g.activeFileName = toProdosName(g.activeFileName)
|
2017-07-20 06:05:11 +00:00
|
|
|
g.activeFileSize = getFileLength(disk, arg1, arg2)
|
2017-06-21 02:27:38 +00:00
|
|
|
|
|
|
|
if (not g.PDOSPATH_INDEX or
|
|
|
|
g.activeFileName.upper() == g.PDOSPATH_SEGMENT.upper()):
|
|
|
|
|
|
|
|
# if ProDOS directory, not file
|
2017-07-20 06:05:11 +00:00
|
|
|
if not g.src_shk and getStorageType(disk, arg1, arg2) == 13:
|
2017-06-21 02:27:38 +00:00
|
|
|
if not g.PDOSPATH_INDEX:
|
2017-06-22 11:17:23 +00:00
|
|
|
g.target_dir = g.target_dir + "/" + g.activeFileName
|
|
|
|
g.appledouble_dir = g.target_dir + "/.AppleDouble"
|
|
|
|
if not g.catalog_only or os.path.isdir(g.target_dir):
|
2017-06-22 09:30:05 +00:00
|
|
|
makedirs(g.target_dir)
|
2017-06-26 13:56:19 +00:00
|
|
|
if (not g.catalog_only and g.use_appledouble
|
|
|
|
and not os.path.isdir(g.appledouble_dir)):
|
2017-06-22 09:30:05 +00:00
|
|
|
makedirs(g.appledouble_dir)
|
2017-06-21 02:27:38 +00:00
|
|
|
if g.PDOSPATH_SEGMENT:
|
|
|
|
g.PDOSPATH_INDEX += 1
|
|
|
|
g.PDOSPATH_SEGMENT = g.PDOSPATH[g.PDOSPATH_INDEX]
|
2017-07-20 06:05:11 +00:00
|
|
|
process_dir(disk, getKeyPointer(disk, arg1, arg2),
|
|
|
|
getCaseMask(disk, arg1, arg2))
|
2017-06-21 02:27:38 +00:00
|
|
|
g.DIRPATH = g.DIRPATH.rsplit("/", 1)[0]
|
|
|
|
if not g.PDOSPATH_INDEX:
|
2017-06-22 09:30:05 +00:00
|
|
|
g.target_dir = g.target_dir.rsplit("/", 1)[0]
|
2017-07-08 11:01:57 +00:00
|
|
|
g.appledouble_dir = g.target_dir + "/.AppleDouble"
|
|
|
|
else: # ProDOS or DOS 3.3 file either from image or ShrinkIt archive
|
2017-06-21 02:27:38 +00:00
|
|
|
dirPrint = ""
|
|
|
|
if g.DIRPATH:
|
|
|
|
dirPrint = g.DIRPATH + "/"
|
|
|
|
else:
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.src_shk:
|
2017-06-22 11:17:23 +00:00
|
|
|
if "/".join(dirName.split('/')[3:]):
|
2017-06-21 02:27:38 +00:00
|
|
|
dirPrint = ("/".join(dirName.split('/')[3:]) + "/")
|
2017-06-26 13:56:19 +00:00
|
|
|
if (not g.extract_file or (
|
|
|
|
os.path.basename(g.extract_file.lower())
|
|
|
|
== origFileName.split('#')[0].lower())):
|
2017-06-21 02:27:38 +00:00
|
|
|
filePrint = g.activeFileName.split("#")[0]
|
2017-06-26 13:56:19 +00:00
|
|
|
print(
|
|
|
|
dirPrint + filePrint
|
|
|
|
+ ("+" if (g.shk_hasrf
|
|
|
|
or (not g.src_shk
|
2017-07-20 06:05:11 +00:00
|
|
|
and getStorageType(disk, arg1, arg2) == 5))
|
2017-06-26 13:56:19 +00:00
|
|
|
else "")
|
|
|
|
+ ((" [" + origFileName + "] ")
|
|
|
|
if (g.prodos_names
|
|
|
|
and origFileName != g.activeFileName)
|
|
|
|
else ""))
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.catalog_only:
|
2017-06-21 02:27:38 +00:00
|
|
|
return
|
2017-06-22 09:30:05 +00:00
|
|
|
if not g.target_name:
|
|
|
|
g.target_name = g.activeFileName
|
|
|
|
if g.use_extended:
|
|
|
|
if g.src_shk:
|
2017-06-21 02:27:38 +00:00
|
|
|
eTargetName = arg2
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # ProDOS image
|
2017-06-26 13:56:19 +00:00
|
|
|
eTargetName = (g.target_name + "#"
|
2017-07-20 06:05:11 +00:00
|
|
|
+ getFileType(disk, arg1, arg2).lower()
|
|
|
|
+ getAuxType(disk, arg1, arg2).lower())
|
2017-06-22 09:30:05 +00:00
|
|
|
# touch(g.target_dir + "/" + g.target_name)
|
|
|
|
if g.use_appledouble:
|
2017-06-21 02:27:38 +00:00
|
|
|
makeADfile()
|
2017-07-20 06:05:11 +00:00
|
|
|
copyFile(arg1, arg2, disk)
|
2017-06-26 13:56:19 +00:00
|
|
|
saveName = (g.target_dir + "/"
|
|
|
|
+ (eTargetName if eTargetName else g.target_name))
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
save_file(saveName, g.out_data)
|
2017-07-20 06:05:11 +00:00
|
|
|
d_created = getCreationDate(disk, arg1, arg2)
|
|
|
|
d_modified = getModifiedDate(disk, arg1, arg2)
|
2017-06-25 23:15:39 +00:00
|
|
|
if not d_modified:
|
2017-06-26 13:56:19 +00:00
|
|
|
d_modified = (d_created
|
|
|
|
or int(datetime.datetime.today().timestamp()))
|
2017-06-25 23:15:39 +00:00
|
|
|
if not d_created:
|
|
|
|
d_created = d_modified
|
2017-07-08 11:01:57 +00:00
|
|
|
if g.use_appledouble: # AppleDouble
|
2017-06-21 02:27:38 +00:00
|
|
|
# set dates
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
ADfile_path = g.appledouble_dir + "/" + g.target_name
|
2017-06-25 23:15:39 +00:00
|
|
|
g.ex_data[637:641] = date_unix_to_appledouble(d_created)
|
|
|
|
g.ex_data[641:645] = date_unix_to_appledouble(d_modified)
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
g.ex_data[645] = 0x80
|
|
|
|
g.ex_data[649] = 0x80
|
2017-06-21 02:27:38 +00:00
|
|
|
#set type/creator
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
g.ex_data[653] = ord('p')
|
|
|
|
g.ex_data[654:657] = bytes.fromhex(
|
2017-07-20 06:05:11 +00:00
|
|
|
getFileType(disk, arg1, arg2)
|
|
|
|
+ getAuxType(disk, arg1, arg2))
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
g.ex_data[657:661] = b'pdos'
|
|
|
|
save_file(ADfile_path, g.ex_data)
|
2017-06-25 23:15:39 +00:00
|
|
|
touch(saveName, d_modified)
|
2017-07-08 11:01:57 +00:00
|
|
|
if g.use_extended: # extended name from ProDOS image
|
2017-06-22 11:17:23 +00:00
|
|
|
if g.ex_data:
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
save_file((saveName + "r"), g.ex_data)
|
2017-06-25 23:15:39 +00:00
|
|
|
touch((saveName + "r"), d_modified)
|
2017-06-26 13:56:19 +00:00
|
|
|
if (g.PDOSPATH_SEGMENT
|
|
|
|
or (g.extract_file
|
|
|
|
and (g.extract_file.lower()
|
|
|
|
== origFileName.lower()))):
|
Logging, unStudlyCapping, main()
Replaced some of the commented out print lines with calls to a logger object.
These are currently always turned on, which we don't want, but they don't hurt
anything and are short.
Oh, and new logging system! The setup is a bit more verbose than it could be
because logging predates str.format and uses the str % tuple syntax that now
exists mostly to avoid breaking older code. You can override this, and I did.
It's not done yet because we might want to actually make some of the existing
print calls into log.info's. Y'know, just as soon as I set that up so ONLY
logging.INFO goes to stdout, unadorned, and everything higher than that goes to
stderr, depending on your logging level, with pretty formatting.
Yeah, logging can do all of that and chew bubblegum at the same time, I just
haven't set it up yet because I want to do it right.
A little more unStudlyCapping of things. I'm going to have to start actually
creating classes soon which is going to bring back the capitals, but I've been
working to get rid of them so that it becomes less confusing when we get there.
I dunno if it's helped any.
I also added a few comments about our imports and checked that we actually used
everything we imported. No, we don't. But we maybe should switch what we are
using for what we aren't at some point?
2017-06-26 12:35:46 +00:00
|
|
|
quit_now(0)
|
2017-06-22 09:30:05 +00:00
|
|
|
g.target_name = None
|
2017-06-22 11:17:23 +00:00
|
|
|
#else print(g.activeFileName + " doesn't match " + g.PDOSPATH_SEGMENT)
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def processForkedFile(disk, arg1):
|
2017-06-21 02:27:38 +00:00
|
|
|
# finder info except type/creator
|
2017-07-20 06:05:11 +00:00
|
|
|
fInfoA_entryType = disk.buffer.read1(9)
|
|
|
|
fInfoB_entryType = disk.buffer.read1(27)
|
|
|
|
if (fInfoA_entryType == 1):
|
|
|
|
disk.buffer.write(disk.buffer.read(18, 8), 661, 8)
|
|
|
|
elif (fInfoA_entryType == 2):
|
|
|
|
disk.buffer.write(disk.buffer.read(10, 16), 669, 16)
|
|
|
|
if (fInfoB_entryType == 1):
|
|
|
|
disk.buffer.write(disk.buffer.read(36, 8), 661, 8)
|
|
|
|
elif (fInfoB_entryType == 2):
|
|
|
|
disk.buffer.write(disk.buffer.read(28, 16), 669, 16)
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-06-22 11:17:23 +00:00
|
|
|
for f in (0, 256):
|
2017-06-21 02:27:38 +00:00
|
|
|
g.resourceFork = f
|
|
|
|
g.activeFileBytesCopied = 0
|
2017-07-08 11:01:57 +00:00
|
|
|
forkStart = arg1 * 512 # start of Forked File key block
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
#print("--" + forkStart)
|
2017-07-20 06:05:11 +00:00
|
|
|
forkStorageType = disk.buffer.read1(forkStart + f)
|
|
|
|
forkKeyPointer = unpack_u16le(disk.buffer.read(forkStart + f + 1, 2))
|
|
|
|
forkFileLen = unpack_u24le(disk.buffer.read(forkStart + f + 5, 3))
|
2017-06-21 02:27:38 +00:00
|
|
|
g.activeFileSize = forkFileLen
|
2017-06-22 11:17:23 +00:00
|
|
|
if g.resourceFork > 0:
|
2017-07-20 06:05:11 +00:00
|
|
|
rsrcForkLen = unpack_u24le(disk.buffer.read(forkStart + f + 5, 3))
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
#print(">>>", rsrcForkLen)
|
2017-06-22 11:17:23 +00:00
|
|
|
if g.use_appledouble or g.use_extended:
|
2017-06-21 02:27:38 +00:00
|
|
|
print(" [resource fork]")
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.use_appledouble:
|
2017-06-30 21:30:31 +00:00
|
|
|
pack_u24be(g.ex_data, 35, rsrcForkLen)
|
2017-06-21 02:27:38 +00:00
|
|
|
else:
|
|
|
|
print(" [data fork]")
|
2017-07-08 11:01:57 +00:00
|
|
|
if forkStorageType == 1: #seedling
|
2017-07-20 06:05:11 +00:00
|
|
|
copyBlock(disk, forkKeyPointer, forkFileLen)
|
2017-07-08 11:01:57 +00:00
|
|
|
elif forkStorageType == 2: #sapling
|
2017-07-20 06:05:11 +00:00
|
|
|
processIndexBlock(disk, forkKeyPointer)
|
2017-07-08 11:01:57 +00:00
|
|
|
elif forkStorageType == 3: #tree
|
2017-07-20 06:05:11 +00:00
|
|
|
processMasterIndexBlock(disk, forkKeyPointer)
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
#print()
|
2017-06-21 02:27:38 +00:00
|
|
|
g.resourceFork = 0
|
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def processMasterIndexBlock(disk, arg1):
|
|
|
|
processIndexBlock(disk, arg1, True)
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-07-20 06:05:11 +00:00
|
|
|
def processIndexBlock(disk, arg1, arg2=False):
|
2017-06-21 02:27:38 +00:00
|
|
|
#arg1: indexBlock, or [t,s] of track/sector list
|
|
|
|
#arg2: if True, it's a Master Index Block
|
2017-06-22 09:30:05 +00:00
|
|
|
pos = 12 if g.dos33 else 0
|
2017-06-21 02:27:38 +00:00
|
|
|
bytesRemaining = g.activeFileSize
|
2017-06-22 11:17:23 +00:00
|
|
|
while g.activeFileBytesCopied < g.activeFileSize:
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.dos33:
|
2017-07-20 06:05:11 +00:00
|
|
|
targetTS = list(disk.buffer.read(ts(arg1) + pos, 2))
|
2017-07-14 06:38:19 +00:00
|
|
|
#print('{02x} {02x}'.format(targetTS[0], targetTS[1]))
|
2017-06-21 02:27:38 +00:00
|
|
|
bytesRemaining = (g.activeFileSize - g.activeFileBytesCopied)
|
2017-06-22 11:17:23 +00:00
|
|
|
bs = (bytesRemaining if bytesRemaining < 256 else 256)
|
2017-07-20 06:05:11 +00:00
|
|
|
copyBlock(disk, targetTS, bs)
|
2017-06-21 02:27:38 +00:00
|
|
|
pos += 2
|
2017-06-22 11:17:23 +00:00
|
|
|
if pos > 255:
|
2017-06-21 02:27:38 +00:00
|
|
|
# continue with next T/S list sector
|
2017-07-20 06:05:11 +00:00
|
|
|
processIndexBlock(disk, list(disk.buffer.read(ts(arg1) + 1, 2)))
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # ProDOS
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
# Note these are not consecutive bytes
|
2017-07-20 06:05:11 +00:00
|
|
|
targetBlock = (disk.buffer.read1(arg1 * 512 + pos) +
|
|
|
|
disk.buffer.read1(arg1 * 512 + pos+256) * 256)
|
2017-06-21 02:27:38 +00:00
|
|
|
if arg2:
|
2017-07-20 06:05:11 +00:00
|
|
|
processIndexBlock(disk, targetBlock)
|
2017-06-21 02:27:38 +00:00
|
|
|
else:
|
|
|
|
bytesRemaining = (g.activeFileSize - g.activeFileBytesCopied)
|
2017-07-08 11:01:57 +00:00
|
|
|
bs = bytesRemaining if bytesRemaining < 512 else 512
|
2017-07-20 06:05:11 +00:00
|
|
|
copyBlock(disk, targetBlock, bs)
|
2017-06-21 02:27:38 +00:00
|
|
|
pos += 1
|
2017-06-22 11:17:23 +00:00
|
|
|
if pos > 255:
|
2017-07-08 11:01:57 +00:00
|
|
|
break # go to next entry in Master Index Block (tree)
|
2017-06-21 02:27:38 +00:00
|
|
|
|
|
|
|
def makeADfile():
|
2017-06-22 09:30:05 +00:00
|
|
|
if not g.use_appledouble:
|
2017-06-21 02:27:38 +00:00
|
|
|
return
|
2017-06-22 09:30:05 +00:00
|
|
|
touch(g.appledouble_dir + "/" + g.target_name)
|
2017-06-22 08:33:40 +00:00
|
|
|
g.ex_data = bytearray(741)
|
2017-06-21 02:27:38 +00:00
|
|
|
# ADv2 header
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
g.ex_data[sli(0x00,8)] = a2b_hex("0005160700020000")
|
2017-06-21 02:27:38 +00:00
|
|
|
# number of entries
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
g.ex_data[sli(0x18,2)] = a2b_hex("000D")
|
2017-06-21 02:27:38 +00:00
|
|
|
# Resource Fork
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
g.ex_data[sli(0x1a,12)] = a2b_hex("00000002000002E500000000")
|
2017-06-21 02:27:38 +00:00
|
|
|
# Real Name
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
g.ex_data[sli(0x26,12)] = a2b_hex("00000003000000B600000000")
|
2017-06-21 02:27:38 +00:00
|
|
|
# Comment
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
g.ex_data[sli(0x32,12)] = a2b_hex("00000004000001B500000000")
|
2017-06-21 02:27:38 +00:00
|
|
|
# Dates Info
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
g.ex_data[sli(0x3e,12)] = a2b_hex("000000080000027D00000010")
|
2017-06-21 02:27:38 +00:00
|
|
|
# Finder Info
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
g.ex_data[sli(0x4a,12)] = a2b_hex("000000090000028D00000020")
|
2017-06-21 02:27:38 +00:00
|
|
|
# ProDOS file info
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
g.ex_data[sli(0x56,12)] = a2b_hex("0000000B000002C100000008")
|
2017-06-21 02:27:38 +00:00
|
|
|
# AFP short name
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
g.ex_data[sli(0x62,12)] = a2b_hex("0000000D000002B500000000")
|
2017-06-21 02:27:38 +00:00
|
|
|
# AFP File Info
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
g.ex_data[sli(0x6e,12)] = a2b_hex("0000000E000002B100000004")
|
2017-06-21 02:27:38 +00:00
|
|
|
# AFP Directory ID
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
g.ex_data[sli(0x7a,12)] = a2b_hex("0000000F000002AD00000004")
|
2017-06-21 02:27:38 +00:00
|
|
|
# dbd (second time) will create DEV, INO, SYN, SV~
|
|
|
|
|
Logging, unStudlyCapping, main()
Replaced some of the commented out print lines with calls to a logger object.
These are currently always turned on, which we don't want, but they don't hurt
anything and are short.
Oh, and new logging system! The setup is a bit more verbose than it could be
because logging predates str.format and uses the str % tuple syntax that now
exists mostly to avoid breaking older code. You can override this, and I did.
It's not done yet because we might want to actually make some of the existing
print calls into log.info's. Y'know, just as soon as I set that up so ONLY
logging.INFO goes to stdout, unadorned, and everything higher than that goes to
stderr, depending on your logging level, with pretty formatting.
Yeah, logging can do all of that and chew bubblegum at the same time, I just
haven't set it up yet because I want to do it right.
A little more unStudlyCapping of things. I'm going to have to start actually
creating classes soon which is going to bring back the capitals, but I've been
working to get rid of them so that it becomes less confusing when we get there.
I dunno if it's helped any.
I also added a few comments about our imports and checked that we actually used
everything we imported. No, we don't. But we maybe should switch what we are
using for what we aren't at some point?
2017-06-26 12:35:46 +00:00
|
|
|
def quit_now(exitcode=0):
|
2017-06-22 09:30:05 +00:00
|
|
|
if (exitcode == 0 and g.afpsync_msg and
|
|
|
|
g.use_appledouble and os.path.isdir("/usr/local/etc/netatalk")):
|
2017-06-26 13:56:19 +00:00
|
|
|
print(
|
|
|
|
"File(s) have been copied to the target directory. "
|
|
|
|
"If the directory\n"
|
|
|
|
"is shared by Netatalk, please type 'afpsync' now.")
|
2017-07-08 11:01:57 +00:00
|
|
|
if g.src_shk: # clean up
|
2017-06-21 02:27:38 +00:00
|
|
|
for file in os.listdir('/tmp'):
|
|
|
|
if file.startswith("cppo-"):
|
|
|
|
shutil.rmtree('/tmp' + "/" + file)
|
2017-06-22 08:33:40 +00:00
|
|
|
sys.exit(exitcode)
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-06-21 12:50:22 +00:00
|
|
|
def to_sys_name(name):
|
|
|
|
if os.name == 'nt':
|
|
|
|
if name[-1] == '.':
|
|
|
|
name += '-'
|
|
|
|
name = name.replace('./', '.-/')
|
|
|
|
return name
|
|
|
|
|
2017-06-21 02:27:38 +00:00
|
|
|
#---- IvanX general purpose functions ----#
|
|
|
|
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
def touch(file_path, modTime=None):
|
2017-06-21 02:27:38 +00:00
|
|
|
# http://stackoverflow.com/questions/1158076/implement-touch-using-python
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
#print(file_path)
|
|
|
|
with open(to_sys_name(file_path), "ab"):
|
|
|
|
os.utime(file_path, None if modTime is None else (modTime, modTime))
|
2017-06-21 02:27:38 +00:00
|
|
|
|
|
|
|
def mkdir(dirPath):
|
|
|
|
try:
|
2017-06-21 12:50:22 +00:00
|
|
|
os.mkdir(to_sys_name(dirPath))
|
2017-06-21 02:27:38 +00:00
|
|
|
except FileExistsError:
|
|
|
|
pass
|
|
|
|
|
|
|
|
def makedirs(dirPath):
|
|
|
|
try:
|
2017-06-21 12:50:22 +00:00
|
|
|
os.makedirs(to_sys_name(dirPath))
|
2017-06-21 02:27:38 +00:00
|
|
|
except OSError as e:
|
2017-06-22 11:17:23 +00:00
|
|
|
if e.errno != errno.EEXIST:
|
2017-06-21 02:27:38 +00:00
|
|
|
raise
|
|
|
|
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
def load_file(file_path):
|
Logging, unStudlyCapping, main()
Replaced some of the commented out print lines with calls to a logger object.
These are currently always turned on, which we don't want, but they don't hurt
anything and are short.
Oh, and new logging system! The setup is a bit more verbose than it could be
because logging predates str.format and uses the str % tuple syntax that now
exists mostly to avoid breaking older code. You can override this, and I did.
It's not done yet because we might want to actually make some of the existing
print calls into log.info's. Y'know, just as soon as I set that up so ONLY
logging.INFO goes to stdout, unadorned, and everything higher than that goes to
stderr, depending on your logging level, with pretty formatting.
Yeah, logging can do all of that and chew bubblegum at the same time, I just
haven't set it up yet because I want to do it right.
A little more unStudlyCapping of things. I'm going to have to start actually
creating classes soon which is going to bring back the capitals, but I've been
working to get rid of them so that it becomes less confusing when we get there.
I dunno if it's helped any.
I also added a few comments about our imports and checked that we actually used
everything we imported. No, we don't. But we maybe should switch what we are
using for what we aren't at some point?
2017-06-26 12:35:46 +00:00
|
|
|
with open(to_sys_name(file_path), "rb") as image_handle:
|
|
|
|
return image_handle.read()
|
2017-06-21 02:27:38 +00:00
|
|
|
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
def save_file(file_path, fileData):
|
Logging, unStudlyCapping, main()
Replaced some of the commented out print lines with calls to a logger object.
These are currently always turned on, which we don't want, but they don't hurt
anything and are short.
Oh, and new logging system! The setup is a bit more verbose than it could be
because logging predates str.format and uses the str % tuple syntax that now
exists mostly to avoid breaking older code. You can override this, and I did.
It's not done yet because we might want to actually make some of the existing
print calls into log.info's. Y'know, just as soon as I set that up so ONLY
logging.INFO goes to stdout, unadorned, and everything higher than that goes to
stderr, depending on your logging level, with pretty formatting.
Yeah, logging can do all of that and chew bubblegum at the same time, I just
haven't set it up yet because I want to do it right.
A little more unStudlyCapping of things. I'm going to have to start actually
creating classes soon which is going to bring back the capitals, but I've been
working to get rid of them so that it becomes less confusing when we get there.
I dunno if it's helped any.
I also added a few comments about our imports and checked that we actually used
everything we imported. No, we don't. But we maybe should switch what we are
using for what we aren't at some point?
2017-06-26 12:35:46 +00:00
|
|
|
with open(to_sys_name(file_path), "wb") as image_handle:
|
|
|
|
image_handle.write(fileData)
|
2017-06-21 02:27:38 +00:00
|
|
|
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
def dopo_swap(image_data):
|
|
|
|
# for each track,
|
|
|
|
# read each sector in the right sequence to make
|
|
|
|
# valid ProDOS blocks (sector pairs)
|
|
|
|
dopo = bytearray(143360)
|
|
|
|
for t in range(0, 35):
|
|
|
|
for s in range(16):
|
|
|
|
src = ts(t,s)
|
|
|
|
dst = ts(t,s if s in (0,15) else 15-s)
|
|
|
|
dopo[dst:dst+256] = image_data[src:src+256]
|
|
|
|
return bytes(dopo)
|
|
|
|
|
2017-06-21 02:27:38 +00:00
|
|
|
#---- end IvanX general purpose functions ----#
|
|
|
|
|
2017-07-07 15:57:09 +00:00
|
|
|
def run_cppo():
|
2017-07-01 10:45:53 +00:00
|
|
|
try:
|
2017-07-08 12:52:34 +00:00
|
|
|
disk = diskimg.Disk(g.image_file)
|
2017-07-01 10:45:53 +00:00
|
|
|
except IOError as e:
|
2017-07-18 18:18:39 +00:00
|
|
|
LOG.critical(e)
|
Logging, unStudlyCapping, main()
Replaced some of the commented out print lines with calls to a logger object.
These are currently always turned on, which we don't want, but they don't hurt
anything and are short.
Oh, and new logging system! The setup is a bit more verbose than it could be
because logging predates str.format and uses the str % tuple syntax that now
exists mostly to avoid breaking older code. You can override this, and I did.
It's not done yet because we might want to actually make some of the existing
print calls into log.info's. Y'know, just as soon as I set that up so ONLY
logging.INFO goes to stdout, unadorned, and everything higher than that goes to
stderr, depending on your logging level, with pretty formatting.
Yeah, logging can do all of that and chew bubblegum at the same time, I just
haven't set it up yet because I want to do it right.
A little more unStudlyCapping of things. I'm going to have to start actually
creating classes soon which is going to bring back the capitals, but I've been
working to get rid of them so that it becomes less confusing when we get there.
I dunno if it's helped any.
I also added a few comments about our imports and checked that we actually used
everything we imported. No, we don't. But we maybe should switch what we are
using for what we aren't at some point?
2017-06-26 12:35:46 +00:00
|
|
|
quit_now(2)
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-06-22 08:59:07 +00:00
|
|
|
# automatically set ShrinkIt mode if extension suggests it
|
2017-07-01 10:45:53 +00:00
|
|
|
if g.src_shk or disk.ext in ('.shk', '.sdk', '.bxy'):
|
2017-06-22 11:17:23 +00:00
|
|
|
if os.name == "nt":
|
2017-06-22 08:59:07 +00:00
|
|
|
print("ShrinkIt archives cannot be extracted on Windows.")
|
Logging, unStudlyCapping, main()
Replaced some of the commented out print lines with calls to a logger object.
These are currently always turned on, which we don't want, but they don't hurt
anything and are short.
Oh, and new logging system! The setup is a bit more verbose than it could be
because logging predates str.format and uses the str % tuple syntax that now
exists mostly to avoid breaking older code. You can override this, and I did.
It's not done yet because we might want to actually make some of the existing
print calls into log.info's. Y'know, just as soon as I set that up so ONLY
logging.INFO goes to stdout, unadorned, and everything higher than that goes to
stderr, depending on your logging level, with pretty formatting.
Yeah, logging can do all of that and chew bubblegum at the same time, I just
haven't set it up yet because I want to do it right.
A little more unStudlyCapping of things. I'm going to have to start actually
creating classes soon which is going to bring back the capitals, but I've been
working to get rid of them so that it becomes less confusing when we get there.
I dunno if it's helped any.
I also added a few comments about our imports and checked that we actually used
everything we imported. No, we don't. But we maybe should switch what we are
using for what we aren't at some point?
2017-06-26 12:35:46 +00:00
|
|
|
quit_now(2)
|
2017-06-22 08:59:07 +00:00
|
|
|
else:
|
|
|
|
try:
|
|
|
|
with open(os.devnull, "w") as fnull:
|
|
|
|
subprocess.call("nulib2", stdout = fnull, stderr = fnull)
|
2017-06-22 09:30:05 +00:00
|
|
|
g.src_shk = True
|
2017-06-22 08:59:07 +00:00
|
|
|
except Exception:
|
2017-06-26 13:56:19 +00:00
|
|
|
print(
|
|
|
|
"Nulib2 is not available; not expanding "
|
|
|
|
"ShrinkIt archive.")
|
Logging, unStudlyCapping, main()
Replaced some of the commented out print lines with calls to a logger object.
These are currently always turned on, which we don't want, but they don't hurt
anything and are short.
Oh, and new logging system! The setup is a bit more verbose than it could be
because logging predates str.format and uses the str % tuple syntax that now
exists mostly to avoid breaking older code. You can override this, and I did.
It's not done yet because we might want to actually make some of the existing
print calls into log.info's. Y'know, just as soon as I set that up so ONLY
logging.INFO goes to stdout, unadorned, and everything higher than that goes to
stderr, depending on your logging level, with pretty formatting.
Yeah, logging can do all of that and chew bubblegum at the same time, I just
haven't set it up yet because I want to do it right.
A little more unStudlyCapping of things. I'm going to have to start actually
creating classes soon which is going to bring back the capitals, but I've been
working to get rid of them so that it becomes less confusing when we get there.
I dunno if it's helped any.
I also added a few comments about our imports and checked that we actually used
everything we imported. No, we don't. But we maybe should switch what we are
using for what we aren't at some point?
2017-06-26 12:35:46 +00:00
|
|
|
quit_now(2)
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.src_shk:
|
|
|
|
g.prodos_names = False
|
2017-06-22 08:59:07 +00:00
|
|
|
unshkdir = ('/tmp' + "/cppo-" + str(uuid.uuid4()))
|
|
|
|
makedirs(unshkdir)
|
2017-06-26 13:56:19 +00:00
|
|
|
result = os.system(
|
|
|
|
"/bin/bash -c 'cd " + unshkdir + "; "
|
2017-07-01 10:45:53 +00:00
|
|
|
+ "result=$(nulib2 -xse " + os.path.abspath(disk.pathname)
|
2017-07-07 15:57:09 +00:00
|
|
|
+ ((" " + g.extract_file.replace('/', ':'))
|
2017-06-26 13:56:19 +00:00
|
|
|
if g.extract_file else "") + " 2> /dev/null); "
|
|
|
|
+ "if [[ $result == \"Failed.\" ]]; then exit 3; "
|
|
|
|
+ "else if grep -q \"no records match\" <<< \"$result\""
|
|
|
|
+ " > /dev/null; then exit 2; else exit 0; fi; fi'")
|
2017-06-22 11:17:23 +00:00
|
|
|
if result == 512:
|
2017-06-26 13:56:19 +00:00
|
|
|
print(
|
|
|
|
"File not found in ShrinkIt archive. "
|
|
|
|
"Try cppo -cat to get the path,\n"
|
|
|
|
" and omit any leading slash or colon.")
|
Logging, unStudlyCapping, main()
Replaced some of the commented out print lines with calls to a logger object.
These are currently always turned on, which we don't want, but they don't hurt
anything and are short.
Oh, and new logging system! The setup is a bit more verbose than it could be
because logging predates str.format and uses the str % tuple syntax that now
exists mostly to avoid breaking older code. You can override this, and I did.
It's not done yet because we might want to actually make some of the existing
print calls into log.info's. Y'know, just as soon as I set that up so ONLY
logging.INFO goes to stdout, unadorned, and everything higher than that goes to
stderr, depending on your logging level, with pretty formatting.
Yeah, logging can do all of that and chew bubblegum at the same time, I just
haven't set it up yet because I want to do it right.
A little more unStudlyCapping of things. I'm going to have to start actually
creating classes soon which is going to bring back the capitals, but I've been
working to get rid of them so that it becomes less confusing when we get there.
I dunno if it's helped any.
I also added a few comments about our imports and checked that we actually used
everything we imported. No, we don't. But we maybe should switch what we are
using for what we aren't at some point?
2017-06-26 12:35:46 +00:00
|
|
|
quit_now(1)
|
2017-06-22 11:17:23 +00:00
|
|
|
elif result != 0:
|
2017-06-26 13:56:19 +00:00
|
|
|
print(
|
|
|
|
"ShrinkIt archive is invalid, "
|
|
|
|
"or some other problem happened.")
|
Logging, unStudlyCapping, main()
Replaced some of the commented out print lines with calls to a logger object.
These are currently always turned on, which we don't want, but they don't hurt
anything and are short.
Oh, and new logging system! The setup is a bit more verbose than it could be
because logging predates str.format and uses the str % tuple syntax that now
exists mostly to avoid breaking older code. You can override this, and I did.
It's not done yet because we might want to actually make some of the existing
print calls into log.info's. Y'know, just as soon as I set that up so ONLY
logging.INFO goes to stdout, unadorned, and everything higher than that goes to
stderr, depending on your logging level, with pretty formatting.
Yeah, logging can do all of that and chew bubblegum at the same time, I just
haven't set it up yet because I want to do it right.
A little more unStudlyCapping of things. I'm going to have to start actually
creating classes soon which is going to bring back the capitals, but I've been
working to get rid of them so that it becomes less confusing when we get there.
I dunno if it's helped any.
I also added a few comments about our imports and checked that we actually used
everything we imported. No, we don't. But we maybe should switch what we are
using for what we aren't at some point?
2017-06-26 12:35:46 +00:00
|
|
|
quit_now(1)
|
2017-06-22 08:59:07 +00:00
|
|
|
if g.extract_file:
|
|
|
|
g.extract_file = g.extract_file.replace(':', '/')
|
|
|
|
extractPath = (unshkdir + "/" + g.extract_file)
|
|
|
|
extractPathDir = os.path.dirname(extractPath)
|
|
|
|
# move the extracted file to the root
|
|
|
|
newunshkdir = ('/tmp' + "/cppo-" + str(uuid.uuid4()))
|
|
|
|
makedirs(newunshkdir)
|
|
|
|
for filename in os.listdir(extractPathDir):
|
|
|
|
shutil.move(extractPathDir + "/" + filename, newunshkdir)
|
|
|
|
shutil.rmtree(unshkdir)
|
|
|
|
unshkdir = newunshkdir
|
|
|
|
|
|
|
|
fileNames = [name for name in sorted(os.listdir(unshkdir))
|
|
|
|
if not name.startswith(".")]
|
2017-07-08 11:01:57 +00:00
|
|
|
if g.extract_in_place: # extract in place from "-n"
|
2017-06-22 08:59:07 +00:00
|
|
|
curDir = True
|
|
|
|
elif (len(fileNames) == 1 and
|
|
|
|
os.path.isdir(unshkdir + "/" + fileNames[0])):
|
2017-07-08 11:01:57 +00:00
|
|
|
curDir = True # only one folder at top level, so extract in place
|
2017-06-22 08:59:07 +00:00
|
|
|
volumeName = toProdosName(fileNames[0])
|
2017-07-08 11:01:57 +00:00
|
|
|
elif (len(fileNames) == 1 and # disk image, so extract in place
|
2017-06-22 08:59:07 +00:00
|
|
|
fileNames[0][-1:] == "i"):
|
|
|
|
curDir = True
|
|
|
|
volumeName = toProdosName(fileNames[0].split("#")[0])
|
2017-07-08 11:01:57 +00:00
|
|
|
else: # extract in folder based on disk image name
|
2017-06-22 08:59:07 +00:00
|
|
|
curDir = False
|
2017-07-01 10:45:53 +00:00
|
|
|
volumeName = toProdosName(os.path.basename(disk.pathname))
|
2017-06-22 11:17:23 +00:00
|
|
|
if volumeName[-4:].lower() in ('.shk', '.sdk', '.bxy'):
|
|
|
|
volumeName = volumeName[:-4]
|
2017-06-22 09:30:05 +00:00
|
|
|
if not g.catalog_only and not curDir and not g.extract_file:
|
2017-06-22 08:59:07 +00:00
|
|
|
print("Extracting into " + volumeName)
|
|
|
|
# recursively process unshrunk archive hierarchy
|
|
|
|
for dirName, subdirList, fileList in os.walk(unshkdir):
|
|
|
|
subdirList.sort()
|
2017-06-22 09:30:05 +00:00
|
|
|
if not g.catalog_only:
|
2017-06-26 13:56:19 +00:00
|
|
|
g.target_dir = (
|
2017-07-07 15:57:09 +00:00
|
|
|
g.target_dir
|
2017-06-26 13:56:19 +00:00
|
|
|
+ ("" if curDir else ("/" + volumeName))
|
|
|
|
+ ("/" if dirName.count('/') > 2 else "")
|
2017-07-08 11:01:57 +00:00
|
|
|
+ ("/".join(dirName.split('/')[3:]))) # chop tempdir
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.casefold_upper:
|
|
|
|
g.target_dir = g.target_dir.upper()
|
|
|
|
g.appledouble_dir = (g.target_dir + "/.AppleDouble")
|
|
|
|
makedirs(g.target_dir)
|
|
|
|
if g.use_appledouble:
|
|
|
|
makedirs(g.appledouble_dir)
|
2017-06-22 08:59:07 +00:00
|
|
|
for fname in sorted(fileList):
|
2017-06-22 11:17:23 +00:00
|
|
|
if fname[-1:] == "i":
|
Remove bashbyter, misc cleanups, a bugfix
The full summary:
**ADDED**
- New dopo_swap swaps 140k images between DOS order and ProDOS order. This
function replaces code in the main program body which does the same thing.
- Add optional zfill parameter to to_bin. Considered this for to_hex, but
nowhere would that be used currently and I'd rather get rid of these lower
level support functions that mainly are there for Bashbyter (but for now
have larger direct use now that Bashbyter is gone.)
**CHANGED**
- In getFileLength for DOS 3.3 T/other files, initialize prevTSpair to [0,0]
which, when combined with the removal of Bashbyter and vestiges of Python2
support, makes `The Correspondent 4.4.dsk` both -cat and extract. (Noted
previously, we currently do nothing about the control characters in the
filenames on this disk. They extract as non-printables and they don't show
up properly in -cat.)
- Replaced 4294967296 (2**32) with 1<<32 for use in turning negative integers
into unsigned 32 bit integers. It's possible to int.to_bytes() in a way
that does this the way we want, and we ought to do that. The syntax is
longer than it needs to be though.
- Strip high bit of DOS 3.3 filenames more efficiently
- Replaced type("".encode().decode()) with str. That wasn't necessary, and
you might think otherwise is an example of why dropping Python 2 is a very
good idea.
- Use int.from_bytes() calls to replace reading several bytes by hand,
multiplying them by bit offsets, and adding them together.
- Made unixDateToADDate return four bytes instead of a hex-ustr because it
only had one caller which just converted the value to that format anyway.
- Misc slight changes like unStudlyCapping identifiers, saving a return value
rather than calling the function that creates it multiple times, tuple
assignment, and coding style
**REMOVED**
- slyce functions: {,bin_,dec_,hex_}slyce
- aToB conversions: binTo{Dec,Hex}, charTo{Dec,Hex}, decTo{Char,Hex},
hexTo{Bin,Char,Dec} (just use to_thing or do it better than that.)
- Removed: readchar{s,Dec,Hex}, writechar{s,sHex,Dec,Hex}
2017-06-24 10:22:26 +00:00
|
|
|
# disk image; rename to include suffix and correct
|
|
|
|
# type/auxtype
|
2017-06-22 08:59:07 +00:00
|
|
|
imagePath = os.path.join(dirName, fname).split("#")[0]
|
2017-06-26 13:56:19 +00:00
|
|
|
new_name = (
|
|
|
|
imagePath
|
|
|
|
+ ("" if os.path.splitext(imagePath.lower())[1]
|
|
|
|
in ('.po', '.hdv') else ".PO") + "#e00005")
|
2017-06-22 08:59:07 +00:00
|
|
|
os.rename(os.path.join(dirName, fname), new_name)
|
|
|
|
fname = os.path.basename(new_name)
|
|
|
|
g.shk_hasrf = False
|
|
|
|
rfork = False
|
2017-06-26 13:56:19 +00:00
|
|
|
if (fname[-1:] == "r"
|
|
|
|
and os.path.isfile(os.path.join(dirName, fname[:-1]))):
|
2017-06-22 08:59:07 +00:00
|
|
|
rfork = True
|
|
|
|
elif (os.path.isfile(os.path.join(dirName, (fname + "r")))):
|
|
|
|
g.shk_hasrf = True
|
|
|
|
if not rfork:
|
2017-07-20 06:05:11 +00:00
|
|
|
processEntry(disk, dirName, fname)
|
2017-06-22 08:59:07 +00:00
|
|
|
shutil.rmtree(unshkdir, True)
|
Logging, unStudlyCapping, main()
Replaced some of the commented out print lines with calls to a logger object.
These are currently always turned on, which we don't want, but they don't hurt
anything and are short.
Oh, and new logging system! The setup is a bit more verbose than it could be
because logging predates str.format and uses the str % tuple syntax that now
exists mostly to avoid breaking older code. You can override this, and I did.
It's not done yet because we might want to actually make some of the existing
print calls into log.info's. Y'know, just as soon as I set that up so ONLY
logging.INFO goes to stdout, unadorned, and everything higher than that goes to
stderr, depending on your logging level, with pretty formatting.
Yeah, logging can do all of that and chew bubblegum at the same time, I just
haven't set it up yet because I want to do it right.
A little more unStudlyCapping of things. I'm going to have to start actually
creating classes soon which is going to bring back the capitals, but I've been
working to get rid of them so that it becomes less confusing when we get there.
I dunno if it's helped any.
I also added a few comments about our imports and checked that we actually used
everything we imported. No, we don't. But we maybe should switch what we are
using for what we aren't at some point?
2017-06-26 12:35:46 +00:00
|
|
|
quit_now(0)
|
2017-06-22 08:59:07 +00:00
|
|
|
|
|
|
|
# end script if SHK
|
|
|
|
|
2017-06-22 09:30:05 +00:00
|
|
|
# detect if image is 2mg and remove 64-byte header if so
|
2017-07-01 10:45:53 +00:00
|
|
|
if disk.ext in ('.2mg', '.2img'):
|
2017-07-20 06:05:11 +00:00
|
|
|
# FIXME: Seriously STOP doing this...
|
|
|
|
disk.buffer._buf = disk.buffer._buf[64:]
|
2017-06-22 08:59:07 +00:00
|
|
|
|
Logging, unStudlyCapping, main()
Replaced some of the commented out print lines with calls to a logger object.
These are currently always turned on, which we don't want, but they don't hurt
anything and are short.
Oh, and new logging system! The setup is a bit more verbose than it could be
because logging predates str.format and uses the str % tuple syntax that now
exists mostly to avoid breaking older code. You can override this, and I did.
It's not done yet because we might want to actually make some of the existing
print calls into log.info's. Y'know, just as soon as I set that up so ONLY
logging.INFO goes to stdout, unadorned, and everything higher than that goes to
stderr, depending on your logging level, with pretty formatting.
Yeah, logging can do all of that and chew bubblegum at the same time, I just
haven't set it up yet because I want to do it right.
A little more unStudlyCapping of things. I'm going to have to start actually
creating classes soon which is going to bring back the capitals, but I've been
working to get rid of them so that it becomes less confusing when we get there.
I dunno if it's helped any.
I also added a few comments about our imports and checked that we actually used
everything we imported. No, we don't. But we maybe should switch what we are
using for what we aren't at some point?
2017-06-26 12:35:46 +00:00
|
|
|
# handle 140k disk image
|
2017-07-20 06:05:11 +00:00
|
|
|
if len(disk.buffer) == 143360:
|
2017-07-18 18:18:39 +00:00
|
|
|
LOG.debug("140k disk")
|
2017-06-22 09:30:05 +00:00
|
|
|
prodos_disk = False
|
|
|
|
fix_order = False
|
2017-06-22 08:59:07 +00:00
|
|
|
# is it ProDOS?
|
2017-07-20 06:05:11 +00:00
|
|
|
if disk.buffer.read(ts(0, 0), 4) == b'\x01\x38\xb0\x03':
|
2017-07-18 18:18:39 +00:00
|
|
|
LOG.debug("detected ProDOS by boot block")
|
2017-07-20 06:05:11 +00:00
|
|
|
if disk.buffer.read(ts(0, 1) + 3, 6) == b'PRODOS':
|
2017-07-18 18:18:39 +00:00
|
|
|
LOG.debug("order OK (PO)")
|
2017-06-22 09:30:05 +00:00
|
|
|
prodos_disk = True
|
2017-07-20 06:05:11 +00:00
|
|
|
elif disk.buffer.read(ts(0, 14) + 3, 6) == b'PRODOS':
|
2017-07-18 18:18:39 +00:00
|
|
|
LOG.debug("order needs fixing (DO)")
|
2017-06-22 09:30:05 +00:00
|
|
|
prodos_disk = True
|
|
|
|
fix_order = True
|
2017-06-22 08:59:07 +00:00
|
|
|
# is it DOS 3.3?
|
|
|
|
else:
|
2017-07-18 18:18:39 +00:00
|
|
|
LOG.debug("it's not ProDOS")
|
2017-07-20 06:05:11 +00:00
|
|
|
if disk.buffer.read1(ts(17, 0) + 3) == 3:
|
|
|
|
vtocT, vtocS = disk.buffer.read(ts(17,0) + 1, 2)
|
2017-06-26 13:56:19 +00:00
|
|
|
if vtocT < 35 and vtocS < 16:
|
2017-07-18 18:18:39 +00:00
|
|
|
LOG.debug("it's DOS 3.3")
|
2017-06-22 09:30:05 +00:00
|
|
|
g.dos33 = True
|
2017-06-22 08:59:07 +00:00
|
|
|
# it's DOS 3.3; check sector order next
|
2017-07-20 06:05:11 +00:00
|
|
|
if disk.buffer.read1(ts(17, 14) + 2) != 13:
|
2017-07-18 18:18:39 +00:00
|
|
|
LOG.debug("order needs fixing (PO)")
|
2017-06-22 09:30:05 +00:00
|
|
|
fix_order = True
|
Logging, unStudlyCapping, main()
Replaced some of the commented out print lines with calls to a logger object.
These are currently always turned on, which we don't want, but they don't hurt
anything and are short.
Oh, and new logging system! The setup is a bit more verbose than it could be
because logging predates str.format and uses the str % tuple syntax that now
exists mostly to avoid breaking older code. You can override this, and I did.
It's not done yet because we might want to actually make some of the existing
print calls into log.info's. Y'know, just as soon as I set that up so ONLY
logging.INFO goes to stdout, unadorned, and everything higher than that goes to
stderr, depending on your logging level, with pretty formatting.
Yeah, logging can do all of that and chew bubblegum at the same time, I just
haven't set it up yet because I want to do it right.
A little more unStudlyCapping of things. I'm going to have to start actually
creating classes soon which is going to bring back the capitals, but I've been
working to get rid of them so that it becomes less confusing when we get there.
I dunno if it's helped any.
I also added a few comments about our imports and checked that we actually used
everything we imported. No, we don't. But we maybe should switch what we are
using for what we aren't at some point?
2017-06-26 12:35:46 +00:00
|
|
|
else:
|
2017-07-18 18:18:39 +00:00
|
|
|
LOG.debug("order OK (DO)")
|
2017-06-22 08:59:07 +00:00
|
|
|
# fall back on disk extension if weird boot block (e.g. AppleCommander)
|
2017-06-22 09:30:05 +00:00
|
|
|
if not prodos_disk and not g.dos33:
|
2017-07-18 18:18:39 +00:00
|
|
|
LOG.debug("format and ordering unknown, checking extension")
|
2017-07-01 10:45:53 +00:00
|
|
|
if disk.ext in ('.dsk', '.do'):
|
2017-07-18 18:18:39 +00:00
|
|
|
LOG.debug("extension indicates DO, changing to PO")
|
2017-06-22 09:30:05 +00:00
|
|
|
fix_order = True
|
|
|
|
if fix_order:
|
2017-07-18 18:18:39 +00:00
|
|
|
LOG.debug("fixing order")
|
2017-07-20 06:05:11 +00:00
|
|
|
# FIXME
|
|
|
|
disk.buffer._buf = dopo_swap(disk.buffer._buf)
|
2017-06-22 08:59:07 +00:00
|
|
|
#print("saving fixed order file as outfile.dsk")
|
2017-07-20 06:05:11 +00:00
|
|
|
#save_file("outfile.dsk", disk.buffer._buf)
|
2017-06-22 08:59:07 +00:00
|
|
|
#print("saved")
|
|
|
|
|
2017-06-22 09:30:05 +00:00
|
|
|
if not prodos_disk and not g.dos33:
|
2017-06-22 08:59:07 +00:00
|
|
|
print("Warning: Unable to determine disk format, assuming ProDOS.")
|
|
|
|
|
|
|
|
# enforce leading slash if ProDOS
|
2017-06-26 13:56:19 +00:00
|
|
|
if (not g.src_shk and not g.dos33 and g.extract_file
|
2017-07-07 15:57:09 +00:00
|
|
|
and (g.extract_file[0] not in ('/', ':'))):
|
2017-07-18 18:18:39 +00:00
|
|
|
LOG.critical("Cannot extract {} from {}: "
|
2017-07-07 15:07:20 +00:00
|
|
|
"ProDOS volume name required".format(
|
|
|
|
g.extract_file, g.image_file))
|
2017-07-07 14:33:26 +00:00
|
|
|
quit_now(2)
|
2017-06-22 08:59:07 +00:00
|
|
|
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.dos33:
|
2017-07-07 15:57:09 +00:00
|
|
|
disk_name = (disk.diskname if disk.ext in ('.dsk', '.do', '.po')
|
2017-07-01 10:45:53 +00:00
|
|
|
else disk.filename)
|
2017-06-22 09:30:05 +00:00
|
|
|
if g.prodos_names:
|
2017-06-22 11:17:23 +00:00
|
|
|
disk_name = toProdosName(disk_name)
|
2017-06-22 09:30:05 +00:00
|
|
|
if not g.catalog_only:
|
2017-07-07 15:57:09 +00:00
|
|
|
print(g.target_dir)
|
|
|
|
g.target_dir = (g.extract_file if g.extract_file
|
|
|
|
else (g.target_dir + "/" + disk_name))
|
2017-06-22 09:30:05 +00:00
|
|
|
g.appledouble_dir = (g.target_dir + "/.AppleDouble")
|
|
|
|
makedirs(g.target_dir)
|
|
|
|
if g.use_appledouble:
|
|
|
|
makedirs(g.appledouble_dir)
|
2017-06-22 08:59:07 +00:00
|
|
|
if not g.extract_file:
|
2017-06-22 11:17:23 +00:00
|
|
|
print("Extracting into " + disk_name)
|
2017-07-20 06:05:11 +00:00
|
|
|
process_dir(disk, list(disk.buffer.read(ts(17, 0) + 1, 2)))
|
2017-06-22 08:59:07 +00:00
|
|
|
if g.extract_file:
|
|
|
|
print("ProDOS file not found within image file.")
|
Logging, unStudlyCapping, main()
Replaced some of the commented out print lines with calls to a logger object.
These are currently always turned on, which we don't want, but they don't hurt
anything and are short.
Oh, and new logging system! The setup is a bit more verbose than it could be
because logging predates str.format and uses the str % tuple syntax that now
exists mostly to avoid breaking older code. You can override this, and I did.
It's not done yet because we might want to actually make some of the existing
print calls into log.info's. Y'know, just as soon as I set that up so ONLY
logging.INFO goes to stdout, unadorned, and everything higher than that goes to
stderr, depending on your logging level, with pretty formatting.
Yeah, logging can do all of that and chew bubblegum at the same time, I just
haven't set it up yet because I want to do it right.
A little more unStudlyCapping of things. I'm going to have to start actually
creating classes soon which is going to bring back the capitals, but I've been
working to get rid of them so that it becomes less confusing when we get there.
I dunno if it's helped any.
I also added a few comments about our imports and checked that we actually used
everything we imported. No, we don't. But we maybe should switch what we are
using for what we aren't at some point?
2017-06-26 12:35:46 +00:00
|
|
|
quit_now(0)
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-06-22 08:59:07 +00:00
|
|
|
# below: ProDOS
|
2017-06-21 02:27:38 +00:00
|
|
|
|
2017-06-22 08:59:07 +00:00
|
|
|
g.activeDirBlock = 0
|
|
|
|
g.activeFileName = ""
|
|
|
|
g.activeFileSize = 0
|
|
|
|
g.activeFileBytesCopied = 0
|
|
|
|
g.resourceFork = 0
|
|
|
|
g.PDOSPATH_INDEX = 0
|
2017-06-22 09:30:05 +00:00
|
|
|
g.prodos_names = False
|
2017-06-22 08:59:07 +00:00
|
|
|
|
|
|
|
if g.extract_file:
|
|
|
|
g.PDOSPATH = g.extract_file.replace(':', '/').split('/')
|
|
|
|
g.extract_file = None
|
|
|
|
if not g.PDOSPATH[0]:
|
|
|
|
g.PDOSPATH_INDEX += 1
|
|
|
|
g.PDOSPATH_SEGMENT = g.PDOSPATH[g.PDOSPATH_INDEX]
|
2017-06-22 09:30:05 +00:00
|
|
|
g.appledouble_dir = (g.target_dir + "/.AppleDouble")
|
2017-06-22 11:17:23 +00:00
|
|
|
if g.use_appledouble and not os.path.isdir(g.appledouble_dir):
|
2017-06-22 09:30:05 +00:00
|
|
|
mkdir(g.appledouble_dir)
|
2017-07-20 06:05:11 +00:00
|
|
|
process_dir(disk, 2)
|
2017-06-22 08:59:07 +00:00
|
|
|
print("ProDOS file not found within image file.")
|
Logging, unStudlyCapping, main()
Replaced some of the commented out print lines with calls to a logger object.
These are currently always turned on, which we don't want, but they don't hurt
anything and are short.
Oh, and new logging system! The setup is a bit more verbose than it could be
because logging predates str.format and uses the str % tuple syntax that now
exists mostly to avoid breaking older code. You can override this, and I did.
It's not done yet because we might want to actually make some of the existing
print calls into log.info's. Y'know, just as soon as I set that up so ONLY
logging.INFO goes to stdout, unadorned, and everything higher than that goes to
stderr, depending on your logging level, with pretty formatting.
Yeah, logging can do all of that and chew bubblegum at the same time, I just
haven't set it up yet because I want to do it right.
A little more unStudlyCapping of things. I'm going to have to start actually
creating classes soon which is going to bring back the capitals, but I've been
working to get rid of them so that it becomes less confusing when we get there.
I dunno if it's helped any.
I also added a few comments about our imports and checked that we actually used
everything we imported. No, we don't. But we maybe should switch what we are
using for what we aren't at some point?
2017-06-26 12:35:46 +00:00
|
|
|
quit_now(2)
|
2017-06-22 08:59:07 +00:00
|
|
|
else:
|
2017-06-22 09:30:05 +00:00
|
|
|
if not g.catalog_only:
|
2017-07-20 06:05:11 +00:00
|
|
|
g.target_dir = (g.target_dir + "/" + getVolumeName(disk).decode())
|
2017-06-22 09:30:05 +00:00
|
|
|
g.appledouble_dir = (g.target_dir + "/.AppleDouble")
|
|
|
|
if not os.path.isdir(g.target_dir):
|
|
|
|
makedirs(g.target_dir)
|
2017-06-22 11:17:23 +00:00
|
|
|
if g.use_appledouble and not os.path.isdir(g.appledouble_dir):
|
2017-06-22 09:30:05 +00:00
|
|
|
makedirs(g.appledouble_dir)
|
2017-07-20 06:05:11 +00:00
|
|
|
process_dir(disk, 2)
|
Logging, unStudlyCapping, main()
Replaced some of the commented out print lines with calls to a logger object.
These are currently always turned on, which we don't want, but they don't hurt
anything and are short.
Oh, and new logging system! The setup is a bit more verbose than it could be
because logging predates str.format and uses the str % tuple syntax that now
exists mostly to avoid breaking older code. You can override this, and I did.
It's not done yet because we might want to actually make some of the existing
print calls into log.info's. Y'know, just as soon as I set that up so ONLY
logging.INFO goes to stdout, unadorned, and everything higher than that goes to
stderr, depending on your logging level, with pretty formatting.
Yeah, logging can do all of that and chew bubblegum at the same time, I just
haven't set it up yet because I want to do it right.
A little more unStudlyCapping of things. I'm going to have to start actually
creating classes soon which is going to bring back the capitals, but I've been
working to get rid of them so that it becomes less confusing when we get there.
I dunno if it's helped any.
I also added a few comments about our imports and checked that we actually used
everything we imported. No, we don't. But we maybe should switch what we are
using for what we aren't at some point?
2017-06-26 12:35:46 +00:00
|
|
|
quit_now(0)
|