From cb6768aafafcc8a88c1d0a6856138aca5813904b Mon Sep 17 00:00:00 2001 From: Marc-Olivier Titeux Date: Sat, 2 Nov 2013 23:55:02 +0100 Subject: Updating to use local settings --- brevisurl/migrations/0001_initial.py | 6 ++---- brevisurl/models.py | 3 ++- brevisurl/settings.py | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/brevisurl/migrations/0001_initial.py b/brevisurl/migrations/0001_initial.py index 185db6c..6f55ad7 100644 --- a/brevisurl/migrations/0001_initial.py +++ b/brevisurl/migrations/0001_initial.py @@ -6,16 +6,14 @@ from django.db import models from django.conf import settings -MAX_LEN_ORI_URL = getattr(settings, 'BREVISURL_LOCAL_BACKEND_TOKEN_LENGTH', 200) - - class Migration(SchemaMigration): def forwards(self, orm): # Adding model 'ShortUrl' + import brevis.settings db.create_table('brevisurl_shorturl', ( ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('original_url', self.gf('django.db.models.fields.URLField')(max_length=MAX_LEN_ORI_URL)), + ('original_url', self.gf('django.db.models.fields.URLField')(max_length=brevis.settings.LOCAL_BACKEND_ORIGINAL_URL_MAX_LENGTH)), ('original_url_hash', self.gf('django.db.models.fields.CharField')(max_length=64)), ('shortened_url', self.gf('django.db.models.fields.URLField')(unique=True, max_length=200)), ('backend', self.gf('django.db.models.fields.CharField')(max_length=200)), diff --git a/brevisurl/models.py b/brevisurl/models.py index 417fa20..84aeff1 100644 --- a/brevisurl/models.py +++ b/brevisurl/models.py @@ -7,6 +7,7 @@ from django.db import models from django.core.validators import URLValidator from brevisurl import get_connection +import brevisurl.settings log = logging.getLogger(__name__) @@ -14,7 +15,7 @@ log = logging.getLogger(__name__) class ShortUrl(models.Model): """Model that represents shortened url.""" - original_url = models.URLField(max_length=getattr(settings, 'LOCAL_BACKEND_ORIGINAL_URL_MAX_LENGTH', 200), null=False, blank=False) + original_url = models.URLField(max_length=brevis.settings.LOCAL_BACKEND_ORIGINAL_URL_MAX_LENGTH, null=False, blank=False) original_url_hash = models.CharField(max_length=64, null=False, blank=False) shortened_url = models.URLField(max_length=200, null=False, blank=False, unique=True) backend = models.CharField(max_length=200, null=False, blank=False) diff --git a/brevisurl/settings.py b/brevisurl/settings.py index 3a5db7e..568e024 100644 --- a/brevisurl/settings.py +++ b/brevisurl/settings.py @@ -15,6 +15,7 @@ LOCAL_BACKEND_TOKEN_CHARS = getattr(settings, 'BREVISURL_LOCAL_BACKEND_TOKEN_CHA # Settings for token length. LOCAL_BACKEND_TOKEN_LENGTH = getattr(settings, 'BREVISURL_LOCAL_BACKEND_TOKEN_LENGTH', 5) +# Settings for url max length. LOCAL_BACKEND_ORIGINAL_URL_MAX_LENGTH = getattr(settings, 'SHORTURL_LOCAL_BACKEND_ORIGINAL_URL_MAX_LENGTH', 200) # Settings for url pattern. -- cgit v1.2.3