summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoretobi <git@e-tobi.net>2011-10-08 23:24:50 +0200
committeretobi <git@e-tobi.net>2011-10-09 19:15:53 +0200
commita196a16d13930033b2dffc9920149e339ddb3d07 (patch)
treeb365fe4c996536c9f2c110c4d53756210def486b
parentf6284c8edbf219540c8c6082ec97e6bc53e9bbec (diff)
downloadvdrnfofs-a196a16d13930033b2dffc9920149e339ddb3d07.tar.gz
vdrnfofs-a196a16d13930033b2dffc9920149e339ddb3d07.tar.bz2
Some more micro-optimizations
-rw-r--r--vdrnfofs/filesystemnodes.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/vdrnfofs/filesystemnodes.py b/vdrnfofs/filesystemnodes.py
index 6600859..758a1e4 100644
--- a/vdrnfofs/filesystemnodes.py
+++ b/vdrnfofs/filesystemnodes.py
@@ -58,7 +58,7 @@ class MpgNode:
if not self.mpeg_files:
self.mpeg_files = glob.glob(path + '/[0-9]*.ts')
self.mpeg_files.sort()
- self.file_system_name = os.path.basename(os.path.abspath(path + '/..')) + '_' + os.path.basename(path) + '.mpg'
+ self.file_system_name = '_'.join(path.rsplit('/', 3)[-2:]) + '.mpg'
self.reader = ConcatenatedFileReader(self.mpeg_files)
def size(self):
@@ -86,7 +86,7 @@ class MpgNode:
class NfoNode:
def __init__(self, path):
self.path = path
- self.file_system_name = os.path.basename(os.path.abspath(path + '/..')) + '_' + os.path.basename(path) + '.nfo'
+ self.file_system_name = '_'.join(path.rsplit('/', 3)[-2:]) + '.nfo'
if os.path.exists(path + '/info.vdr'):
info_vdr = InfoVdr(path + '/info.vdr')
elif os.path.exists(path + '/info'):
@@ -121,7 +121,7 @@ class NfoNode:
class DirNode:
def __init__(self, path):
self.path = path
- self.file_system_name = os.path.basename(path)
+ self.file_system_name = path.rsplit('/',1)[1]
self.cache = []
def content(self):