)<[^<]*)*<\/script>/gi,cs=/([?&])_=[^&]*/,ct=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,cu=p.fn.load,cv={},cw={},cx=["*/"]+["*"];try{ck=f.href}catch(cy){ck=e.createElement("a"),ck.href="",ck=ck.href}cj=ct.exec(ck.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&cu)return cu.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):c&&typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("").append(a.replace(cr,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cB(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cB(a,b),a},ajaxSettings:{url:ck,isLocal:cn.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cx},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cz(cv),ajaxTransport:cz(cw),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cC(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cD(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=(c||y)+"",k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cm.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(cl,"").replace(cp,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=ct.exec(l.url.toLowerCase())||!1,l.crossDomain=i&&i.join(":")+(i[3]?"":i[1]==="http:"?80:443)!==cj.join(":")+(cj[3]?"":cj[1]==="http:"?80:443)),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cA(cv,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!co.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cq.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cs,"$1_="+z);l.url=A+(A===l.url?(cq.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cx+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cA(cw,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cE=[],cF=/\?/,cG=/(=)\?(?=&|$)|\?\?/,cH=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cE.pop()||p.expando+"_"+cH++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cG.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cG.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cG,"$1"+f):m?c.data=i.replace(cG,"$1"+f):k&&(c.url+=(cF.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cE.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cI,cJ=a.ActiveXObject?function(){for(var a in cI)cI[a](0,1)}:!1,cK=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cL()||cM()}:cL,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cJ&&delete cI[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cK,cJ&&(cI||(cI={},p(a).unload(cJ)),cI[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cN,cO,cP=/^(?:toggle|show|hide)$/,cQ=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cR=/queueHooks$/,cS=[cY],cT={"*":[function(a,b){var c,d,e=this.createTween(a,b),f=cQ.exec(b),g=e.cur(),h=+g||0,i=1,j=20;if(f){c=+f[2],d=f[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&h){h=p.css(e.elem,a,!0)||c||1;do i=i||".5",h=h/i,p.style(e.elem,a,h+d);while(i!==(i=e.cur()/g)&&i!==1&&--j)}e.unit=d,e.start=h,e.end=f[1]?h+(f[1]+1)*c:c}return e}]};p.Animation=p.extend(cW,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c_.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c_.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=da(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g,null)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window);
\ No newline at end of file
diff --git a/headphones/__init__.py b/headphones/__init__.py
index aeea9001..086ab4c0 100644
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -196,6 +196,8 @@ CUSTOMSLEEP = None
HPUSER = None
HPPASS = None
+CACHE_SIZEMB = 32
+
def CheckSection(sec):
""" Check if INI section exists, if not create it """
try:
@@ -259,7 +261,7 @@ def initialize():
ENCODERVBRCBR, ENCODERLOSSLESS, DELETE_LOSSLESS_FILES, PROWL_ENABLED, PROWL_PRIORITY, PROWL_KEYS, PROWL_ONSNATCH, MIRRORLIST, \
MIRROR, CUSTOMHOST, CUSTOMPORT, CUSTOMSLEEP, HPUSER, HPPASS, XBMC_ENABLED, XBMC_HOST, XBMC_USERNAME, XBMC_PASSWORD, XBMC_UPDATE, \
XBMC_NOTIFY, NMA_ENABLED, NMA_APIKEY, NMA_PRIORITY, NMA_ONSNATCH, SYNOINDEX_ENABLED, ALBUM_COMPLETION_PCT, PREFERRED_BITRATE_HIGH_BUFFER, \
- PREFERRED_BITRATE_LOW_BUFFER
+ PREFERRED_BITRATE_LOW_BUFFER,CACHE_SIZEMB
if __INITIALIZED__:
return False
@@ -421,6 +423,8 @@ def initialize():
CUSTOMSLEEP = check_setting_int(CFG, 'General', 'customsleep', 1)
HPUSER = check_setting_str(CFG, 'General', 'hpuser', '')
HPPASS = check_setting_str(CFG, 'General', 'hppass', '')
+
+ CACHE_SIZEMB = check_setting_int(CFG,'Advanced','cache_sizemb',32)
ALBUM_COMPLETION_PCT = check_setting_int(CFG, 'Advanced', 'album_completion_pct', 80)
@@ -724,6 +728,7 @@ def config_write():
new_config['Advanced'] = {}
new_config['Advanced']['album_completion_pct'] = ALBUM_COMPLETION_PCT
+ new_config['Advanced']['cache_sizemb'] = CACHE_SIZEMB
new_config.write()
diff --git a/headphones/cache.py b/headphones/cache.py
index 28f9d500..9592e8f3 100644
--- a/headphones/cache.py
+++ b/headphones/cache.py
@@ -62,21 +62,27 @@ class Cache(object):
def __init__(self):
pass
-
- def _exists(self, type):
- self.artwork_files = glob.glob(os.path.join(self.path_to_art_cache, self.id + '*'))
- self.thumb_files = glob.glob(os.path.join(self.path_to_art_cache, 'T_' + self.id + '*'))
+ def _findfilesstartingwith(self,pattern,folder):
+ files = []
+ for fname in os.listdir(folder):
+ if fname.startswith(pattern):
+ files.append(os.path.join(folder,fname))
+ return files
+
+ def _exists(self, type):
+ self.artwork_files = []
+ self.thumb_files = []
if type == 'artwork':
-
+ self.artwork_files = self._findfilesstartingwith(self.id,self.path_to_art_cache)
if self.artwork_files:
return True
else:
return False
-
+
elif type == 'thumb':
-
+ self.thumb_files = self._findfilesstartingwith("T_" + self.id,self.path_to_art_cache)
if self.thumb_files:
return True
else:
diff --git a/headphones/db.py b/headphones/db.py
index 601b6286..985f6b72 100644
--- a/headphones/db.py
+++ b/headphones/db.py
@@ -40,6 +40,12 @@ class DBConnection:
self.filename = filename
self.connection = sqlite3.connect(dbFilename(filename), timeout=20)
+ #don't wait for the disk to finish writing
+ self.connection.execute("PRAGMA synchronous = OFF")
+ #journal disabled since we never do rollbacks
+ self.connection.execute("PRAGMA journal_mode = OFF")
+ #64mb of cache memory,probably need to make it user configurable
+ self.connection.execute("PRAGMA cache_size=-%s" % (headphones.CACHE_SIZEMB*1024))
self.connection.row_factory = sqlite3.Row
def action(self, query, args=None):
diff --git a/headphones/importer.py b/headphones/importer.py
index d8ceb281..404ffe7e 100644
--- a/headphones/importer.py
+++ b/headphones/importer.py
@@ -21,7 +21,12 @@ from lib.beets.mediafile import MediaFile
import headphones
from headphones import logger, helpers, db, mb, albumart, lastfm
-various_artists_mbid = '89ad4ac3-39f7-470e-963a-56509c546377'
+#[anonymous],[data],[no artist],[traditional],[unknown],Various Artists
+blacklisted_special_artists = ['f731ccc4-e22a-43af-a747-64213329e088','33cf029c-63b0-41a0-9855-be2a3665fb3b',\
+ '314e1c25-dde7-4e4d-b2f4-0a7b9f7c56dc','eec63d3c-3b81-4ad4-b1e4-7c147d4d2b61',\
+ '9be7f096-97ec-4615-8957-8d40b5dcbc41','125ec42a-7229-4250-afc5-e057484327fe',\
+ '89ad4ac3-39f7-470e-963a-56509c546377']
+
def is_exists(artistid):
@@ -63,7 +68,7 @@ def artistlist_to_mbids(artistlist, forced=False):
if not forced:
bl_artist = myDB.action('SELECT * FROM blacklist WHERE ArtistID=?', [artistid]).fetchone()
- if bl_artist or artistid == various_artists_mbid:
+ if bl_artist or artistid in blacklisted_special_artists:
logger.info("Artist ID for '%s' is either blacklisted or Various Artists. To add artist, you must do it manually (Artist ID: %s)" % (artist, artistid))
continue
@@ -99,8 +104,8 @@ def addArtisttoDB(artistid, extrasonly=False):
from headphones import cache
# Can't add various artists - throws an error from MB
- if artistid == various_artists_mbid:
- logger.warn('Cannot import Various Artists.')
+ if artistid in blacklisted_special_artists:
+ logger.warn('Cannot import blocked special purpose artist with id' + artistid)
return
# We'll use this to see if we should update the 'LastUpdated' time stamp
@@ -158,6 +163,16 @@ def addArtisttoDB(artistid, extrasonly=False):
myDB.upsert("artists", newValueDict, controlValueDict)
+ # See if we need to grab extras. Artist specific extras take precedence over global option
+ # Global options are set when adding a new artist
+ myDB = db.DBConnection()
+
+ try:
+ db_artist = myDB.action('SELECT IncludeExtras, Extras from artists WHERE ArtistID=?', [artistid]).fetchone()
+ includeExtras = db_artist['IncludeExtras']
+ except IndexError:
+ includeExtras = False
+
for rg in artist['releasegroups']:
logger.info("Now adding/updating: " + rg['title'])
@@ -167,69 +182,54 @@ def addArtisttoDB(artistid, extrasonly=False):
# check if the album already exists
rg_exists = myDB.action("SELECT * from albums WHERE AlbumID=?", [rg['id']]).fetchone()
- try:
- releaselist = mb.getReleaseGroup(rgid)
- except Exception, e:
- logger.info('Unable to get release information for %s - there may not be any official releases in this release group' % rg['title'])
+ releases = mb.get_all_releases(rgid,includeExtras)
+ if releases == []:
+ logger.info('No official releases in release group %s' % rg['title'])
continue
-
- if not releaselist:
+ if not releases:
errors = True
+ logger.info('Unable to get release information for %s - there may not be any official releases in this release group' % rg['title'])
continue
# This will be used later to build a hybrid release
fullreleaselist = []
-
- for release in releaselist:
+
+ for release in releases:
# What we're doing here now is first updating the allalbums & alltracks table to the most
# current info, then moving the appropriate release into the album table and its associated
# tracks into the tracks table
-
- releaseid = release['id']
-
- try:
- releasedict = mb.getRelease(releaseid, include_artist_info=False)
- except Exception, e:
- errors = True
- logger.info('Unable to get release information for %s: %s' % (release['id'], e))
- continue
-
- if not releasedict:
- errors = True
- continue
+ controlValueDict = {"ReleaseID" : release['ReleaseID']}
- controlValueDict = {"ReleaseID": release['id']}
-
- newValueDict = {"ArtistID": artistid,
- "ArtistName": artist['artist_name'],
- "AlbumTitle": rg['title'],
- "AlbumID": rg['id'],
- "AlbumASIN": releasedict['asin'],
- "ReleaseDate": releasedict['date'],
- "Type": rg['type'],
- "ReleaseCountry": releasedict['country'],
- "ReleaseFormat": releasedict['format']
+ newValueDict = {"ArtistID": release['ArtistID'],
+ "ArtistName": release['ArtistName'],
+ "AlbumTitle": release['AlbumTitle'],
+ "AlbumID": release['AlbumID'],
+ "AlbumASIN": release['AlbumASIN'],
+ "ReleaseDate": release['ReleaseDate'],
+ "Type": release['Type'],
+ "ReleaseCountry": release['ReleaseCountry'],
+ "ReleaseFormat": release['ReleaseFormat']
}
-
+
myDB.upsert("allalbums", newValueDict, controlValueDict)
# Build the dictionary for the fullreleaselist
- newValueDict['ReleaseID'] = release['id']
- newValueDict['Tracks'] = releasedict['tracks']
+ newValueDict['ReleaseID'] = release['ReleaseID']
+ newValueDict['Tracks'] = release['Tracks']
fullreleaselist.append(newValueDict)
- for track in releasedict['tracks']:
+ for track in release['Tracks']:
cleanname = helpers.cleanName(artist['artist_name'] + ' ' + rg['title'] + ' ' + track['title'])
controlValueDict = {"TrackID": track['id'],
- "ReleaseID": release['id']}
+ "ReleaseID": release['ReleaseID']}
- newValueDict = {"ArtistID": artistid,
- "ArtistName": artist['artist_name'],
- "AlbumTitle": rg['title'],
- "AlbumASIN": releasedict['asin'],
- "AlbumID": rg['id'],
+ newValueDict = {"ArtistID": release['ArtistID'],
+ "ArtistName": release['ArtistName'],
+ "AlbumTitle": release['AlbumTitle'],
+ "AlbumID": release['AlbumID'],
+ "AlbumASIN": release['AlbumASIN'],
"TrackTitle": track['title'],
"TrackDuration": track['duration'],
"TrackNumber": track['number'],
@@ -251,7 +251,13 @@ def addArtisttoDB(artistid, extrasonly=False):
myDB.upsert("alltracks", newValueDict, controlValueDict)
# Basically just do the same thing again for the hybrid release
- hybridrelease = getHybridRelease(fullreleaselist)
+ # This may end up being called with an empty fullreleaselist
+ try:
+ hybridrelease = getHybridRelease(fullreleaselist)
+ except Exception, e:
+ errors = True
+ logger.warn('Unable to get hybrid release information for %s: %s' % (rg['title'],e))
+ continue
# Use the ReleaseGroupID as the ReleaseID for the hybrid release to differentiate it
# We can then use the condition WHERE ReleaseID == ReleaseGroupID to select it
@@ -584,6 +590,8 @@ def getHybridRelease(fullreleaselist):
"""
Returns a dictionary of best group of tracks from the list of releases & earliest release date
"""
+ if len(fullreleaselist) == 0:
+ raise Exception("getHybridRelease was called with an empty fullreleaselist")
sortable_release_list = []
for release in fullreleaselist:
diff --git a/headphones/librarysync.py b/headphones/librarysync.py
index 7001c14c..ea95efa6 100644
--- a/headphones/librarysync.py
+++ b/headphones/librarysync.py
@@ -56,6 +56,11 @@ def libraryScan(dir=None, append=False, ArtistID=None, ArtistName=None):
song_list = []
for r,d,f in os.walk(dir):
+ #need to abuse slicing to get a copy of the list, doing it directly will skip the element after a deleted one
+ #using a list comprehension will not work correctly for nested subdirectories (os.walk keeps its original list)
+ for directory in d[:]:
+ if directory.startswith("."):
+ d.remove(directory)
for files in f:
# MEDIA_FORMATS = music file extensions, e.g. mp3, flac, etc
if any(files.lower().endswith('.' + x.lower()) for x in headphones.MEDIA_FORMATS):
diff --git a/headphones/mb.py b/headphones/mb.py
index c1f856ec..b9c03499 100644
--- a/headphones/mb.py
+++ b/headphones/mb.py
@@ -30,16 +30,12 @@ mb_lock = threading.Lock()
# Quick fix to add mirror switching on the fly. Need to probably return the mbhost & mbport that's
# being used, so we can send those values to the log
-def startmb(forcemb=False):
+def startmb():
mbuser = None
mbpass = None
- # Can use headphones mirror for queries
- if headphones.MIRROR == "headphones" or "custom":
- forcemb=False
-
- if forcemb or headphones.MIRROR == "musicbrainz.org":
+ if headphones.MIRROR == "musicbrainz.org":
mbhost = "musicbrainz.org"
mbport = 80
sleepytime = 1
@@ -54,16 +50,15 @@ def startmb(forcemb=False):
mbpass = headphones.HPPASS
sleepytime = 0
else:
- mbhost = "tbueter.com"
- mbport = 5000
- sleepytime = 0
+ return False
musicbrainzngs.set_useragent("headphones","0.0","https://github.com/rembo10/headphones")
musicbrainzngs.set_hostname(mbhost + ":" + str(mbport))
if sleepytime == 0:
musicbrainzngs.set_rate_limit(False)
else:
- musicbrainzngs.set_rate_limit(True)
+ #calling it with an it ends up blocking all requests after the first
+ musicbrainzngs.set_rate_limit(limit_or_interval=float(sleepytime))
# Add headphones credentials
if headphones.MIRROR == "headphones":
@@ -71,13 +66,10 @@ def startmb(forcemb=False):
logger.warn("No username or password set for VIP server")
else:
musicbrainzngs.hpauth(mbuser,mbpass)
-
- # Don't really need to return q anymore since ngs, but maybe we can return an 'initialized=True' instead?
- q = musicbrainzngs
logger.debug('Using the following server values:\nMBHost: %s ; MBPort: %i ; Sleep Interval: %i ' % (mbhost, mbport, sleepytime))
- return (q, sleepytime)
+ return True
def findArtist(name, limit=1):
@@ -89,16 +81,12 @@ def findArtist(name, limit=1):
if any((c in chars) for c in name):
name = '"'+name+'"'
- q, sleepytime = startmb(forcemb=True)
-
try:
artistResults = musicbrainzngs.search_artists(query='artist:'+name,limit=limit)['artist-list']
except WebServiceError, e:
logger.warn('Attempt to query MusicBrainz for %s failed (%s)' % (name, str(e)))
time.sleep(5)
- time.sleep(sleepytime)
-
if not artistResults:
return False
for result in artistResults:
@@ -134,27 +122,23 @@ def findArtist(name, limit=1):
def findRelease(name, limit=1):
with mb_lock:
- releaselistngs = []
- releaseResultsngs = None
+ releaselist = []
+ releaseResults = None
chars = set('!?')
if any((c in chars) for c in name):
name = '"'+name+'"'
- q, sleepytime = startmb(forcemb=True)
-
try:
- releaseResultsngs = musicbrainzngs.search_releases(query=name,limit=limit)['release-list']
+ releaseResults = musicbrainzngs.search_releases(query=name,limit=limit)['release-list']
except WebServiceError, e: #need to update exceptions
logger.warn('Attempt to query MusicBrainz for "%s" failed: %s' % (name, str(e)))
time.sleep(5)
-
- time.sleep(sleepytime)
-
- if not releaseResultsngs:
+
+ if not releaseResults:
return False
- for result in releaseResultsngs:
- releaselistngs.append({
+ for result in releaseResults:
+ releaselist.append({
'uniquename': unicode(result['artist-credit'][0]['artist']['name']),
'title': unicode(result['title']),
'id': unicode(result['artist-credit'][0]['artist']['id']),
@@ -163,7 +147,7 @@ def findRelease(name, limit=1):
'albumurl': unicode("http://musicbrainz.org/release/" + result['id']),#probably needs to be changed
'score': int(result['ext:score'])
})
- return releaselistngs
+ return releaselist
def getArtist(artistid, extrasonly=False):
@@ -172,8 +156,6 @@ def getArtist(artistid, extrasonly=False):
artist = None
- q, sleepytime = startmb()
-
try:
limit = 100
artist = musicbrainzngs.get_artist_by_id(artistid)['artist']
@@ -191,8 +173,6 @@ def getArtist(artistid, extrasonly=False):
if not artist:
return False
- time.sleep(sleepytime)
-
#if 'disambiguation' in artist:
# uniquename = unicode(artist['sort-name'] + " (" + artist['disambiguation'] + ")")
#else:
@@ -285,9 +265,7 @@ def getReleaseGroup(rgid):
releaselist = []
releaseGroup = None
-
- q, sleepytime = startmb()
-
+
try:
releaseGroup = musicbrainzngs.get_release_group_by_id(rgid,["artists","releases","media","discids",])['release-group']
except WebServiceError, e:
@@ -308,8 +286,6 @@ def getRelease(releaseid, include_artist_info=True):
release = {}
results = None
- q, sleepytime = startmb()
-
try:
if include_artist_info:
results = musicbrainzngs.get_release_by_id(releaseid,["artists","release-groups","media","recordings"]).get('release')
@@ -321,8 +297,6 @@ def getRelease(releaseid, include_artist_info=True):
if not results:
return False
-
- time.sleep(sleepytime)
release['title'] = unicode(results['title'])
release['id'] = unicode(results['id'])
@@ -350,24 +324,86 @@ def getRelease(releaseid, include_artist_info=True):
release['artist_name'] = unicode(results['artist-credit'][0]['artist']['name'])
release['artist_id'] = unicode(results['artist-credit'][0]['artist']['id'])
-
- totalTracks = 1
- tracks = []
- for medium in results['medium-list']:
- for track in medium['track-list']:
- tracks.append({
- 'number': totalTracks,
- 'title': unicode(track['recording']['title']),
- 'id': unicode(track['recording']['id']),
- 'url': u"http://musicbrainz.org/track/" + track['recording']['id'],
- 'duration': int(track['length']) if 'length' in track else 0
- })
- totalTracks += 1
- release['tracks'] = tracks
+ release['tracks'] = getTracksFromRelease(results)
return release
+def get_all_releases(rgid,includeExtras=False):
+ results = []
+ try:
+ limit = 100
+ newResults = None
+ while newResults == None or len(newResults) >= limit:
+ newResults = musicbrainzngs.browse_releases(release_group=rgid,includes=['artist-credits','labels','recordings','release-groups','media'],limit=limit,offset=len(results))
+ if 'release-list' not in newResults:
+ break #may want to raise an exception here instead ?
+ newResults = newResults['release-list']
+ results += newResults
+
+ except WebServiceError, e:
+ logger.warn('Attempt to retrieve information from MusicBrainz for release group "%s" failed (%s)' % (rgid, str(e)))
+ time.sleep(5)
+ return False
+
+ if not results or len(results) == 0:
+ return False
+
+
+ releases = []
+ for releasedata in results:
+ #releasedata.get will return None if it doesn't have a status
+ #all official releases should have the Official status included
+ if not includeExtras and releasedata.get('status') != 'Official':
+ continue
+
+ release = {}
+ release['AlbumTitle'] = unicode(releasedata['title'])
+ release['AlbumID'] = unicode(rgid)
+ release['AlbumASIN'] = unicode(releasedata['asin']) if 'asin' in releasedata else None
+ release['ReleaseDate'] = unicode(releasedata['date']) if 'date' in releasedata else None
+ release['ReleaseID'] = releasedata['id']
+ if 'release-group' not in releasedata:
+ raise Exception('No release group associated with release id ' + releasedata['id'] + ' album id' + rgid)
+ release['Type'] = unicode(releasedata['release-group']['type'])
+
+
+ #making the assumption that the most important artist will be first in the list
+ if 'artist-credit' in releasedata:
+ release['ArtistID'] = unicode(releasedata['artist-credit'][0]['artist']['id'])
+ release['ArtistName'] = unicode(releasedata['artist-credit-phrase'])
+ else:
+ logger.warn('Release ' + releasedata['id'] + ' has no Artists associated.')
+ return False
+
+
+ release['ReleaseCountry'] = unicode(releasedata['country']) if 'country' in releasedata else u'Unknown'
+ #assuming that the list will contain media and that the format will be consistent
+ try:
+ release['ReleaseFormat'] = unicode(releasedata['medium-list'][0]['format'])
+ except:
+ release['ReleaseFormat'] = u'Unknown'
+
+ release['Tracks'] = getTracksFromRelease(releasedata)
+ releases.append(release)
+
+ return releases
+
+def getTracksFromRelease(release):
+ totalTracks = 1
+ tracks = []
+ for medium in release['medium-list']:
+ for track in medium['track-list']:
+ tracks.append({
+ 'number': totalTracks,
+ 'title': unicode(track['recording']['title']),
+ 'id': unicode(track['recording']['id']),
+ 'url': u"http://musicbrainz.org/track/" + track['recording']['id'],
+ 'duration': int(track['length']) if 'length' in track else 0
+ })
+ totalTracks += 1
+ return tracks
+
# Used when there is a disambiguation
def findArtistbyAlbum(name):
@@ -386,15 +422,12 @@ def findArtistbyAlbum(name):
results = None
- q, sleepytime = startmb(forcemb=True)
-
try:
results = musicbrainzngs.search_release_groups(term).get('release-group-list')
except WebServiceError, e:
logger.warn('Attempt to query MusicBrainz for %s failed (%s)' % (name, str(e)))
time.sleep(5)
- time.sleep(sleepytime)
if not results:
return False
@@ -419,23 +452,19 @@ def findArtistbyAlbum(name):
def findAlbumID(artist=None, album=None):
- results_ngs = None
-
- q, sleepytime = startmb(forcemb=True)
+ results = None
try:
term = '"'+album+'" AND artist:"'+artist+'"'
- results_ngs = musicbrainzngs.search_release_groups(term,1).get('release-group-list')
+ results = musicbrainzngs.search_release_groups(term,1).get('release-group-list')
except WebServiceError, e:
logger.warn('Attempt to query MusicBrainz for %s - %s failed (%s)' % (artist, album, str(e)))
time.sleep(5)
-
- time.sleep(sleepytime)
-
- if not results_ngs:
+
+ if not results:
return False
- if len(results_ngs) < 1:
+ if len(results) < 1:
return False
- rgid_ngs = unicode(results_ngs[0]['id'])
- return rgid_ngs
+ rgid = unicode(results[0]['id'])
+ return rgid
diff --git a/headphones/webserve.py b/headphones/webserve.py
index c445ea2e..116692ff 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -26,7 +26,7 @@ import threading
import headphones
from headphones import logger, searcher, db, importer, mb, lastfm, librarysync
-from headphones.helpers import checked, radio
+from headphones.helpers import checked, radio,today
import lib.simplejson as simplejson
@@ -190,6 +190,20 @@ class WebInterface(object):
raise cherrypy.HTTPRedirect("home")
deleteArtist.exposed = True
+
+ def deleteEmptyArtists(self):
+ logger.info(u"Deleting all empty artists")
+ myDB = db.DBConnection()
+ emptyArtistIDs = [row['ArtistID'] for row in myDB.select("SELECT ArtistID FROM artists WHERE HaveTracks == 0 OR LatestAlbum IS NULL")]
+ for ArtistID in emptyArtistIDs:
+ logger.info(u"Deleting all traces of artist: " + ArtistID)
+ myDB.action('DELETE from artists WHERE ArtistID=?', [ArtistID])
+ myDB.action('DELETE from albums WHERE ArtistID=?', [ArtistID])
+ myDB.action('DELETE from tracks WHERE ArtistID=?', [ArtistID])
+ myDB.action('INSERT OR REPLACE into blacklist VALUES (?)', [ArtistID])
+ deleteEmptyArtists.exposed = True
+
+
def refreshArtist(self, ArtistID):
threading.Thread(target=importer.addArtisttoDB, args=[ArtistID]).start()
raise cherrypy.HTTPRedirect("artistPage?ArtistID=%s" % ArtistID)
@@ -394,6 +408,110 @@ class WebInterface(object):
return serve_template(templatename="logs.html", title="Log", lineList=headphones.LOG_LIST)
logs.exposed = True
+
+ def getLog(self,iDisplayStart=0,iDisplayLength=100,iSortCol_0=0,sSortDir_0="desc",sSearch="",**kwargs):
+
+ iDisplayStart = int(iDisplayStart)
+ iDisplayLength = int(iDisplayLength)
+
+ filtered = []
+ if sSearch == "":
+ filtered = headphones.LOG_LIST[::]
+ else:
+ filtered = [row for row in headphones.LOG_LIST for column in row if sSearch in column]
+
+ sortcolumn = 0
+ if iSortCol_0 == '1':
+ sortcolumn = 2
+ elif iSortCol_0 == '2':
+ sortcolumn = 1
+ filtered.sort(key=lambda x:x[sortcolumn],reverse=sSortDir_0 == "desc")
+
+ rows = filtered[iDisplayStart:(iDisplayStart+iDisplayLength)]
+ rows = [[row[0],row[2],row[1]] for row in rows]
+
+ dict = {'iTotalDisplayRecords':len(filtered),
+ 'iTotalRecords':len(headphones.LOG_LIST),
+ 'aaData':rows,
+ }
+ s = simplejson.dumps(dict)
+ return s
+ getLog.exposed = True
+
+ def getArtists_json(self,iDisplayStart=0,iDisplayLength=100,sSearch="",iSortCol_0='0',sSortDir_0='asc',**kwargs):
+ iDisplayStart = int(iDisplayStart)
+ iDisplayLength = int(iDisplayLength)
+ filtered = []
+ totalcount = 0
+ myDB = db.DBConnection()
+
+
+ sortcolumn = 'ArtistSortName'
+ sortbyhavepercent = False
+ if iSortCol_0 == '2':
+ sortcolumn = 'Status'
+ elif iSortCol_0 == '3':
+ sortcolumn = 'ReleaseDate'
+ elif iSortCol_0 == '4':
+ sortbyhavepercent = True
+
+ if sSearch == "":
+ query = 'SELECT * from artists order by %s COLLATE NOCASE %s' % (sortcolumn,sSortDir_0)
+ filtered = myDB.select(query)
+ totalcount = len(filtered)
+ else:
+ query = 'SELECT * from artists WHERE ArtistSortName LIKE "%' + sSearch + '%" OR LatestAlbum LIKE "%' + sSearch +'%"' + 'ORDER BY %s COLLATE NOCASE %s' % (sortcolumn,sSortDir_0)
+ filtered = myDB.select(query)
+ totalcount = myDB.select('SELECT COUNT(*) from artists')[0][0]
+
+ if sortbyhavepercent:
+ filtered.sort(key=lambda x:(float(x['HaveTracks'])/x['TotalTracks'] if x['TotalTracks'] > 0 else 0.0,x['HaveTracks'] if x['HaveTracks'] else 0.0),reverse=sSortDir_0 == "asc")
+
+ #can't figure out how to change the datatables default sorting order when its using an ajax datasource so ill
+ #just reverse it here and the first click on the "Latest Album" header will sort by descending release date
+ if sortcolumn == 'ReleaseDate':
+ filtered.reverse()
+
+
+ artists = filtered[iDisplayStart:(iDisplayStart+iDisplayLength)]
+ rows = []
+ for artist in artists:
+ row = {"ArtistID":artist['ArtistID'],
+ "ArtistSortName":artist["ArtistSortName"],
+ "Status":artist["Status"],
+ "TotalTracks":artist["TotalTracks"],
+ "HaveTracks":artist["HaveTracks"],
+ "LatestAlbum":"",
+ "ReleaseDate":"",
+ "ReleaseInFuture":"False",
+ "AlbumID":"",
+ }
+
+ if not row['HaveTracks']:
+ row['HaveTracks'] = 0
+ if artist['ReleaseDate'] and artist['LatestAlbum']:
+ row['ReleaseDate'] = artist['ReleaseDate']
+ row['LatestAlbum'] = artist['LatestAlbum']
+ row['AlbumID'] = artist['AlbumID']
+ if artist['ReleaseDate'] > today():
+ row['ReleaseInFuture'] = "True"
+ elif artist['LatestAlbum']:
+ row['ReleaseDate'] = ''
+ row['LatestAlbum'] = artist['LatestAlbum']
+ row['AlbumID'] = artist['AlbumID']
+
+ rows.append(row)
+
+
+ dict = {'iTotalDisplayRecords':len(filtered),
+ 'iTotalRecords':totalcount,
+ 'aaData':rows,
+ }
+ s = simplejson.dumps(dict)
+ cherrypy.response.headers['Content-type'] = 'application/json'
+ return s
+ getArtists_json.exposed=True
+
def clearhistory(self, type=None):
myDB = db.DBConnection()
if type == 'all':
@@ -523,7 +641,8 @@ class WebInterface(object):
"customport": headphones.CUSTOMPORT,
"customsleep": headphones.CUSTOMSLEEP,
"hpuser": headphones.HPUSER,
- "hppass": headphones.HPPASS
+ "hppass": headphones.HPPASS,
+ "cache_sizemb":headphones.CACHE_SIZEMB,
}
# Need to convert EXTRAS to a dictionary we can pass to the config: it'll come in as a string like 2,5,6,8
@@ -556,7 +675,7 @@ class WebInterface(object):
encoderoutputformat=None, encodervbrcbr=None, encoderquality=None, encoderlossless=0, delete_lossless_files=0, prowl_enabled=0, prowl_onsnatch=0,
prowl_keys=None, prowl_priority=0, xbmc_enabled=0, xbmc_host=None, xbmc_username=None, xbmc_password=None, xbmc_update=0, xbmc_notify=0, nma_enabled=False,
nma_apikey=None, nma_priority=0, nma_onsnatch=0, synoindex_enabled=False, mirror=None, customhost=None, customport=None, customsleep=None, hpuser=None, hppass=None,
- preferred_bitrate_high_buffer=None, preferred_bitrate_low_buffer=None, **kwargs):
+ preferred_bitrate_high_buffer=None, preferred_bitrate_low_buffer=None,cache_sizemb=32, **kwargs):
headphones.HTTP_HOST = http_host
headphones.HTTP_PORT = http_port
@@ -656,6 +775,7 @@ class WebInterface(object):
headphones.CUSTOMSLEEP = customsleep
headphones.HPUSER = hpuser
headphones.HPPASS = hppass
+ headphones.CACHE_SIZEMB = cache_sizemb
# Handle the variable config options. Note - keys with False values aren't getting passed
@@ -688,6 +808,9 @@ class WebInterface(object):
# Write the config
headphones.config_write()
+ #reconfigure musicbrainz database connection with the new values
+ mb.startmb()
+
raise cherrypy.HTTPRedirect("config")
configUpdate.exposed = True
@@ -778,3 +901,67 @@ class WebInterface(object):
return simplejson.dumps(image_dict)
getImageLinks.exposed = True
+
+class Artwork(object):
+ def index(self):
+ return "Artwork"
+ index.exposed = True
+
+ def default(self,ArtistOrAlbum="",ID=None):
+ from headphones import cache
+ ArtistID = None
+ AlbumID = None
+ if ArtistOrAlbum == "artist":
+ ArtistID = ID
+ elif ArtistOrAlbum == "album":
+ AlbumID = ID
+
+ relpath = cache.getArtwork(ArtistID,AlbumID)
+
+ if not relpath:
+ relpath = "data/interfaces/default/images/no-cover-art.png"
+ cherrypy.response.headers['Content-type'] = 'image/png'
+ cherrypy.response.headers['Cache-Control'] = 'no-cache'
+ else:
+ fileext = os.path.splitext(relpath)[1][1::]
+ cherrypy.response.headers['Content-type'] = 'image/' + fileext
+ cherrypy.response.headers['Cache-Control'] = 'max-age=31556926'
+
+ path = os.path.abspath(relpath)
+ f = open(path,'rb')
+ return f.read()
+ default.exposed = True
+
+ class Thumbs(object):
+ def index(self):
+ return "Here be thumbs"
+ index.exposed = True
+ def default(self,ArtistOrAlbum="",ID=None):
+ from headphones import cache
+ ArtistID = None
+ AlbumID = None
+ if ArtistOrAlbum == "artist":
+ ArtistID = ID
+ elif ArtistOrAlbum == "album":
+ AlbumID = ID
+
+ relpath = cache.getThumb(ArtistID,AlbumID)
+
+ if not relpath:
+ relpath = "data/interfaces/default/images/no-cover-artist.png"
+ cherrypy.response.headers['Content-type'] = 'image/png'
+ cherrypy.response.headers['Cache-Control'] = 'no-cache'
+ else:
+ fileext = os.path.splitext(relpath)[1][1::]
+ cherrypy.response.headers['Content-type'] = 'image/' + fileext
+ cherrypy.response.headers['Cache-Control'] = 'max-age=31556926'
+
+ path = os.path.abspath(relpath)
+ f = open(path,'rb')
+ return f.read()
+ default.exposed = True
+
+ thumbs = Thumbs()
+
+
+WebInterface.artwork = Artwork()
diff --git a/headphones/webstart.py b/headphones/webstart.py
index b16d6765..0472a033 100644
--- a/headphones/webstart.py
+++ b/headphones/webstart.py
@@ -56,7 +56,7 @@ def initialize(options={}):
},
'/favicon.ico':{
'tools.staticfile.on': True,
- 'tools.staticfile.filename': "images/favicon.ico"
+ 'tools.staticfile.filename': os.path.join(os.path.abspath(os.curdir),"images" + os.sep + "favicon.ico")
},
'/cache':{
'tools.staticdir.on': True,
diff --git a/lib/musicbrainzngs/musicbrainz.py b/lib/musicbrainzngs/musicbrainz.py
index b0e94fed..e16c0816 100644
--- a/lib/musicbrainzngs/musicbrainz.py
+++ b/lib/musicbrainzngs/musicbrainz.py
@@ -552,6 +552,7 @@ def _do_mb_query(entity, id, includes=[], params={}):
# Build the endpoint components.
path = '%s/%s' % (entity, id)
+ logging.debug(str(path))
return _mb_request(path, 'GET', auth_required, args=args)
def _do_mb_search(entity, query='', fields={},
@@ -776,7 +777,7 @@ def browse_recordings(artist=None, release=None, includes=[], limit=None, offset
def browse_releases(artist=None, label=None, recording=None, release_group=None, release_status=[], release_type=[], includes=[], limit=None, offset=None):
# track_artist param doesn't work yet
- valid_includes = ["artist-credits", "labels", "recordings", "release-groups"]
+ valid_includes = ["artist-credits", "labels", "recordings", "release-groups","media"]
params = {"artist": artist,
"label": label,
"recording": recording,
