Skip to content

Fix install package name #1377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renkun-ken merged 2 commits into from
Jun 9, 2023
Merged

Fix install package name #1377

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6369331
Fix install package name
renkun-ken Jun 9, 2023
46578a3
Fix url
renkun-ken Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 18 additions & 29 deletions src/helpViewer/cran.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ type ParseFunction = (html: string, baseUrl: string) => Package[];

export async function getPackagesFromCran(cranUrl: string): Promise<Package[]> {
const cranSites: {url: string, parseFunction: ParseFunction}[] = [
{
url: new URL('stats/descriptions', cranUrl).toString(),
parseFunction: parseCranJson
},
// NOTE: Not working any more
// {
// url: new URL('stats/descriptions', cranUrl).toString(),
// parseFunction: parseCranJson
// },
{
url: new URL('web/packages/available_packages_by_date.html', cranUrl).toString(),
parseFunction: parseCranTable
Expand Down Expand Up @@ -83,35 +84,23 @@ function parseCranTable(html: string, baseUrl: string): Package[] {
tables.each((tableIndex, table) => {
const rows = $('tr', table);
rows.each((rowIndex, row) => {
const elements = $('td', row);
if(elements.length === 3){

const e0 = elements[0];
const e1 = elements[1];
const e2 = elements[2];
if(
e0.type === 'tag' && e1.type === 'tag' &&
e0.firstChild?.type === 'text' && e1.children[1].type === 'tag' &&
e2.type === 'tag'
){
const href = e1.children[1].attribs['href'];
const url = new URL(href, baseUrl).toString();
ret.push({
date: (e0.firstChild.data || '').trim(),
name: (e1.children[1].firstChild?.data || '').trim(),
href: url,
description: (e2.firstChild?.data || '').trim(),
isCran: true
});
}
}
if (rowIndex === 0) return; // Skip the header row
const date = $(row).find('td:nth-child(1)').text().trim();
const href = $(row).find('td:nth-child(2) a').attr('href');
const url = href ? new URL(href, baseUrl).toString() : undefined;
const name = $(row).find('td:nth-child(2) span').text().trim();
const title = $(row).find('td:nth-child(3)').text().trim();
ret.push({
date: date,
name: name,
href: url,
description: title,
isCran: true
});
});
});

const retSorted = ret.sort((a, b) => a.name.localeCompare(b.name));

return retSorted;
}