Darren/dpaste
1
0
Fork 0
mirror of https://github.com/DarrenOfficial/dpaste.git synced 2024-11-23 20:06:35 +11:00
Code Issues Projects Releases Packages Wiki Activity

Warn if slug length exceeded

Browse source
This commit is contained in:
Martin Mahner 2018-06-23 14:31:32 +02:00
parent aef701ec89
commit d7477e6a97
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dpaste/models.py
View file

@ -14,14 +14,13 @@ logger = getLogger(__file__)
R = SystemRandom() R = SystemRandom()
def generate_secret_id(length=None, tries=0): def generate_secret_id(length):
if tries >= 10000: if length > config.SLUG_LENGTH:
m = 'Tried to often to generate a unique slug. Inceease the slug length.' logger.warning('Slug creation triggered a duplicate, '
logger.critical(m) 'consider increasing the SLUG_LENGTH.')
raise Exception(m)
secret_id = ''.join([R.choice(config.SLUG_CHOICES) secret_id = ''.join([R.choice(config.SLUG_CHOICES)
for i in range(config.SLUG_LENGTH)]) for i in range(length or config.SLUG_LENGTH)])
# Check if this slug already exists, if not, return this new slug # Check if this slug already exists, if not, return this new slug
try: try:
@ -29,9 +28,9 @@ def generate_secret_id(length=None, tries=0):
except Snippet.DoesNotExist: except Snippet.DoesNotExist:
return secret_id return secret_id
# Otherwise create a new slug which is +1 character longer than the # Otherwise create a new slug which is +1 character longer
# regular one. # than the previous one.
return generate_secret_id(length=length+1, tries=tries) return generate_secret_id(length=length+1)
@python_2_unicode_compatible @python_2_unicode_compatible
@ -71,7 +70,7 @@ class Snippet(models.Model):
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if not self.secret_id: if not self.secret_id:
self.secret_id = generate_secret_id() self.secret_id = generate_secret_id(length=config.SLUG_LENGTH)
super(Snippet, self).save(*args, **kwargs) super(Snippet, self).save(*args, **kwargs)
def get_absolute_url(self): def get_absolute_url(self):
@ -89,6 +88,5 @@ class Snippet(models.Model):
@property @property
def remaining_views(self): def remaining_views(self):
if self.expire_type == self.EXPIRE_ONETIME: if self.expire_type == self.EXPIRE_ONETIME:
remaining = config.ONETIME_LIMIT - self.view_count remaining = config.ONETIME_LIMIT - self.view_count
return remaining > 0 and remaining or 0 return remaining > 0 and remaining or 0