Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5e84f98

Browse files
Alderamin49lyAlderamin
and
Alderamin
authored
feat: add support for cmscript files (#1788)
Co-authored-by: Alderamin <alderamin49ly@gmail.com>
1 parent3f428a9 commit5e84f98

File tree

2 files changed

+28
-19
lines changed

2 files changed

+28
-19
lines changed

‎pkg/tasks/heatmap.go

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"os"
1111
"path/filepath"
1212
"sort"
13+
"strings"
1314

1415
"github.com/lucasb-eyer/go-colorful"
1516
"github.com/sirupsen/logrus"
@@ -69,21 +70,24 @@ func GenerateHeatmaps(tlog *logrus.Entry) {
6970
tlog.Infof("Generating heatmaps (%v/%v)",i+1,len(scriptfiles))
7071
}
7172
iffile.Exists() {
72-
log.Infof("Rendering %v",file.Filename)
73-
destFile:=filepath.Join(common.ScriptHeatmapDir,fmt.Sprintf("heatmap-%d.png",file.ID))
74-
err:=RenderHeatmap(
75-
file.GetPath(),
76-
destFile,
77-
1000,
78-
10,
79-
250,
80-
)
81-
iferr==nil {
82-
file.HasHeatmap=true
83-
file.RefreshHeatmapCache=true
84-
file.Save()
85-
}else {
86-
log.Warn(err)
73+
path:=file.GetPath()
74+
ifstrings.HasSuffix(path,".funscript") {
75+
log.Infof("Rendering %v",file.Filename)
76+
destFile:=filepath.Join(common.ScriptHeatmapDir,fmt.Sprintf("heatmap-%d.png",file.ID))
77+
err:=RenderHeatmap(
78+
path,
79+
destFile,
80+
1000,
81+
10,
82+
250,
83+
)
84+
iferr==nil {
85+
file.HasHeatmap=true
86+
file.RefreshHeatmapCache=true
87+
file.Save()
88+
}else {
89+
log.Warn(err)
90+
}
8791
}
8892
}
8993
}
@@ -275,6 +279,10 @@ func (funscript Script) getDuration() float64 {
275279
}
276280

277281
funcgetFunscriptDuration(pathstring) (float64,error) {
282+
if!strings.HasSuffix(path,".funscript") {
283+
return0.0,fmt.Errorf("Not a funscript: %s",path)
284+
}
285+
278286
funscript,err:=LoadFunscriptData(path)
279287
iferr!=nil {
280288
return0.0,err

‎pkg/tasks/volume.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,16 @@ func RescanVolumes(id int) {
7777
filename:=escape(unescapedFilename)
7878
filename2:=strings.Replace(filename,".funscript",".mp4",-1)
7979
filename3:=strings.Replace(filename,".hsp",".mp4",-1)
80-
filename3=strings.Replace(filename3,".srt",".mp4",-1)
81-
err:=db.Where("filenames_arr LIKE ? OR filenames_arr LIKE ? OR filenames_arr LIKE ?",`%"`+filename+`"%`,`%"`+filename2+`"%`,`%"`+filename3+`"%`).Find(&scenes).Error
80+
filename4:=strings.Replace(filename,".srt",".mp4",-1)
81+
filename5:=strings.Replace(filename,".cmscript",".mp4",-1)
82+
err:=db.Where("filenames_arr LIKE ? OR filenames_arr LIKE ? OR filenames_arr LIKE ? OR filenames_arr LIKE ? OR filenames_arr LIKE ?",`%"`+filename+`"%`,`%"`+filename2+`"%`,`%"`+filename3+`"%`,`%"`+filename4+`"%`,`%"`+filename5+`"%`).Find(&scenes).Error
8283
iferr!=nil {
8384
log.Error(err," when matching "+unescapedFilename)
8485
}
8586
iflen(scenes)==0&&config.Config.Advanced.UseAltSrcInFileMatching {
8687
// check if the filename matches in external_reference record
8788

88-
db.Preload("XbvrLinks").Where("external_source like 'alternate scene %' and external_data LIKE ? OR external_data LIKE ? OR external_data LIKE ?",`%"`+filename+`%`,`%"`+filename2+`%`,`%"`+filename3+`%`).Find(&extrefs)
89+
db.Preload("XbvrLinks").Where("external_source like 'alternate scene %' and external_data LIKE ? OR external_data LIKE ? OR external_data LIKE ? OR external_data LIKE ? OR external_data LIKE ?",`%"`+filename+`%`,`%"`+filename2+`%`,`%"`+filename3+`%`,`%"`+filename4+`%`,`%"`+filename5+`%`).Find(&extrefs)
8990
iflen(extrefs)==1 {
9091
iflen(extrefs[0].XbvrLinks)==1 {
9192
// the scene id will be the Internal DB Id from the associated link
@@ -226,7 +227,7 @@ func scanLocalVolume(vol models.Volume, db *gorm.DB, tlog *logrus.Entry) {
226227
}
227228
}
228229

229-
if!strings.HasPrefix(filepath.Base(path),".")&&filepath.Ext(path)==".funscript" {
230+
if!strings.HasPrefix(filepath.Base(path),".")&&(filepath.Ext(path)==".funscript"||filepath.Ext(path)==".cmscript") {
230231
scriptProcList=append(scriptProcList,path)
231232
}
232233
if!strings.HasPrefix(filepath.Base(path),".")&&filepath.Ext(path)==".hsp" {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp