Version 154a

help/changelog.html

@@ -8,6 +8,12 @@
 		<div class="content">
 			<h3>changelog</h3>
 			<ul>
+				<li><h3>version 154a</h3></li>
+				<ul>
+					<li>fixed a bug in v154 update code when there was more than one set of shortcuts to convert</li>
+					<li>fixed a faulty default value for num_pixels system predicate that was stopping options from opening</li>
+					<li>fixed an error when video fps is 0</li>
+				</ul>
 				<li><h3>version 154</h3></li>
 				<ul>
 					<li>managed to completely break my linux and os x dev environments trying to update python--their release will come soon, once I've cleaned them up</li>

include/ClientDB.py

@@ -5400,7 +5400,7 @@ class DB( HydrusDB.HydrusDB ):
                 
                 ( dump_type, dump_version ) = obj.GetTypeAndVersion()
                 
-                name = obj.GetName()
+                dump_name = obj.GetName()
                 
                 dump = obj.GetSerialisedInfo()
                 

include/ClientDefaults.py

@@ -41,7 +41,7 @@ def GetClientDefaultOptions():
     system_predicates[ 'size' ] = ( '<', 200, 1024 )
     system_predicates[ 'width' ] = ( '=', 1920 )
     system_predicates[ 'num_words' ] = ( '<', 30000 )
-    system_predicates[ 'num_pixels' ] = ( u'\u2248', 2, 2 )
+    system_predicates[ 'num_pixels' ] = ( u'\u2248', 2, 1000000 )
     system_predicates[ 'hamming_distance' ] = 5
     
     options[ 'file_system_predicates' ] = system_predicates

include/HydrusData.py

@@ -76,6 +76,7 @@ def ConvertIntToPixels( i ):
     if i == 1: return 'pixels'
     elif i == 1000: return 'kilopixels'
     elif i == 1000000: return 'megapixels'
+    else: return 'megapixels'
     
 def ConvertIntToPrettyString( num ): return ToString( locale.format( "%d", num, grouping = True ) )
 

include/HydrusVideoHandling.py

@@ -100,6 +100,8 @@ def GetVideoFrameDuration( path ):
     
     fps = cv_video.get( cv2.cv.CV_CAP_PROP_FPS )
     
+    if fps == 0: fps = 15
+    
     return 1000.0 / fps
     
 def GetMatroskaOrWebm( path ):