Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
ff011db3
O
obs-studio
项目概览
尘离序散
/
obs-studio
与 Fork 源项目一致
从无法访问的项目Fork
通知
30
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obs-studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
ff011db3
编写于
3月 15, 2018
作者:
J
Jim
提交者:
GitHub
3月 15, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1209 from VodBox/log-swap
UI: Replace gist for log uploads
上级
b7e2247d
840f9b7d
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
8 addition
and
26 deletion
+8
-26
UI/window-basic-main.cpp
UI/window-basic-main.cpp
+8
-26
未找到文件。
UI/window-basic-main.cpp
浏览文件 @
ff011db3
...
...
@@ -4249,32 +4249,11 @@ void OBSBasic::UploadLog(const char *file)
ui
->
menuLogFiles
->
setEnabled
(
false
);
auto
data_deleter
=
[](
obs_data_t
*
d
)
{
obs_data_release
(
d
);
};
using
data_t
=
unique_ptr
<
struct
obs_data
,
decltype
(
data_deleter
)
>
;
data_t
content
{
obs_data_create
(),
data_deleter
};
data_t
files
{
obs_data_create
(),
data_deleter
};
data_t
request
{
obs_data_create
(),
data_deleter
};
obs_data_set_string
(
content
.
get
(),
"content"
,
fileString
);
obs_data_set_obj
(
files
.
get
(),
file
,
content
.
get
());
stringstream
ss
;
ss
<<
"OBS "
<<
App
()
->
GetVersionString
()
<<
" log file uploaded at "
<<
CurrentDateTimeString
();
obs_data_set_string
(
request
.
get
(),
"description"
,
ss
.
str
().
c_str
());
obs_data_set_bool
(
request
.
get
(),
"public"
,
false
);
obs_data_set_obj
(
request
.
get
(),
"files"
,
files
.
get
());
const
char
*
json
=
obs_data_get_json
(
request
.
get
());
if
(
!
json
)
{
blog
(
LOG_ERROR
,
"Failed to get JSON data for log upload"
);
return
;
}
<<
" log file uploaded at "
<<
CurrentDateTimeString
()
<<
"
\n\n
"
<<
fileString
;
QBuffer
*
postData
=
new
QBuffer
();
postData
->
setData
(
json
,
(
int
)
strlen
(
json
));
if
(
logUploadThread
)
{
logUploadThread
->
wait
();
...
...
@@ -4282,8 +4261,9 @@ void OBSBasic::UploadLog(const char *file)
}
RemoteTextThread
*
thread
=
new
RemoteTextThread
(
"https://api.github.com/gists"
,
"application/json"
,
json
);
"https://hastebin.com/documents"
,
"text/plain"
,
ss
.
str
().
c_str
());
logUploadThread
=
thread
;
connect
(
thread
,
&
RemoteTextThread
::
Result
,
this
,
&
OBSBasic
::
logUploadFinished
);
...
...
@@ -4343,7 +4323,9 @@ void OBSBasic::logUploadFinished(const QString &text, const QString &error)
}
obs_data_t
*
returnData
=
obs_data_create_from_json
(
QT_TO_UTF8
(
text
));
QString
logURL
=
obs_data_get_string
(
returnData
,
"html_url"
);
string
resURL
=
"https://hastebin.com/"
;
resURL
+=
obs_data_get_string
(
returnData
,
"key"
);
QString
logURL
=
resURL
.
c_str
();
obs_data_release
(
returnData
);
OBSLogReply
logDialog
(
this
,
logURL
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录