First Letter of Folders disappearing

marky1991 commented 10 years ago

Relevant info from previous ticket:

Interestingly, now my folders are missing the first character, e.g. from the logs: (If this is not related to this fix, let me know and I'll move this to a seperate ticket)

[131114-01:11] Fetching album art for keywords ' wesome Songs'
[131114-01:11] Fetching album art for keywords ' rt History'
[131114-01:11] Fetching album art for keywords ' nime'
[131114-01:11] Fetching album art for keywords ' odcasts de Español'
[131114-01:11] Fetching album art for keywords ' nglish'
[131114-01:11] Fetching album art for keywords ' avoritas'

As a result of that, I can't play view files through "Browse Files" anymore. From the logs:

[131114-01:15] ERROR   : [14/Nov/2013:01:15:08] HTTP Traceback (most recent call last):
  File "/usr/local/lib/python3.3/dist-packages/cherrypy/_cprequest.py", line 656, in respond
    response.body = self.handler()
  File "/usr/local/lib/python3.3/dist-packages/cherrypy/lib/encoding.py", line 188, in __call__
    self.body = self.oldhandler(*args, **kwargs)
  File "/usr/local/lib/python3.3/dist-packages/cherrypy/_cpdispatch.py", line 34, in __call__
    return self.callable(*self.args, **self.kwargs)
  File "/home/mark/Documentos/cherrymusic-devel/cherrymusicserver/httphandler.py", line 266, in api
    return json.dumps({'data': handler(**handler_args)})
  File "/home/mark/Documentos/cherrymusic-devel/cherrymusicserver/httphandler.py", line 402, in api_listdir
    return [entry.to_dict() for entry in self.model.listdir(directory)]
  File "/home/mark/Documentos/cherrymusic-devel/cherrymusicserver/cherrymodel.py", line 104, in listdir
    allfilesindir = os.listdir(absdirpath)
FileNotFoundError: [Errno 2] No such file or directory: '/home/mark/Música/spañol'

I'm reliably getting this error. It appears to somehow go away a while after the server is restarted.

Still trying to figure out what makes it start working properly.

marky1991 commented 10 years ago

Aha! After waiting a long time, nothing happened. After doing a search, however, the letters suddenly returned. After doing another restart of the server, the letters were gone again. After another search, they came back.

tilboerner commented 10 years ago

Alright! If you switch back to Browse after searching, are the letters gone again?

marky1991 commented 10 years ago

No, after searching, they stay until the next server restart.

devsnd commented 10 years ago

Well, that is some mysterious :shit: going on there.

So, these are all the places where we cut strings. We can check them one after another and ✓ them...

[cherrymusic]$ grep -PRn "\[\d:" ./cherrymusicserver/*

[ ] ./cherrymusicserver/cherrymodel.py:301: return ext and ext[1:].lower() in CherryModel.supportedFormats
[x] ./cherrymusicserver/ext/zipstream.py:111: filename = filename[0:null_byte]
[x] ./cherrymusicserver/ext/zipstream.py:268: date_time = mtime[0:6]
[x] ./cherrymusicserver/ext/zipstream.py:274: arcname = arcname[1:]
[ ] ./cherrymusicserver/httphandler.py:228: newformat = args[-1][4:] # get.format
[ ] ./cherrymusicserver/log.py:52: hasorg = lambda seq: False if not seq else True if seq[0].startswith('org') else has_org(seq[1:])
[ ] ./cherrymusicserver/playlistdb.py:103: trackurl = trackurl[7:]
[ ] ./cherrymusicserver/playlistdb.py:105: trackurl = trackurl[6:]
[ ] ./cherrymusicserver/resultorder.py:103: filename = filename[1:]
[ ] ./cherrymusicserver/sqlitecache.py:138: value = value[3:]
[ ] ./cherrymusicserver/sqlitecache.py:144: value = value[3:]
[ ] ./cherrymusicserver/test/test_configuration.py:171: for attrname in self.attributes[3:]:
[ ] ./cherrymusicserver/userdb.py:134: return (plain[1::2] + salt + plain[::2])[::-1]

marky1991 commented 10 years ago

I've discovered the issue.

The root cause was that in my config file, I specified my basepath like this:

basedir = /home/mark/Música/

, with a trailing slash. Looking at the comments in the configuration file, this is indeed not exactly as specified. (But the difference is so tiny that I as a user (or a developer, on that note) would never expect this to cause an issue.)

In cherrymodel.py, strippath does this:

if path.startswith(cherry.config['media.basedir']):
    return path[len(cherry.config['media.basedir']) + 1:]

which assumes that media.basedir doesn't have a trailing slash. If there is a trailing slash, it removes the first character from the rest of the path, giving the faulty behavior I noticed. (How it ends up working after doing a search, I don't know. I didn't bother further looking into the code.)

I'm feeling too lazy to bother forking the project for one little fix, but if I were going to fix the code, I'd do something like this:

def strippath(path):
    if path.startswith(cherry.config['media.basedir']):
        return os.path.relpath(path, cherry.config['media.basedir'])
    return path

With this modification, everything works properly with or without the trailing slash. (I've verified that this function is available for all the versions of python that y'all support.)

As far as I can tell, no other code uses the limiting assumption, so this should be the only trouble spot.

devsnd commented 10 years ago

Thanks for your investigation and you fix! I've commited the fix to the devel branch.

Have a few funny icons as reward! :dancers: :octopus: :8ball: :monkey:

tilboerner commented 10 years ago

Good job tracking that one down. I like the use of relpath there, very neat.

devsnd / cherrymusic

First Letter of Folders disappearing #374