From: sigoden <sigoden@gmail.com>
Date: Thu, 9 Jun 2022 13:35:52 +0000 (+0800)
Subject: chore: optimize code
X-Git-Url: https://git.ozva.co.uk/?a=commitdiff_plain;h=e01f2030e17a1bbacec97d419384b176ec0d459c;p=ozva-cloud

chore: optimize code
---

diff --git a/src/server.rs b/src/server.rs
index 150d4e6..f8029c5 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -816,10 +816,12 @@ struct PathItem {
 impl PathItem {
     pub fn to_dav_xml(&self, prefix: &str) -> String {
         let mtime = Utc.timestamp_millis(self.mtime as i64).to_rfc2822();
+        let href = encode_uri(&format!("{}{}", prefix, &self.name));
+        let displayname = escape_str_pcdata(&self.base_name);
         match self.path_type {
             PathType::Dir | PathType::SymlinkDir => format!(
                 r#"<D:response>
-<D:href>{}{}</D:href>
+<D:href>{}</D:href>
 <D:propstat>
 <D:prop>
 <D:displayname>{}</D:displayname>
@@ -829,14 +831,11 @@ impl PathItem {
 <D:status>HTTP/1.1 200 OK</D:status>
 </D:propstat>
 </D:response>"#,
-                prefix,
-                encode_uri(&self.name),
-                escape_str_pcdata(&self.base_name),
-                mtime
+                href, displayname, mtime
             ),
             PathType::File | PathType::SymlinkFile => format!(
                 r#"<D:response>
-<D:href>{}{}</D:href>
+<D:href>{}</D:href>
 <D:propstat>
 <D:prop>
 <D:displayname>{}</D:displayname>
@@ -847,9 +846,8 @@ impl PathItem {
 <D:status>HTTP/1.1 200 OK</D:status>
 </D:propstat>
 </D:response>"#,
-                prefix,
-                encode_uri(&self.name),
-                escape_str_pcdata(&self.base_name),
+                href,
+                displayname,
                 self.size.unwrap_or_default(),
                 mtime
             ),