juan/japanese-drum-game
1
0
Fork 0
mirror of https://github.com/jiojciojsioe3/a3cjroijsiojiorj.git synced 2024-11-22 19:01:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

solidify default git repo

Browse Source
This commit is contained in:
Bui 2019-02-06 18:49:25 +00:00
parent b3ed655e44
commit 4be9334be3
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app.py
View File

@ -11,6 +11,7 @@ from ffmpy import FFmpeg
app = Flask(__name__) app = Flask(__name__)
DATABASE = 'taiko.db' DATABASE = 'taiko.db'
DEFAULT_URL = 'https://github.com/bui/taiko-web/'
def get_db(): def get_db():
@ -119,9 +120,17 @@ def get_tja_preview(tja):
def get_version(): def get_version():
version = None version = {'commit': None, 'commit_short': '', 'version': None, 'url': DEFAULT_URL}
if os.path.isfile('version.json'): if os.path.isfile('version.json'):
version = json.load(open('version.json', 'r')) try:
ver = json.load(open('version.json', 'r'))
except ValueError:
print('Invalid version.json file')
return version
for key in version.keys():
if ver.get(key):
version[key] = ver.get(key)
return version return version
@ -213,10 +222,10 @@ def make_preview(song_id, song_type):
if os.path.isfile(song_path) and not os.path.isfile(prev_path): if os.path.isfile(song_path) and not os.path.isfile(prev_path):
preview = get_preview(song_id, song_type) / 1000 preview = get_preview(song_id, song_type) / 1000
if not preview or preview <= 0.1: if not preview or preview <= 0.1:
print 'Skipping #%s due to no preview' % song_id print('Skipping #%s due to no preview' % song_id)
return False return False
print 'Making preview.mp3 for song #%s' % song_id print('Making preview.mp3 for song #%s' % song_id)
ff = FFmpeg(inputs={song_path: '-ss %s' % preview}, ff = FFmpeg(inputs={song_path: '-ss %s' % preview},
outputs={prev_path: '-codec:a libmp3lame -ar 32000 -b:a 92k -y -loglevel panic'}) outputs={prev_path: '-codec:a libmp3lame -ar 32000 -b:a 92k -y -loglevel panic'})
ff.run() ff.run()

5
public/src/js/about.js
View File

@ -29,10 +29,7 @@
this.endButton.innerText = strings.tutorial.ok this.endButton.innerText = strings.tutorial.ok
this.endButton.setAttribute("alt", strings.tutorial.ok) this.endButton.setAttribute("alt", strings.tutorial.ok)
var versionUrl = "https://github.com/bui/taiko-web/" var versionUrl = gameConfig._version.url
if(gameConfig._version){
versionUrl = gameConfig._version.url
}
this.getLink(this.linkIssues).href = versionUrl + "issues" this.getLink(this.linkIssues).href = versionUrl + "issues"
pageEvents.add(this.linkIssues, ["click", "touchend"], this.linkButton.bind(this)) pageEvents.add(this.linkIssues, ["click", "touchend"], this.linkButton.bind(this))

2
public/src/js/loader.js
View File

@ -23,7 +23,7 @@ class Loader{
this.loaderPercentage = document.querySelector("#loader .percentage") this.loaderPercentage = document.querySelector("#loader .percentage")
this.loaderProgress = document.querySelector("#loader .progress") this.loaderProgress = document.querySelector("#loader .progress")
var queryString = gameConfig._version ? "?" + gameConfig._version.commit_short : "" var queryString = gameConfig._version.commit_short ? "?" + gameConfig._version.commit_short : ""
assets.js.forEach(name => { assets.js.forEach(name => {
var script = document.createElement("script") var script = document.createElement("script")

4
templates/index.html
View File

@ -19,10 +19,10 @@
<div id="assets"></div> <div id="assets"></div>
<div id="screen" class="pattern-bg"></div> <div id="screen" class="pattern-bg"></div>
<div id="version"> <div id="version">
{% if version %} {% if version.version and version.commit_short and version.commit %}
<a href="{{version.url}}commit/{{version.commit}}" target="_blank" id="version-link" class="stroke-sub" alt="taiko-web ver.{{version.version}} ({{version.commit_short}})">taiko-web ver.{{version.version}} ({{version.commit_short}})</a> <a href="{{version.url}}commit/{{version.commit}}" target="_blank" id="version-link" class="stroke-sub" alt="taiko-web ver.{{version.version}} ({{version.commit_short}})">taiko-web ver.{{version.version}} ({{version.commit_short}})</a>
{% else %} {% else %}
<a href="https://github.com/bui/taiko-web" target="_blank" id="version-link" class="stroke-sub" alt="taiko-web (unknown version)">taiko-web (unknown version)</a> <a href="{{version.url}}" target="_blank" id="version-link" class="stroke-sub" alt="taiko-web (unknown version)">taiko-web (unknown version)</a>
{% endif %} {% endif %}
</div> </div>
<script src="/src/js/browsersupport.js?{{version.commit_short}}"></script> <script src="/src/js/browsersupport.js?{{version.commit_short}}"></script>