Added addnode command

app/management/commands/addnode.py

@@ -0,0 +1,20 @@
+import os
+from django.core.management.base import BaseCommand
+from nodeodm.models import ProcessingNode
+
+class Command(BaseCommand):
+    requires_system_checks = []
+
+    def add_arguments(self, parser):
+        parser.add_argument("host", type=str)
+        parser.add_argument("port", type=int)
+        parser.add_argument("--label", type=str, required=False, default="", help="Node label")
+        super(Command, self).add_arguments(parser)
+
+    def handle(self, **options):
+        ProcessingNode.objects.update_or_create(hostname=options.get('host'), 
+                defaults={
+                    'hostname': options.get('host'), 
+                    'port': options.get('port'), 
+                    'label': options.get('label', '')
+                })

start.sh

@@ -61,11 +61,16 @@ echo Running migrations
 python manage.py migrate
 
 if [[ "$WO_DEFAULT_NODES" > 0 ]]; then
-   echo -e "from nodeodm.models import ProcessingNode\nfor node_index in map(str, range(1, $WO_DEFAULT_NODES + 1)):\n\t ProcessingNode.objects.update_or_create(hostname='webodm_node-odm_' + node_index, defaults={'hostname': 'webodm_node-odm_' + node_index, 'port': 3000, 'label': 'node-odm-' + node_index})" | python manage.py shell
+    i=0
+    while [ $i -ne "$WO_DEFAULT_NODES" ]
+    do
+        i=$(($i+1))
+        python manage.py addnode webodm_node-odm_$i 3000 --label node-odm-$i
+    done
 fi
 
 if [[ "$WO_CREATE_MICMAC_PNODE" = "YES" ]]; then
-   echo "from nodeodm.models import ProcessingNode; ProcessingNode.objects.update_or_create(hostname='node-micmac-1', defaults={'hostname': 'node-micmac-1', 'port': 3000})" | python manage.py shell
+    python manage.py addnode node-micmac-1 3000
 fi
 
 export WO_HOST="${WO_HOST:=localhost}"

translate.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-LOCALES=$(cat LOCALES)
-
-if [[ "$1" == "extract" ]]; then
-    echo "Extracting .po files from Django/React"
-    locale_param=""
-    for lang in $LOCALES
-    do
-        locale_param="--locale=$lang $locale_param"
-    done
-    
-    mkdir -p locale
-
-    python3 app/scripts/extract_potree_strings.py app/static/app/js/vendor/potree/build/potree/resources/lang/en/translation.json app/static/app/js/translations/potree_autogenerated.js
-    python3 app/scripts/extract_odm_strings.py https://raw.githubusercontent.com/OpenDroneMap/ODM/master/opendm/config.py app/static/app/js/translations/odm_autogenerated.js
-    python3 app/scripts/extract_plugin_manifest_strings.py plugins/ app/translations/plugin_manifest_autogenerated.py
-    
-    django-admin makemessages --keep-pot $locale_param --ignore=build --ignore=app/templates/app/registration/*
-    python manage.py makemessages_djangojs --keep-pot $locale_param -d djangojs --extension jsx --extension js --ignore=build --ignore app/static/app/js/vendor --ignore app/static/app/bundles --ignore node_modules --language Python
-fi
-
-if [[ "$1" == "build" ]]; then
-    if [[ "$2" == "safe" ]]; then
-        for lang in $LOCALES
-        do
-            echo "Building $lang .po files into .mo"
-            django-admin compilemessages --locale=$lang
-        done
-    else
-        echo "Building .po files into .mo"
-        django-admin compilemessages
-    fi
-fi

webodm/settings.py

@@ -154,7 +154,7 @@ DATABASES = {
         'NAME': os.environ.get('WO_DATABASE_NAME', 'webodm_dev'),
         'USER': os.environ.get('WO_DATABASE_USER', 'postgres'),
         'PASSWORD': os.environ.get('WO_DATABASE_PASSWORD', 'postgres'),
-        'HOST': os.environ.get('WO_DATABASE_HOST', 'dbxxx'),
+        'HOST': os.environ.get('WO_DATABASE_HOST', 'db'),
         'PORT': os.environ.get('WO_DATABASE_PORT', '5432'),
     }
 }