diff --git a/src/Dialogs.py b/src/Dialogs.py index dcc301ce5..ff9e260ee 100644 --- a/src/Dialogs.py +++ b/src/Dialogs.py @@ -2593,41 +2593,3 @@ def changeLoadingSplashScreenText(engine, splash, text=_("Loading...")): def hideLoadingSplashScreen(engine, splash): engine.view.popLayer(splash) - -def isInt(possibleInt): - try: - #MFH - remove any leading zeros (for songs with 01. or 02. for example) - splitName = possibleInt.split("0",1) - while splitName[0] == "": - splitName = possibleInt.split("0",1) - if len(splitName) > 1: - if splitName[0] == "": - possibleInt = splitName[1] - if str(int(possibleInt)) == str(possibleInt): - #Log.debug("Dialogs.isInt: " + str(possibleInt) + " = TRUE") - return True - else: - #Log.debug("Dialogs.isInt: " + str(possibleInt) + " = FALSE") - return False - except Exception, e: - return False - #Log.debug("Dialogs.isInt: " + str(possibleInt) + " = FALSE, exception: " + str(e) ) - - -def removeSongOrderPrefixFromName(name): - if not name.startswith("."): - splitName = name.split(".",1) - #Log.debug("Dialogs.songListLoaded: Separating song name from prefix: " + str(splitName) ) - if isInt(splitName[0]) and len(splitName) > 1: - name = splitName[1] - #while len(splitName) > 1: #now remove any remaining leading spaces - splitName[0] = "" - while splitName[0] == "": - splitName = name.split(" ",1) - if len(splitName) > 1: - if splitName[0] == "": - name = splitName[1] - #Log.debug("Dialogs.songListLoaded: Removing song name prefix, new name = " + splitName[1]) - #else: - # Log.debug("Song name starting with a period filtered from prefix removal logic: " + name) - return name diff --git a/src/GameResultsScene.py b/src/GameResultsScene.py index 2bc576f40..91f4b7d39 100644 --- a/src/GameResultsScene.py +++ b/src/GameResultsScene.py @@ -542,7 +542,7 @@ def uploadHighscores(self, part = Song.parts[Song.GUITAR_PART], playerNum = 0, s i = playerNum try: d = { - "songName": "%s" % (Dialogs.removeSongOrderPrefixFromName(self.song.info.name)), + "songName": "%s" % (Song.removeSongOrderPrefixFromName(self.song.info.name)), "songHash": self.song.getHash(), "scores": None, "scores_ext": None, @@ -827,9 +827,9 @@ def renderInitialScore(self, visibility, topMost): if self.song: try: - text = self.engine.theme.result_song_text % Dialogs.removeSongOrderPrefixFromName(self.song.info.name) + text = self.engine.theme.result_song_text % Song.removeSongOrderPrefixFromName(self.song.info.name) except TypeError: - text = "%s %s" % (Dialogs.removeSongOrderPrefixFromName(self.song.info.name), self.engine.theme.result_song_text) + text = "%s %s" % (Song.removeSongOrderPrefixFromName(self.song.info.name), self.engine.theme.result_song_text) try: r, g, b = self.engine.theme.hexToColorResults(self.engine.theme.result_song[3]) glColor3f(r, g, b) @@ -1027,9 +1027,9 @@ def renderInitialCoOpScore(self, visibility, topMost): if self.song: try: - text = self.engine.theme.result_song_text % Dialogs.removeSongOrderPrefixFromName(self.song.info.name) + text = self.engine.theme.result_song_text % Song.removeSongOrderPrefixFromName(self.song.info.name) except TypeError: - text = "%s %s" % (Dialogs.removeSongOrderPrefixFromName(self.song.info.name), self.engine.theme.result_song_text) + text = "%s %s" % (Song.removeSongOrderPrefixFromName(self.song.info.name), self.engine.theme.result_song_text) try: r, g, b = self.engine.theme.hexToColorResults(self.engine.theme.result_song[3]) glColor3f(r, g, b) @@ -1302,7 +1302,7 @@ def renderHighScores(self, visibility, topMost): # evilynux - highscore if self.song is not None: - text = _("%s High Scores for %s") % (self.scorePart, Dialogs.removeSongOrderPrefixFromName(self.song.info.name)) + text = _("%s High Scores for %s") % (self.scorePart, Song.removeSongOrderPrefixFromName(self.song.info.name)) else: text = _("%s High Scores") % self.scorePart w1, h1 = font.getStringSize(text) diff --git a/src/GuitarScene.py b/src/GuitarScene.py index b62dc4cdf..1a7c8699e 100644 --- a/src/GuitarScene.py +++ b/src/GuitarScene.py @@ -5851,7 +5851,7 @@ def render(self, visibility, topMost): #QQstarS: Fix this function for mostly. # evilynux - Closer to actual GH3 font = self.engine.data.pauseFont - text = Dialogs.removeSongOrderPrefixFromName(self.song.info.name).upper() + text = Song.removeSongOrderPrefixFromName(self.song.info.name).upper() scale = font.scaleText(text, maxwidth = 0.398, scale = 0.0038) size = font.getStringSize(text, scale = scale) font.render(text, (.5-size[0]/2.0,.37-size[1]), scale = scale) @@ -6733,9 +6733,9 @@ def render(self, visibility, topMost): #QQstarS: Fix this function for mostly. extra = "%s \n v%s" % (extra, self.song.info.version) if self.theme != 1: #shift this stuff down so it don't look so bad over top the lyricsheet: - Dialogs.wrapText(songFont, (self.songInfoDisplayX, self.songInfoDisplayX - h / 2), "%s \n %s%s%s%s%s" % (Dialogs.removeSongOrderPrefixFromName(self.song.info.name), cover, self.song.info.artist, comma, self.song.info.year, extra), rightMargin = .6, scale = self.songInfoDisplayScale)#kk69: incorporates song.ttf + Dialogs.wrapText(songFont, (self.songInfoDisplayX, self.songInfoDisplayX - h / 2), "%s \n %s%s%s%s%s" % (Song.removeSongOrderPrefixFromName(self.song.info.name), cover, self.song.info.artist, comma, self.song.info.year, extra), rightMargin = .6, scale = self.songInfoDisplayScale)#kk69: incorporates song.ttf else: - Dialogs.wrapText(songFont, (self.songInfoDisplayX, self.songInfoDisplayY - h / 2), "%s \n %s%s%s%s%s" % (Dialogs.removeSongOrderPrefixFromName(self.song.info.name), cover, self.song.info.artist, comma, self.song.info.year, extra), rightMargin = .6, scale = self.songInfoDisplayScale) + Dialogs.wrapText(songFont, (self.songInfoDisplayX, self.songInfoDisplayY - h / 2), "%s \n %s%s%s%s%s" % (Song.removeSongOrderPrefixFromName(self.song.info.name), cover, self.song.info.artist, comma, self.song.info.year, extra), rightMargin = .6, scale = self.songInfoDisplayScale) else: #mfh: this is where the song countdown display is generated: if pos < 0: diff --git a/src/SongChoosingScene.py b/src/SongChoosingScene.py index 8a47fcbae..bd5f154e6 100644 --- a/src/SongChoosingScene.py +++ b/src/SongChoosingScene.py @@ -372,7 +372,7 @@ def prepareSetlist(self, songs): for item in self.items: if isinstance(item, Song.SongInfo): - item.name = Dialogs.removeSongOrderPrefixFromName(item.name) #TODO: I don't like this. + item.name = Song.removeSongOrderPrefixFromName(item.name) #TODO: I don't like this. elif not self.tiersPresent and (isinstance(item, Song.TitleInfo) or isinstance(item, Song.SortTitleInfo)): self.tiersPresent = True @@ -455,7 +455,7 @@ def checkCmdPlay(self): Dialogs.hideLoadingSplashScreen(self.engine, self.splash) self.splash = None self.playerList[0].difficulty = Dialogs.chooseItem(self.engine, info.partDifficulties[p.id], - "%s \n %s" % (Dialogs.removeSongOrderPrefixFromName(info.name), _("%s Choose a difficulty:") % player.name), selected = player.difficulty) + "%s \n %s" % (Song.removeSongOrderPrefixFromName(info.name), _("%s Choose a difficulty:") % player.name), selected = player.difficulty) return True def loadItemLabel(self, i, preload = False):