diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py index c288bb59..d2dc53d7 100644 --- a/headphones/postprocessor.py +++ b/headphones/postprocessor.py @@ -172,11 +172,16 @@ def moveFiles(albumpath, release, tracks): artist = release['ArtistName'].replace('/', '_') album = release['AlbumTitle'].replace('/', '_') + + if release['ArtistName'].startswith('The '): + sortname = release['ArtistName'][4:] + else: + sortname = release['ArtistName'] - if artist[0].isdigit(): + if sortname.isdigit(): firstchar = '0-9' else: - firstchar = artist[0] + firstchar = sortname[0] values = { 'artist': artist, diff --git a/headphones/webserve.py b/headphones/webserve.py index c7b75390..185592f8 100644 --- a/headphones/webserve.py +++ b/headphones/webserve.py @@ -508,18 +508,14 @@ class WebInterface(object): page.append(templates._logobar) page.append(templates._nav) page.append('''
''')
- if os.path.isfile(os.path.join(headphones.LOG_DIR, 'headphones.log')):
- fileHandle = open(os.path.join(headphones.LOG_DIR, 'headphones.log'))
+ log_file = os.path.join(headphones.LOG_DIR, 'headphones.log')
+ if os.path.isfile(log_file):
+ fileHandle = open(log_file)
lineList = fileHandle.readlines()
fileHandle.close()
- i = -1
- if len(lineList) < 100:
- limit = -len(lineList)
- else:
- limit = -100
- while i > limit:
- page.append(lineList[i] + '
')
- i -= 1
+ lineList.reverse()
+ for line in lineList[1:200]:
+ page.append(line.decode('utf-8') + '
')
page.append('''