hiro/tdesktop
1
0
Fork 0
mirror of https://github.com/vale981/tdesktop synced 2025-03-06 02:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use separate download folder for support.

Browse source
This commit is contained in:
John Preston 2018-11-22 17:15:52 +04:00
parent 7705999e57
commit 3f58c930e3
13 changed files with 17 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Telegram/SourceFiles/core/file_utilities.cpp
View file

@ -138,6 +138,16 @@ void ShowInFolder(const QString &filepath) {
});
}
QString DefaultDownloadPath() {
return QStandardPaths::writableLocation(
QStandardPaths::DownloadLocation)
+ '/'
+ (AuthSession::Exists() && Auth().supportMode()
? "Tsupport Desktop"
: str_const_toString(AppName))
+ '/';
}
namespace internal {
void UnsafeOpenEmailLinkDefault(const QString &email) {

2
Telegram/SourceFiles/core/file_utilities.h
View file

@ -35,6 +35,8 @@ void OpenWith(const QString &filepath, QPoint menuPosition);
void Launch(const QString &filepath);
void ShowInFolder(const QString &filepath);
QString DefaultDownloadPath();
namespace internal {
inline QString UrlToLocalDefault(const QUrl &url) {

2
Telegram/SourceFiles/data/data_document.cpp
View file

@ -146,7 +146,7 @@ QString FileNameUnsafe(
QString path;
if (Global::DownloadPath().isEmpty()) {
path = psDownloadPath();
path = File::DefaultDownloadPath();
} else if (Global::DownloadPath() == qsl("tmp")) {
path = cTempDir();
} else {

6
Telegram/SourceFiles/export/view/export_view_panel_controller.cpp
View file

@ -109,12 +109,12 @@ bool IsDefaultPath(const QString &path) {
: value;
return (cPlatform() == dbipWindows) ? result.toLower() : result;
};
return (check(path) == check(psDownloadPath()));
return (check(path) == check(File::DefaultDownloadPath()));
}
void ResolveSettings(Settings &settings) {
if (settings.path.isEmpty()) {
settings.path = psDownloadPath();
settings.path = File::DefaultDownloadPath();
settings.forceSubPath = true;
} else {
settings.forceSubPath = IsDefaultPath(settings.path);
@ -381,7 +381,7 @@ void PanelController::saveSettings() const {
return (cPlatform() == dbipWindows) ? result.toLower() : result;
};
auto settings = *_settings;
if (check(settings.path) == check(psDownloadPath())) {
if (check(settings.path) == check(File::DefaultDownloadPath())) {
settings.path = QString();
}
Local::WriteExportSettings(settings);

2
Telegram/SourceFiles/mediaview.cpp
View file

@ -979,7 +979,7 @@ void MediaView::onDownload() {
QString path;
if (Global::DownloadPath().isEmpty()) {
path = psDownloadPath();
path = File::DefaultDownloadPath();
} else if (Global::DownloadPath() == qsl("tmp")) {
path = cTempDir();
} else {

4
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View file

@ -306,10 +306,6 @@ QString psAppDataPath() {
return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + '/';
}
QString psDownloadPath() {
return QStandardPaths::writableLocation(QStandardPaths::DownloadLocation) + '/' + str_const_toString(AppName) + '/';
}
void psDoCleanup() {
try {
psAutoStart(false, true);

1
Telegram/SourceFiles/platform/linux/specific_linux.h
View file

@ -59,7 +59,6 @@ void psClearInitLogs();
void psActivateProcess(uint64 pid = 0);
QString psLocalServerPrefix();
QString psAppDataPath();
QString psDownloadPath();
void psAutoStart(bool start, bool silent = false);
void psSendToMenu(bool send, bool silent = false);

1
Telegram/SourceFiles/platform/mac/specific_mac.h
View file

@ -58,7 +58,6 @@ void psClearInitLogs();
void psActivateProcess(uint64 pid = 0);
QString psLocalServerPrefix();
QString psAppDataPath();
QString psDownloadPath();
void psAutoStart(bool start, bool silent = false);
void psSendToMenu(bool send, bool silent = false);

4
Telegram/SourceFiles/platform/mac/specific_mac.mm
View file

@ -206,10 +206,6 @@ QString psAppDataPath() {
return objc_appDataPath();
}
QString psDownloadPath() {
return objc_downloadPath();
}
void psDoCleanup() {
try {
psAutoStart(false, true);

1
Telegram/SourceFiles/platform/mac/specific_mac_p.h
View file

@ -31,7 +31,6 @@ double objc_appkitVersion();
QString objc_documentsPath();
QString objc_appDataPath();
QString objc_downloadPath();
QByteArray objc_downloadPathBookmark(const QString &path);
QByteArray objc_pathBookmark(const QString &path);
void objc_downloadPathEnableAccess(const QByteArray &bookmark);

8
Telegram/SourceFiles/platform/mac/specific_mac_p.mm
View file

@ -489,14 +489,6 @@ QString objc_appDataPath() {
return QString();
}
QString objc_downloadPath() {
NSURL *url = [[NSFileManager defaultManager] URLForDirectory:NSDownloadsDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:nil];
if (url) {
return QString::fromUtf8([[url path] fileSystemRepresentation]) + '/' + str_const_toString(AppName) + '/';
}
return QString();
}
QByteArray objc_downloadPathBookmark(const QString &path) {
#ifndef OS_MAC_STORE
return QByteArray();

4
Telegram/SourceFiles/platform/win/specific_win.cpp
View file

@ -193,10 +193,6 @@ QString psAppDataPathOld() {
return QString();
}
QString psDownloadPath() {
return QStandardPaths::writableLocation(QStandardPaths::DownloadLocation) + '/' + str_const_toString(AppName) + '/';
}
void psDoCleanup() {
try {
psAutoStart(false, true);

1
Telegram/SourceFiles/platform/win/specific_win.h
View file

@ -68,7 +68,6 @@ void psActivateProcess(uint64 pid = 0);
QString psLocalServerPrefix();
QString psAppDataPath();
QString psAppDataPathOld();
QString psDownloadPath();
void psAutoStart(bool start, bool silent = false);
void psSendToMenu(bool send, bool silent = false);