andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Better fir for merge_choose_generate_location.

Browse Source 
GitOrigin-RevId: 23286b6d59cbfefae852b63f6cf6daa7e41d2690
This commit is contained in:
levlam 2019-01-19 22:42:06 +03:00
parent c47b737ef7
commit 6cc83f025f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -966,17 +966,15 @@ static int merge_choose_generate_location(const unique_ptr<FullGenerateFileLocat
if (x_empty != y_empty) {
return x_empty ? 1 : 0;
}
if (!x_empty) {
if (!x_empty && *x != *y) {
bool x_has_mtime = begins_with(x->conversion_, "#mtime#");
bool y_has_mtime = begins_with(y->conversion_, "#mtime#");
if (x_has_mtime != y_has_mtime) {
return x_has_mtime ? 0 : 1;
}
if (x->conversion_ != y->conversion) {
return x->conversion_ >= y->conversion_
? 0
: 1; // the bigger conversion, the bigger mtime or at least more stable choise
}
return x->conversion_ >= y->conversion_
? 0
: 1; // the bigger conversion, the bigger mtime or at least more stable choise
}
return 2;
}