Add CSS file download

kaishin · kaishin · commit a4ecfb4bf1ba · 2020-04-10T01:14:21.000+02:00
diff --git a/Sources/swift-doc/Subcommands/Generate.swift b/Sources/swift-doc/Subcommands/Generate.swift
@@ -110,9 +110,22 @@ extension SwiftDoc {
                         try $0.value.write(to: url, format: format, baseURL: options.baseURL)
                     }
                 }
+
+                if case .html = format {
+                    let cssData = try fetchRemoteCSS()
+                    let cssURL = outputDirectoryURL.appendingPathComponent("all.css")
+                    try writeFile(cssData, to: cssURL)
+                }
+
+
             } catch {
                 logger.error("\(error)")
             }
         }
     }
 }
+
+func fetchRemoteCSS() throws -> Data {
+    let url = URL(string: "https://raw.githubusercontent.com/kaishin/swift-doc/reda/css-build/Resources/all.css")!
+    return try Data(contentsOf: url)
+}
diff --git a/Sources/swift-doc/Supporting Types/Layout.swift b/Sources/swift-doc/Supporting Types/Layout.swift
@@ -12,7 +12,7 @@ func layout(_ page: Page, baseURL: String) -> HTML {
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <title>\#(page.module.name) - \#(page.title)</title>
         <base href="\#(baseURL)"/>
-        <link rel="stylesheet" href="index.css" media="all" />
+        <link rel="stylesheet" type="text/css" href="all.css" media="all" />
     </head>
     <body>
         <header>
diff --git a/Sources/swift-doc/Supporting Types/Page.swift b/Sources/swift-doc/Supporting Types/Page.swift
@@ -28,11 +28,9 @@ extension Page {
             data = layout(self, baseURL: baseURL).description.data(using: .utf8)
         }
 
-        let fileManager = FileManager.default
-        try fileManager.createDirectory(at: url.deletingLastPathComponent(), withIntermediateDirectories: true, attributes: [.posixPermissions: 0o744])
+        guard let filedata = data else { return }
 
-        try data?.write(to: url)
-        try fileManager.setAttributes([.posixPermissions: 0o744], ofItemAtPath: url.path)
+        try writeFile(filedata, to: url)
     }
 }
 
@@ -43,3 +41,11 @@ func path(for symbol: Symbol) -> String {
 func path(for identifier: CustomStringConvertible) -> String {
     return "\(identifier)".replacingOccurrences(of: ".", with: "_")
 }
+
+func writeFile(_ data: Data, to url: URL) throws {
+    let fileManager = FileManager.default
+    try fileManager.createDirectory(at: url.deletingLastPathComponent(), withIntermediateDirectories: true, attributes: [.posixPermissions: 0o744])
+
+    try data.write(to: url)
+    try fileManager.setAttributes([.posixPermissions: 0o744], ofItemAtPath: url.path)
+}

Original file line number	Diff line number	Diff line change
`@@ -110,9 +110,22 @@ extension SwiftDoc {`
`110`	`110`	`try $0.value.write(to: url, format: format, baseURL: options.baseURL)`
`111`	`111`	`}`
`112`	`112`	`}`
	`113`	`+`
	`114`	`+ if case .html = format {`
	`115`	`+ let cssData = try fetchRemoteCSS()`
	`116`	`+ let cssURL = outputDirectoryURL.appendingPathComponent("all.css")`
	`117`	`+ try writeFile(cssData, to: cssURL)`
	`118`	`+ }`
	`119`	`+`
	`120`	`+`
`113`	`121`	`} catch {`
`114`	`122`	`logger.error("\(error)")`
`115`	`123`	`}`
`116`	`124`	`}`
`117`	`125`	`}`
`118`	`126`	`}`
	`127`	`+`
	`128`	`+func fetchRemoteCSS() throws -> Data {`
	`129`	`+ let url = URL(string: "https://raw.githubusercontent.com/kaishin/swift-doc/reda/css-build/Resources/all.css")!`
	`130`	`+ return try Data(contentsOf: url)`
	`131`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,9 @@ extension Page {`
`28`	`28`	`data = layout(self, baseURL: baseURL).description.data(using: .utf8)`
`29`	`29`	`}`
`30`	`30`
`31`		`- let fileManager = FileManager.default`
`32`		`- try fileManager.createDirectory(at: url.deletingLastPathComponent(), withIntermediateDirectories: true, attributes: [.posixPermissions: 0o744])`
	`31`	`+ guard let filedata = data else { return }`
`33`	`32`
`34`		`- try data?.write(to: url)`
`35`		`- try fileManager.setAttributes([.posixPermissions: 0o744], ofItemAtPath: url.path)`
	`33`	`+ try writeFile(filedata, to: url)`
`36`	`34`	`}`
`37`	`35`	`}`
`38`	`36`
`@@ -43,3 +41,11 @@ func path(for symbol: Symbol) -> String {`
`43`	`41`	`func path(for identifier: CustomStringConvertible) -> String {`
`44`	`42`	`return "\(identifier)".replacingOccurrences(of: ".", with: "_")`
`45`	`43`	`}`
	`44`	`+`
	`45`	`+func writeFile(_ data: Data, to url: URL) throws {`
	`46`	`+ let fileManager = FileManager.default`
	`47`	`+ try fileManager.createDirectory(at: url.deletingLastPathComponent(), withIntermediateDirectories: true, attributes: [.posixPermissions: 0o744])`
	`48`	`+`
	`49`	`+ try data.write(to: url)`
	`50`	`+ try fileManager.setAttributes([.posixPermissions: 0o744], ofItemAtPath: url.path)`
	`51`	`+}`