account/admin.py

@@ -5,7 +5,7 @@ from django.contrib.auth.hashers import make_password

                 
              

                 from account.models import LensmanInfo, LensmanLoginLogInfo, UserInfo, UserLoginLogInfo
              

                 
              

                -from utils.uuid_utils import curtailUUID
              

                +from curtail_uuid import CurtailUUID
              

                 
              

                 
              

                 class LensmanInfoAdmin(admin.ModelAdmin):
              
@@ -16,7 +16,7 @@ class LensmanInfoAdmin(admin.ModelAdmin):

                 
              

                     def save_model(self, request, obj, form, change):
              

                         if not obj.lensman_id:
              

                -            obj.lensman_id = curtailUUID(LensmanInfo, 'lensman_id')
              

                +            obj.lensman_id = CurtailUUID.uuid(LensmanInfo, 'lensman_id')
              

                         if obj.password:
              

                             obj.encryption = make_password(obj.password, None, 'pbkdf2_sha256')
              

                             obj.password = None
              

account/views.py

@@ -10,8 +10,8 @@ from account.models import LensmanInfo, UserInfo, UserLoginLogInfo

                 from account.serializers import UserSerializer, GroupSerializer, LensmanInfoSerializer, UserInfoSerializer
              

                 
              

                 from utils.ip_utils import ip_addr
              

                -from utils.uuid_utils import curtailUUID
              

                 
              

                +from curtail_uuid import CurtailUUID
              

                 from TimeConvert import TimeConvert as tc
              

                 
              

                 
              
@@ -65,7 +65,7 @@ def user_signup_api(request):

                         })
              

                 
              

                     user = UserInfo.objects.create(
              

                -        user_id=curtailUUID(UserInfo, 'user_id'),
              

                +        user_id=CurtailUUID.uuid(UserInfo, 'user_id'),
              

                         username=username,
              

                         password=make_password(password, None, 'pbkdf2_sha256'),
              

                         user_status=UserInfo.ACTIVATED,
              

photo/views.py

@@ -12,9 +12,10 @@ from account.models import LensmanInfo

                 from photo.models import UUIDInfo, PhotosInfo
              

                 from photo.serializers import PhotosInfoSerializer
              

                 
              

                -from utils.uuid_utils import curtailUUID
              

                 from utils.watermark_utils import watermark_wrap
              

                 
              

                +from curtail_uuid import CurtailUUID
              

                +
              

                 import os
              

                 import shortuuid
              

                 
              
@@ -23,7 +24,7 @@ def uuid_init(request):

                     num = int(request.GET.get('num', 1000))
              

                 
              

                     for i in xrange(num):
              

                -        UUIDInfo.objects.create(uuid=curtailUUID(UUIDInfo))
              

                +        UUIDInfo.objects.create(uuid=CurtailUUID.uuid(UUIDInfo))
              

                 
              

                     return JsonResponse({
              

                         'status': 200,
              

requirements.txt

@@ -2,6 +2,7 @@ CodeConvert==2.0.3

                 Django==1.8.4
              

                 MySQL-python==1.2.5
              

                 TimeConvert==1.1.3
              

                +django-curtail-uuid==1.0.0
              

                 django-multidomain==1.1.4
              

                 django-shortuuidfield==0.1.3
              

                 djangorestframework==3.3.1
              

utils/uuid_utils.py

@@ -1,16 +0,0 @@

                -# -*- coding: utf-8 -*-
              

                -
              

                -from django.conf import settings
              

                -
              

                -import shortuuid
              

                -
              

                -
              

                -def curtailUUID(model, field='uuid', length=settings.CURTAIL_UUID_LENGTH):
              

                -    flag = True
              

                -    while flag:
              

                -        uuid = shortuuid.uuid()[-length:]
              

                -        try:
              

                -            model.objects.get(**{field: uuid})
              

                -        except model.DoesNotExist:
              

                -            flag = False
              

                -    return uuid