fixed error finding duplicate file
This commit is contained in:
@@ -99,7 +99,7 @@ def main(argv):
|
|||||||
The main program for TVEncoder.
|
The main program for TVEncoder.
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
opts, args = getopt.getopt(argv, "hlpen:")
|
opts, _ = getopt.getopt(argv, "hlpen:")
|
||||||
except getopt.GetoptError:
|
except getopt.GetoptError:
|
||||||
showhelp()
|
showhelp()
|
||||||
sys.exit(2)
|
sys.exit(2)
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ class FileManager:
|
|||||||
dirname = os.path.dirname(filename)
|
dirname = os.path.dirname(filename)
|
||||||
filename = os.path.basename(filename)[:6]
|
filename = os.path.basename(filename)[:6]
|
||||||
|
|
||||||
for filenames in os.walk(dirname)[2]:
|
for _, _, filenames in os.walk(dirname):
|
||||||
for show in filenames:
|
for show in filenames:
|
||||||
extension = os.path.splitext(show)[1]
|
extension = os.path.splitext(show)[1]
|
||||||
if (extension in [".avi", ".mpg", ".mpeg", "mp4"] and
|
if (extension in [".avi", ".mpg", ".mpeg", "mp4"] and
|
||||||
@@ -147,7 +147,7 @@ class FileManager:
|
|||||||
filelist = []
|
filelist = []
|
||||||
|
|
||||||
for show in self.__settings.getshownames():
|
for show in self.__settings.getshownames():
|
||||||
for dirpath, dirnames, filenames in os.walk(
|
for dirpath, _, filenames in os.walk(
|
||||||
self.__settings.getshowinputdirectory(show)):
|
self.__settings.getshowinputdirectory(show)):
|
||||||
for inputfile in filenames:
|
for inputfile in filenames:
|
||||||
if inputfile.endswith(".mpg"):
|
if inputfile.endswith(".mpg"):
|
||||||
|
|||||||
@@ -9,10 +9,10 @@ import unittest
|
|||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import minimock
|
import minimock
|
||||||
from minimock import mock
|
from minimock import mock, Mock
|
||||||
parentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
parentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
sys.path.insert(0, parentdir)
|
sys.path.insert(0, parentdir)
|
||||||
from libfilemanager import EncodeData
|
from libfilemanager import EncodeData, FileManager
|
||||||
|
|
||||||
|
|
||||||
class libfilemanagertest(unittest.TestCase):
|
class libfilemanagertest(unittest.TestCase):
|
||||||
@@ -46,6 +46,30 @@ class libfilemanagertest(unittest.TestCase):
|
|||||||
result = data.checkproblems()
|
result = data.checkproblems()
|
||||||
self.assertIn("FILE_EXISTS", result)
|
self.assertIn("FILE_EXISTS", result)
|
||||||
|
|
||||||
|
def test_checkduplicateavi(self):
|
||||||
|
settings = Mock('libsettings.Settings')
|
||||||
|
filemanager = FileManager(settings)
|
||||||
|
|
||||||
|
os.walk = dummywalk
|
||||||
|
|
||||||
|
result = filemanager.checkduplicates("/path/to/S03E14 - Test - SD TV.mkv")
|
||||||
|
|
||||||
|
self.assertTrue(result)
|
||||||
|
|
||||||
|
def test_checkduplicatenomatch(self):
|
||||||
|
settings = Mock('libsettings.Settings')
|
||||||
|
filemanager = FileManager(settings)
|
||||||
|
|
||||||
|
os.walk = dummywalk
|
||||||
|
|
||||||
|
result = filemanager.checkduplicates("/path/to/S03E13 - Test - SD TV.mkv")
|
||||||
|
|
||||||
|
self.assertFalse(result)
|
||||||
|
|
||||||
|
|
||||||
|
def dummywalk(arg):
|
||||||
|
return [("/path/to/", [], ["S03E14 - Test - SD TV.avi"])]
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
suite = unittest.TestLoader().loadTestsFromTestCase(libfilemanagertest)
|
suite = unittest.TestLoader().loadTestsFromTestCase(libfilemanagertest)
|
||||||
unittest.TextTestRunner(verbosity=2).run(suite)
|
unittest.TextTestRunner(verbosity=2).run(suite)
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ class SickbeardTest(unittest.TestCase):
|
|||||||
def test_findepisodeCloseSubtitle(self):
|
def test_findepisodeCloseSubtitle(self):
|
||||||
settings = Mock('libsettings.Settings')
|
settings = Mock('libsettings.Settings')
|
||||||
settings.sickbeardaddress.mock_returns = "test"
|
settings.sickbeardaddress.mock_returns = "test"
|
||||||
settings.sickbeardport.mock_returns = "test"
|
settings.sickbeardport.mock_returns = "123"
|
||||||
settings.sickbeardapikey.mock_returns = "test"
|
settings.sickbeardapikey.mock_returns = "test"
|
||||||
|
|
||||||
urllib.urlopen = dummy_urlopen
|
urllib.urlopen = dummy_urlopen
|
||||||
|
|||||||
Reference in New Issue
Block a user