From nobody Thu Apr 25 13:17:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=patchew-devel-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=patchew-devel-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556795899; cv=none; d=zoho.com; s=zohoarc; b=Oi8NsCTmR/5sRKuAhUFduBhYv6PhJxHG+FpMAwtQpQYsI05fgvj+12MaDCskCBdeH4oziLUWvEAXdoQat+HeSGcTiEWrOtTR7ZjoUb5KQOVoQF+9RI5K4vr8gOH7E8s/JJr+fSRPdSVjVEDTGabHOaU4mJABhkm8+iuuqbw8Ueo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556795899; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=uzOfD1hbeKZJRnnD0DfZxWSCsNSQcDDQZiN9RSYTalE=; b=M6LM/Y/pPbadokZdAGVW8kENOXoo9+6J9UsDUV6Xnsbd8q2U3jx8TumV3knqLZ5mGvfI6G2yLUkTDB4W/sYlcByr1j8Nf3mD9opLAVD6U8yb3HnVd0MtcNNqAAcPyUESL9qiDjZudpYhDZR6CzldZ4DL2/oJ/dqw+InfhKbPs7U= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=patchew-devel-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1556795899575172.03263977216045; Thu, 2 May 2019 04:18:19 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 498D937E7B; Thu, 2 May 2019 11:18:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3B1B25DA35; Thu, 2 May 2019 11:18:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2F4C841F3E; Thu, 2 May 2019 11:18:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x42BIG7C008975 for ; Thu, 2 May 2019 07:18:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2B49C8ADB1; Thu, 2 May 2019 11:18:16 +0000 (UTC) Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 253E38ADAE for ; Thu, 2 May 2019 11:18:13 +0000 (UTC) Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DA92237E7B for ; Thu, 2 May 2019 11:18:12 +0000 (UTC) Received: by mail-oi1-f174.google.com with SMTP id k9so1294018oig.9 for ; Thu, 02 May 2019 04:18:12 -0700 (PDT) Received: from localhost.localdomain ([198.59.53.9]) by smtp.gmail.com with ESMTPSA id o1sm19095697otj.11.2019.05.02.04.18.11 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2019 04:18:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YZEz7ViYd3igJNt4Wu2wfdgIPKdkWiKaYpscTpk97oY=; b=H4H6bDimE59Q+2kBSGSXwmln1AVic6Sgk/3eFtO/shCVUtFgOO97nq1MLPMh2DJVtm /uKdfeAf9/QSguoGqMXfn7QF1thNdw6WNB7xdKFzxwbQPLWQB9iN8wOZ1z7kStAJCYLO EvSQ/LloweEpM/Dlu22SOzkbcxRTaxI+qpeBO8hpCXR6ODzwUidy7tY4eFwk+nxVZHUy MsrMUXaoTFbwMtlI51iAzkVWerZDbrYPFFc58iszuiasXqFsIuLll2IkTbVPw+FJD763 Z1Y9FJAXceBx19urKeOfpnE21ALvHccIte3NYU0Ww8AWB2zpbM5Stw8Ea6ofEhqj+X6T q0ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=YZEz7ViYd3igJNt4Wu2wfdgIPKdkWiKaYpscTpk97oY=; b=R8X3qmPdSf6xXBQ9Q90ZklnmaUoLzKRXBXpDQctKSfNHg8L84UdR1EZ2Qr0FVPB5wX UT2WRwSpautlTFcoURG++we13uW3xKxthosvxVCJcn4KYqbz7mqJaZzayreP60iPkiPc PJ1IzM1PuUH/E2ZD+rvvFtY6YBQndlN7j0d+OasMNS2iM9pwNefkiM2M1VV6yQk6u4Tr 2FJa7uJaAt1x8uRyrEQROXNFnNhpU8/R3jKQCBQAWIl8nypiugqEK3ZujlA1ZH9quaIU IBbJqmHduCQ5WScsESzMc7FUaRuMltpo+hhWgTk5VRUJsJwc76F5YWKI+LlorHNSXY4g enxw== X-Gm-Message-State: APjAAAU4VNe8k4EEkMFQ3NvciXjXhukkfVIpQE+1Q6crFcxuH14/0cAf 94j9VGLD5TEweqO0Uy1hqLMYrUPHfuA= X-Google-Smtp-Source: APXvYqwShqmh536mAD7fvBWwVnSu+8+sAC3d3D9Y6rVZRTlcQ8kcii+SLl4zt1mX9GaCyBy+Lj8PJg== X-Received: by 2002:aca:4d2:: with SMTP id 201mr1935688oie.12.1556795892025; Thu, 02 May 2019 04:18:12 -0700 (PDT) From: Paolo Bonzini To: patchew-devel@redhat.com Date: Thu, 2 May 2019 05:17:55 -0600 Message-Id: <20190502111804.15843-9-pbonzini@redhat.com> In-Reply-To: <20190502111804.15843-1-pbonzini@redhat.com> References: <20190502111804.15843-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 02 May 2019 11:18:13 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 02 May 2019 11:18:13 +0000 (UTC) for IP:'209.85.167.174' DOMAIN:'mail-oi1-f174.google.com' HELO:'mail-oi1-f174.google.com' FROM:'paolo.bonzini@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.136 (DKIM_SIGNED, DKIM_VALID, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS, T_FILL_THIS_FORM_SHORT) 209.85.167.174 mail-oi1-f174.google.com 209.85.167.174 mail-oi1-f174.google.com X-RedHat-Possible-Forgery: Paolo Bonzini X-Scanned-By: MIMEDefang 2.78 on 10.5.110.29 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: patchew-devel@redhat.com Subject: [Patchew-devel] [PATCH 08/17] mods: refactor construction of config editor HTML X-BeenThere: patchew-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Patchew development and discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: patchew-devel-bounces@redhat.com Errors-To: patchew-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 02 May 2019 11:18:18 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Refactor the Javascript config editor to work on the properties dictionary that is retrieved by get_project_config. The _build_*_scm functions therefore no longer need to understand how properties are stored in the dat= abase. --- mod.py | 77 ++++++++++++++++++++-------------------------------------- 1 file changed, 27 insertions(+), 50 deletions(-) diff --git a/mod.py b/mod.py index 9e15064..4cf2e9f 100644 --- a/mod.py +++ b/mod.py @@ -49,29 +49,13 @@ class PatchewModule(object): data["module"] =3D self return Template(tmpl).render(Context(data)) =20 - def _build_map_scm(self, request, project, prefix, scm): - prefix =3D prefix + scm.name + "." - def _build_map_items(): - r =3D {} - for p in project.get_properties().keys(): - if not p.startswith(prefix): - continue - name =3D p[len(prefix):] - name =3D name[:name.rfind(".")] - if name in r: - continue - pref =3D prefix + name + "." - r[name] =3D { - "name": name, - "html": self._build_one(request, project, - pref, scm.item) - } - return list(r.values()) - - schema_html =3D self._build_one(request, project, prefix, - scm.item) + def _build_map_scm(self, request, project, prefix, config, scm): + schema_html =3D self._build_one(request, project, "", {}, scm.item) item =3D {"html": schema_html} - items =3D _build_map_items() + items =3D [{ + "name": name, + "html": self._build_one(request, project, prefix + "." + name, + value, scm.item)} for name, value in c= onfig.items()] return self._render_template(request, project, TMPL_MAP, schema=3Dscm, item_schema=3Dscm.item, @@ -79,9 +63,10 @@ class PatchewModule(object): items=3Ditems, item=3Ditem) =20 - def _build_array_scm(self, request, project, prefix, scm): + def _build_array_scm(self, request, project, prefix, config, scm): members =3D [self._build_one(request, project, - prefix, x) for x in scm.me= mbers] + prefix + "." + x.name, + config.get(x.name), x) for x in scm.mem= bers] show_save_button =3D False for m in scm.members: if type(m) =3D=3D StringSchema: @@ -93,62 +78,54 @@ class PatchewModule(object): show_save_button=3Dshow_save_button, prefix=3Dprefix) =20 - def _build_string_scm(self, request, project, prefix, scm): - prop_name =3D prefix + scm.name - prop_value =3D project.get_property(prop_name) + def _build_string_scm(self, request, project, prefix, config, scm): return self._render_template(request, project, TMPL_STRING, schema=3Dscm, name=3Dscm.name, prefix=3Dprefix, - value=3Dprop_value) + value=3Dconfig or '') =20 - def _build_integer_scm(self, request, project, prefix, scm): - prop_name =3D prefix + scm.name - prop_value =3D project.get_property(prop_name) + def _build_integer_scm(self, request, project, prefix, config, scm): return self._render_template(request, project, TMPL_INTEGER, schema=3Dscm, name=3Dscm.name, prefix=3Dprefix, - value=3Dprop_value) + value=3Dconfig or 0) =20 - def _build_boolean_scm(self, request, project, prefix, scm): - prop_name =3D prefix + scm.name - prop_value =3D project.get_property(prop_name) + def _build_boolean_scm(self, request, project, prefix, config, scm): return self._render_template(request, project, TMPL_BOOLEAN, schema=3Dscm, name=3Dscm.name, prefix=3Dprefix, - value=3Dprop_value) + value=3Dconfig or False) =20 - def _build_enum_scm(self, request, project, prefix, scm): - prop_name =3D prefix + scm.name - prop_value =3D project.get_property(prop_name) + def _build_enum_scm(self, request, project, prefix, config, scm): return self._render_template(request, project, TMPL_ENUM, schema=3Dscm, name=3Dscm.name, prefix=3Dprefix, - value=3Dprop_value) + value=3Dconfig) =20 - def _build_one(self, request, project, prefix, scm): + def _build_one(self, request, project, prefix, config, scm): if type(scm) =3D=3D MapSchema: - return self._build_map_scm(request, project, prefix, scm) + return self._build_map_scm(request, project, prefix, config, s= cm) elif type(scm) =3D=3D StringSchema: - return self._build_string_scm(request, project, prefix, scm) + return self._build_string_scm(request, project, prefix, config= , scm) elif type(scm) =3D=3D IntegerSchema: - return self._build_integer_scm(request, project, prefix, scm) + return self._build_integer_scm(request, project, prefix, confi= g, scm) elif type(scm) =3D=3D BooleanSchema: - return self._build_boolean_scm(request, project, prefix, scm) + return self._build_boolean_scm(request, project, prefix, confi= g, scm) elif type(scm) =3D=3D EnumSchema: - return self._build_enum_scm(request, project, prefix, scm) + return self._build_enum_scm(request, project, prefix, config, = scm) elif type(scm) =3D=3D ArraySchema: - return self._build_array_scm(request, project, prefix, scm) + return self._build_array_scm(request, project, prefix, config,= scm) assert False =20 def build_config_html(self, request, project): - assert not isinstance(self.project_config_schema, StringSchema) - assert not isinstance(self.project_config_schema, IntegerSchema) + assert isinstance(self.project_config_schema, ArraySchema) scm =3D self.project_config_schema - return self._build_one(request, project, scm.name + ".", scm) + config =3D self.get_project_config(project) + return self._build_one(request, project, scm.name, config, scm) =20 def _get_map_scm(self, project, prop_name, scm): prefix =3D prop_name + "." --=20 2.21.0 _______________________________________________ Patchew-devel mailing list Patchew-devel@redhat.com https://www.redhat.com/mailman/listinfo/patchew-devel