Skip to content
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

Jump to bottom

Fixes to download articles thumbnails #1794

Merged
merged 2 commits into from
Mar 6, 2023
Merged

Fixes to download articles thumbnails #1794

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da425a2
Fixes to download articles thumbnails
pavel-karatsiuba Feb 23, 2023
f70e9b1
Do not remove any properties from the details object when the request…
pavel-karatsiuba Mar 2, 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
36 changes: 3 additions & 33 deletions src/Downloader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ class Downloader {
let finalProcessedResp: QueryMwRet

while (true) {
const queryOpts = {
const queryOpts: KVS<any> = {
...this.getArticleQueryOpts(shouldGetThumbnail, true),
titles: articleIds.join('|'),
...(this.mwCapabilities.coordinatesAvailable ? { colimit: 'max' } : {}),
Expand All @@ -285,9 +285,7 @@ class Downloader {
let processedResponse = resp.query ? normalizeMwResponse(resp.query) : {}
if (resp.continue) {
continuation = resp.continue
const relevantDetails = this.stripNonContinuedProps(processedResponse)

finalProcessedResp = finalProcessedResp === undefined ? relevantDetails : deepmerge(finalProcessedResp, relevantDetails)
finalProcessedResp = finalProcessedResp === undefined ? processedResponse : deepmerge(finalProcessedResp, processedResponse)
} else {
if (this.mw.getCategories) {
processedResponse = await this.setArticleSubCategories(processedResponse)
Expand Down Expand Up @@ -344,9 +342,7 @@ class Downloader {
if (!queryComplete) {
queryContinuation = resp['query-continue']

const relevantDetails = this.stripNonContinuedProps(processedResponse)

finalProcessedResp = finalProcessedResp === undefined ? relevantDetails : deepmerge(finalProcessedResp, relevantDetails)
finalProcessedResp = finalProcessedResp === undefined ? processedResponse : deepmerge(finalProcessedResp, processedResponse)
} else {
if (this.mw.getCategories) {
processedResponse = await this.setArticleSubCategories(processedResponse)
Expand Down Expand Up @@ -438,32 +434,6 @@ class Downloader {
return `${isMainPage ? this.baseUrlForMainPage : this.baseUrl}${encodeURIComponent(articleId)}`
}

private stripNonContinuedProps(articleDetails: QueryMwRet, cont: QueryContinueOpts | ContinueOpts = {}): QueryMwRet {
const propsMap: KVS<string[]> = {
pageimages: ['thumbnail', 'pageimage'],
coordinates: ['coordinates'],
categories: ['categories'],
}
const keysToKeep: string[] = ['subCategories', 'revisions', 'redirects'].concat(Object.keys(cont).reduce((acc, key) => acc.concat(propsMap[key] || []), []))
const items = Object.entries(articleDetails).map(([aId, detail]) => {
const newDetail = keysToKeep.reduce((acc, key) => {
const val = (detail as any)[key]
if (!val) {
return acc
} else {
return {
...acc,
[key]: val,
}
}
}, {})
return [aId, newDetail]
})
return items.reduce((acc, [key, detail]: any[]) => {
return { ...acc, [key]: detail }
}, {})
}

private static handleMWWarningsAndErrors(resp: MwApiResponse): void {
if (resp.warnings) logger.warn(`Got warning from MW Query ${JSON.stringify(resp.warnings, null, '\t')}`)
if (resp.error?.code === DB_ERROR) throw new Error(`Got error from MW Query ${JSON.stringify(resp.error, null, '\t')}`)
Expand Down