Merge pull request #403 from Wieku/dev

0.11.0 #2

Author: Wieku

.github/workflows/release.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Install golang
         uses: actions/setup-go@v3
         with:
-          go-version: '1.22.4'
+          go-version: '1.24.1'
           cache: true
 
       - name: Build danser
@@ -69,6 +69,7 @@ jobs:
         id: build
 
       - name: Sign files with Trusted Signing
+        if: ${{ inputs.sign == true || inputs.sign == 'true' }}
         uses: azure/trusted-signing-action@v0
         with:
           azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -107,7 +108,7 @@ jobs:
 
   build_linux:
     name: Building linux version
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout branch
         uses: actions/checkout@v3
@@ -120,7 +121,7 @@ jobs:
       - name: Install golang
         uses: actions/setup-go@v3
         with:
-          go-version: '1.22.4'
+          go-version: '1.24.1'
           cache: true
 
       - name: Build danser

README.md

@@ -107,7 +107,7 @@ You need to clone it or download as a .zip (and unpack it to desired directory)
 
 #### Prerequisites
 
-* [64-bit go (1.22 at least)](https://go.dev/dl/)
+* [64-bit go (1.24 at least)](https://go.dev/dl/)
 * gcc/g++ (Linux/Unix), [WinLibs](http://winlibs.com/) MSVCRT+POSIX (Windows, TDM-GCC won't work, mingw-w64 is outdated)
 * OpenGL library (shipped with drivers, `libgl1-mesa-dev` when building on Linux servers)
 * xorg-dev, libgtk-3 and libgtk-3-dev (Linux)

app/beatmap/objects/slider.go

@@ -404,7 +404,7 @@ func (slider *Slider) calculateFollowPointsLazer(beatmapVersion int) {
 		reversed := span%2 == 1
 
 		// Skip ticks if timingPoint has NaN beatLength
-		for d := tickDistance; d <= length && !nanTimingPoint; d += tickDistance {
+		for d := tickDistance; d <= length && !nanTimingPoint && tickDistance != 0; d += tickDistance {
 			if d >= length-minDistanceFromEnd {
 				break
 			}

app/database/manager.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/wieku/danser-go/app/beatmap"
-	"github.com/wieku/danser-go/app/rulesets/osu/performance/pp241007"
+	"github.com/wieku/danser-go/app/rulesets/osu/performance/pp250306"
 	"github.com/wieku/danser-go/app/settings"
 	"github.com/wieku/danser-go/app/utils"
 	"github.com/wieku/danser-go/framework/env"
@@ -46,7 +46,7 @@ var migrations []Migration
 
 var songsDir string
 
-var difficultyCalc = pp241007.NewDifficultyCalculator()
+var difficultyCalc = pp250306.NewDifficultyCalculator()
 
 func Init() error {
 	log.Println("DatabaseManager: Initializing database...")
@@ -413,7 +413,7 @@ func trySendStatus(listener ImportListener, stage ImportStage, progress, target
 	}
 }
 
-func UpdateStarRating(maps []*beatmap.BeatMap, progressListener func(processed, target int)) {
+func UpdateStarRating(maps []*beatmap.BeatMap, progressListener func(processed, target int, message string)) {
 	const workers = 1 // For now using only one thread because calculating 4 aspire maps at once can OOM since (de)allocation can't keep up with many complex sliders
 
 	var toCalculate []*beatmap.BeatMap
@@ -428,14 +428,25 @@ func UpdateStarRating(maps []*beatmap.BeatMap, progressListener func(processed,
 		return
 	}
 
+	var message string
+
 	if progressListener != nil {
-		progressListener(0, len(toCalculate))
+		progressListener(0, len(toCalculate), message)
 	}
 
 	receive := make(chan *beatmap.BeatMap, workers)
 
+	var progress int
+
 	goroutines.Run(func() {
-		util.BalanceChan(workers, toCalculate, receive, func(bMap *beatmap.BeatMap) (ret *beatmap.BeatMap, ret2 bool) {
+		util.BalanceChanWatchdog(workers, toCalculate, receive, time.Minute, func(worker int, a *beatmap.BeatMap) {
+			log.Println("DatabaseManager: It seems like SR calculation for this file got stuck! Please report it to developer(s). File:", a.Dir+"/"+a.File)
+			message = "Calculation got stuck! Please check logs"
+
+			if progressListener != nil {
+				progressListener(progress, len(toCalculate), message)
+			}
+		}, func(bMap *beatmap.BeatMap) (ret *beatmap.BeatMap, ret2 bool) {
 			ret = bMap // HACK: still return the beatmap even if execution panics: https://golangbyexample.com/return-value-function-panic-recover-go/
 			ret2 = true
 
@@ -467,17 +478,17 @@ func UpdateStarRating(maps []*beatmap.BeatMap, progressListener func(processed,
 	})
 
 	var calculated []*beatmap.BeatMap
-	var progress int
 
 	for bMap := range receive {
 		if progressListener != nil {
+			message = ""
 			progress++
-			progressListener(progress, len(toCalculate))
+			progressListener(progress, len(toCalculate), message)
 		}
 
 		calculated = append(calculated, bMap)
 
-		if len(calculated) >= 1000 { // Commit to database every 1k beatmaps to not lose progress in case of crash/close
+		if len(calculated) >= 200 { // Commit to database every 1k beatmaps to not lose progress in case of crash/close
 			pushSRToDB(calculated)
 
 			calculated = calculated[:0]

app/rulesets/osu/performance/pp241007/skills/skill.go

@@ -68,11 +68,7 @@ func (skill *Skill) Process(current *preprocessing.DifficultyObject) {
 		skill.currentSectionEnd = math.Ceil(current.StartTime/skill.SectionLength) * skill.SectionLength
 	}
 
-	for current.StartTime > skill.currentSectionEnd {
-		skill.saveCurrentPeak()
-		skill.startNewSectionFrom(skill.currentSectionEnd, current)
-		skill.currentSectionEnd += skill.SectionLength
-	}
+	skill.processSectionEnd(current)
 
 	currentStrain := skill.StrainValueOf(current)
 
@@ -93,6 +89,26 @@ func (skill *Skill) Process(current *preprocessing.DifficultyObject) {
 	skill.lastDifficulty = skill.difficulty
 }
 
+func (skill *Skill) processSectionEnd(nextObj *preprocessing.DifficultyObject) {
+	for nextObj.StartTime > skill.currentSectionEnd {
+		sectionsLeft := math.Floor((nextObj.StartTime - skill.currentSectionEnd) / skill.SectionLength)
+
+		if skill.currentSectionPeak == 0 && sectionsLeft > 100 { // skip for maps with huge distances between objects
+			newPeaks := make([]float64, len(skill.strainPeaks)+int(sectionsLeft))
+			copy(newPeaks, skill.strainPeaks)
+			skill.strainPeaks = newPeaks // just add it to temporal list, we don't need to add 0's to sorted one
+
+			skill.currentSectionEnd += skill.SectionLength * sectionsLeft
+
+			continue
+		}
+
+		skill.saveCurrentPeak()
+		skill.startNewSectionFrom(skill.currentSectionEnd, nextObj)
+		skill.currentSectionEnd += skill.SectionLength
+	}
+}
+
 func (skill *Skill) GetCurrentStrainPeaks() []float64 {
 	peaks := make([]float64, len(skill.strainPeaks)+1)
 	copy(peaks, skill.strainPeaks)
@@ -185,7 +201,10 @@ func (skill *Skill) CountDifficultStrains() float64 {
 
 func (skill *Skill) saveCurrentPeak() {
 	skill.strainPeaks = append(skill.strainPeaks, skill.currentSectionPeak)
-	skill.strainPeaksSorted.Add(skill.currentSectionPeak)
+
+	if skill.currentSectionPeak > 0 {
+		skill.strainPeaksSorted.Add(skill.currentSectionPeak)
+	}
 }
 
 func (skill *Skill) startNewSectionFrom(end float64, current *preprocessing.DifficultyObject) {

app/rulesets/osu/performance/pp250306/skills/skill.go

@@ -68,11 +68,7 @@ func (skill *Skill) Process(current *preprocessing.DifficultyObject) {
 		skill.currentSectionEnd = math.Ceil(current.StartTime/skill.SectionLength) * skill.SectionLength
 	}
 
-	for current.StartTime > skill.currentSectionEnd {
-		skill.saveCurrentPeak()
-		skill.startNewSectionFrom(skill.currentSectionEnd, current)
-		skill.currentSectionEnd += skill.SectionLength
-	}
+	skill.processSectionEnd(current)
 
 	currentStrain := skill.StrainValueOf(current)
 
@@ -93,6 +89,26 @@ func (skill *Skill) Process(current *preprocessing.DifficultyObject) {
 	skill.lastDifficulty = skill.difficulty
 }
 
+func (skill *Skill) processSectionEnd(nextObj *preprocessing.DifficultyObject) {
+	for nextObj.StartTime > skill.currentSectionEnd {
+		sectionsLeft := math.Floor((nextObj.StartTime - skill.currentSectionEnd) / skill.SectionLength)
+
+		if skill.currentSectionPeak == 0 && sectionsLeft > 10 { // skip for maps with huge distances between objects
+			newPeaks := make([]float64, len(skill.strainPeaks)+int(sectionsLeft))
+			copy(newPeaks, skill.strainPeaks)
+			skill.strainPeaks = newPeaks // just add it to temporal db, we don't need to add
+
+			skill.currentSectionEnd += skill.SectionLength * sectionsLeft
+
+			continue
+		}
+
+		skill.saveCurrentPeak()
+		skill.startNewSectionFrom(skill.currentSectionEnd, nextObj)
+		skill.currentSectionEnd += skill.SectionLength
+	}
+}
+
 func (skill *Skill) GetCurrentStrainPeaks() []float64 {
 	peaks := make([]float64, len(skill.strainPeaks)+1)
 	copy(peaks, skill.strainPeaks)
@@ -187,7 +203,10 @@ func (skill *Skill) CountDifficultStrains() float64 {
 
 func (skill *Skill) saveCurrentPeak() {
 	skill.strainPeaks = append(skill.strainPeaks, skill.currentSectionPeak)
-	skill.strainPeaksSorted.Add(skill.currentSectionPeak)
+
+	if skill.currentSectionPeak > 0 {
+		skill.strainPeaksSorted.Add(skill.currentSectionPeak)
+	}
 }
 
 func (skill *Skill) startNewSectionFrom(end float64, current *preprocessing.DifficultyObject) {

app/states/components/overlays/scoreoverlay.go

@@ -131,6 +131,8 @@ type ScoreOverlay struct {
 	customStats *cstats.StatDisplay
 
 	lazerScore bool
+
+	skipped bool
 }
 
 type keyInfo struct {
@@ -538,8 +540,9 @@ func (overlay *ScoreOverlay) Update(time float64) {
 
 	if input.Win.GetKey(glfw.KeySpace) == glfw.Press {
 		if overlay.skip != nil && overlay.music != nil && overlay.music.GetState() == bass.MusicPlaying {
-			if overlay.audioTime < overlay.skipTo {
+			if overlay.audioTime < overlay.skipTo && !overlay.skipped {
 				overlay.music.SetPosition(overlay.skipTo / 1000)
+				overlay.skipped = true
 			}
 		}
 	}