BETA flag not shown

[hgy59]

BETA flag is not shown on some package versions.

See monit package.
All three revisions (7, 8, 10) are BETA, but only revisions 7 and 8 are displayed with betaLabel, revision 10 is missing this label.

[hgy59]

@mreid-tt any idea what's going wrong?

[hgy59]

Just uploaded revision 11 and it has the label (revision 10 is still missing it).

[mreid-tt]

@hgy59 this seems to be a side-effect of how we define beta versions. Technically there are two fields related to beta packages in the DSM developer guide:

Field Name: beta

• Description: If this package is considered the beta version, the beta information will be shown in Package Center.
• Value: "yes"/"no"
• Default Value: "no"
• Example: None
• DSM Requirement: 6.0

Field Name: report_url

• Description: If a package is a beta version and has a "report" webpage, Package Center will display a hyperlink. If this package is considered the beta version, the beta information will be also be shown in Package Center.
• Value: String
• Default Value: (Empty)
• Example: None
• DSM Requirement: 3.2-1922

The problem is that in our database schema we only define the report_url:

spkrepo/spkrepo/models.py

Lines 402 to 411 in 2b4012b

	class Version(db.Model):
	__tablename__ = "version"
	# Columns
	id = db.Column(db.Integer, primary_key=True)
	package_id = db.Column(db.Integer, db.ForeignKey("package.id"), nullable=False)
	version = db.Column(db.Integer, nullable=False, index=True)
	upstream_version = db.Column(db.Unicode(20), nullable=False)
	changelog = db.Column(db.UnicodeText)
	report_url = db.Column(db.Unicode(255))

The field for beta is actually derived based on the report_url:

spkrepo/spkrepo/models.py

Lines 463 to 465 in 2b4012b

	@hybrid_property
	def beta(self):
	return self.report_url != None # noqa: E711

Now this creates a dependency in our packages for the value of beta to be based on report_url which isn't the case in the DSM developer guide. We have however codified this into our Makefile variable handling:

spksrc/mk/spksrc.spk.mk (L208-L210)

ifneq ($(strip $(BETA)),)
	@echo beta=\"yes\" >> $@
	@echo report_url=\"$(REPORT_URL)\" >> $@

The challenge is that when monit revision 10 was published the Info file contained the following:

beta="yes"
report_url=""

This structure should not exist based on how our Makefile variables are handled. Revision 11 has it correct as follows:

beta="yes"
report_url="https://github.com/SynoCommunity/spksrc/issues"

Now, within the admin interface it lists it as a beta because the view is initialised based on the model above:

spkrepo/spkrepo/views/admin.py

Lines 274 to 278 in 2b4012b

	class VersionView(ModelView):
	"""View for :class:`~spkrepo.models.Version`"""
	def __init__(self, **kwargs):
	super(VersionView, self).__init__(Version, db.session, **kwargs)

Then we have the specific columns:

spkrepo/spkrepo/views/admin.py

Lines 310 to 315 in 2b4012b

	# View
	column_list = (
	"package",
	"upstream_version",
	"version",
	"beta",

So it would be using the synthetic field for beta as noted before.

Now this is different than what is done in the front-end interface with this code block:

spkrepo/spkrepo/templates/frontend/package.html

Line 21 in 2b4012b

<dt>Version {{ version.version_string | safe }}{% if version.report_url %} <span class="label label-danger">beta</span>{% endif %}</dt>

As you can see it is querying the version.report_url field directly. This would also be consistent with how the Package Center queries beta packages as follows:

spkrepo/spkrepo/views/nas.py

Lines 66 to 67 in 2b4012b

	if not beta:
	latest_version = latest_version.filter(Version.report_url.is_(None))

spkrepo/spkrepo/views/nas.py

Lines 181 to 183 in 2b4012b

	if b.version.report_url:
	entry["report_url"] = b.version.report_url
	entry["beta"] = True

My guess is that the synthetic beta field used by the admin interface is returning True when it should return False since the value of report_url is empty. It's possible that and empty string may not equate to None but I'll need to do some more testing to confirm.