prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extract contentType from safari

Browse source 
This fixes issues where we'd incorrectly identify a PDF as HTML.
Safari will use our preprocess javascript file even if the
file is PDF, so we rely on JS to detect the content type here.
This commit is contained in:
Jackson Harper 2022-05-24 21:01:01 -07:00
parent ad91c41f0f
commit a02bb2f5c9
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apple/OmnivoreKit/Sources/Models/PageScrapePayload.swift
View file

@ -19,11 +19,18 @@ public struct PageScrapePayload {
public let url: String
public let contentType: ContentType
init(url: String, title: String?, html: String?) {
init(url: String, title: String?, html: String?, contentType: String?) {
self.url = url
self.title = title
self.html = html
self.contentType = url.hasSuffix(".pdf") ? .pdf : .html
// If the content type was specified and we know its PDF, use that
// otherwise fallback to using file extensions.
if let contentType = contentType, contentType == "application/pdf" {
self.contentType = .pdf
} else {
self.contentType = url.hasSuffix(".pdf") ? .pdf : .html
}
}
}
@ -207,7 +214,7 @@ public enum PageScraper {
private extension PageScrapePayload {
static func make(url: URL?) -> PageScrapePayload? {
guard let url = url else { return nil }
return PageScrapePayload(url: url.absoluteString, title: nil, html: nil)
return PageScrapePayload(url: url.absoluteString, title: nil, html: nil, contentType: nil)
}
static func make(item: NSSecureCoding?) -> PageScrapePayload? {
@ -216,7 +223,8 @@ private extension PageScrapePayload {
guard let url = results?["url"] as? String else { return nil }
let html = results?["documentHTML"] as? String
let title = results?["title"] as? String
let contentType = results?["contentType"] as? String
return PageScrapePayload(url: url, title: title, html: html)
return PageScrapePayload(url: url, title: title, html: html, contentType: contentType)
}
}

1
apple/Sources/ShareExtension/ShareExtension.js
View file

@ -5,6 +5,7 @@ ShareExtension.prototype = {
arguments.completionFunction({
'url': window.location.href,
'title': document.title.toString(),
'contentType': document.contentType,
'documentHTML': new XMLSerializer().serializeToString(document),
});
}