75
77
This assumes that both paths are already fully specified file:// URLs.
77
79
if len(base) < MIN_ABS_FILEURL_LENGTH:
78
raise ValueError('Length of base (%r) must equal or'
80
raise ValueError('Length of base must be equal or'
79
81
' exceed the platform minimum url length (which is %d)' %
80
(base, MIN_ABS_FILEURL_LENGTH))
82
MIN_ABS_FILEURL_LENGTH)
81
83
base = local_path_from_url(base)
82
84
path = local_path_from_url(path)
83
85
return escape(osutils.relpath(base, path))
217
219
# jam 20060502 Sorted to 'l' because the final target is 'local_path_from_url'
218
220
def _posix_local_path_from_url(url):
219
221
"""Convert a url like file:///path/to/foo into /path/to/foo"""
220
file_localhost_prefix = 'file://localhost/'
221
if url.startswith(file_localhost_prefix):
222
path = url[len(file_localhost_prefix) - 1:]
223
elif not url.startswith('file:///'):
224
raise errors.InvalidURL(
225
url, 'local urls must start with file:/// or file://localhost/')
227
path = url[len('file://'):]
222
if not url.startswith('file:///'):
223
raise errors.InvalidURL(url, 'local urls must start with file:///')
228
224
# We only strip off 2 slashes
229
return unescape(path)
225
return unescape(url[len('file://'):])
232
228
def _posix_local_path_to_url(path):
469
465
return url_base + head, tail
472
def split_segment_parameters_raw(url):
473
"""Split the subsegment of the last segment of a URL.
475
:param url: A relative or absolute URL
476
:return: (url, subsegments)
478
(parent_url, child_dir) = split(url)
479
subsegments = child_dir.split(",")
480
if len(subsegments) == 1:
482
return (join(parent_url, subsegments[0]), subsegments[1:])
485
def split_segment_parameters(url):
486
"""Split the segment parameters of the last segment of a URL.
488
:param url: A relative or absolute URL
489
:return: (url, segment_parameters)
491
(base_url, subsegments) = split_segment_parameters_raw(url)
493
for subsegment in subsegments:
494
(key, value) = subsegment.split("=", 1)
495
parameters[key] = value
496
return (base_url, parameters)
499
def join_segment_parameters_raw(base, *subsegments):
500
"""Create a new URL by adding subsegments to an existing one.
502
This adds the specified subsegments to the last path in the specified
503
base URL. The subsegments should be bytestrings.
505
:note: You probably want to use join_segment_parameters instead.
509
for subsegment in subsegments:
510
if type(subsegment) is not str:
511
raise TypeError("Subsegment %r is not a bytestring" % subsegment)
512
if "," in subsegment:
513
raise errors.InvalidURLJoin(", exists in subsegments",
515
return ",".join((base,) + subsegments)
518
def join_segment_parameters(url, parameters):
519
"""Create a new URL by adding segment parameters to an existing one.
521
The parameters of the last segment in the URL will be updated; if a
522
parameter with the same key already exists it will be overwritten.
524
:param url: A URL, as string
525
:param parameters: Dictionary of parameters, keys and values as bytestrings
527
(base, existing_parameters) = split_segment_parameters(url)
529
new_parameters.update(existing_parameters)
530
for key, value in parameters.iteritems():
531
if type(key) is not str:
532
raise TypeError("parameter key %r is not a bytestring" % key)
533
if type(value) is not str:
534
raise TypeError("parameter value %r for %s is not a bytestring" %
537
raise errors.InvalidURLJoin("= exists in parameter key", url,
539
new_parameters[key] = value
540
return join_segment_parameters_raw(base,
541
*["%s=%s" % item for item in sorted(new_parameters.items())])
544
468
def _win32_strip_local_trailing_slash(url):
545
469
"""Strip slashes after the drive letter"""
546
470
if len(url) > WIN32_MIN_ABS_FILEURL_LENGTH:
763
687
if len(segments) == 0:
765
689
return osutils.pathjoin(*segments)
770
"""Extract the server address, the credentials and the path from the url.
772
user, password, host and path should be quoted if they contain reserved
775
:param url: an quoted url
777
:return: (scheme, user, password, host, port, path) tuple, all fields
780
if isinstance(url, unicode):
781
raise errors.InvalidURL('should be ascii:\n%r' % url)
782
url = url.encode('utf-8')
783
(scheme, netloc, path, params,
784
query, fragment) = urlparse.urlparse(url, allow_fragments=False)
785
user = password = host = port = None
787
user, host = netloc.rsplit('@', 1)
789
user, password = user.split(':', 1)
790
password = urllib.unquote(password)
791
user = urllib.unquote(user)
795
if ':' in host and not (host[0] == '[' and host[-1] == ']'): #there *is* port
796
host, port = host.rsplit(':',1)
800
raise errors.InvalidURL('invalid port number %s in url:\n%s' %
802
if host != "" and host[0] == '[' and host[-1] == ']': #IPv6
805
host = urllib.unquote(host)
806
path = urllib.unquote(path)
808
return (scheme, user, password, host, port, path)