chiark / gitweb /
use save_directory
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 1 Aug 2020 16:13:05 +0000 (17:13 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 1 Aug 2020 16:13:05 +0000 (17:13 +0100)
src/global.rs
src/updates.rs

index 607e2a56dd13d92240a4fd80dcf71e22a60b97e9..78b915eda577ddacedbfd72062ee71df0cef7cd9 100644 (file)
@@ -521,11 +521,11 @@ impl InstanceGuard<'_> {
       Server => format!(""),
       Unix{user} => { format!("{}:", user) },
     } };
-    iter::once(prefix)
-      .chain( iter::once(scope_prefix.as_ref()) )
+    [ SAVE_DIRECTORY, &"/", prefix, scope_prefix.as_ref() ]
+      .iter().map(Deref::deref)
       .chain( utf8_percent_encode(&name.scoped_name,
                                   &percent_encoding::NON_ALPHANUMERIC) )
-      .chain( iter::once(suffix) )
+      .chain([ suffix ].iter().map(Deref::deref))
       .collect()
   }
   #[throws(ServerFailure)]
index 86dc544151d7f9d0efeb4f7842366f1d28e742e0..7cdff5c9962e11bddb01e9272aeb490dfc25ead4 100644 (file)
@@ -14,6 +14,7 @@ const RECENT_BUFFER : usize = 50;
 
 pub type PlayerUpdatesLog =
   StableIndexVecDeque<Arc<PreparedUpdate>,sse::UpdateId>;
+// xxx delete old updates at some point
 
 #[derive(Debug)]
 pub struct PlayerUpdates {