Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Report document URL in domready event as well

Browse Source
This commit is contained in:
Kovid Goyal 2022-04-02 13:23:32 +05:30
parent a0c9005d69
commit 7a4a6d0d19
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/scraper.js
View File

@ -21,7 +21,7 @@
send_msg({type: 'print', text: text}); send_msg({type: 'print', text: text});
} }
if (!document.location.href.startsWith('chrome-error:') && !document.location.href.startsWith('about:')) { if (document.location && document.location.href && !document.location.href.startsWith('chrome-error:') && !document.location.href.startsWith('about:')) {
send_msg({type: 'domready', html: new XMLSerializer().serializeToString(document)}); send_msg({type: 'domready', url: document.location.href, html: new XMLSerializer().serializeToString(document)});
} }
})(); })();

4
src/calibre/scraper/simple_backend.py
View File

@ -16,7 +16,9 @@ from calibre.gui2.webengine import create_script, insert_scripts
def canonicalize_qurl(qurl): def canonicalize_qurl(qurl):
qurl = qurl.adjusted(QUrl.UrlFormattingOption.StripTrailingSlash | QUrl.UrlFormattingOption.NormalizePathSegments) qurl = qurl.adjusted(
QUrl.UrlFormattingOption.StripTrailingSlash | QUrl.UrlFormattingOption.NormalizePathSegments | QUrl.UrlFormattingOption.RemoveFragment
)
if qurl.path() == '/': if qurl.path() == '/':
qurl = qurl.adjusted(QUrl.UrlFormattingOption.RemovePath) qurl = qurl.adjusted(QUrl.UrlFormattingOption.RemovePath)
return qurl return qurl