Changeset - 1bd15c2c9d47
[Not reviewed]
default
0 1 0
drewp@bigasterisk.com - 19 years ago 2006-06-16 17:06:38
drewp@bigasterisk.com
music path fix again
1 file changed with 4 insertions and 24 deletions:
0 comments (0 inline, 0 general)
light9/showconfig.py
Show inline comments
 
@@ -27,30 +27,10 @@ def songInMpd(song):
 

	
 
    changed root to /home/drewp/projects/light9/show/dance2005 for now
 
    """
 

	
 
    assert isinstance(song, URIRef), "songInMpd now takes URIRefs"
 

	
 
    mpdHome = None
 
    for line in open(path.expanduser("~/.mpdconf")):
 
        if line.startswith("music_directory"):
 
            mpdHome = line.split()[1].strip('"')
 
    if mpdHome is None:
 
        raise ValueError("can't find music_directory in your ~/.mpdconf")
 
    mpdHome = mpdHome.rstrip(path.sep) + path.sep
 

	
 
    songFullPath = songOnDisk(song)
 
    if not songFullPath.startswith(mpdHome):
 
        raise ValueError("the song path %r is not under your MPD music_directory (%r)" % (songFullPath, mpdHome))
 
        
 
    mpdRelativePath = songFullPath[len(mpdHome):]
 
    if path.join(mpdHome, mpdRelativePath) != songFullPath:
 
        raise ValueError("%r + %r doesn't make the songpath %r" % (mpdHome, mpdRelativePath, songFullPath))
 
    return mpdRelativePath.encode('ascii')
 

	
 
def songOnDisk(song):
 
    graph = getGraph()
 
    songFullPath = path.join(root(), graph.value(song, L9['showPath']))
 
    return songFullPath
 
    
 
    if 'dance2005' in root():
 
        return "projects/dance2005/%s" % song
 
    raise NotImplementedError
 

	
 
def curvesDir():
 
    return path.join(root(),"curves")
0 comments (0 inline, 0 general)