|
|
|
|
@ -18,7 +18,12 @@ use log::{error, info};
@@ -18,7 +18,12 @@ use log::{error, info};
|
|
|
|
|
use rocket::futures::{self, channel::mpsc}; |
|
|
|
|
use ruma::{DeviceId, ServerName, UserId}; |
|
|
|
|
use serde::Deserialize; |
|
|
|
|
use std::{collections::HashMap, fs::{self, remove_dir_all}, io::Write, sync::{Arc, RwLock}}; |
|
|
|
|
use std::{ |
|
|
|
|
collections::HashMap, |
|
|
|
|
fs::{self, remove_dir_all}, |
|
|
|
|
io::Write, |
|
|
|
|
sync::{Arc, RwLock}, |
|
|
|
|
}; |
|
|
|
|
use tokio::sync::Semaphore; |
|
|
|
|
|
|
|
|
|
#[derive(Clone, Debug, Deserialize)] |
|
|
|
|
@ -264,7 +269,6 @@ impl Database {
@@ -264,7 +269,6 @@ impl Database {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if db.globals.database_version()? < 3 { |
|
|
|
|
|
|
|
|
|
// Move media to filesystem
|
|
|
|
|
for r in db.media.mediaid_file.iter() { |
|
|
|
|
let (key, content) = r?; |
|
|
|
|
|