[SHARE-511][Feature] Store user favicons as a blob

api/serializers.py

@@ -140,11 +140,14 @@ def get_token(self, obj):
     def is_superuser(self, obj):
         return obj.is_superuser
 
+    def get_favicon(self, obj):
+        return obj.favicon.url if obj.favicon else None
+
     class Meta:
         model = models.ShareUser
         fields = (
             'username', 'first_name', 'last_name', 'email', 'date_joined', 'last_login',
-            'is_active', 'gravatar', 'locale', 'time_zone'
+            'is_active', 'gravatar', 'locale', 'time_zone', 'favicon'
         )
 
 
@@ -179,7 +182,7 @@ def provider_name(self, obj):
 
     class Meta:
         model = models.ShareUser
-        fields = ('home_page', 'long_title', 'date_joined', 'gravatar')
+        fields = ('home_page', 'long_title', 'date_joined', 'gravatar', 'favicon')
 
 
 class SiteBannerSerializer(ShareModelSerializer):

api/views/share.py

@@ -5,13 +5,15 @@
 from rest_framework_json_api import serializers
 
 from django import http
+from django.views.decorators.http import require_GET
 from django.views.generic.base import RedirectView
 from django.shortcuts import get_object_or_404
 
 from api.filters import ShareObjectFilterSet
 from api import serializers as api_serializers
 
 from share.util import IDObfuscator, InvalidID
+from share.models import ShareUser
 
 
 class VersionsViewSet(viewsets.ReadOnlyModelViewSet):
@@ -107,6 +109,16 @@ def get(self, request, *args, **kwargs):
         return Response(ser.data)
 
 
+@require_GET
+def user_favicon_view(request, username):
+    user = get_object_or_404(ShareUser, username=username)
+    if not user.favicon:
+        raise http.Http404('Favicon for user {} does not exist'.format(user.username))
+    response = http.FileResponse(user.favicon)
+    response['Content-Type'] = 'image/x-icon'
+    return response
+
+
 class HttpSmartResponseRedirect(http.HttpResponseRedirect):
     status_code = 307
 

docs/harvesters_and_normalizers.rst

@@ -149,12 +149,12 @@ Adding a new provider
     - See :ref:`Best practices for writing a non-OAI Harvester <writing-harvesters>`
 - Writing the normalizer
     - See :ref:`Best practices for writing a non-OAI Normalizer <writing-normalizers>`
-- Adding the migration
-    - Finally, run ``./manage.py makeprovidermigrations`` in the terminal
-    - Include only the relevant migration in the PR
 - Adding a provider's favicon
     - visit ``www.domain.com/favicon.ico`` and download the ``favicon.ico`` file
-    - place ``favicon.ico`` in ``providers/domain/provider_name/static/domain.provider_name/img/``
+    - place ``favicon.ico`` in the ``providers/`` specific folder
+- Adding the migration
+    - Finally, run ``./manage.py makeprovidermigrations`` in the terminal
+    - Include only the relevant migrations in the PR
 
 .. _OAI-PMH: http://www.openarchives.org/OAI/openarchivesprotocol.html
 

project/urls.py

@@ -22,7 +22,7 @@
 
 from osf_oauth2_adapter import views as osf_oauth2_adapter_views
 
-from api.views import APIVersionRedirectView
+from api.views import APIVersionRedirectView, user_favicon_view
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
@@ -38,7 +38,8 @@
     url(r'^favicon.ico$', RedirectView.as_view(
         url=staticfiles_storage.url('favicon.ico'),
         permanent=False
-    ), name="favicon"),
+    ), name='favicon'),
+    url(r'^favicons/(?P<username>[^/]+).ico$', user_favicon_view, name='user_favicon'),
 ]
 
 if settings.DEBUG:

providers/au/uow/migrations/0002_favicon.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-02-01 21:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+import share.robot
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('au.uow', '0001_initial'),
+        ('share', '0018_store_favicons'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=share.robot.RobotFaviconMigration('au.uow'),
+        ),
+    ]

providers/be/ghent/migrations/0002_favicon.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-02-01 21:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+import share.robot
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('be.ghent', '0001_initial'),
+        ('share', '0018_store_favicons'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=share.robot.RobotFaviconMigration('be.ghent'),
+        ),
+    ]

providers/br/pcurio/migrations/0002_favicon.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-02-01 21:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+import share.robot
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('br.pcurio', '0001_initial'),
+        ('share', '0018_store_favicons'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=share.robot.RobotFaviconMigration('br.pcurio'),
+        ),
+    ]

providers/ca/lwbin/migrations/0002_favicon.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-02-01 21:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+import share.robot
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ca.lwbin', '0001_initial'),
+        ('share', '0018_store_favicons'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=share.robot.RobotFaviconMigration('ca.lwbin'),
+        ),
+    ]

providers/ca/umontreal/migrations/0002_favicon.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-02-01 21:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+import share.robot
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ca.umontreal', '0001_initial'),
+        ('share', '0018_store_favicons'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=share.robot.RobotFaviconMigration('ca.umontreal'),
+        ),
+    ]

providers/ca/uwo/migrations/0002_favicon.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-02-01 21:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+import share.robot
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ca.uwo', '0001_initial'),
+        ('share', '0018_store_favicons'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=share.robot.RobotFaviconMigration('ca.uwo'),
+        ),
+    ]

providers/ch/cern/migrations/0002_favicon.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-02-01 21:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+import share.robot
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ch.cern', '0001_initial'),
+        ('share', '0018_store_favicons'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=share.robot.RobotFaviconMigration('ch.cern'),
+        ),
+    ]

providers/com/figshare/migrations/0002_favicon.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-02-01 21:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+import share.robot
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('com.figshare', '0002_disable'),
+        ('share', '0018_store_favicons'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=share.robot.RobotFaviconMigration('com.figshare'),
+        ),
+    ]

providers/com/figshare/v2/migrations/0002_favicon.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-02-01 21:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+import share.robot
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('com.figshare.v2', '0001_initial'),
+        ('share', '0018_store_favicons'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=share.robot.RobotFaviconMigration('com.figshare.v2'),
+        ),
+    ]

providers/com/nature/migrations/0002_favicon.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-02-01 21:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+import share.robot
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('com.nature', '0001_initial'),
+        ('share', '0018_store_favicons'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=share.robot.RobotFaviconMigration('com.nature'),
+        ),
+    ]

providers/com/peerj/migrations/0002_favicon.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-02-01 21:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+import share.robot
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('com.peerj', '0002_disable'),
+        ('share', '0018_store_favicons'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=share.robot.RobotFaviconMigration('com.peerj'),
+        ),
+    ]

providers/com/peerj/preprints/migrations/0002_favicon.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-02-01 21:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+import share.robot
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('com.peerj.preprints', '0001_initial'),
+        ('share', '0018_store_favicons'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=share.robot.RobotFaviconMigration('com.peerj.preprints'),
+        ),
+    ]

providers/com/peerj/xml/migrations/0002_favicon.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-02-01 21:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+import share.robot
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('com.peerj.xml', '0001_initial'),
+        ('share', '0018_store_favicons'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=share.robot.RobotFaviconMigration('com.peerj.xml'),
+        ),
+    ]

providers/com/springer/migrations/0002_favicon.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-02-01 21:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+import share.robot
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('com.springer', '0001_initial'),
+        ('share', '0018_store_favicons'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=share.robot.RobotFaviconMigration('com.springer'),
+        ),
+    ]