Merge lp:~davidc3/developer-ubuntu-com/webapp-generator-version-appname into lp:developer-ubuntu-com

[David Callé]

- Add version field
- Create appname using display name (cleaned and shortened if needed)
- Pre-fills name and email

- Add version field
- Create appname using display name (cleaned and shortened if needed)
- Pre-fills name and email

[Michael Hall (mhall119)]

LGTM

review: Approve

=== modified file 'webapp_creator/resources/appname.desktop'
--- webapp_creator/resources/appname.desktop	2015-03-14 16:38:55 +0000
+++ webapp_creator/resources/appname.desktop	2015-03-20 13:17:10 +0000
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name={displayname}
-Comment=Web app for {domain}
+Comment=Webapp for {domain}
 Type=Application
 Icon={appicon}
 Exec=webapp-container {container_options} --webappUrlPatterns=https?://{domain}/* {url}
 
=== modified file 'webapp_creator/resources/manifest.json'
--- webapp_creator/resources/manifest.json	2015-03-04 16:31:01 +0000
+++ webapp_creator/resources/manifest.json	2015-03-20 13:17:10 +0000
@@ -1,6 +1,5 @@
 {
     "architecture": "all",
-    "version": "0.1",
     "framework" : "ubuntu-sdk-14.10"
 }
 
 
=== modified file 'webapp_creator/views.py'
--- webapp_creator/views.py	2015-03-16 08:58:17 +0000
+++ webapp_creator/views.py	2015-03-20 13:17:10 +0000
@@ -30,6 +30,9 @@
         label=_("App options"),
         help_text=_('Use CTRL to select multiple options'),
         required=False)
+    version = forms.CharField(
+        max_length=20, required=True, label=_('Version'),
+        help_text=_('E.g. 0.1'), initial=0.1)
     nickname = forms.RegexField(
         regex='^[\w-]+$', max_length=200, required=True,
         label=_('Developer namespace'),
@@ -57,7 +60,14 @@
                 click_name,)
             return response
     else:
+        try:
+            name = "%s %s" % (request.user.first_name, request.user.last_name)
+            email = request.user.email
+        except:
+            name, email = '', ''
         webapp_form = WebappForm()
+        webapp_form.fields['email'].initial = email
+        webapp_form.fields['fullname'].initial = name.strip()
     return render_to_response(
         'webapp.html',
         {'webapp_form': webapp_form},
 
=== modified file 'webapp_creator/woc.py'
--- webapp_creator/woc.py	2015-03-17 14:09:18 +0000
+++ webapp_creator/woc.py	2015-03-20 13:17:10 +0000
@@ -3,20 +3,12 @@
 import shutil
 import re
 import subprocess
-import random
-import string
-
 from urlparse import urlsplit
 
 
-def random_str(length):
-    """Generates a random str to differentiate apps using the same domain."""
-    return ''.join(random.choice(string.lowercase) for i in range(length))
-
-
-def create_appname(domain):
-    domain_nowww = re.sub('www\.', '', domain)
-    appname = re.sub('\.', '', domain_nowww)
+def create_appname(name):
+    name = re.sub('[^0-9a-zA-Z]+', '', name)
+    appname = name[:20].lower()
     return appname
 
 
@@ -33,10 +25,11 @@
 def create(data):
     nickname = data['nickname'].encode('UTF-8')
     url = data['url'].encode('UTF-8')
+    version = data['version'].encode('UTF-8')
     displayname = data['displayname'].encode('UTF-8')
     domain = urlsplit(url)[1].encode('UTF-8')
     options = ' '.join(data['options'])
-    appname = '%s-%s' % (create_appname(domain), random_str(3))
+    appname = create_appname(displayname)
     tmp = create_tmp(appname, domain)
 
     # Create icon
@@ -63,7 +56,8 @@
         open("webapp_creator/resources/manifest.json").read())
     manifest_new['name'] = '%s.%s' % (appname, nickname,)
     manifest_new['title'] = displayname
-    manifest_new['description'] = 'Web app for %s' % (domain,)
+    manifest_new['version'] = version
+    manifest_new['description'] = 'Webapp for %s' % (domain,)
     manifest_new['hooks'] = {appname:
                              {'apparmor': '%s.apparmor' % (appname,),
                               'desktop': '%s.desktop' % (appname,)
@@ -78,6 +72,6 @@
     # Build click package in tmp dir
     subprocess.call(['click', 'build', tmp+'/resources'],
                     cwd=tmp)
-    click_path = '%s/%s.%s_0.1_all.click' % (tmp, appname, nickname,)
-    click_name = '%s.%s_0.1_all.click' % (appname, nickname,)
+    click_path = '%s/%s.%s_%s_all.click' % (tmp, appname, nickname, version)
+    click_name = '%s.%s_%s_all.click' % (appname, nickname, version)
     return tmp, click_name, click_path