Merge pull request #17 from MeeGoIntegration/device-model-variant

Pass Device{Model,Variant} .ks headers along to mic via tokenmap

Author: larstiq

src/img_web/app/forms.py

@@ -251,25 +251,39 @@ class ImageJobForm(forms.Form):
                                                  help_text=\
                               "Packages: comma separated list of tags "\
                               "to describe the image built.")
-
+    devicemodel = forms.CharField(
+        label="Device model",
+        required=False,
+        widget=forms.HiddenInput(attrs={'readonly': 'readonly'}),
+    )
+    devicevariant = forms.CharField(
+        label="Device variant",
+        required=False,
+        widget=forms.HiddenInput(attrs={'readonly': 'readonly'}),
+    )
 
     def __init__(self, *args, **kwargs):
         super(ImageJobForm, self).__init__(*args, **kwargs)
         self.fields['template'].choices = []
+        suggested_re = re.compile(
+            r'^#.*?Suggested(Architecture|ImageType|Features):(.*)$'
+        )
+        device_re = re.compile(
+            r'^#.*?(DeviceModel|DeviceVariant):(.*)$'
+        )
         for template in glob.glob(os.path.join(settings.TEMPLATESDIR, '*.ks')):
             name = os.path.basename(template)
             templatename = os.path.basename(template)
             attrs = {}
             with open(template, 'r') as tf:
                 for line in tf:
-                    if re.match(r'^#.*?DisplayName:.+$', line):
+                    match = suggested_re.match(line) or device_re.match(line)
+                    if match:
+                        key = 'data-' + match.group(1).lower()
+                        val = match.group(2).strip()
+                        attrs[key] = val
+                    elif re.match(r'^#.*?DisplayName:.+$', line):
                         name = line.split(":")[1].strip()
-                    if re.match(r'^#.*?SuggestedFeatures:.+$', line):
-                        attrs["data-features"] = line.split(":")[1].strip()
-                    if re.match(r'^#.*?SuggestedArchitecture:.+$', line):
-                        attrs["data-architecture"] = line.split(":")[1].strip()
-                    if re.match(r'^#.*?SuggestedImageType:.+$', line):
-                        attrs["data-imagetype"] = line.split(":")[1].strip()
 
             self.fields['template'].choices.append((templatename , name, attrs))
 

src/img_web/app/views.py

@@ -150,6 +150,13 @@ def submit(request):
             archtoken = "i586"
         tokenmap["ARCH"] = archtoken
 
+        devicemodeltoken = jobdata.get('devicemodel')
+        if devicemodeltoken:
+            tokenmap['DEVICEMODEL'] = devicemodeltoken
+        devicevarianttoken = jobdata.get('devicevariant')
+        if devicevarianttoken:
+            tokenmap['DEVICEVARIANT'] = devicevarianttoken
+
         tokens_list = []
         extra_repos_tmp = []
         for token, tokenvalue in tokenmap.items(): 

src/img_web/templates/app/upload.html

@@ -112,6 +112,7 @@
             </td>
         </tr>
         </table>
+        {{ jobform.devicemodel }} {{ jobform.devicevariant }}
     </fieldset>
 </table>
 <fieldset>