0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

more windows path fixes

Browse source
This commit is contained in:
j 2016-02-23 17:45:03 +05:30
parent a37a63d8da
commit b50821ba85
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
oml/item/models.py
View file

@ -710,7 +710,7 @@ class File(db.Model):
def fullpath(self): def fullpath(self):
prefs = settings.preferences prefs = settings.preferences
prefix = os.sep.join(os.path.join(os.path.expanduser(prefs['libraryPath']), 'Books/').split('/')) prefix = os.sep.join(os.path.join(os.path.expanduser(prefs['libraryPath']), 'Books/').split('/'))
return os.path.join(prefix, self.path) return os.path.normpath(os.path.join(prefix, self.path))
def make_readonly(self): def make_readonly(self):
current_path = self.fullpath() current_path = self.fullpath()

2
oml/item/scan.py
View file

@ -113,7 +113,7 @@ def collect_books(prefix, status=None):
if ext == 'kepub': if ext == 'kepub':
ext = 'epub' ext = 'epub'
if ext in extensions: if ext in extensions:
books.append(f) books.append(os.path.normpath(f))
count += 1 count += 1
if status and not status(count): if status and not status(count):
return None return None