Include leading zeroes in URL increment/decrement
This commit is contained in:
parent
eb276df876
commit
d6cda0ed27
@ -509,11 +509,11 @@ def incdec_number(url, incdec, segments=None):
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
# Get the last number in a string
|
# Get the last number in a string
|
||||||
match = re.match(r'(.*\D|^)(\d+)(.*)', getter())
|
match = re.match(r'(.*\D|^)(0*)(\d+)(.*)', getter())
|
||||||
if not match:
|
if not match:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
pre, number, post = match.groups()
|
pre, zeroes, number, post = match.groups()
|
||||||
# This should always succeed because we match \d+
|
# This should always succeed because we match \d+
|
||||||
val = int(number)
|
val = int(number)
|
||||||
if incdec == 'decrement':
|
if incdec == 'decrement':
|
||||||
@ -524,8 +524,15 @@ def incdec_number(url, incdec, segments=None):
|
|||||||
val += 1
|
val += 1
|
||||||
else:
|
else:
|
||||||
raise ValueError("Invalid value {} for indec!".format(incdec))
|
raise ValueError("Invalid value {} for indec!".format(incdec))
|
||||||
new_value = ''.join([pre, str(val), post])
|
if zeroes:
|
||||||
|
if len(number) < len(str(val)):
|
||||||
|
zeroes = zeroes[1:]
|
||||||
|
if len(number) > len(str(val)):
|
||||||
|
zeroes = ''.join([zeroes,'0'])
|
||||||
|
|
||||||
|
new_value = ''.join([pre, zeroes, str(val), post])
|
||||||
setter(new_value)
|
setter(new_value)
|
||||||
|
|
||||||
return url
|
return url
|
||||||
|
|
||||||
raise IncDecError("No number found in URL!", url)
|
raise IncDecError("No number found in URL!", url)
|
||||||
|
Loading…
Reference in New Issue
Block a user