tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Files: new remote (persistent) id version

Browse Source 
GitOrigin-RevId: 9935066e24e9fff6c4b82b57b55ea2d517119b4b
This commit is contained in:
Arseny Smirnov 2019-06-12 17:28:00 +03:00
parent c856242644
commit 4b113527b2
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/telegram/Photo.hpp
View File

@ -54,6 +54,8 @@ void OfflineInputPeer::parse(ParserT &parser) {
case DialogType::None:
parser.set_error("Invalid chat id");
break;
default:
break;
}
}

28
td/telegram/files/FileManager.cpp
View File

@ -2564,6 +2564,7 @@ string FileManager::get_persistent_id(const FullRemoteFileLocation &location) {
auto binary = serialize(location_copy);
binary = zero_encode(binary);
binary.push_back(narrow_cast<td::uint8>(Version::Next) - 1);
binary.push_back(PERSISTENT_ID_VERSION);
return base64url_encode(binary);
}
@ -2587,9 +2588,12 @@ Result<FileId> FileManager::from_persistent_id(CSlice persistent_id, FileType fi
if (binary.empty()) {
return Status::Error(10, "Remote file id can't be empty");
}
if (binary.back() == PERSISTENT_ID_VERSION) {
if (binary.back() == PERSISTENT_ID_VERSION_OLD) {
return from_persistent_id_v2(binary, file_type);
}
if (binary.back() == PERSISTENT_ID_VERSION) {
return from_persistent_id_v3(binary, file_type);
}
if (binary.back() == PERSISTENT_ID_VERSION_MAP) {
return from_persistent_id_map(binary, file_type);
}
@ -2617,13 +2621,14 @@ Result<FileId> FileManager::from_persistent_id_map(Slice binary, FileType file_t
return register_file(std::move(data), FileLocationSource::FromUser, "from_persistent_id_map", false).move_as_ok();
}
Result<FileId> FileManager::from_persistent_id_v2(Slice binary, FileType file_type) {
binary.remove_suffix(1);
Result<FileId> FileManager::from_persistent_id_v23(Slice binary, FileType file_type, int32 version) {
if (version < 0 || version >= static_cast<int32>(Version::Next)) {
return Status::Error("Invalid remote id");
}
auto decoded_binary = zero_decode(binary);
FullRemoteFileLocation remote_location;
logevent::WithVersion<TlParser> parser(decoded_binary);
//TODO(now): encode version?
parser.set_version(static_cast<int32>(Version::Initial));
parser.set_version(version);
parse(remote_location, parser);
parser.fetch_end();
auto status = parser.get_status();
@ -2644,6 +2649,19 @@ Result<FileId> FileManager::from_persistent_id_v2(Slice binary, FileType file_ty
register_file(std::move(data), FileLocationSource::FromUser, "from_persistent_id_v2", false).move_as_ok();
return file_id;
}
Result<FileId> FileManager::from_persistent_id_v2(Slice binary, FileType file_type) {
binary.remove_suffix(1);
return from_persistent_id_v23(binary, file_type, 0);
}
Result<FileId> FileManager::from_persistent_id_v3(Slice binary, FileType file_type) {
binary.remove_suffix(1);
if (binary.empty()) {
return Status::Error("Invalid remote id");
}
auto version = static_cast<uint8>(binary.back());
binary.remove_suffix(1);
return from_persistent_id_v23(binary, file_type, version);
}
FileView FileManager::get_file_view(FileId file_id) const {
auto file_node = get_file_node(file_id);

5
td/telegram/files/FileManager.h
View File

@ -452,8 +452,9 @@ class FileManager : public FileLoadManager::Callback {
FileId parse_file(ParserT &parser);
private:
static constexpr char PERSISTENT_ID_VERSION = 2;
static constexpr char PERSISTENT_ID_VERSION_OLD = 2;
static constexpr char PERSISTENT_ID_VERSION_MAP = 3;
static constexpr char PERSISTENT_ID_VERSION = 4;
Result<FileId> check_input_file_id(FileType type, Result<FileId> result, bool is_encrypted, bool allow_zero,
bool is_secure) TD_WARN_UNUSED_RESULT;
@ -559,6 +560,8 @@ class FileManager : public FileLoadManager::Callback {
Result<FileId> from_persistent_id_map(Slice binary, FileType file_type);
Result<FileId> from_persistent_id_v2(Slice binary, FileType file_type);
Result<FileId> from_persistent_id_v3(Slice binary, FileType file_type);
Result<FileId> from_persistent_id_v23(Slice binary, FileType file_type, int32 version);
string fix_file_extension(Slice file_name, Slice file_type, Slice file_extension);
string get_file_name(FileType file_type, Slice path);