KevinMidboe/seasonedParser
1
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases 1 Wiki Activity

And the other conflict

Browse Source
This commit is contained in:
Kevin
2018-09-20 23:28:47 +02:00
parent 9e80cc4d97
commit 8fab27a95f
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core.py
View File

@@ -285,11 +285,6 @@ def pickforgirlscouts(video):
elif isinstance(video, Episode): elif isinstance(video, Episode):
if video.series != None and video.season != None and video.episode != None and type(video.episode) != list: if video.series != None and video.season != None and video.episode != None and type(video.episode) != list:
<<<<<<< HEAD
home_path = '{} S{}E{}'.format(str(video.series), str(video.season), str(video.episode))
movingToCollege(video, home_path)
return True
=======
# Handle the list problems # Handle the list problems
home_path = '{} S{:02d}E{:02d}'.format(str(video.series), str(video.season), str(video.episode)) home_path = '{} S{:02d}E{:02d}'.format(str(video.series), str(video.season), str(video.episode))
try: try:
@@ -297,7 +292,6 @@ def pickforgirlscouts(video):
return True return True
except: except:
return False return False
>>>>>>> 916ce45fecb6d2b9edbed0a408ea1a16b7d85d0b
return False return False