merge

Author: fernao

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)
@@ -183,6 +193,7 @@
     'mocambola',
     'lang',
     'south',
+    'celery',
     'sorl.thumbnail',
 )
 

app/django-bbx/bbx/static/css/main.css

@@ -100,7 +100,7 @@ a {text-decoration: none;}
 /*
  * footer
  */
-#usage-content {padding: 6px; font-size: 10px; font-weight: bold }
+#usage-content {padding: 6px; font-size: 9px; font-weight: bold }
 #usage-content .usage-bar,
 #usage-content .legend {width: 700px; height: 15px; padding-left: 6px }
 #usage-content .legend .available {color: #000; width: 150px; margin-right: 5px}

app/django-bbx/bbx/static/js/modules/bbx/functions.js

@@ -263,10 +263,10 @@ define([
 		};
 
 		// set mucua variables from API
-		mucuaData.totalDiskSpace = BBX.mucua.info['total disk space'];
-		mucuaData.usedByAnnex = BBX.mucua.info['local annex size'];
-		mucuaData.usedByOther = BBX.mucua.info['local used by other'];
-		mucuaData.availableLocalDiskSpace = BBX.mucua.info['available local disk space'];
+		mucuaData.totalDiskSpace = String(BBX.mucua.info['total disk space'])
+		mucuaData.usedByAnnex = String(BBX.mucua.info['local annex size']);
+		mucuaData.usedByOther = String(BBX.mucua.info['local used by other']);
+		mucuaData.availableLocalDiskSpace = String(BBX.mucua.info['available local disk space'])
 		mucuaData.demanded = 0; // TODO: dynamic var
 
 		total = mucuaData.totalDiskSpace.match(reStripUnit);
@@ -286,7 +286,7 @@ define([
 		mucuaData.usedByAnnexPercent = parseFloat(parseFloat(mucuaData.usedByAnnex) / parseFloat(mucuaData.total) * 100).toFixed(1);
 		mucuaData.availableLocalDiskSpacePercent = parseFloat(parseFloat(mucuaData.availableLocalDiskSpace) / parseFloat(mucuaData.total) * 100).toFixed(1);
 		mucuaData.demandedPercent = parseFloat(parseFloat(mucuaData.demanded) / parseFloat(mucuaData.total) * 100).toFixed(1);
-		
+			
 		BBX.mucua.info = mucuaData;
 	    }
 	});

app/django-bbx/bbx/static/js/modules/media/functions.js

@@ -50,6 +50,7 @@ define([
 
     var __parseUrlSearch = function(terms) {
 	var config = __getConfig();
+	terms = terms.replace(/\s/g, '\/');
 	return config.interfaceUrl + config.MYREPOSITORY + '/' + config.mucua + '/bbx/search/' + terms;
     }
 

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

@@ -89,7 +89,10 @@ <h3><%= media.name %></h3>
       <div class="blocks clear-both solicit-copy">
 	<p class="solicit-copy">
 	  <a href="">
-	    <span class="title-bold">{% trans "request local copy" %} local</span>
+	    <span class="title-bold">
+	      local</span>
+	  <a href="<%= '/api/' + media.repository + '/' + media.origin +  '/media/' + media.uuid %>/request">
+	    <span class="title-bold">{% trans "request local copy" %}</span>
 	    <span class="image"></span>
 	  </a>
 	</p>

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
@@ -27,7 +28,7 @@
 TYPE_CHOICES = (('audio', 'audio'), ('imagem', 'imagem'), ('video', 'video'),
                 ('arquivo', 'arquivo'))
 FORMAT_CHOICES = (('ogg', 'ogg'), ('ogv', 'ogv'), ('webm', 'webm'), ('mp4', 'mp4'),
-                  ('jpg', 'jpg'), ('png', 'png'), ('pdf', 'pdf'), ('gif', 'gif'))
+                  ('jpg', 'jpg'), ('png', 'png'), ('pdf', 'pdf'), ('gif', 'gif'), ('odp','odp'))
 
 
 def media_file_name(instance, file_name):
@@ -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):
@@ -128,9 +128,8 @@ def get_mucua_disk():
     df = subprocess.Popen(["df", MEDIA_ROOT], stdout=subprocess.PIPE)
     output = df.communicate()[0]
     data = []
-    data.append(int(output.split("\n")[1].split()[1]) / 1024 / 1024)  # size
-    data.append(int(output.split("\n")[1].split()[2]) / 1024 / 1024)  # used
-    
+    data.append(float(output.split("\n")[1].split()[1]) / 1024 / 1024)  # size
+    data.append(float(output.split("\n")[1].split()[2]) / 1024 / 1024)  # used
     return data
 
 

app/django-bbx/mucua/views.py

@@ -92,14 +92,14 @@ def mucua_get_info(request, uuid, repository=None):
                  'terabyte': 'TB',
                  'terabytes': 'TB'
                  }
-    
+     
     mucua_full = json.loads(get_mucua_info(repository))
     size, used = get_mucua_disk()
     mucua_info = {
         "local annex size": mucua_full["local annex size"],
         "local annex keys": mucua_full["local annex keys"],
-        "available local disk space": str(size - used) + 'GB',
-        "total disk space": str(size) + 'GB',
+        "available local disk space": str(int(size) - int(used)) + 'GB',
+        "total disk space": str(int(size)) + 'GB',
         "local used by other": 0,
         "network size" : mucua_full["size of annexed files in working tree"]
         }
@@ -110,10 +110,13 @@ def mucua_get_info(request, uuid, repository=None):
 
     mucua_info['local annex size'] = convertToGB(
         str(float(local_annex_size.group(1))), size_list[local_annex_size.group(2)])
-    mucua_info['local used by other'] = str(
-        round(
-            used - float(re_crop_unit.match(mucua_info['local annex size']).group(1))
-        , 2)) + 'GB'
+    mucua_info['local used by other'] = convertToGB(
+        str(used - float(re_crop_unit.match(mucua_info['local annex size']).group(1))
+        ), size_list[network_size.group(2)]
+    )
+    if mucua_info['local used by other'] < 0:
+	mucua_info['local used by other'] = 0
+
     mucua_info['network size'] =  convertToGB(
         str(float(network_size.group(1))), size_list[network_size.group(2)])