From e07af7c02fc8a79fd3a7bf2cffc72bf3a57064eb Mon Sep 17 00:00:00 2001
From: Jesse Morgan <jesse@jesterpm.net>
Date: Sat, 19 Sep 2020 15:15:10 -0700
Subject: Fetch files from S3 directly.
---
src/main.rs | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
(limited to 'src/main.rs')
diff --git a/src/main.rs b/src/main.rs
index 2c81ccd..a3a7f76 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,9 +15,12 @@ mod oauth;
pub struct SiteConfig {
bind: String,
+ media_url: String,
token_endpoint: String,
s3_bucket: String,
- media_url: String,
+
+ default_width: u32,
+ default_height: u32,
}
impl SiteConfig {
@@ -25,6 +28,11 @@ impl SiteConfig {
&self.bind
}
+ /// Base URL for serving files
+ pub fn media_url(&self) -> &str {
+ &self.media_url
+ }
+
/// The URI to use to validate an access token.
pub fn token_endpoint(&self) -> &str {
&self.token_endpoint
@@ -35,9 +43,12 @@ impl SiteConfig {
&self.s3_bucket
}
- /// Base URL for S3 bucket assets.
- pub fn media_url(&self) -> &str {
- &self.media_url
+ pub fn default_width(&self) -> u32 {
+ self.default_width
+ }
+
+ pub fn default_height(&self) -> u32 {
+ self.default_height
}
}
@@ -51,6 +62,8 @@ async fn main() -> std::io::Result<()> {
s3_bucket: std::env::var("S3_BUCKET").expect("Expected S3_BUCKET env var"),
media_url: std::env::var("MEDIA_URL").expect("Expected MEDIA_URL env var"),
token_endpoint: std::env::var("TOKEN_ENDPOINT").expect("Expected TOKEN_ENDPOINT env var"),
+ default_width: std::env::var("DEFAULT_WIDTH").ok().and_then(|v| v.parse().ok()).unwrap_or(1000),
+ default_height: std::env::var("DEFAULT_HEIGHT").ok().and_then(|v| v.parse().ok()).unwrap_or(0),
};
let bind = site_config.bind().to_string();
--
cgit v1.2.3