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