Initial parts of Bitbucket importing

Author: ericholscher

readthedocs/oauth/utils.py

@@ -126,6 +126,96 @@ def import_github(user, sync):
                         make_github_project(user=user, org=org_obj, privacy=repo_type, repo_json=repo)
             except TypeError, e:
                 print e
-                    
 
     return github_connected
+
+
+###
+### Bitbucket
+###
+
+
+def bitbucket_paginate(session, url):
+    """
+    Scans trough all github paginates results and returns the concatenated
+    list of results.
+
+    :param session: requests client instance
+    :param url: start url to get the data from.
+
+    """
+    result = []
+    while url:
+        r = session.get(url)
+        result.extend([r.json()])
+        next_url = r.json().get('next')
+        if next_url:
+            url = next_url
+        else:
+            url = None
+    return result
+
+
+def make_bitbucket_project(user, org, privacy, repo_json):
+    log.info('Trying Bitbucket: %s' % repo_json['full_name'])
+    if (repo_json['is_private'] is True and privacy == 'private' or
+            repo_json['is_private'] is False and privacy == 'public'):
+        project, created = GithubProject.objects.get_or_create(
+            full_name=repo_json['full_name'],
+        )
+        if project.organization and project.organization != org:
+            log.debug('Not importing %s because mismatched orgs' % repo_json['name'])
+            return None
+        else:
+            project.organization = org
+        project.users.add(user)
+        project.name = repo_json['name']
+        project.description = repo_json['description']
+        project.git_url = repo_json['links']['clone'][0]['href']
+        project.ssh_url = repo_json['links']['clone'][1]['href']
+        project.html_url = repo_json['links']['html']['href']
+        project.json = repo_json
+        project.save()
+        return project
+    else:
+        log.debug('Not importing %s because mismatched type' % repo_json['name'])
+
+
+def process_bitbucket_json(user, json, repo_type):
+    try:
+        for page in json:
+            for repo in page['values']:
+                make_bitbucket_project(user=user, org=None, privacy=repo_type, repo_json=repo)
+    except TypeError, e:
+        print e
+
+
+def import_bitbucket(user, sync):
+    """ Do the actual github import """
+
+    repo_type = getattr(settings, 'GITHUB_PRIVACY', 'public')
+    tokens = SocialToken.objects.filter(
+        account__user__username=user.username, app__provider='bitbucket')
+    bitbucket_connected = False
+    if tokens.exists():
+        bitbucket_connected = True
+        if sync:
+            token = tokens[0]
+            session = OAuth2Session(
+                client_id=token.app.client_id,
+                token={
+                    'access_token': str(token.token),
+                    'token_type': 'bearer'
+                }
+            )
+            # Get user repos
+            owner_resp = bitbucket_paginate(session, 'https://bitbucket.org/api/2.0/repositories/{owner}'.format(owner=token.account.uid))
+            process_bitbucket_json(user, owner_resp, repo_type)
+
+            # Get org repos
+            resp = session.get('https://bitbucket.org/api/1.0/user/privileges/')
+            for team in resp.json()['teams'].keys():
+                org_resp = bitbucket_paginate(session, 'https://bitbucket.org/api/2.0/teams/{teamname}/repositories' % team)
+                process_bitbucket_json(user, org_resp, repo_type)
+
+    return bitbucket_connected

readthedocs/projects/urls/private.py

@@ -29,6 +29,16 @@
         'projects.views.private.project_import_github',
         {'sync': True},
         name='projects_sync_github'),
+    
+    url(r'^import/bitbucket/$',
+        'projects.views.private.project_import_bitbucket',
+        {'sync': False},
+        name='projects_import_bitbucket'),
+
+    url(r'^import/bitbucket/sync/$',
+        'projects.views.private.project_import_bitbucket',
+        {'sync': True},
+        name='projects_sync_bitbucket'),
 
     url(r'^(?P<project_slug>[-\w]+)/$',
         'projects.views.private.project_manage',

readthedocs/projects/views/private.py

@@ -532,3 +532,33 @@ def project_import_github(request, sync=False):
         },
         context_instance=RequestContext(request)
     )
+
+@login_required
+def project_import_bitbucket(request, sync=False):
+    '''Show form that prefills import form with data from BitBucket'''
+
+    bitbucket_connected = oauth_utils.import_bitbucket(user=request.user, sync=sync)
+    repos = GithubProject.objects.filter(users__in=[request.user])
+
+    # Find existing projects that match a repo url
+    for repo in repos:
+        ghetto_repo = repo.git_url.replace('git://', '').replace('.git', '')
+        projects = (Project
+                    .objects
+                    .public(request.user)
+                    .filter(Q(repo__endswith=ghetto_repo) |
+                            Q(repo__endswith=ghetto_repo + '.git')))
+        if projects:
+            repo.matches = [project.slug for project in projects]
+        else:
+            repo.matches = []
+
+    return render_to_response(
+        'projects/project_import_bitbucket.html',
+        {
+            'repos': repos,
+            'bitbucket_connected': bitbucket_connected,
+            'sync': sync,
+        },
+        context_instance=RequestContext(request)
+    )

readthedocs/settings/base.py

@@ -201,7 +201,7 @@
     'allauth.account',
     'allauth.socialaccount',
     'allauth.socialaccount.providers.github',
-    #'allauth.socialaccount.providers.bitbucket',
+    'allauth.socialaccount.providers.bitbucket',
     #'allauth.socialaccount.providers.twitter',
 ]
 

readthedocs/templates/projects/project_import.html

@@ -43,9 +43,26 @@ <h3>{% trans "From GitHub" %}</h3>
     <div class="col col-trisect">
       <h3>From Bitbucket</h3>
 
-      <p>
-        Coming soon, import your Bitbucket repositories!
-      </p>
+      {% if accounts.bitbucket.0 %}
+        <p>
+          {% blocktrans %}
+            Import one of your <b>public Bitbucket repositories</b> to start using your documentation.
+          {% endblocktrans %}
+        </p>
+
+        <form method="get" action="{% url "projects_import_bitbucket" %}">
+          <input type="submit" value="{% trans "Import from Bitbucket" %}"/>
+        </form>
+      {% else %}
+        <p>
+          {% blocktrans %}
+            Once your account is connected to your Bitbucket account,
+            you will be able to automatically import and configure your <b>public Bitbucket repositories</b>.
+          {% endblocktrans %}
+          <a href="{% provider_login_url "bitbucket" process="connect" next="/dashboard/import/" %}">Connect to Bitbucket</a>
+          {% trans "to import your first repository." %}
+        </p>
+      {% endif %}
     </div>
 
     <div class="col col-trisect">

readthedocs/templates/projects/project_import_bitbucket.html

@@ -0,0 +1,89 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans "Import a BitBucket project" %}{% endblock %}
+
+{% block extra_links %}
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}lib/markitup/skins/simple/style.css" />
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}lib/markitup/sets/sphinx/editor.css" />
+{% endblock %}
+
+{% block extra_scripts %}
+<script type="text/javascript" src="{{ MEDIA_URL }}javascript/rtd-import.js"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}lib/markitup/jquery.markitup.pack.js"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}lib/markitup/sets/sphinx/editor.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() {
+      $("#id_description").markItUp(SphinxDocsSettings); // .markItUp(mySettings);
+    });
+</script>
+{% endblock %}
+
+{% block content-header %}<h1>{% trans "Import a BitBucket project" %}</h1>{% endblock %}
+
+{% block content %}
+{% if bitbucket_connected %}
+{% if not sync %}
+<p class="empty">
+  {% url 'projects_sync_bitbucket' as sync_bitbucket_url %}
+  {% blocktrans %}Showing your BitBucket projects. <a href="{{ sync_bitbucket_url }}">Sync your BitBucket projects</a> to update them.{% endblocktrans %}
+</p>
+{% else %}
+<p class="empty">
+  {% blocktrans %}BitBucket projects are now up to date.{% endblocktrans %}
+</p>
+{% endif %}
+<div class="module">
+  <div class="module-wrapper">
+    <div class="module-list">
+      <div class="module-list-wrapper">
+        <ul>
+          {% for repo in repos %}
+          <li class="module-item">
+
+            <a class="module-item-title" href="{{ repo.html_url }}">{{ repo.full_name }}</a>
+
+            <form method="post" action="{% url "projects_import" %}">
+              {% csrf_token %}
+              <input name="name" type="hidden" value="{{ repo.name }}" />
+              <input name="repo" type="hidden" value="{{ repo.html_url }}" />
+              <input name="repo_type" type="hidden" value="git" />
+              <input name="description" type="hidden" value="{{ repo.description }}" />
+              <input name="project_url" type="hidden" value="{{ repo.homepage }}" />
+
+              {% if repo.matches %}
+              <span class="dropdown" style="position:absolute; right:0px; top:0px;">
+                <span>
+                  <a href="{% url 'projects_detail' repo.matches.0 %}">{% trans "View Project" %}</a>
+                  <a href="#">&#x25BC;</a>
+                </span>
+                <ul>
+                  {% for match in repo.matches %}
+                      <li><a href="{% url 'projects_detail' match %}">{{ match }}</a></li>
+                  {% endfor %}
+                </ul> 
+              </span>
+
+              {% else %}
+              <ul class="module-item-menu">
+                <span>
+                  <input type="submit" value="Create" style="margin: 3px;" />
+                </span>
+              </ul>
+              {% endif %}
+
+            </form>
+          </li>
+          {% endfor %}
+        </ul>
+      </div>
+    </div>
+  </div>
+</div>
+{% else %}
+  {% url 'socialaccount_connections' as social_url %}
+  {% blocktrans %}You don't have any BitBucket repositories connected. 
+  Go to your <a href="{{ social_url }}">Social Accounts</a> to set one up.
+  {% endblocktrans %}
+{% endif %}
+{% endblock %}