From a2958dd68751b8c878b05bca18ce02a3454f7d00 Mon Sep 17 00:00:00 2001
From: Jose Quintana <joseluisquintana20@gmail.com>
Date: Tue, 12 Jan 2021 01:06:41 +0100
Subject: [PATCH] refactor: concise control headers conditionals

---
 src/core/cache.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/core/cache.rs b/src/core/cache.rs
index 267ca7f..9512619 100644
--- a/src/core/cache.rs
+++ b/src/core/cache.rs
@@ -12,13 +12,10 @@ pub fn control_headers(res: warp::fs::File) -> warp::reply::WithHeader<warp::fs:
 
     if let Some(ext) = res.path().extension() {
         if let Some(ext) = ext.to_str() {
-            // Caching (one year)
-            if CACHE_EXT_ONE_YEAR.iter().any(|n| *n == ext) {
-                max_age = 60 * 60 * 24 * 365;
-            }
-            // Caching (one hour)
             if CACHE_EXT_ONE_HOUR.iter().any(|n| *n == ext) {
                 max_age = 60 * 60;
+            } else if CACHE_EXT_ONE_YEAR.iter().any(|x| *x == ext) {
+                max_age = 60 * 60 * 24 * 365;
             }
         }
     }
--
libgit2 1.7.2