Display errors in export UI.

All errors are now fatal errors :(
telegramdesktop · Jun 19, 2018 · 5f01751 · 5f01751
1 parent 7d4e234
commit 5f01751
Show file tree

Hide file tree

Showing 23 changed files with 852 additions and 292 deletions.
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
@@ -1654,7 +1654,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_passport_bad_name" = "Please use latin characters only.";
 
 "lng_export_title" = "Personal data export";
-"lng_export_option_info" = "Personal info";
+"lng_export_option_info" = "Personal information";
 "lng_export_option_contacts" = "Contacts list";
 "lng_export_option_sessions" = "Sessions list";
 "lng_export_header_chats" = "Chats export settings";
@@ -1675,6 +1675,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_export_option_files" = "Files";
 "lng_export_option_size_limit" = "Size limit: {size}";
 "lng_export_start" = "Export";
+"lng_export_state_initializing" = "Initializing...";
+"lng_export_state_userpics" = "Personal photos";
+"lng_export_state_chats_list" = "Processing chats...";
+"lng_export_state_chats" = "Chats";
+"lng_export_state_progress" = "{count} / {total}";
+"lng_export_state_photo" = "Photo";
+"lng_export_state_video_file" = "Video file";
+"lng_export_state_voice_message" = "Voice message";
+"lng_export_state_video_message" = "Round video message";
+"lng_export_state_sticker" = "Sticker";
+"lng_export_state_gif" = "Animated GIF";
 
 // Wnd specific
 

diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -250,6 +250,21 @@ QString CleanDocumentName(QString name) {
 	return name;
 }
 
+QString DocumentFolder(const Document &data) {
+	if (data.isVideoFile) {
+		return "VideoFiles";
+	} else if (data.isAnimated) {
+		return "AnimatedGIFs";
+	} else if (data.isSticker) {
+		return "Stickers";
+	} else if (data.isVoiceMessage) {
+		return "VoiceMessages";
+	} else if (data.isVideoMessage) {
+		return "RoundVideoMessages";
+	}
+	return "Files";
+}
+
 Document ParseDocument(
 		const MTPDocument &data,
 		const QString &suggestedFolder,
@@ -267,6 +282,7 @@ Document ParseDocument(
 		result.mime = ParseString(data.vmime_type);
 		ParseAttributes(result, data.vattributes);
 		result.file.suggestedPath = suggestedFolder
+			+ DocumentFolder(result) + '/'
 			+ CleanDocumentName(
 				ComputeDocumentName(result, date ? date : result.date));
 	}, [&](const MTPDdocumentEmpty &data) {
@@ -548,10 +564,7 @@ Media ParseMedia(
 		result.content = UnsupportedMedia();
 	}, [&](const MTPDmessageMediaDocument &data) {
 		result.content = data.has_document()
-			? ParseDocument(
-				data.vdocument,
-				folder + "Files/",
-				date)
+			? ParseDocument(data.vdocument, folder, date)
 			: Document();
 		if (data.has_ttl_seconds()) {
 			result.ttl = data.vttl_seconds.v;

diff --git a/Telegram/SourceFiles/export/data/export_data_types.h b/Telegram/SourceFiles/export/data/export_data_types.h
@@ -427,6 +427,9 @@ struct DialogInfo {
 	bool onlyMyMessages = false;
 	QString relativePath;
 
+	// Filled when requesting dialog messages.
+	int messagesCount = 0;
+
 };
 
 struct DialogsInfo {