QB64/QB64-PE
QB64/QB64-PE
1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-07-24 12:25:14 +00:00
Code Issues Releases Wiki Activity

Fix Wiki downloads (Update all pages)

Browse source 
Better detect deleted/new pages and prevent the problem discussed here: https://qb64phoenix.com/forum/showthread.php?tid=1521
This commit is contained in:
Roland Heyder 2023-03-19 12:33:24 +01:00
parent c52d3bcd28
commit 7038e2527d
1 changed files with 39 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
source/ide/wiki/wiki_methods.bas
View file

@ -62,13 +62,15 @@ FUNCTION Wiki$ (PageName$) 'Read cached wiki page (download, if not yet cached)
a$ = "" 'dummy pages (for error display) a$ = "" 'dummy pages (for error display)
ELSE ELSE
a$ = wikiDLPage$(url$, 15) a$ = wikiDLPage$(url$, 15)
IF INSTR(a$, "Login required") > 0 THEN a$ = s1$ + s2$ 'continue as empty page
END IF END IF
'Find wikitext in the downloaded page 'Find wikitext in the downloaded page
s1 = INSTR(a$, s1$) s1 = INSTR(a$, s1$)
IF s1 > 0 THEN a$ = MID$(a$, s1 + LEN(s1$)): s2 = INSTR(a$, s2$): ELSE s2 = 0 IF s1 > 0 THEN a$ = MID$(a$, s1 + LEN(s1$)): s2 = INSTR(a$, s2$): ELSE s2 = 0
IF s2 > 0 THEN a$ = LEFT$(a$, s2 - 1) IF s2 > 0 THEN a$ = LEFT$(a$, s2 - 1)
IF s1 > 0 AND s2 > 0 AND a$ <> "" THEN IF s1 > 0 AND s2 > 0 THEN
IF a$ <> "" THEN
'If wikitext was found, then substitute stuff & save it 'If wikitext was found, then substitute stuff & save it
'--- first HTML specific entities '--- first HTML specific entities
WHILE INSTR(a$, "&amp;") > 0 ' '&amp; must be first and looped until all WHILE INSTR(a$, "&amp;") > 0 ' '&amp; must be first and looped until all
@ -90,10 +92,21 @@ FUNCTION Wiki$ (PageName$) 'Read cached wiki page (download, if not yet cached)
PRINT #fh, a$; PRINT #fh, a$;
CLOSE #fh CLOSE #fh
ELSE ELSE
'Error message, if empty or corrupted (force re-download on next access) 'if page returns empty, then it's either
IF _FILEEXISTS(outputFile$) THEN
KILL outputFile$ 'an old no longer existing/needed page
ELSE
'or a new not yet created page
a$ = CHR$(10) + "{{PageInternalError}}" + CHR$(10) +_ a$ = CHR$(10) + "{{PageInternalError}}" + CHR$(10) +_
"* Either the requested page is not yet available in the Wiki," + CHR$(10) +_ "* The requested page is not yet available in the Wiki." + CHR$(10) +_
"* or the download from Wiki failed and corrupted the page data." + CHR$(10) +_ "** If this is a new keyword, which was recently added to the language, then " +_
"please allow some time for the developers to add it and recheck later." + CHR$(10)
END IF
END IF
ELSE
'download failure, page corrupted, no text delimiters found
a$ = CHR$(10) + "{{PageInternalError}}" + CHR$(10) +_
"* For some unknown reason the download of the requested page failed." + CHR$(10) +_
"** You may try ''Update Current Page'' from the ''Help'' menu." + CHR$(10) +_ "** You may try ''Update Current Page'' from the ''Help'' menu." + CHR$(10) +_
";Note:This may also just be a temporary server issue. If the problem persists " +_ ";Note:This may also just be a temporary server issue. If the problem persists " +_
"after waiting some time, then please feel free to leave us a message." + CHR$(10) "after waiting some time, then please feel free to leave us a message." + CHR$(10)
@ -488,7 +501,7 @@ SUB WikiParse (a$) 'Wiki page interpret
END IF END IF
END IF END IF
'However, the internal link logic must run always, as it also handles 'However, the internal link logic must run always, as it also handles
'the template {{Cb| and {{Cl| links used in text/code blocks 'the template {{Cb|, {{Cl| and {{Cm| links used in text/code blocks
IF link = 1 THEN IF link = 1 THEN
IF c$(2) = "]]" OR c$(2) = "}}" THEN IF c$(2) = "]]" OR c$(2) = "}}" THEN
i = i + 1 i = i + 1
@ -557,7 +570,7 @@ SUB WikiParse (a$) 'Wiki page interpret
'Wiki templates are handled always, as these are the basic building blocks of all 'Wiki templates are handled always, as these are the basic building blocks of all
'the wiki pages, but look for special conditions inside (Help_LockParse checks) 'the wiki pages, but look for special conditions inside (Help_LockParse checks)
IF c$(5) = "{{Cb|" OR c$(5) = "{{Cl|" THEN 'just nice wrapped links IF c$(5) = "{{Cb|" OR c$(5) = "{{Cl|" OR c$(5) = "{{Cm|" THEN 'just nice wrapped links
i = i + 4 i = i + 4
link = 1: link$ = "": lcol$ = "" link = 1: link$ = "": lcol$ = ""
Help_LinkTxt = 1: col = Help_Col Help_LinkTxt = 1: col = Help_Col