Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump golang.org/x/net from 0.14.0 to 0.17.0 in /fyne_coder #1

Open
wants to merge 139 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
70ed988
增加http重定向
Feb 27, 2020
ea5dff1
add namesilo log
Feb 27, 2020
841f6d1
fix bug
Feb 27, 2020
8674ad8
add cert/sign
Feb 27, 2020
ce29f21
zip bug fix
Feb 28, 2020
b77498c
优化域名证书申请更新流程
Feb 29, 2020
f715042
fix conf file
Feb 29, 2020
f5fc979
fix
Feb 29, 2020
e18b2c4
fix
Feb 29, 2020
e43102f
fix
Feb 29, 2020
0f36818
fix path bug
Feb 29, 2020
f909df2
small fix
Feb 29, 2020
9fed204
fix bug
Feb 29, 2020
b463765
修复多域名处理时cmd错误问题
Mar 3, 2020
3b95782
取消http端口的启动
Mar 7, 2020
4fa3a46
增加docker脚本
Mar 8, 2020
df170d3
合并dnspod两个域名的证书
Mar 9, 2020
72992af
copy issuer.crt
Mar 9, 2020
4f6b5c2
remove issuer.crt
Mar 9, 2020
8c9abee
renew 后改为调用sslcopy.sh
May 11, 2020
d796156
Merge branch 'master' of https://github.com/xyzj/homecloud
May 11, 2020
19a4799
close resp body after request
May 11, 2020
31c0898
增加字符串编码功能
Jul 22, 2020
c15545a
调整movie路由跳转路径
xyzj Jul 24, 2020
bcf96f9
增加路由跳转管理接口
xyzj Jul 25, 2020
9ffca66
a little change
Jul 27, 2020
47fbe7b
增加本地videojs播放,使用配置tv-xx设置资源地址
Aug 7, 2020
d0283c4
tv增加order排序,默认按时间逆序,可设置按name排序
Aug 7, 2020
56f5d30
修正页面
Aug 7, 2020
88789bd
调整页面
xyzj Aug 7, 2020
7aea5cc
页面调整
xyzj Aug 7, 2020
00c59af
修复缩略图bug,调整样式'
xyzj Aug 9, 2020
72c0917
调整样式
xyzj Aug 9, 2020
590f43c
调整js
xyzj Aug 9, 2020
3697964
change css
xyzj Aug 9, 2020
fb90e89
页面调整,使用预载入
Aug 10, 2020
915f9ad
微调样式
Aug 10, 2020
fead7c5
加倍videojs缓存大小
Aug 11, 2020
1bbb9b9
设置mkv文件类型为webm
xyzj Aug 11, 2020
80c3ddc
增加字幕转化(todo)
xyzj Aug 13, 2020
3bbf339
增加字幕文件smi2vtt
Aug 14, 2020
b2df170
增加sub参数显示子目录内容
xyzj Aug 15, 2020
6cca838
bug fix
xyzj Aug 17, 2020
fefd284
修复选中列表的边框问题
Aug 17, 2020
9b586ae
增加watchfrp脚本
Aug 19, 2020
f9a096c
音频文件增加长度采样
xyzj Aug 19, 2020
765233b
Merge branch 'master' of https://github.com/xyzj/homecloud
xyzj Aug 19, 2020
a811fe2
修正字幕转换
xyzj Aug 21, 2020
58568e9
证书增加cloudflare支持
xyzj Aug 23, 2020
af48c7b
调整css
xyzj Aug 23, 2020
e05ea4c
更新hpc的dockerfile
xyzj Aug 27, 2020
56b7c6a
更新样式
xyzj Sep 2, 2020
80c2de5
恢复字幕按钮
Sep 3, 2020
7ab7fe7
更新sslrenew
Sep 4, 2020
54a29f2
增加youtube下载功能
xyzj Oct 2, 2020
476f26b
增加下载数量控制
xyzj Oct 3, 2020
0593cb5
增加youtube批量下载功能
xyzj Oct 4, 2020
9bdf1f4
优化
xyzj Oct 5, 2020
395bade
增加flash.min.js
xyzj Oct 5, 2020
ad314b1
优化下载
xyzj Oct 8, 2020
bde803e
ydl下载框outline:none
xyzj Oct 8, 2020
aaceb15
add sslrenew
Oct 10, 2020
333052f
增加英语字幕下载
xyzj Oct 11, 2020
96096f3
更新英文字幕下载
Oct 14, 2020
fec9cb9
修正文件遍历bug
Oct 14, 2020
f2a2e0e
优化sslrenew
Oct 14, 2020
d82e790
调整下载的停顿
Oct 20, 2020
3603979
精简部分内容
xyzj Nov 8, 2020
71b6db7
增加cf更新接口,少量问题修正
Nov 9, 2020
3107edc
修正视频下载bug
xyzj Nov 9, 2020
4e9412c
cf bug fix
xyzj Nov 21, 2020
bbd467d
调整下载间隔
xyzj Dec 8, 2020
5802ff7
优化下载脚本
Dec 8, 2020
9def1bb
优化下载脚本
Dec 8, 2020
3ffb7f0
update webtv
xyzj Dec 17, 2020
8f41754
支持跨域
Dec 17, 2020
ecd0f01
webtv忽略无音频文件
xyzj Dec 30, 2020
a484139
youtube-dl add --no-mtime
Jan 20, 2021
af5fac5
增加aria2c两个web页面
xyzj Jan 27, 2021
6386ed9
集成youtube,http,bt,thunder下载到/tools/dl
Jan 28, 2021
bb4fc19
用aria2管理http下载
xyzj Jan 29, 2021
3433f25
add httphere
Mar 17, 2021
9e01260
fix httphere
Mar 17, 2021
4355b08
fix thunder download
xyzj Mar 17, 2021
fe2c546
优化代码
Mar 23, 2021
3d93b61
fix ext4 youtube filename too long
xyzj Mar 23, 2021
9bd7338
replace youtube filename
xyzj Mar 23, 2021
38f0284
name bug fix
xyzj Mar 23, 2021
edb05bd
bug fix
xyzj Mar 23, 2021
4fe3fbd
清理无用代码
Mar 25, 2021
9f71148
small change
xyzj Mar 25, 2021
559e42a
使用embed管理videojs依赖,增加vauth启动参数,设置是否对video路由进行验证
xyzj May 3, 2021
d93e538
无域名时可默认使用本地证书
xyzj May 3, 2021
e9c04c2
添加本地证书为静态文件
xyzj May 3, 2021
c82b8f1
video路由,启用认证时增加流量控制
May 6, 2021
01412e3
缩短sslrenew检查证书的间隔,分类http代码
May 27, 2021
60a403b
更新内置证书为ecc证书
Jul 30, 2021
8c385e4
修改youtube下载的错误判断
xyzj Aug 4, 2021
7a8aa9e
优化youtube下载
xyzj Aug 8, 2021
4ba1bb4
增加md5计算功能
Aug 11, 2021
479d81e
增加filelogon参数,控制是否启用文件日志
Aug 17, 2021
f96d5a9
更新watchfrpc,完全接管frpc进程启动
Aug 23, 2021
b85cf12
sslrenew改为每日0-3点检查更新一次
Sep 6, 2021
c480bd1
fix sslrenew zip file name
Oct 13, 2021
c9cfe4c
use something new
Oct 16, 2021
50592d2
good httphere
Oct 26, 2021
02f6691
更新videojs
Oct 29, 2021
560d1e9
upgrade httphere
Nov 1, 2021
50a51fb
更新sslrenew
Nov 4, 2021
56b6404
some change
Nov 4, 2021
de00a82
精简httphere
Nov 11, 2021
99dff80
fix route/v/*
Nov 16, 2021
bb6c04b
优化代码结构
Dec 20, 2021
7e2d0f1
bug fix
Dec 21, 2021
ca8a107
fix route
Jan 17, 2022
f2c2080
fix hcloud bug
Jan 26, 2022
2d07628
use json, not sjson
Jan 26, 2022
e79885f
add webtv
Jan 27, 2022
8ef07cd
fix bug
Jan 27, 2022
fb8e2ef
httphere增加showroutes路由
Feb 14, 2022
df6d2bf
update sslrenew, add -show
Mar 25, 2022
f3fbc4d
add vpstools and dockerfile
May 1, 2022
3508bcc
update vpstools and docker-wall
May 2, 2022
74e3c81
add game to hcloud
Jun 5, 2022
29d5b54
rewrite httphere
Jun 5, 2022
8a3a5e9
fix a lot
Aug 1, 2022
e0010e4
update docker-wall
Sep 5, 2022
32b0176
update ydl
Sep 6, 2022
f146ee1
fix ydl bug
Sep 19, 2022
7b871e9
use godaemon
Sep 27, 2022
b2efbda
upgrade docker-wall
Nov 30, 2022
71e6b25
upgrade v2 config
Nov 30, 2022
411f452
upgrade hcloud, support arm64
Mar 3, 2023
c62ef2c
add urlparser and ncmc
May 4, 2023
fd98a37
add coder, add renamemp4
Jun 19, 2023
b3c0dc3
use gocmd
Aug 11, 2023
7497e25
fix hcloud css
Aug 14, 2023
5d973f6
add fyne_coder
Sep 28, 2023
b6ceaec
Bump golang.org/x/net from 0.14.0 to 0.17.0 in /fyne_coder
dependabot[bot] Oct 11, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix hcloud css
unknow committed Aug 14, 2023
commit 7497e25914745108fed6a9680b30e3ec3b94467b
6 changes: 3 additions & 3 deletions hcloud/libdownload.go
Original file line number Diff line number Diff line change
@@ -188,16 +188,16 @@ RUN:
scmd.WriteString("-- " + vi.url)
}
scmd.WriteString(" && \\\nrm $0\n")
ioutil.WriteFile(shellName, scmd.Bytes(), 0755)
os.WriteFile(shellName, scmd.Bytes(), 0755)
// DOWN:
time.Sleep(time.Second * time.Duration(rand.Int31n(5)+10))
cmd = exec.Command(shellName)
b, err := cmd.CombinedOutput()
if err != nil {
b = append(b, []byte("\n"+err.Error()+"\n")...)
ioutil.WriteFile(shellName+".log", b, 0664)
os.WriteFile(shellName+".log", b, 0664)
}
time.Sleep(time.Second * time.Duration(rand.Int31n(5)+3))
time.Sleep(time.Second * 40)
if isExist(shellName) {
out := strings.ToLower(string(b))
if strings.Contains(out, "error") ||
2 changes: 1 addition & 1 deletion hcloud/main.go
Original file line number Diff line number Diff line change
@@ -87,7 +87,7 @@ func main() {
*ydir += "/"
}
// 启动youtube下载控制
for i := 0; i < 3; i++ {
for i := 0; i < 2; i++ {
go youtubeControl()
}

135 changes: 135 additions & 0 deletions hcloud/static/css/videojs-playlist-ui.c.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
.vjs-playlist {
padding: 0;
background-color: rgba(50, 50, 50, 0.7);
/* color: #fff; */
list-style-type: none;
}

.vjs-playlist img {
display: block;
height: auto;
width: auto;
}

.vjs-playlist .vjs-playlist-item-list {
position: relative;
margin: 0;
padding: 0;
list-style: none;
/* border: 2px solid rgb(0, 0, 0) */
}

.vjs-playlist .vjs-playlist-item {
position: relative;
cursor: pointer;
overflow: hidden;
border: 1px solid #000000;
}

.vjs-playlist .vjs-playlist-thumbnail-placeholder {
background: #051e8f;
}

.vjs-playlist .vjs-playlist-duration {
position: absolute;
top: 3px;
right: 3px;
padding: 0 3px 0 3px;
color: rgba(0, 0, 0, 1.0);
background-color: rgba(255, 255, 255, 0.8);
}

.vjs-playlist .vjs-playlist-datetime {
position: absolute;
top: 3px;
left: 3px;
padding: 0 3px 0 3px;
color: rgba(0, 0, 0, 1.0);
background-color: rgba(255, 255, 255, 0.8);
/* text-shadow: 1px 1px 2px black, -1px 1px 2px black, 1px -1px 2px black, -1px -1px 2px black */
}

.vjs-playlist .vjs-playlist-title-container {
position: absolute;
bottom: 0px;
left: 1px;
box-sizing: border-box;
width: 99.2%;
padding: 3px 3px 3px 3px;
color: rgba(0, 0, 0, 1.0);
background-color: rgba(255, 255, 255, 0.8);
/* text-shadow: 1px 1px 2px black, -1px 1px 2px black, 1px -1px 2px black, -1px -1px 2px black */
}

.vjs-playlist .vjs-playlist-name {
display: block;
max-height: 40px;
font-style: normal;
text-overflow: ellipsis;
overflow: hidden;
white-space: wrap;
line-height: 20px
}

.vjs-playlist .vjs-playlist-description {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
display: none;
font-size: 14px;
padding: 0 0 0 2px
}

.vjs-playlist .vjs-selected {
background-color: #ffffff;
border: 4px solid #dca74a;
}

.vjs-playlist .vjs-selected img {
opacity: .6
}

.vjs-playlist .vjs-selected .vjs-playlist-duration {
display: block
}

.vjs-playlist .vjs-selected .vjs-playlist-now-playing-text {
display: none
}

.vjs-playlist .vjs-selected .vjs-playlist-title-container {
text-shadow: none
}

.vjs-playlist-vertical {
overflow-x: hidden;
overflow-y: auto
}

.vjs-playlist-vertical img {
width: 100%;
min-height: 90px
}

.vjs-playlist-vertical .vjs-playlist-item {
margin-bottom: 3px;
outline: none;
}

.vjs-playlist-vertical .vjs-playlist-thumbnail {
display: block;
width: 100%
}

.vjs-playlist-vertical .vjs-playlist-thumbnail-placeholder {
height: 90px
}

.vjs-playlist {
font-size: 14px
}

.vjs-playlist .vjs-playlist-description {
height: 28px;
line-height: 21px
}
259 changes: 259 additions & 0 deletions hcloud/static/css/videojs-playlist-ui.c2.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,259 @@
.vjs-playlist {
padding: 0;
background-color: #1a1a1a;
color: #fff;
list-style-type: none
}

.vjs-playlist img {
display: block;
height: auto;
width: auto
}

.vjs-playlist .vjs-playlist-item-list {
position: relative;
margin: 0;
padding: 0;
list-style: none
}

.vjs-playlist .vjs-playlist-item {
position: relative;
cursor: pointer;
overflow: hidden
}

.vjs-playlist .vjs-playlist-thumbnail-placeholder {
background: #303030
}

.vjs-playlist .vjs-playlist-now-playing-text {
display: none;
position: absolute;
top: 0;
left: 0;
padding-left: 2px;
margin: .8rem
}

.vjs-playlist .vjs-playlist-duration {
position: absolute;
top: .5rem;
left: .5rem;
padding: 2px 5px 3px;
margin-left: 2px;
background-color: rgba(26, 26, 26, 0.8)
}

.vjs-playlist .vjs-playlist-datetime {
position: absolute;
bottom: 48px;
left: 0px;
width: 35%;
padding: 0px 0px 3px 3px;
background-color: rgba(0, 0, 0, 0.7);
text-shadow: 1px 1px 2px black, -1px 1px 2px black, 1px -1px 2px black, -1px -1px 2px black
/* text-shadow: 1px 1px 2px black, -1px 1px 2px black, 1px -1px 2px black, -1px -1px 2px black */
}

.vjs-playlist .vjs-playlist-title-container {
position: absolute;
bottom: 0;
box-sizing: border-box;
width: 100%;
height: 48px;
/* padding: 2px 2px 2px 2px; */
/* padding: 1.2rem 0rem; */
/* background-color: rgba(255, 255, 255, 0.7); */
background-color: rgba(0, 0, 0, 0.7);
text-shadow: 1px 1px 2px black, -1px 1px 2px black, 1px -1px 2px black, -1px -1px 2px black
}

.vjs-playlist .vjs-playlist-name {
display: block;
max-height: 3em;
padding: 2px 0 2px 3px;
font-style: normal;
text-overflow: ellipsis;
overflow: hidden;
white-space: wrap;
line-height: 20px
}

.vjs-playlist .vjs-playlist-description {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
display: block;
font-size: 14px;
padding: 0 0 0 2px
}

.vjs-playlist .vjs-up-next-text {
display: none;
padding: .1rem 2px;
font-size: .8em;
text-transform: uppercase
}

.vjs-playlist .vjs-up-next .vjs-up-next-text {
display: block
}

.vjs-playlist .vjs-selected {
background-color: #141a21
}

.vjs-playlist .vjs-selected img {
opacity: .2
}

.vjs-playlist .vjs-selected .vjs-playlist-duration {
display: none
}

.vjs-playlist .vjs-selected .vjs-playlist-now-playing-text {
display: block
}

.vjs-playlist .vjs-selected .vjs-playlist-title-container {
text-shadow: none
}

.vjs-playlist-vertical {
overflow-x: hidden;
overflow-y: auto
}

.vjs-playlist-vertical img {
width: 100%;
min-height: 54px
}

.vjs-playlist-vertical .vjs-playlist-item {
margin-bottom: 5px
}

.vjs-playlist-vertical .vjs-playlist-thumbnail {
display: block;
width: 100%
}

.vjs-playlist-vertical .vjs-playlist-thumbnail-placeholder {
height: 100px
}

.vjs-playlist-horizontal {
overflow-x: auto;
overflow-y: hidden
}

.vjs-playlist-horizontal img {
min-width: 100px;
height: 100%
}

.vjs-playlist-horizontal .vjs-playlist-item-list {
height: 100%;
white-space: nowrap
}

.vjs-playlist-horizontal .vjs-playlist-item {
display: inline-block;
height: 100%;
margin-right: 5px
}

.vjs-playlist-horizontal .vjs-playlist-thumbnail {
display: block;
height: 100%
}

.vjs-playlist-horizontal .vjs-playlist-thumbnail-placeholder {
height: 100%;
width: 180px
}

.vjs-playlist.vjs-ad-playing {
overflow: hidden
}

.vjs-playlist.vjs-ad-playing.vjs-csspointerevents {
pointer-events: none;
overflow: auto
}

.vjs-playlist.vjs-ad-playing.vjs-csspointerevents .vjs-playlist-ad-overlay {
pointer-events: auto
}

.vjs-playlist.vjs-ad-playing .vjs-playlist-ad-overlay {
display: block;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: #1a1a1a;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
background-color: rgba(0, 0, 0, 0.5)
}

.vjs-playlist {
font-size: 14px
}

.vjs-playlist .vjs-playlist-description {
height: 28px;
line-height: 21px
}

.vjs-mouse.vjs-playlist {
font-size: 15px
}

.vjs-mouse.vjs-playlist .vjs-playlist-description {
height: 30px;
line-height: 23px
}

@media (min-width: 600px) {
.vjs-mouse.vjs-playlist {
font-size: 17px
}

.vjs-mouse.vjs-playlist .vjs-playlist-description {
height: 34px;
line-height: 26px
}

.vjs-playlist .vjs-playlist-name {
line-height: 22px
}
}

@media (max-width: 520px) {

.vjs-playlist .vjs-selected .vjs-playlist-now-playing-text,
.vjs-playlist .vjs-up-next .vjs-up-next-text {
display: none
}

.vjs-mouse.vjs-playlist .vjs-selected .vjs-playlist-now-playing-text,
.vjs-mouse.vjs-playlist .vjs-up-next .vjs-up-next-text {
display: none
}
}

@media (min-width: 521px) {
.vjs-playlist img {
min-height: 85px
}
}

@media (max-width: 750px) {
.vjs-playlist .vjs-playlist-duration {
display: none
}
}
1 change: 1 addition & 0 deletions hcloud/static/css/videojs-playlist-ui.css.map
2 changes: 1 addition & 1 deletion hcloud/tpl/webtv.html
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<meta charset="UTF-8">
<title>Web Gallery</title>
<link rel="stylesheet" href="/emb/static/css/video-js.min.css" />
<link rel="stylesheet" href="/emb/static/css/videojs-playlist-ui.css" />
<link rel="stylesheet" href="/emb/static/css/videojs-playlist-ui.c2.css" />
<script src="/emb/static/js/videojs/video.min.js"></script>
<!-- <script src="/emb/static/js/videojs-hotkeys/videojs.hotkeys.min.js"></script> -->
<script src="/emb/static/js/videojs-playlist/videojs-playlist.min.js"></script>