nikdoof/tvorganise
1
0
Fork 0
mirror of https://github.com/nikdoof/tvorganise.git synced 2026-01-31 01:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further PEP8 work.

Browse Source
This commit is contained in:
Andrew Williams
2010-01-26 13:36:11 +00:00
parent 47c58a18de
commit 7f108e80eb
1 changed files with 140 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tvorganise.py
View File

@@ -63,8 +63,9 @@ class TvOrganiser():
def _findFiles(self, args): def _findFiles(self, args):
""" """
Takes a list of files/folders, grabs files inside them. Does not recurse Takes a list of files/folders, grabs files inside them. Does not
more than one level (if a folder is supplied, it will list files within) recurse more than one level (if a folder is supplied, it will list
files within)
""" """
allfiles = [] allfiles = []
for cfile in args: for cfile in args:
@@ -94,7 +95,7 @@ class TvOrganiser():
if match: if match:
showname, seasno, epno, epname = match.groups() showname, seasno, epno, epname = match.groups()
#remove ._- characters from name (- removed only if next to end of line) #remove ._- characters from name
showname = re.sub("[\._]|\-(?=$)", " ", showname).strip() showname = re.sub("[\._]|\-(?=$)", " ", showname).strip()
seasno, epno = int(seasno), int(epno) seasno, epno = int(seasno), int(epno)
@@ -154,9 +155,10 @@ class TvOrganiser():
sys.exit(0) sys.exit(0)
for name in files: for name in files:
oldfile = os.path.join(name['filepath'], name['filename']) + "." + name['ext'] filename = "%s.%s" % (name['filename'], name['ext'])
oldfile = os.path.join(name['filepath'], filename)
newpath = config['target_path'] % name newpath = config['target_path'] % name
newfile = os.path.join(newpath, name['filename']) + "." + name['ext'] newfile = os.path.join(newpath, filename)
self._logger.info("Old path:", oldfile) self._logger.info("Old path:", oldfile)
self._logger.info("New path:", newfile) self._logger.info("New path:", newfile)