import os.path, re, fnmatch
from twisted.python import usage
-from allmydata.scripts.common import BaseOptions, get_aliases, get_default_nodedir, DEFAULT_ALIAS
+from allmydata.scripts.common import get_aliases, get_default_nodedir, \
+ DEFAULT_ALIAS, BaseOptions
from allmydata.util.encodingutil import argv_to_unicode, argv_to_abspath, quote_output
NODEURL_RE=re.compile("http(s?)://([^:]*)(:([1-9][0-9]*))?")
class VDriveOptions(BaseOptions):
optParameters = [
- ["node-directory", "d", None,
- "Specify which Tahoe node directory should be used. The directory "
- "should either contain a full Tahoe node, or a file named node.url "
- "that points to some other Tahoe node. It should also contain a file "
- "named '" + os.path.join('private', 'aliases') + "' which contains the "
- "mapping from alias name to root dirnode URI." + (
- _default_nodedir and (" [default: " + quote_output(_default_nodedir) + "]") or "")],
["node-url", "u", None,
- "Specify the URL of the Tahoe gateway node, such as 'http://127.0.0.1:3456'. "
+ "Specify the URL of the Tahoe gateway node, such as "
+ "'http://127.0.0.1:3456'. "
"This overrides the URL found in the --node-directory ."],
["dir-cap", None, None,
"Specify which dirnode URI should be used as the 'tahoe' alias."]
]
def postOptions(self):
- if self['node-directory']:
- self['node-directory'] = argv_to_abspath(self['node-directory'])
+ self["quiet"] = self.parent["quiet"]
+ if self.parent['node-directory']:
+ self['node-directory'] = argv_to_abspath(self.parent['node-directory'])
else:
self['node-directory'] = _default_nodedir
class MakeDirectoryOptions(VDriveOptions):
+ optParameters = [
+ ("format", None, None, "Create a directory with the given format: SDMF or MDMF (case-insensitive)"),
+ ]
+
def parseArgs(self, where=""):
self.where = argv_to_unicode(where)
+ if self['format']:
+ if self['format'].upper() not in ("SDMF", "MDMF"):
+ raise usage.UsageError("%s is an invalid format" % self['format'])
+
def getSynopsis(self):
return "Usage: %s mkdir [options] [REMOTE_DIR]" % (self.command_name,)
def parseArgs(self, where=""):
self.where = argv_to_unicode(where)
+ def getSynopsis(self):
+ return "Usage: %s ls [options] [PATH]" % (self.command_name,)
+
longdesc = """
List the contents of some portion of the grid.
+ If PATH is omitted, "tahoe:" is assumed.
+
When the -l or --long option is used, each line is shown in the
following format:
class PutOptions(VDriveOptions):
optFlags = [
- ("mutable", "m", "Create a mutable file instead of an immutable one."),
+ ("mutable", "m", "Create a mutable file instead of an immutable one (like --format=SDMF)"),
+ ]
+ optParameters = [
+ ("format", None, None, "Create a file with the given format: SDMF and MDMF for mutable, CHK (default) for immutable. (case-insensitive)"),
]
def parseArgs(self, arg1=None, arg2=None):
if self.from_file == u"-":
self.from_file = None
+ if self['format']:
+ if self['format'].upper() not in ("SDMF", "MDMF", "CHK"):
+ raise usage.UsageError("%s is an invalid format" % self['format'])
+
def getSynopsis(self):
return "Usage: %s put [options] LOCAL_FILE REMOTE_FILE" % (self.command_name,)
If REMOTE_FILE is missing, upload the file but do not link it into a
directory; also print the new filecap to stdout. If LOCAL_FILE is missing
or '-', data will be copied from stdin. REMOTE_FILE is assumed to start
- with tahoe: unless otherwise specified."""
+ with tahoe: unless otherwise specified.
+
+ If the destination file already exists and is mutable, it will be modified
+ in-place, whether or not --mutable is specified. (--mutable only affects
+ creation of new files.)"""
def getUsage(self, width=None):
t = VDriveOptions.getUsage(self, width)
self.destination = argv_to_unicode(args[-1])
def getSynopsis(self):
- return "Usage: tahoe cp [options] FROM.. TO"
+ return "Usage: %s cp [options] FROM.. TO" % (self.command_name,)
longdesc = """
Use 'tahoe cp' to copy files between a local filesystem and a Tahoe grid.
slashes.
"""
-class RmOptions(VDriveOptions):
+class UnlinkOptions(VDriveOptions):
def parseArgs(self, where):
self.where = argv_to_unicode(where)
def getSynopsis(self):
- return "Usage: %s rm [options] REMOTE_FILE" % (self.command_name,)
+ return "Usage: %s unlink [options] REMOTE_FILE" % (self.command_name,)
-class UnlinkOptions(RmOptions):
+class RmOptions(UnlinkOptions):
def getSynopsis(self):
- return "Usage: %s unlink [options] REMOTE_FILE" % (self.command_name,)
+ return "Usage: %s rm [options] REMOTE_FILE" % (self.command_name,)
class MvOptions(VDriveOptions):
def parseArgs(self, frompath, topath):
["get", None, GetOptions, "Retrieve a file from the grid."],
["put", None, PutOptions, "Upload a file into the grid."],
["cp", None, CpOptions, "Copy one or more files or directories."],
- ["rm", None, RmOptions, "Unlink a file or directory on the grid."],
- ["unlink", None, UnlinkOptions, "Unlink a file or directory on the grid (same as rm)."],
+ ["unlink", None, UnlinkOptions, "Unlink a file or directory on the grid."],
+ ["rm", None, RmOptions, "Unlink a file or directory on the grid (same as unlink)."],
["mv", None, MvOptions, "Move a file within the grid."],
["ln", None, LnOptions, "Make an additional link to an existing file or directory."],
["backup", None, BackupOptions, "Make target dir look like local dir."],
rc = tahoe_cp.copy(options)
return rc
-def rm(options):
- from allmydata.scripts import tahoe_rm
- rc = tahoe_rm.rm(options)
+def unlink(options, command="unlink"):
+ from allmydata.scripts import tahoe_unlink
+ rc = tahoe_unlink.unlink(options, command=command)
return rc
+def rm(options):
+ return unlink(options, command="rm")
+
def mv(options):
from allmydata.scripts import tahoe_mv
rc = tahoe_mv.mv(options, mode="move")
"get": get,
"put": put,
"cp": cp,
+ "unlink": unlink,
"rm": rm,
- "unlink": rm,
"mv": mv,
"ln": ln,
"backup": backup,
projects / tahoe-lafs / tahoe-lafs.git / blobdiff