Merge branch 'master' of https://gitlab.lavid.ufpb.br/wikilibras/corretor_sinais

Adabriand Furtado
2 parents 84627d9b ab285f7a
Showing 2 changed files with 54 additions and 43 deletions Show diff stats
Makefile
corretor.py
-PROJECT_NAME             = corretor
-VLIBRAS_NAME             = vlibras-wiki
-PYBOSSA_CONF             = /etc/apache2/sites-available/pybossa.conf
-PROJECT_DIR              = $(CURDIR)
-SED_REPLACE_ALL          = sed -i "s/$(1)/$(2)/g" "$(3)"
-SED_REPLACE_ALL_PATH     = sed -i "s\#$(1)\#$(2)\#g" "$(3)"
+PROJECT_NAME              = corretor
+VLIBRAS_WIKILIBRAS_ENV   := /etc/profile.d/lavid/vlibras/wikilibras_env.sh
+PROJECT_DIR              := $(CURDIR)
+SED_REPLACE_ALL           = sed -i "s/$(1)/$(2)/g" "$(3)"
+SED_REPLACE_ALL_PATH      = sed -i "s\#$(1)\#$(2)\#g" "$(3)"
+
+-include ${VLIBRAS_WIKILIBRAS_ENV}
 ifndef LOCALHOST
     ifndef NETWORK_INTERFACE
-        NETWORK_INTERFACE := $(shell ip route | awk '{print $$5; exit}')
+        NETWORK_INTERFACE := $(shell ip route | grep "default" | awk '{print $$5; exit}')
     endif
     ifdef NETWORK_INTERFACE
-        LOCALHOST := $(shell ip addr list ${NETWORK_INTERFACE} | grep "inet " | cut -d ' ' -f6 | cut -d/ -f1)
+        LOCALHOST ?= $(shell ip route get 1 | awk '{print $$7; exit}')
     endif
 endif
 ifndef LOCALHOST
-    LOCALHOST := localhost
+    LOCALHOST ?= 127.0.0.1
 endif
-install: uninstall config
-	@( \
+install: uninstall config env
+
+env:
+	@ ( \
 	    virtualenv ./env/; \
 	    . ./env/bin/activate; \
 	    pip install -U pip; \
@@ -27,14 +30,14 @@ install: uninstall config
 	    pip install -U ndg-httpsclient; \
 	    pip install -r requirements.txt; \
 	)
+
+create_project update_project:
+	@ echo "http://${LOCALHOST}/${PROJECT_NAME}-backend/$@"
 ifdef PYBOSSA_API_KEY
-	@ curl "http://${LOCALHOST}/${PROJECT_NAME}-backend/create_project" && echo ""
-	@ echo "http://${LOCALHOST}/${PROJECT_NAME}-backend/create_project"
+	@ curl "http://${LOCALHOST}/${PROJECT_NAME}-backend/$@" && echo ""
 endif
 config:
-	@ $(info Using interface: ${NETWORK_INTERFACE})
-	@ $(info Using local IP: ${LOCALHOST})
 	@ cp settings_local.py.tmpl settings_local.py
 	@ $(call SED_REPLACE_ALL_PATH,<path-to-project>,${PROJECT_DIR},settings_local.py)
 	@ $(call SED_REPLACE_ALL,localhost,${LOCALHOST},settings_local.py)
@@ -48,32 +51,36 @@ endif
 	@ $(call SED_REPLACE_ALL,user1,$$USER,./contrib/apache/${PROJECT_NAME}.conf)
 	@ $(call SED_REPLACE_ALL,group1,$$USER,./contrib/apache/${PROJECT_NAME}.conf)
 	@ $(call SED_REPLACE_ALL_PATH,<path-to-project>,${PROJECT_DIR},./contrib/apache/${PROJECT_NAME}.conf)
-	@ sudo cp -u ${PYBOSSA_CONF} /etc/apache2/sites-available/${VLIBRAS_NAME}.conf
-	@ if grep -q "${PROJECT_NAME}" "/etc/apache2/sites-available/${VLIBRAS_NAME}.conf"; \
+	@ sudo cp -u "/etc/apache2/sites-available/pybossa.conf" /etc/apache2/sites-available/wikilibras.conf
+	@ if grep -q "WSGIScriptAlias /${PROJECT_NAME}" "/etc/apache2/sites-available/wikilibras.conf"; \
 	  then \
-	      echo "A previous WSGI daemon definition for '${PROJECT_NAME}' in: /etc/apache2/sites-available/${VLIBRAS_NAME}.conf"; \
+	      echo "\33[33;1mA previous WSGI daemon definition for '${PROJECT_NAME}' in: /etc/apache2/sites-available/wikilibras.conf\33[0m"; \
 	  else \
-	      sudo sed -i -e "/Header/,/VirtualHost>/d" /etc/apache2/sites-available/${VLIBRAS_NAME}.conf; \
+	      sudo sed -i -e "/Header/,/VirtualHost>/d" /etc/apache2/sites-available/wikilibras.conf; \
 	      sudo sed -n -e '/WSGIDaemonProcess/,/VirtualHost>/p' ./contrib/apache/${PROJECT_NAME}.conf | \
-	      sudo tee -a /etc/apache2/sites-available/${VLIBRAS_NAME}.conf > /dev/null; \
+	      sudo tee -a /etc/apache2/sites-available/wikilibras.conf > /dev/null; \
 	  fi
+
+apache:
 	@ sudo a2dissite pybossa.conf
-	@ sudo a2ensite ${VLIBRAS_NAME}.conf
+	@ sudo a2ensite wikilibras.conf
 	@ sudo apachectl configtest
+	@ sudo service apache2 start
 	@ sudo service apache2 reload
 clean:
 	@ find . -regextype posix-awk -regex "(.*.log|.*.pyc)" -type f -print -delete
-uninstall: clean
+uninstall:
 	@ rm -rf ./env/
+	$(MAKE) clean
 	@ rm -f ./settings_local.py
 	@ rm -f ./contrib/${PROJECT_NAME}.wsgi
-	@ sudo rm -f /etc/apache2/sites-available/${VLIBRAS_NAME}.conf
-	@ sudo rm -f /etc/apache2/sites-enabled/${VLIBRAS_NAME}.conf
+	@ sudo rm -f /etc/apache2/sites-available/wikilibras.conf
+	@ sudo rm -f /etc/apache2/sites-enabled/wikilibras.conf
 run:
 	@ ( \
 	    . ./env/bin/activate; \
 	    python main.py; \
-	 )
+	)
@@ -10,17 +10,18 @@ import requests
 import shutil
 import tempfile
+
 class Corretor:
     def __init__(self, configuration, template_env):
-       self.config = configuration
-       self.env = template_env
-       self.__setup_pb_client()
-       self.__setup_upload_folder()
+        self.config = configuration
+        self.env = template_env
+        self.__setup_pb_client()
+        self.__setup_upload_folder()
     def __setup_pb_client(self):
-       pbclient.set('endpoint', self.config['PYBOSSA_ENDPOINT'])
-       pbclient.set('api_key', self.config['PYBOSSA_API_KEY'])
+        pbclient.set('endpoint', self.config['PYBOSSA_ENDPOINT'])
+        pbclient.set('api_key', self.config['PYBOSSA_API_KEY'])
     def __setup_upload_folder(self):
         upload_folder = self.config['UPLOAD_FOLDER']
@@ -41,16 +42,16 @@ class Corretor:
             video_ava = "/videos/" + sign + "_AVATAR.webm"
             blend = "/videos/" + sign + "_AVATAR.blend"
             task = dict(sign_name=sign, submission_date=pyutil.get_date_now(),
-                         video_ref=video_ref, video_ava=video_ava, blend=blend)
+                        video_ref=video_ref, video_ava=video_ava, blend=blend)
             pbclient.create_task(project.id, task)
     def __update_project_info(self, project):
         template = self.env.get_template('index.html')
         project.info['task_presenter'] = template.render(
-                            server=self.config['HOST_STATIC_FILES_ENDPOINT'],
-                            server_backend=self.config['HOST_ENDPOINT'],
-                            app_shortname=self.config['PYBOSSA_APP_SHORT_NAME'],
-                            api_db_host=self.config['API_DB_HOST'])
+            server=self.config['HOST_STATIC_FILES_ENDPOINT'],
+            server_backend=self.config['HOST_ENDPOINT'],
+            app_shortname=self.config['PYBOSSA_APP_SHORT_NAME'],
+            api_db_host=self.config['API_DB_HOST'])
         project.info['thumbnail'] = self.config['HOST_STATIC_FILES_ENDPOINT'] + "/img/thumbnail.png"
         project.info['sched'] = "incremental"
         project.info['published'] = True
@@ -104,21 +105,24 @@ class Corretor:
                 pyutil.log("video file: %s was not downloaded" % (video_url))
             else:
                 files_to_upload = [
-                    ("video", (video_path, open(video_path,"rb"))),
+                    ("video", (video_path, open(video_path, "rb"))),
                     ("video", (blend_path, open(blend_path, "rb")))
                 ]
                 body = {
                     "nome": sign_name,
-                    "idTask": task_id,
+                    "idtask": task_id,
                     "selo": 5
                 }
                 r = requests.post(("%s/updatesinal" % (api_dbhost)), files=files_to_upload, data=body)
-                pyutil.log(r.text)
+                code = r.status_code
+                if (code == 200):
+                    result_msg = self.__close_task(project_id, task_id)
+                else:
+                    result_msg = r.text
             shutil.rmtree(tmp_dir)
-            result_msg = self.__close_task(project_id, task_id)
         else:
             result_msg = "The task with ID=" + str(task_id) + " didn't reach the agreement number yet."
-        pyutil.log(result_msg)
+        pyutil.log(str(result_msg).encode("UTF-8", errors="ignore"))
         return make_response(result_msg, code)
     def render_video(self):
@@ -169,10 +173,10 @@ class Corretor:
         return '.' in filename and filename.rsplit('.', 1)[1] in allowed_extensions
     def get_file(self, url, filename):
-        r = requests.get(url, stream = True)
+        r = requests.get(url, stream=True)
         if (r.status_code == 200):
             with open(filename, 'wb') as f:
-                for chunk in r.iter_content(chunk_size = 1024):
+                for chunk in r.iter_content(chunk_size=1024):
                     if chunk:
                         f.write(chunk)
             return True