Merge branch 'requests_logic'

Author: 20

app/django-bbx/bbx/__init__.py

@@ -0,0 +1,5 @@
+from __future__ import absolute_import
+
+# This will make sure the app is always imported when
+# Django starts so that shared_task will use this app.
+from .celery import app as celery_app

app/django-bbx/bbx/celery.py

@@ -0,0 +1,32 @@
+from __future__ import absolute_import
+
+import os
+
+from celery import Celery
+
+from django.conf import settings
+
+# set the default Django settings module for the 'celery' program.
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'bbx.settings')
+
+app = Celery('bbx',
+             broker='amqp://',
+             backend='amqp://',
+             include=['repository.tasks'])
+
+# Optional configuration, see the application user guide.
+app.conf.update(
+    CELERY_TASK_RESULT_EXPIRES=3600,
+)
+
+
+# Using a string here means the worker will not have to
+# pickle the object when using Windows.
+app.config_from_object('django.conf:settings')
+app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
+
+
+@app.task(bind=True)
+def debug_task(self):
+    print('Request: {0!r}'.format(self.request))
+

app/django-bbx/bbx/settings.example.py

@@ -14,6 +14,16 @@
 # Example: "/var/www/example.com/media/"
 MEDIA_ROOT = "/data/bbx/"
 
+## Broker settings.
+BROKER_URL = 'amqp://guest:guest@localhost:5672//'
+
+# List of modules to import when celery starts.
+CELERY_IMPORTS = ('repository.tasks',)
+
+## Using the database to store task state and results.
+CELERY_RESULT_BACKEND = 'amqp'
+CELERY_TASK_RESULT_EXPIRES = 18000  # 5 hours.   
+
 # Change this to the full path to your own repository
 REPOSITORY_DIR_NAME ="repositories"
 REPOSITORY_DIR = os.path.join(MEDIA_ROOT, REPOSITORY_DIR_NAME)
@@ -173,6 +183,7 @@
     'repository',
     'mocambola',
     'south',
+    'celery',
     'sorl.thumbnail',
 )
 

app/django-bbx/bbx/static/templates/media/MediaView.html

@@ -87,7 +87,7 @@ <h3><%= media.name %></h3>
       <% if (!media.is_local) { %>
       <div class="blocks clear-both solicit-copy">
 	<p class="solicit-copy">
-	  <a href="">
+	  <a href="<%= '/api/' + media.repository + '/' + media.origin +  '/media/' + media.uuid %>/request">
 	    <span class="title-bold">solicitar cópia local</span>
 	    <span class="image"></span>
 	  </a>

app/django-bbx/bbx/templates/admin/base_site.html

@@ -4,7 +4,7 @@
 {% block title %}{{ title }} | {% trans 'Quintão do Baobáxia' %}{% endblock %}
 
 {% block branding %}
-<h1 id="site-name">{% trans 'Quintão do Baobáxia' %}</h1>
+<h1 id="site-name">{% trans 'Quintal do Baobáxia' %}</h1>
 {% endblock %}
 
 {% block nav-global %}{% endblock %}

app/django-bbx/media/models.py

@@ -16,8 +16,9 @@
 from django.utils.functional import lazy
 
 from tag.models import Tag
-from bbx.settings import REPOSITORY_DIR
+from bbx.settings import REPOSITORY_DIR, DEFAULT_MUCUA
 from bbx.utils import logger
+from repository.tasks import git_annex_get
 
 try:
     from django.utils.encoding import force_unicode  # NOQA
@@ -51,6 +52,7 @@ def get_file_path(instance):
     return os.path.join(REPOSITORY_DIR, get_media_path(instance))
 
 def get_media_path(instance):
+    # FIX: se mudar a data quebra o path
     if instance.date == '':
         t = datetime.now
         date = t.strftime("%y/%m/%d/")
@@ -142,6 +144,7 @@ class Media(models.Model):
         _('is requested'),
         help_text=_('True if media content is awaiting a local copy'),
         default=False)
+    # FIX: request_code desnessesario.. usando o uuid mesmo
     request_code = models.CharField(max_length=100, editable=False, blank=True)
     num_copies = models.IntegerField(
         _('number of copies'), default=1, blank=True,
@@ -180,7 +183,7 @@ def get_format(self):
         return self.format
 
     # FIX (Nao pega na primeira save)
-    def _set_is_local(self):
+    def set_is_local(self):
         self.is_local = os.path.isfile(os.path.join(get_file_path(self),
                                                     self.get_file_name()))
 
@@ -198,8 +201,53 @@ def where_is(self):
     def get_tags(self):
         return self.tags
 
+    def request_copy(self):
+        u"""
+        Gera um pedido de copia local do media
+
+        Os pedidos tem um codigo uuid e são gravados em 
+        /repository/mucua/requests/uuid
+
+        O arquivo atualmente contem somente o caminho para o media no
+        repositorio.
+
+        """
+        self.set_is_local()
+        if not self.is_local:
+            self.is_requested = True
+            self.save()
+            try:
+                requests_path = os.path.join(REPOSITORY_DIR, self.get_repository(), 
+                                                DEFAULT_MUCUA,
+                                                'requests')
+                if not os.path.exists(requests_path):
+                    os.makedirs(requests_path)
+                
+                request_filename = os.path.join(requests_path, self.uuid)
+                logger.info("REQUESTING: " + request_filename)
+                request_file = open(request_filename, 'a')
+                request_file.write(self.media_file.path)
+                request_file.close
+                # TODO: Need to git add
+                logger.debug("ADDING REQUEST: " + os.path.basename(request_filename))
+                logger.debug("ADDED ON: " + os.path.dirname(request_filename))
+                from repository.models import git_add
+                git_add(os.path.basename(request_filename), os.path.dirname(request_filename))
+                
+            except IOError:
+                logger.info(u'Alo! I can\'t write request file!')
+            
+                logger.debug("get_file_path: " + get_file_path(self))
+                logger.debug("media_file.name: " + os.path.basename(self.media_file.name))
+        
+            async_result = git_annex_get.delay(get_file_path(self), os.path.basename(self.media_file.name))
+            #logger.debug(async_result.get)
+            #logger.debug(async_result.info)
+
+
+
     def save(self, *args, **kwargs):
-        self._set_is_local()
+        self.set_is_local()
         if self.pk is not None:
             self._set_num_copies()
         self.url = self.get_url()
@@ -213,6 +261,10 @@ class TagPolicyDoesNotExist(exceptions.Exception):
     def __init__(self, args=None):
         self.args = args
 
+class MediaDoesNotExist(exceptions.Exception):
+    def __init__(self, args=None):
+        self.args = args
+
 
 @receiver(post_save, sender=Media)
 def start_post_save_policies(instance, **kwargs):

app/django-bbx/media/urls.py

@@ -7,6 +7,7 @@
         '(?P<width>[0-9]{2,4})x(?P<height>[0-9]{2,4})\.(?P<format_type>[a-zA-Z]{3,4})$', 'show_image'),   
     url(r'^(?P<repository>\w+)/(?P<mucua>[a-zA-Z0-9\-]+)/media/(?P<uuid>[a-z0-9\-]+)/url$', 'media_url'),   
     url(r'^(?P<repository>\w+)/(?P<mucua>[a-zA-Z0-9\-]+)/media/(?P<uuid>[a-z0-9\-]+)/whereis$', 'media_where_is'),   
+    url(r'^(?P<repository>\w+)/(?P<mucua>[a-zA-Z0-9\-]+)/media/(?P<uuid>[a-z0-9\-]+)/request$', 'media_request_copy'),   
     url(r'^(?P<repository>\w+)/(?P<mucua>[a-zA-Z0-9\-]+)/media/last/' +
         '(?P<qtd>[\d]*)$', 'media_last'),
     url(r'^(?P<repository>\w+)/(?P<mucua>[a-zA-Z0-9\-]+)/media/last',

app/django-bbx/media/views.py

@@ -455,3 +455,16 @@ def media_where_is(request, repository, mucua, uuid):
     io = media.where_is()
     data = json.loads(io)
     return Response(data)
+
+@api_view(['GET'])
+#@renderer_classes((BrowsableAPIRenderer))
+def media_request_copy(request, repository, mucua, uuid):
+    try:
+        media = Media.objects.get(uuid=uuid)
+        media.request_copy()
+    except Media.DoesNotExist:
+        return Response(status=status.HTTP_404_NOT_FOUND)
+    return HttpResponseRedirect('/#' + repository +
+                                '/' + mucua +
+                                '/media/' + uuid )
+

app/django-bbx/mocambola/models.py

@@ -103,7 +103,8 @@ def mocambola_post_save(instance, **kwargs):
     fout.close()
     git_add(mocamboladata, mocambolapath)
     git_commit(mocamboladata, instance.user.get_username(),
-              instance.user.email, instance.repository.get_path())
+               instance.user.email, instance.repository.get_path(),
+               os.path.join(mocambolapath, mocamboladata))
 
 # TODO HIGH: Precisa serializar o user tambem na criaçao e update
 # diretamente pelo usuario

app/django-bbx/mucua/models.py

@@ -26,17 +26,17 @@ def update_mucuas_list(repository):
     u"""Atualiza a lista de mucuas disponivéis no repositório"""
     mucuas = get_available_mucuas(None, repository)
     for mucua in mucuas:
-        print ">>> Mucua description: " + mucua[1]
-        print ">>> Mucua uuid: " + mucua[0]
         mucua_description = str(mucua[1])
         mucua_uuid = str(mucua[0])
         try:
             mucua = Mucua.objects.get(description=mucua_description)
-            print "Vi a mucuaa"
+            logger.info("Vi a mucua " + mucua_description + 
+                        ", UUID: " + mucua_uuid)
         except Mucua.DoesNotExist:
             m = Mucua(description=mucua_description, uuid=mucua_uuid) 
             m.save()
-            print "Criei a mucua " + mucua_description
+            logger.info("Criei a mucua " + mucua_description + 
+                        ", UUID: " + mucua_uuid)
 
 
 # Helper function to map repository description to correct 
@@ -109,7 +109,7 @@ def get_available_mucuas(uuid=None, repository=None):
                        in json_repository_status['trusted repositories']])
 
     mucuas =  [(m[0], rpr(m[1].replace('[','').replace(']',''))) for m in mucuas]
-    logger.debug(u'Mucuas: %s' % mucuas)
+#    logger.debug(u'Mucuas: %s' % mucuas)
     return mucuas
 
 def get_mucua_info(uuid, repository=None):

app/django-bbx/repository/management/commands/process_requests.py

@@ -0,0 +1,76 @@
+import os
+import shutil
+
+from django.core.management.base import BaseCommand
+
+from repository.tasks import git_annex_get
+from repository.models import git_remote_get_list, git_annex_drop, git_add, git_rm
+from media.models import Media, MediaDoesNotExist, get_file_path
+from bbx.settings import REPOSITORY_DIR
+from bbx.utils import logger
+
+"""
+Definicoes do comando para processar os pedidos.
+"""
+
+class Command(BaseCommand):
+    """Processa os pedidos em espera."""
+    help = 'Process pending requests'
+
+    def handle(self, *args, **options):
+        repository = args[0]
+        mucua = args[1]
+        # Here we copy mucuas requests from all "linked mucuas" 
+        linked_mucuas = git_remote_get_list(repository)
+        requests_path = os.path.join(REPOSITORY_DIR, repository, mucua, "requests")
+        if not os.path.exists(requests_path):
+            os.makedirs(requests_path)
+
+        for lmucua in linked_mucuas:
+            src_files = os.listdir(os.path.join(REPOSITORY_DIR, repository, lmucua, "requests"))
+            for file_name in src_files:
+                full_file_name = os.path.join(src, file_name)
+                if (os.path.isfile(full_file_name)):
+                    shutil.copy(full_file_name, requests_path)
+                    # TODO: Need to git add
+                    logger.debug('ADDING REQUEST: ' + os.path.basename(full_file_name))
+                    logger.debug('ADDED ON: ' + requests_path)
+                    git_add(os.path.basename(full_file_name), requests_path)
+
+        request_list = [uuid for uuid in os.listdir(requests_path)]
+
+        for request_uuid in request_list:
+            if os.path.isfile(os.path.join(requests_path, request_uuid)):
+                try:
+                    media = Media.objects.get(uuid=request_uuid)
+                    media.set_is_local()
+                    if media.is_local:
+                        request_list = [uuid for uuid in request_list if uuid != request_uuid]
+                        logger.debug('REMOVING REQUEST: ' + request_uuid)
+                        git_rm(request_uuid, requests_path)
+                        # Here we also git annex drop the file because
+                        # it's only a "transport copy", couse of
+                        # media.is_requested = False.
+                        if not media.is_requested:
+                            requests = []
+                            # Check if we can drop, couse linked mucuas doesn't have pending request
+                            for lmucua in linked_mucuas:
+                                requests_path = os.path.join(REPOSITORY_DIR, 
+                                                             repository, lmucua, "requests")
+                                for name in os.listdir(requests_path):
+                                    if os.path.isfile(os.path.join(requests_path, name)):
+                                        requests.append(name)                        
+                                        if request_uuid not in requests:
+                                            git_annex_drop(media)
+                                            
+                        media.save()
+                    else:
+                        repository_path = os.path.join(REPOSITORY_DIR, media.get_repository())
+                        async_result = git_annex_get.delay(get_file_path(media), 
+                                                           os.path.basename(media.media_file.name))
+                        logger.debug(async_result.info)
+                        media.save()
+                except MediaDoesNotExist:
+                    request_list = [uuid for uuid in request_list if uuid != request_uuid]
+                    logger.debug('Requested media not found')
+