Merge pull request #27 from biojs/develop

Visualizations serializer in details

Author: Megh-Thakkar

main/management/commands/updatecomponents.py

@@ -242,7 +242,10 @@ def handle(self, *args, **options):
                         # update_visualizations(_component, latest_commit_hash)
                 # else:
                 _component.github_update_time = aware_date
-                latest_commit_hash = get_commit_hash(github_data['commits_url'])
+                try:
+                    latest_commit_hash = get_commit_hash(github_data['commits_url'])
+                except:
+                    continue
                 _component.latest_commit_hash = latest_commit_hash
                 update_visualizations(_component, latest_commit_hash)
                 # except:
@@ -255,19 +258,23 @@ def handle(self, *args, **options):
                     continue
                 commits = 0
                 count = 0
-                for contributor in contributors_data:
-                    try:
-                        _contributor = Contributor.objects.get(username=contributor["login"])
-                    except:
-                        _contributor = Contributor.objects.create(username=contributor["login"], avatar_url=contributor["avatar_url"])
-                    try:
-                        _contribution = Contribution.objects.get(component=_component, contributor=_contributor)
-                        _contribution.contributions = contributor["contributions"]
-                        _contribution.save()
-                    except:
-                        _contribution = Contribution.objects.create(component=_component, contributor=_contributor, contributions=contributor["contributions"])
-                    commits += _contribution.contributions
-                    count +=1
+                try:
+                    for contributor in contributors_data:
+                        try:
+                            _contributor = Contributor.objects.get(username=contributor["login"])
+                        except:
+                            _contributor = Contributor.objects.create(username=contributor["login"], avatar_url=contributor["avatar_url"])
+                        try:
+                            _contribution = Contribution.objects.get(component=_component, contributor=_contributor)
+                            _contribution.contributions = contributor["contributions"]
+                            _contribution.save()
+                        except:
+                            _contribution = Contribution.objects.create(component=_component, contributor=_contributor, contributions=contributor["contributions"])
+                        commits += _contribution.contributions
+                        count +=1
+                except:
+                    print 'Error'
+                    continue
                 try:
                     _component.downloads = get_downloads(str(github_data['downloads_url']) + '?client_id=' + GITHUB_CLIENT_ID + '&client_secret=' + GITHUB_CLIENT_SECRET)
                 except:

main/views.py

@@ -39,17 +39,25 @@ def component_details(request, url_name):
     contributions = ContributionSerializer(component.contributions, many=True)
     js_dependencies = JSDependencySerializer(component.jsdependency_set.all(), many=True)
     css_dependencies = CSSDependencySerializer(component.cssdependency_set.all(), many=True)
-    sniper_data = component.sniperdata
-    sniper = SniperDataSerializer(sniper_data)
-    snippets = SnippetSerializer(sniper_data.snippet_set.all(), many=True)
-    return JsonResponse({
-        'details' : details.data,
-        'contributors' : contributions.data,
-        'js_dependencies' : js_dependencies.data,
-        'css_dependencies' : css_dependencies.data,
-        'sniper_data' : sniper.data,
-        'snippets' : snippets.data,
-    })
+    try:
+        sniper_data = component.sniperdata
+        sniper = SniperDataSerializer(sniper_data)
+        snippets = SnippetSerializer(sniper_data.snippet_set.all(), many=True)
+        return JsonResponse({
+            'details' : details.data,
+            'contributors' : contributions.data,
+            'js_dependencies' : js_dependencies.data,
+            'css_dependencies' : css_dependencies.data,
+            'sniper_data' : sniper.data,
+            'snippets' : snippets.data,
+        })
+    except:
+        return JsonResponse({
+            'details' : details.data,
+            'contributors' : contributions.data,
+            'js_dependencies' : js_dependencies.data,
+            'css_dependencies' : css_dependencies.data,
+        })
 
 def render_visualization(request, url_name, visualization_name):
     component = Component.objects.get(url_name=url_name)