mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix location parsing issue with short paths

This commit is contained in:
Jonas Borgström 2013-06-26 13:41:42 +02:00
parent cbfdedc329
commit 9630714fac
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
darc/helpers.py
View File

@ -245,17 +245,17 @@ def group2gid(group):
return None
class Location(object):
class Location:
"""Object representing a repository / archive location
"""
proto = user = host = port = path = archive = None
ssh_re = re.compile(r'(?P<proto>ssh)://(?:(?P<user>[^@]+)@)?'
r'(?P<host>[^:/#]+)(?::(?P<port>\d+))?'
r'(?P<path>[^:]*)(?:::(?P<archive>.+))?')
r'(?P<path>[^:]+)(?:::(?P<archive>.+))?')
file_re = re.compile(r'(?P<proto>file)://'
r'(?P<path>[^:]*)(?:::(?P<archive>.+))?')
r'(?P<path>[^:]+)(?:::(?P<archive>.+))?')
scp_re = re.compile(r'((?:(?P<user>[^@]+)@)?(?P<host>[^:/]+):)?'
r'(?P<path>[^:]*)(?:::(?P<archive>.+))?')
r'(?P<path>[^:]+)(?:::(?P<archive>.+))?')
def __init__(self, text):
self.orig = text

12
darc/testsuite/helpers.py
View File

@ -19,8 +19,16 @@ class LocationTestCase(DarcTestCase):
"Location(proto='ssh', user='user', host='host', port=22, path='/some/path', archive='archive')"
)
self.assert_equal(
repr(Location('/some/path::archive')),
"Location(proto='file', user=None, host=None, port=None, path='/some/path', archive='archive')"
repr(Location('mybackup.darc::archive')),
"Location(proto='file', user=None, host=None, port=None, path='mybackup.darc', archive='archive')"
)
self.assert_equal(
repr(Location('/some/absolute/path::archive')),
"Location(proto='file', user=None, host=None, port=None, path='/some/absolute/path', archive='archive')"
)
self.assert_equal(
repr(Location('some/relative/path::archive')),
"Location(proto='file', user=None, host=None, port=None, path='some/relative/path', archive='archive')"
)