Merge branch 'musicbrainz'

This commit is contained in:
Remy Varma
2012-01-23 18:24:18 +00:00
3 changed files with 8 additions and 4 deletions

View File

@@ -82,6 +82,8 @@
<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
</form>
<br>
powered by musicbrainz (<a href="http://metabrainz.org/donate/index.html">donate</a>)
</div>
</footer>
</div>
@@ -102,4 +104,4 @@
<%def name="javascriptIncludes()"></%def>
<%def name="headIncludes()"></%def>
<%def name="headerIncludes()"></%def>
<%def name="headerIncludes()"></%def>

View File

@@ -82,6 +82,8 @@
<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
</form>
<br>
powered by musicbrainz (<a href="http://metabrainz.org/donate/index.html">donate</a>)
</div>
</footer>
</div>
@@ -102,4 +104,4 @@
<%def name="javascriptIncludes()"></%def>
<%def name="headIncludes()"></%def>
<%def name="headerIncludes()"></%def>
<%def name="headerIncludes()"></%def>

View File

@@ -497,7 +497,7 @@ def start():
# Start our scheduled background tasks
SCHED.add_cron_job(updater.dbUpdate, hour=4, minute=0, second=0)
SCHED.add_interval_job(updater.dbUpdate, hours=48)
SCHED.add_interval_job(searcher.searchforalbum, minutes=SEARCH_INTERVAL)
SCHED.add_interval_job(librarysync.libraryScan, minutes=LIBRARYSCAN_INTERVAL)
SCHED.add_interval_job(versioncheck.checkGithub, minutes=300)
@@ -625,4 +625,4 @@ def shutdown(restart=False, update=False):
logger.info('Restarting Headphones with ' + str(popen_list))
subprocess.Popen(popen_list, cwd=os.getcwd())
os._exit(0)
os._exit(0)