Add apk url and version code for latest release #6
Conversation
This provides the data for TeamNewPipe/NewPipe#1520
TobiGr
changed the title
api.py
Outdated
| } | ||
|
|
||
| repo = json.loads(repo_data) | ||
|
|
||
| # scrap latest GitHub version and apk from website | ||
| elem = html.fromstring(release_github_data) |
There was a problem hiding this comment.
@TheAssassin Do you have any idea how I can reduce the redundancy here? I didn't find a good way to do so.
There was a problem hiding this comment.
What kind of redundancy are you talking about specifically?
There was a problem hiding this comment.
We have the same structure for getting the GitHub version, apk and the contributors count:
Get HTML, use cssselect to filter the HTML, check if the we get the a valid number of results, get the first result and modify it.
Unfortunately I couldn't move this to a new method because I failed to execute the steps in the try blocks in a good way. My initial idea was to return tags[0]:
def scrape_data_from_html(data, selector: str):
elem = html.fromstring(data)
tags = elem.cssselect(selector)
if len(tags) < 1:
return -1
else:
try:
return tags[0]
except:
return -1But than I realised that I'd needed another try and catch to handle the possible exceptions which can be thrown by tags[0].get('href'), tags[0].text and int(tags[0].text):
contributors_result = scrape_data_from_html(contributors_data, ".numbers-summary a[href$=contributors] .num")
try:
contributors_count = int(contributors_result.text)
except:
contributors_count = -1There was a problem hiding this comment.
I am okay with this as it is.
| @@ -166,7 +192,13 @@ def assemble_release_data(data: str): | |||
| "translations": int(translations["count"]), | |||
| }, | |||
| "flavors": { | |||
| "stable": assemble_release_data(stable_data), | |||
There was a problem hiding this comment.
Does it make sense to split this up into "github": {"stable": {...}, ...} and "f-droid": {"stable": {...}, ...} instead? GitHub names releases differently, i.e. there's releases and pre-releases.
api.py
Outdated
| except: | ||
| release_github_version = -1 | ||
|
|
||
| # scrap contributors from website |
There was a problem hiding this comment.
It's "scrape" ("extract"), not "scrap" ("dispose", "throw away").
fix typos
|
@TheAssassin Feel free to merge. I can't do it. |
|
@TobiGr I was already working on some solution for this. I added a team, and I'm granting this team permissions for all relevant NewPipe repositories. Please check if you can merge here now, too. |
That is a good idea! |
|
Deployment in progress. |
|
Thanks |
This should be everything we need for TeamNewPipe/NewPipe#1520
I changed the structure a bit to handle the different release platforms F-Droid and GitHub better.
{ "stats": { "stargazers": 3807, "watchers": 216, "forks": 600, "contributors": 243, "translations": 53 }, "flavors": { "stable": { "f-droid": { "version": "v0.13.5", "version_code": 64, "apk": "https://f-droid.org/repo/org.schabi.newpipe_64.apk" }, "github": { "version": "v0.13.5", "apk": "https://github.com/TeamNewPipe/NewPipe/releases/download/v0.13.5/NewPipe-v0.13.5.apk" } } } }