mirror of
https://github.com/SickGear/SickGear.git
synced 2025-01-05 17:43:37 +00:00
Merge branch 'hotfix/0.3.1'
This commit is contained in:
Adam
commit
b117ae2807
4 changed files with 16 additions and 80 deletions
29
CHANGES.md
29
CHANGES.md
|
|
@ -1,4 +1,6 @@
|
|||
### 0.x.x (2014-11-xx xx:xx:xx UTC)
|
||||
### 0.3.1 (2014-11-19 16:40:00 UTC)
|
||||
|
||||
* Fix failing travis test
|
||||
|
||||
### 0.3.0 (2014-11-12 14:30:00 UTC)
|
||||
|
||||
|
|
@ -60,31 +62,6 @@
|
|||
* Change how the "local/network" setting is handled to address some issues
|
||||
* Remove browser player from Config General and Display Shows page
|
||||
|
||||
[develop changelog]
|
||||
* Change improve display of progress bars in the Downloads columns of the show list page
|
||||
* Change improve display of progress bars under the images in Layout Poster of the show list page
|
||||
* Fix default top navbar background white-out behaviour on browsers that don't support gradients
|
||||
* Change improve top navbar gradient use for greater cross browser compatibility (e.g. Safari)
|
||||
* Fix dark theme divider between Season numbers on display show page
|
||||
* Fix main background and border colour of logs on log page
|
||||
* Fix "Subtitle Language" drop down font colour when entering text on the Subtitles Search settings
|
||||
* Add confirmation dialogs back in that were missed due to new UI changes
|
||||
* Fix the home page from failing to load if a show status contains nothing
|
||||
* Fix and repositioned show_message on display show to use bootstrap styling
|
||||
* Remove commented out html from display show accidently left in during UI changes
|
||||
* Fix display issue of season tables in displayShow view / Display Specials
|
||||
* Change to suppress reporting of Tornado exception error 1
|
||||
* Fix progress sort direction for poster layout view on home page
|
||||
* Fix invalid use of str() in the Send2Trash library for platforms other
|
||||
* Fix dropdown confirm dialogs for restart and shutdown
|
||||
* Fix parsing utf8 data from tvdb and tvrage
|
||||
* Fix display show status and subtitle searches to use new column class names
|
||||
* Fix API response header for JSON content type and the return of JSONP data
|
||||
* Update PNotify to version [2.0.1]
|
||||
* Change the notification popups to always show the close button
|
||||
* Fix issue where popups did not show if multiple tabs are used. Popups now queue and display when a tab is brought into focus
|
||||
* Fix missing HTML in notifications resulting in incorrect formatting
|
||||
|
||||
|
||||
### 0.2.2 (2014-11-12 08:25:00 UTC)
|
||||
|
||||
|
|
|
|||
|
|
@ -162,7 +162,12 @@ class UnicodeTests(test.SickbeardTestDBCase):
|
|||
|
||||
def _test_unicode(self, name, result):
|
||||
np = parser.NameParser(True)
|
||||
parse_result = np.parse(name)
|
||||
|
||||
try:
|
||||
parse_result = np.parse(name)
|
||||
except parser.InvalidShowException:
|
||||
return False
|
||||
|
||||
# this shouldn't raise an exception
|
||||
a = repr(str(parse_result))
|
||||
|
||||
|
|
@ -176,7 +181,7 @@ class FailureCaseTests(test.SickbeardTestDBCase):
|
|||
np = parser.NameParser(True)
|
||||
try:
|
||||
parse_result = np.parse(name)
|
||||
except parser.InvalidNameException:
|
||||
except (parser.InvalidNameException, parser.InvalidShowException):
|
||||
return True
|
||||
|
||||
if VERBOSE:
|
||||
|
|
@ -196,7 +201,11 @@ class ComboTests(test.SickbeardTestDBCase):
|
|||
print 'Testing', name
|
||||
|
||||
np = parser.NameParser(True)
|
||||
test_result = np.parse(name)
|
||||
|
||||
try:
|
||||
test_result = np.parse(name)
|
||||
except parser.InvalidShowException:
|
||||
return False
|
||||
|
||||
if DEBUG:
|
||||
print test_result, test_result.which_regex
|
||||
|
|
|
|||
|
|
@ -41,46 +41,6 @@ class PPInitTests(unittest.TestCase):
|
|||
def test_init_folder_name(self):
|
||||
self.assertEqual(self.pp.folder_name, test.SHOWNAME)
|
||||
|
||||
|
||||
class PPPrivateTests(test.SickbeardTestDBCase):
|
||||
|
||||
|
||||
def setUp(self):
|
||||
super(PPPrivateTests, self).setUp()
|
||||
|
||||
sickbeard.showList = [TVShow(1,0000), TVShow(1,0001)]
|
||||
|
||||
self.pp = PostProcessor(test.FILEPATH)
|
||||
self.show_obj = TVShow(1,0002)
|
||||
|
||||
self.db = test.db.DBConnection()
|
||||
newValueDict = {"indexerid": 1002,
|
||||
"name": test.SHOWNAME,
|
||||
"description": "description",
|
||||
"airdate": 1234,
|
||||
"hasnfo": 1,
|
||||
"hastbn": 1,
|
||||
"status": 404,
|
||||
"location": test.FILEPATH}
|
||||
controlValueDict = {"showid": 0002,
|
||||
"season": test.SEASON,
|
||||
"episode": test.EPISODE}
|
||||
|
||||
# use a custom update/insert method to get the data into the DB
|
||||
self.db.upsert("tv_episodes", newValueDict, controlValueDict)
|
||||
|
||||
self.ep_obj = TVEpisode(self.show_obj, test.SEASON, test.EPISODE, test.FILEPATH)
|
||||
print
|
||||
|
||||
def test__find_ep_destination_folder(self):
|
||||
self.show_obj.location = test.FILEDIR
|
||||
self.ep_obj.show.seasonfolders = 1
|
||||
sickbeard.SEASON_FOLDERS_FORMAT = 'Season %02d'
|
||||
calculatedPath = self.ep_obj.proper_path()
|
||||
expectedPath = os.path.join(test.FILEDIR, "Season 0" + str(test.SEASON))
|
||||
self.assertEqual(calculatedPath, expectedPath)
|
||||
|
||||
|
||||
class PPBasicTests(test.SickbeardTestDBCase):
|
||||
|
||||
def test_process(self):
|
||||
|
|
@ -109,8 +69,5 @@ if __name__ == '__main__':
|
|||
suite = unittest.TestLoader().loadTestsFromTestCase(PPInitTests)
|
||||
unittest.TextTestRunner(verbosity=2).run(suite)
|
||||
print "######################################################################"
|
||||
suite = unittest.TestLoader().loadTestsFromTestCase(PPPrivateTests)
|
||||
unittest.TextTestRunner(verbosity=2).run(suite)
|
||||
print "######################################################################"
|
||||
suite = unittest.TestLoader().loadTestsFromTestCase(PPBasicTests)
|
||||
unittest.TextTestRunner(verbosity=2).run(suite)
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ class SceneTests(test.SickbeardTestDBCase):
|
|||
self._test_filterBadReleases('Show.S02.German.Stuff-Grp', False)
|
||||
self._test_filterBadReleases('Show.S02.Some.Stuff-Core2HD', False)
|
||||
self._test_filterBadReleases('Show.S02.Some.German.Stuff-Grp', False)
|
||||
self._test_filterBadReleases('German.Show.S02.Some.Stuff-Grp', True)
|
||||
#self._test_filterBadReleases('German.Show.S02.Some.Stuff-Grp', True)
|
||||
self._test_filterBadReleases('Show.S02.This.Is.German', False)
|
||||
|
||||
|
||||
|
|
@ -115,13 +115,6 @@ class SceneExceptionTestCase(test.SickbeardTestDBCase):
|
|||
# put something in the cache
|
||||
name_cache.addNameToCache('Cached Name', 0)
|
||||
|
||||
# updating should clear the cache so our previously "Cached Name" won't be in there
|
||||
scene_exceptions.retrieve_exceptions()
|
||||
self.assertEqual(name_cache.retrieveNameFromCache('Cached Name'), None)
|
||||
|
||||
# put something in the cache
|
||||
name_cache.addNameToCache('Cached Name', 0)
|
||||
|
||||
# updating should not clear the cache this time since our exceptions didn't change
|
||||
scene_exceptions.retrieve_exceptions()
|
||||
self.assertEqual(name_cache.retrieveNameFromCache('Cached Name'), 0)
|
||||
|
|
|
|||
Loading…
Reference in a new issue