From 3f13e7f2c7cfceaf7b478d02d9c563ef1a8ce580 Mon Sep 17 00:00:00 2001
From: Christoph <auchri@users.noreply.github.com>
Date: Mon, 4 Jul 2016 21:14:29 +0200
Subject: [PATCH 1/4] Revert "Read environment variables properly."
Signed-off-by: Christoph <auer.chrisi@gmx.net>
---
Telegram/qt_static.pri | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Telegram/qt_static.pri b/Telegram/qt_static.pri
index c3e1b873b..9873c80ad 100644
--- a/Telegram/qt_static.pri
+++ b/Telegram/qt_static.pri
@@ -1,8 +1,8 @@
QT_TDESKTOP_VERSION_DEFAULT = 5.6.0
QT_TDESKTOP_PATH_DEFAULT = /usr/local/tdesktop/Qt-$${QT_TDESKTOP_VERSION_DEFAULT}
-QT_TDESKTOP_VERSION = $$(QT_TDESKTOP_VERSION)
-QT_TDESKTOP_PATH = $$(QT_TDESKTOP_PATH)
+QT_TDESKTOP_VERSION = $${QT_TDESKTOP_VERSION}
+QT_TDESKTOP_PATH = $${QT_TDESKTOP_PATH}
isEmpty(QT_TDESKTOP_PATH) {
message(QT_TDESKTOP_PATH is not set. Using default value $${QT_TDESKTOP_PATH_DEFAULT})
From fe26b2e1281317d064ac6542d98dc4b881b46097 Mon Sep 17 00:00:00 2001
From: Christoph <auer.chrisi@gmx.net>
Date: Sun, 3 Jul 2016 02:00:01 +0200
Subject: [PATCH 2/4] Add fast finish to travis
Now, a build will finish as soon as a job has failed, or when the only
jobs left allow failures.
See https://docs.travis-ci.com/user/customizing-the-build/#Fast-Finishing
Signed-off-by: Christoph <auer.chrisi@gmx.net>
---
.travis.yml | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8865792ed..9833abd1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,17 @@ sudo: required
language: cpp
env:
- - BUILD_VERSION=""
- - BUILD_VERSION="disable_autoupdate"
- - BUILD_VERSION="disable_register_custom_scheme"
- - BUILD_VERSION="disable_crash_reports"
- - BUILD_VERSION="disable_network_proxy"
- - BUILD_VERSION="disable_desktop_file_generation"
- - BUILD_VERSION="disable_unity_integration"
+ matrix:
+ - BUILD_VERSION=""
+ - BUILD_VERSION="disable_autoupdate"
+ - BUILD_VERSION="disable_register_custom_scheme"
+ - BUILD_VERSION="disable_crash_reports"
+ - BUILD_VERSION="disable_network_proxy"
+ - BUILD_VERSION="disable_desktop_file_generation"
+ - BUILD_VERSION="disable_unity_integration"
+
+matrix:
+ fast_finish: true
arch:
repos:
From 78d42476ebf53273ac330e1a8e73f3d8085e32ac Mon Sep 17 00:00:00 2001
From: Christoph <auer.chrisi@gmx.net>
Date: Mon, 4 Jul 2016 21:32:29 +0200
Subject: [PATCH 3/4] Automatic comment on missing sig.
Add a comment to a PR if a commit message is missing the signature.
Signed-off-by: Christoph <auer.chrisi@gmx.net>
---
.travis.yml | 3 +++
.travis/check.sh | 32 ++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 9833abd1d..841d2ef65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,9 @@ sudo: required
language: cpp
env:
+ global:
+ # GitHub auth token (GH_AUTH_TOKEN)
+ - secure: "QBbD9VXAx3Mn0vFmHZtm6/sq+twMyR7ilQh7TQm8gBy2TrjhHKDKQ4wRQ5sa2MUFUbzrUOvPlPGq1WuY1mAUt8UE6jZDJNyyDWb6iIlcEmNRsd39XAhYHvJ+uI9JsD+U3OctZ+7Bo4fno0RLv1D5lzh5bpohmjgWxx9TiSZItbsRU+m0XM0Tahx335aXF8NFoVjheGXCOcLAXDt6OmaKPmlrXreuta5nOoRKeOg5vHlt/KNU1pYb8MFvWJc14DKxq3jNqrYlo9vHFv5tVhR1aqvVFWTD/4Z88OSxx3POzyVWdMso0lFov9uxs8qHoqLsGhDMElggyz/jnqZIHpwQMaYIGQ0LLYDv21jGgOuCOWKYlfjDY+tuESXmVPzerTlYBWLZDPrpE8BnXVYo8B/sF4WN6oCuBRjawlqYhqTH+tDDORc9Uc9pamhcuh6OsLMx3PHoyg8joN3t8yUnwhySXyfQ36hqlZ+Y4bBDRZBH/SB/EPmedyLGwdhzQFsUnOBotYeOym7LUdnGraGcj1iTPLdo5TMlBYlAiB12J5mHTNuzUKXh+PBV4REg4Mm2xYX+Pue5Qo1JcOWJteIX4BdPv526DXB3yaNWS1pZgGvYqtBwQlCeOfwOYupS0PksvmV7aX7c4qJSyW3dmEd03cxmebD0b2SbqyPxGFuUajJ7B60="
matrix:
- BUILD_VERSION=""
- BUILD_VERSION="disable_autoupdate"
diff --git a/.travis/check.sh b/.travis/check.sh
index 3fe7c7fd3..2aaae0471 100755
--- a/.travis/check.sh
+++ b/.travis/check.sh
@@ -13,6 +13,7 @@ checkCommitMessage() {
if [[ $TRAVIS_COMMIT_MSG != *"Signed-off-by: "* ]];then
error_msg "The commit message does not contain the signature!"
error_msg "More information: https://github.com/telegramdesktop/tdesktop/blob/master/.github/CONTRIBUTING.md#sign-your-work"
+ addMissingSignatureInfos
exit 1
else
success_msg "Commit message contains signature"
@@ -20,6 +21,37 @@ checkCommitMessage() {
fi
}
+addMissingSignatureInfos() {
+ if [[ $BUILD_VERSION == "" ]]; then
+ local TEXT="Hi,\n\
+thanks for the pull request!\n\
+\n\
+Please read our [contributing policy](https://github.com/telegramdesktop/tdesktop/blob/master/.github/CONTRIBUTING.md). You'll need to make a pull request with the \\\"Signed-off-by:\\\" signature being the last line of your commit message, like it is described in [sign your work](https://github.com/telegramdesktop/tdesktop/blob/master/.github/CONTRIBUTING.md#sign-your-work) section. That will grant your work into the public domain.\n\
+\n\
+(See [travis build](https://travis-ci.org/telegramdesktop/tdesktop/jobs/${TRAVIS_JOB_ID}))"
+ addCommentToGitHub "${TEXT}"
+ addLabelToGitHub "missing signature"
+ info_msg "Added missing signature info on github"
+ fi
+}
+
+addCommentToGitHub() {
+ local BODY=$1
+ sendGitHubRequest "POST" "{\"body\": \"${BODY}\"}" "repos/${TRAVIS_REPO_SLUG}/issues/${TRAVIS_PULL_REQUEST}/comments"
+}
+
+addLabelToGitHub() {
+ local LABEL=$1
+ sendGitHubRequest "PATCH" "{\"labels\": [\"${LABEL}\"]}" "repos/${TRAVIS_REPO_SLUG}/issues/${TRAVIS_PULL_REQUEST}"
+}
+
+sendGitHubRequest() {
+ local METHOD=$1
+ local BODY=$2
+ local URI=$3
+ curl -H "Authorization: token ${GH_AUTH_TOKEN}" --request "${METHOD}" --data "${BODY}" --silent "https://api.github.com/${URI}" > /dev/null
+}
+
source ./.travis/common.sh
run
From 8909943bd31bf37aa5d5d3924c3f18020b090289 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 Jun 2016 18:21:21 +0300
Subject: [PATCH 4/4] Showing in folder instead of launching media files with
bad extensions. Thanks for the report to: Sadegh Ahmadzadegan - Omid
Ghaffarinia.
---
Telegram/SourceFiles/layout.cpp | 20 ++++++++++++++++++++
Telegram/SourceFiles/layout.h | 1 +
Telegram/SourceFiles/mainwidget.cpp | 12 ++++++++++--
Telegram/SourceFiles/structs.cpp | 17 +++++++++++++----
4 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/Telegram/SourceFiles/layout.cpp b/Telegram/SourceFiles/layout.cpp
index 54a7d259d..2dcd973d7 100644
--- a/Telegram/SourceFiles/layout.cpp
+++ b/Telegram/SourceFiles/layout.cpp
@@ -215,3 +215,23 @@ style::sprite documentCorner(int32 colorIndex) {
RoundCorners documentCorners(int32 colorIndex) {
return RoundCorners(DocBlueCorners + (colorIndex & 3));
}
+
+bool documentIsValidMediaFile(const QString &filepath) {
+ static StaticNeverFreedPointer<QList<QString>> validMediaTypes(([] {
+ std_::unique_ptr<QList<QString>> result = std_::make_unique<QList<QString>>();
+ *result = qsl("\
+webm mkv flv vob ogv ogg drc gif gifv mng avi mov qt wmv yuv rm rmvb asf amv mp4 m4p \
+m4v mpg mp2 mpeg mpe mpv m2v svi 3gp 3g2 mxf roq nsv f4v f4p f4a f4b wma divx evo mk3d \
+mka mks mcf m2p ps ts m2ts ifo aaf avchd cam dat dsh dvr-ms m1v fla flr sol wrap smi swf \
+wtv 8svx 16svx iff aiff aif aifc au bwf cdda raw wav flac la pac m4a ape ofr ofs off rka \
+shn tak tta wv brstm dts dtshd dtsma ast amr mp3 spx gsm aac mpc vqf ra ots swa vox voc \
+dwd smp aup cust mid mus sib sid ly gym vgm psf nsf mod ptb s3m xm it mt2 minipsf psflib \
+2sf dsf gsf psf2 qsf ssf usf rmj spc niff mxl xml txm ym jam mp1 mscz \
+").split(' ');
+ return result.release();
+ })());
+
+ QFileInfo info(filepath);
+ auto parts = info.fileName().split('.', QString::SkipEmptyParts);
+ return !parts.isEmpty() && (validMediaTypes->indexOf(parts.back().toLower()) >= 0);
+}
diff --git a/Telegram/SourceFiles/layout.h b/Telegram/SourceFiles/layout.h
index 86e6298e2..7ac05fdeb 100644
--- a/Telegram/SourceFiles/layout.h
+++ b/Telegram/SourceFiles/layout.h
@@ -81,6 +81,7 @@ style::color documentOverColor(int32 colorIndex);
style::color documentSelectedColor(int32 colorIndex);
style::sprite documentCorner(int32 colorIndex);
RoundCorners documentCorners(int32 colorIndex);
+bool documentIsValidMediaFile(const QString &filepath);
class PaintContextBase {
public:
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index fab677930..99dd01174 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1541,7 +1541,11 @@ void MainWidget::audioPlayProgress(const AudioMsgId &audioId) {
DocumentData *audio = audioId.audio;
QString filepath = audio->filepath(DocumentData::FilePathResolveSaveFromData);
if (!filepath.isEmpty()) {
- psOpenFile(filepath);
+ if (documentIsValidMediaFile(filepath)) {
+ psOpenFile(filepath);
+ } else {
+ psShowInFolder(filepath);
+ }
}
}
@@ -1568,7 +1572,11 @@ void MainWidget::documentPlayProgress(const SongMsgId &songId) {
DocumentData *document = songId.song;
QString filepath = document->filepath(DocumentData::FilePathResolveSaveFromData);
if (!filepath.isEmpty()) {
- psOpenFile(filepath);
+ if (documentIsValidMediaFile(filepath)) {
+ psOpenFile(filepath);
+ } else {
+ psShowInFolder(filepath);
+ }
}
}
diff --git a/Telegram/SourceFiles/structs.cpp b/Telegram/SourceFiles/structs.cpp
index 4b3e006d7..54b8f7800 100644
--- a/Telegram/SourceFiles/structs.cpp
+++ b/Telegram/SourceFiles/structs.cpp
@@ -975,8 +975,13 @@ void DocumentOpenClickHandler::doOpen(DocumentData *data, ActionOnLoad action) {
audioPlayer()->play(song);
if (App::main()) App::main()->documentPlayProgress(song);
}
- } else if (data->voice() || data->isVideo()) {
- psOpenFile(location.name());
+ } else if (data->voice() || data->song() || data->isVideo()) {
+ auto filepath = location.name();
+ if (documentIsValidMediaFile(filepath)) {
+ psOpenFile(filepath);
+ } else {
+ psShowInFolder(filepath);
+ }
if (App::main()) App::main()->mediaMarkRead(data);
} else if (data->size < MediaViewImageSizeLimit) {
if (!data->data().isEmpty() && playAnimation) {
@@ -1270,8 +1275,12 @@ void DocumentData::performActionOnLoad() {
psOpenFile(already, true);
}
} else if (_actionOnLoad == ActionOnLoadOpen || _actionOnLoad == ActionOnLoadPlayInline) {
- if (voice() || isVideo()) {
- psOpenFile(already);
+ if (voice() || song() || isVideo()) {
+ if (documentIsValidMediaFile(already)) {
+ psOpenFile(already);
+ } else {
+ psShowInFolder(already);
+ }
if (App::main()) App::main()->mediaMarkRead(this);
} else if (loc.accessEnable()) {
if (showImage && QImageReader(loc.name()).canRead()) {