#1390: Removed stragglers duplicate definition get_two_letter_dir

Author: susanodd

signbank/video/models.py

@@ -27,15 +27,6 @@
     from signbank.dictionary.models import Gloss, Language
 
 
-def get_two_letter_dir(idgloss):
-    foldername = idgloss[:2]
-
-    if len(foldername) == 1:
-        foldername += '-'
-
-    return foldername
-
-
 class GlossVideoStorage(FileSystemStorage):
     """Implement our shadowing video storage system"""
 
@@ -133,6 +124,7 @@ class Meta:
 
 def get_gloss_path_to_video_file_on_disk(gloss):
     idgloss = gloss.idgloss
+    from signbank.tools import get_two_letter_dir
     two_letter_dir = get_two_letter_dir(idgloss)
     dataset_dir = gloss.lemma.dataset.acronym
     filename = idgloss + '-' + str(gloss.id) + '.mp4'

signbank/zip_interface.py

@@ -213,15 +213,6 @@ def uploaded_zip_archives(dataset):
     return zip_archive
 
 
-def get_two_letter_dir(idgloss):
-    foldername = idgloss[:2]
-
-    if len(foldername) == 1:
-        foldername += '-'
-
-    return foldername
-
-
 def get_gloss_filepath(video_file_path, gloss):
 
     filename = os.path.basename(video_file_path)
@@ -245,6 +236,7 @@ def get_gloss_filepath(video_file_path, gloss):
     if annotation_text != filename_without_extension:
         # gloss annotation does not match zip file name
         return "", "", ""
+    from signbank.tools import get_two_letter_dir
     two_letter_dir = get_two_letter_dir(gloss.idgloss)
     destination_folder = os.path.join(
         settings.WRITABLE_FOLDER,
@@ -284,6 +276,7 @@ def get_gloss_filepath_glossid(video_file_path, gloss):
     if glossid != filename_without_extension:
         # gloss id does not match zip file name
         return "", "", ""
+    from signbank.tools import get_two_letter_dir
     two_letter_dir = get_two_letter_dir(gloss.idgloss)
     destination_folder = os.path.join(
         settings.WRITABLE_FOLDER,