Fix: Update beta logic and query to handle empty report_url

[mreid-tt]

• Updated the beta hybrid property in the Version model to treat both None and empty strings as non-beta.
• Modified the catalog query to include versions where report_url is either NULL or an empty string when beta=False.
• Ensured consistent behavior for beta builds in both Python and SQLAlchemy contexts.

Fixes: #140

[mreid-tt]

@hgy59, I’ve tested the updates in my test environment and believe I’ve resolved the issue while also covering some edge cases. Here are the details:

Uploaded Versions

I uploaded two versions of Monit to the test environment. They are listed as follows:

Admin Interface Update

The admin interface now correctly reflects the beta status. Previously, both versions were incorrectly marked as beta. This has been resolved:

Synology Device Lookups

The lookups performed by Synology devices have also been updated.

• Monit v5.17.1-8:

  • The normal query URL does not include Monit: http://localhost:5000/nas/?build=4458&arch=88f628x&language=enu
  • The beta query URL correctly includes Monit: http://localhost:5000/nas/?build=4458&arch=88f628x&language=enu&package_update_channel=beta
  • This matches the previous behavior for the beta channel.

• Monit v5.29.0-10:

  • The normal query URL now correctly includes this version: http://localhost:5000/nas/?build=15047&arch=88f628x&language=enu.
    This is consistent with its non-beta status as defined by the report_url.
  • The beta query URL still includes this version: http://localhost:5000/nas/?build=15047&arch=88f628x&language=enu&package_update_channel=beta
    This behavior remains unchanged for the beta channel.

Let me know if further adjustments are needed.

[mreid-tt]

hey @publicarray, after this is merged, I believe we would need to publish a new spkrepo version and update the server. Would you be able to assist with this?

[publicarray]

@mreid-tt i'm happy to do work on this on the weekend.

[mreid-tt]

@mreid-tt i'm happy to do work on this on the weekend.

thanks @publicarray, let me know if I can be of assistance.

[hgy59]

@mreid-tt the latest update to v0.2.7 was reverted because it broke the package download.

I don't know whether it is related to this PR.
But if you have another look at beta packages, I found another issue, that might not be fixed with this:

Beta Packages are lacking the changelog and the Update Button in DSM Package center.
The changelog of the latest Monit package is

Version 5.34.4-11 beta
    1. Update monit to v5.34.4
    2. Update OpenSSL to v3.1.7.

But in Package Center it is empty and the Update Button is missing:

If the broken downloads are not related to the changes here, we need to create a new issue...

Can you double check this with the updated version?

And Monit package is only shown if already installed. It is lacking under the Community Packages in DSM. (Ok this is a hint that it might be fixed with this PR).

[mreid-tt]

@hgy59 Thanks for the heads-up! I wasn’t aware we attempted to deploy this version or that there were issues — I never received an email or alert about #144.

Regarding your comment on breaking package downloads, I’ll need more details on what happened. Ideally, you can simulate what DSM receives from the package repository using similar link constructions. The general structure is:

• http://localhost:5000/nas/? (local environment) or https://packages.synocommunity.com/? (live server)
• build=15047& (DSM build version)
• arch=88f628x& (CPU architecture)
• language=enu& (NAS language setting)
• package_update_channel=beta (optional beta channel)

It would help to check whether the package appears in the results and what download URL is provided. My testing for this PR was limited to verifying the versions in the index.

For example, the live server should return a link like this:

"link": "https://packages.synocommunity.com/monit/10/monit.v10.f15047%5B88f628x%5D.spk?arch=88f628x&build=15047"

The key question is whether this link was incorrect due to v0.2.7 or if the link was correct but resulted in a server error. I haven’t tested using DSM as a client locally — just checked the server output via a browser.

@publicarray, if you have any additional insights on how downloads were broken, feel free to add them to #144. That would help with diagnosing the issue.

Regarding the changelog, it should also be present in the JSON response. The current online version returns:

"changelog": "1. Update monit to v5.29.0<br/>2. Update OpenSSL to v1.1.1l"

My test setup included a value, but I can’t simulate your exact configuration without your DSM details. I suggest building a test URL, downloading it via a browser, and checking for the "package": "monit" entry in the dataset. If something seems off, opening a new issue might be the best course of action.