From b9302ace874fec042d711678609f8da80b6a4d5a Mon Sep 17 00:00:00 2001
From: Hydrus <hydrus.admin@gmail.com>
Date: Wed, 18 Dec 2013 16:49:24 -0600
Subject: [PATCH] Version 97

---
 help/changelog.html            |  6 +++
 include/ClientConstants.py     | 26 ++++++++--
 include/ClientController.py    |  2 +-
 include/ClientDB.py            | 19 ++++++--
 include/ClientGUI.py           |  4 +-
 include/ClientGUICanvas.py     | 28 +++++++++--
 include/ClientGUICommon.py     | 87 ++++++++++++++++++++--------------
 include/ClientGUIDialogs.py    | 12 ++++-
 include/ClientGUIMedia.py      |  5 +-
 include/HydrusAudioHandling.py |  5 +-
 include/HydrusConstants.py     |  8 +++-
 include/HydrusNATPunch.py      |  4 +-
 12 files changed, 148 insertions(+), 58 deletions(-)

diff --git a/help/changelog.html b/help/changelog.html
index 1cf44c67..6a349990 100755
--- a/help/changelog.html
+++ b/help/changelog.html
@@ -8,6 +8,12 @@
 		<div class="content">
 			<h3>changelog</h3>
 			<ul>
+				<li><h3>version 97</h3></li>
+				<ul>
+					<li>initial os x test build</li>
+					<li>collect typo fixed</li>
+					<li>'remove all mappings with specific namespace' added to advanced content update dialog</li>
+				</ul>
 				<li><h3>version 96</h3></li>
 				<ul>
 					<li>went over _all_ my help (about 200KB of text!), cutting down waffly paragraphs, rewritting bits that were stiff or unclear, updating screenshots, and adding several new sections people suggested</li>
diff --git a/include/ClientConstants.py b/include/ClientConstants.py
index 1354dc61..b5f6234a 100755
--- a/include/ClientConstants.py
+++ b/include/ClientConstants.py
@@ -312,11 +312,27 @@ def AddPaddingToDimensions( dimensions, padding ):
     
 def CatchExceptionClient( etype, value, tb ):
     
-    trace_list = traceback.format_tb( tb )
-    
-    trace = ''.join( trace_list )
-    
-    HC.pubsub.pub( 'message', HC.Message( HC.MESSAGE_TYPE_ERROR, ( etype, value, trace ) ) )
+    try:
+        
+        trace_list = traceback.format_tb( tb )
+        
+        trace = ''.join( trace_list )
+        
+        HC.pubsub.pub( 'message', HC.Message( HC.MESSAGE_TYPE_ERROR, ( etype, value, trace ) ) )
+        
+    except:
+        
+        message = 'Encountered an error I could not parse:'
+        
+        message += os.linesep
+        
+        message += HC.u( ( etype, value, tb ) )
+        
+        try: message += traceback.format_exc()
+        except: pass
+        
+        HC.pubsub.pub( 'message', HC.Message( HC.MESSAGE_TYPE_TEXT, message ) )
+        
     
 def GenerateCollectByChoices( sort_by_choices ):
     
diff --git a/include/ClientController.py b/include/ClientController.py
index 70583569..58c79a51 100755
--- a/include/ClientController.py
+++ b/include/ClientController.py
@@ -265,7 +265,7 @@ class Controller( wx.App ):
             self.SetSplashText( 'starting daemons' )
             
             if HC.is_first_start: self._gui.DoFirstStart()
-            if HC.is_db_updated: wx.CallLater( 0, HC.pubsub.pub, 'message', HC.Message( HC.MESSAGE_TYPE_TEXT, 'The client has updated to version ' + HC.u( HC.SOFTWARE_VERSION ) + '!' ) )
+            if HC.is_db_updated: wx.CallLater( 1, HC.pubsub.pub, 'message', HC.Message( HC.MESSAGE_TYPE_TEXT, 'The client has updated to version ' + HC.u( HC.SOFTWARE_VERSION ) + '!' ) )
             
             self.RestartServer()
             self._db.StartDaemons()
diff --git a/include/ClientDB.py b/include/ClientDB.py
index dd3c8417..b1ee9ff8 100755
--- a/include/ClientDB.py
+++ b/include/ClientDB.py
@@ -3221,7 +3221,7 @@ class ServiceDB( FileDB, MessageDB, TagDB, RatingDB ):
                             predicates = [ 'service_id = ' + str( service_id ) ]
                             
                             ( sub_action, sub_row ) = row
-                            print( sub_action )
+                            
                             if sub_action == 'copy':
                                 
                                 ( tag, hashes, service_identifier_target ) = sub_row
@@ -3245,10 +3245,21 @@ class ServiceDB( FileDB, MessageDB, TagDB, RatingDB ):
                             
                             if tag is not None:
                                 
-                                ( namespace_id, tag_id ) = self._GetNamespaceIdTagId( c, tag )
+                                ( tag_type, tag ) = tag
                                 
-                                predicates.append( 'namespace_id = ' + str( namespace_id ) )
-                                predicates.append( 'tag_id = ' + str( tag_id ) )
+                                if tag_type == 'tag':
+                                    
+                                    ( namespace_id, tag_id ) = self._GetNamespaceIdTagId( c, tag )
+                                    
+                                    predicates.append( 'namespace_id = ' + str( namespace_id ) )
+                                    predicates.append( 'tag_id = ' + str( tag_id ) )
+                                    
+                                elif tag_type == 'namespace':
+                                    
+                                    namespace_id = self._GetNamespaceId( c, tag )
+                                    
+                                    predicates.append( 'namespace_id = ' + str( namespace_id ) )
+                                    
                                 
                             
                             if hashes is not None:
diff --git a/include/ClientGUI.py b/include/ClientGUI.py
index 7edf750b..83b7a459 100755
--- a/include/ClientGUI.py
+++ b/include/ClientGUI.py
@@ -119,13 +119,13 @@ class FrameGUI( ClientGUICommon.FrameThatResizes ):
         
         if HC.options[ 'default_gui_session' ] == 'just a blank page':
             
-            wx.CallLater( 0, self._NewPageQuery, HC.LOCAL_FILE_SERVICE_IDENTIFIER )
+            wx.CallLater( 1, self._NewPageQuery, HC.LOCAL_FILE_SERVICE_IDENTIFIER )
             
         else:
             
             name = HC.options[ 'default_gui_session' ]
             
-            wx.CallLater( 0, self._LoadGUISession, name )
+            wx.CallLater( 1, self._LoadGUISession, name )
             
         
     
diff --git a/include/ClientGUICanvas.py b/include/ClientGUICanvas.py
index 5a5b13d7..0706a854 100755
--- a/include/ClientGUICanvas.py
+++ b/include/ClientGUICanvas.py
@@ -15,9 +15,10 @@ import time
 import traceback
 import urllib
 import wx
-import wx.lib.flashwin
 import wx.media
 
+if HC.PLATFORM_WINDOWS: import wx.lib.flashwin
+
 ID_TIMER_ANIMATED = wx.NewId()
 ID_TIMER_FLASH = wx.NewId()
 ID_TIMER_SLIDESHOW = wx.NewId()
@@ -676,6 +677,8 @@ class CanvasFullscreenMediaList( ClientGUIMixins.ListeningMediaList, Canvas, Cli
         
         HC.pubsub.pub( 'set_focus', self._page_key, None )
         
+        self.t = 0
+        
     
     def _DoManualPan( self, delta_x, delta_y ):
         
@@ -1017,7 +1020,8 @@ class CanvasFullscreenMediaList( ClientGUIMixins.ListeningMediaList, Canvas, Cli
     def EventDrag( self, event ):
         
         CC.CAN_HIDE_MOUSE = True
-        
+        self.t += 1
+        print( self.t )
         self._focus_holder.SetFocus()
         
         if event.Dragging() and self._last_drag_coordinates is not None:
@@ -1028,7 +1032,12 @@ class CanvasFullscreenMediaList( ClientGUIMixins.ListeningMediaList, Canvas, Cli
             
             ( delta_x, delta_y ) = ( x - old_x, y - old_y )
             
-            try: self.WarpPointer( old_x, old_y )
+            try:
+                
+                if HC.PLATFORM_OSX: raise Exception() # can't warppointer in os x
+                
+                self.WarpPointer( old_x, old_y )
+                
             except: self._last_drag_coordinates = ( x, y )
             
             ( old_delta_x, old_delta_y ) = self._total_drag_delta
@@ -1041,7 +1050,7 @@ class CanvasFullscreenMediaList( ClientGUIMixins.ListeningMediaList, Canvas, Cli
         self.SetCursor( wx.StockCursor( wx.CURSOR_ARROW ) )
         
         self._timer_cursor_hide.Start( 800, wx.TIMER_ONE_SHOT )
-        
+        self.t-=1
     
     def EventDragBegin( self, event ):
         
@@ -1062,6 +1071,8 @@ class CanvasFullscreenMediaList( ClientGUIMixins.ListeningMediaList, Canvas, Cli
                 if x > client_x - 20: better_x = client_x - 20
                 if y > client_y - 20: better_y = client_y - 20
                 
+                if HC.PLATFORM_OSX: raise Exception() # can't warppointer in os x
+                
                 self.WarpPointer( better_x, better_y )
                 
                 x = better_x
@@ -3254,7 +3265,12 @@ class RatingsFilterFrameNumerical( ClientGUICommon.FrameThatResizes ):
                 
                 ( delta_x, delta_y ) = ( x - old_x, y - old_y )
                 
-                try: self.WarpPointer( old_x, old_y )
+                try:
+                    
+                    if HC.PLATFORM_OSX: raise Exception() # can't warppointer in os x
+                    
+                    self.WarpPointer( old_x, old_y )
+                    
                 except: self._last_drag_coordinates = ( x, y )
                 
                 ( old_delta_x, old_delta_y ) = self._total_drag_delta
@@ -3290,6 +3306,8 @@ class RatingsFilterFrameNumerical( ClientGUICommon.FrameThatResizes ):
                         if x > client_x - 20: better_x = client_x - 20
                         if y > client_y - 20: better_y = client_y - 20
                         
+                        if HC.PLATFORM_OSX: raise Exception() # can't warppointer in os x
+                        
                         self.WarpPointer( better_x, better_y )
                         
                         x = better_x
diff --git a/include/ClientGUICommon.py b/include/ClientGUICommon.py
index 6fe1ca3d..1659ae8b 100755
--- a/include/ClientGUICommon.py
+++ b/include/ClientGUICommon.py
@@ -1044,7 +1044,7 @@ class CheckboxCollect( wx.combo.ComboCtrl ):
             
             def EventChanged( self, event ):
                 
-                ( collect_types, collect_type_strings ) = self.GeValue()
+                ( collect_types, collect_type_strings ) = self.GetValue()
                 
                 self._special_parent.SetCollectTypes( collect_types, collect_type_strings )
                 
@@ -1271,7 +1271,7 @@ class ListBook( wx.Panel ):
         
         self.SetBackgroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_BTNFACE ) )
         
-        self._list_box = wx.ListBox( self, style = wx.LB_SINGLE | wx.LB_SORT )
+        self._list_box = self.LB( self, style = wx.LB_SINGLE | wx.LB_SORT )
         
         self._empty_panel = wx.Panel( self )
         
@@ -1297,6 +1297,23 @@ class ListBook( wx.Panel ):
         self.Bind( wx.EVT_MENU, self.EventMenu )
         
     
+    class LB( wx.ListBox ):
+        
+        def FindString( self, name ):
+            
+            if HC.PLATFORM_WINDOWS: return wx.ListBox.FindString( self, name )
+            else:
+                
+                for i in range( self.GetCount() ):
+                    
+                    if self.GetString( i ) == name: return i
+                    
+                
+                return wx.NOT_FOUND
+                
+            
+        
+    
     def _RecalcListBoxWidth( self ): self.Layout()
     
     def _Select( self, selection ):
@@ -1504,39 +1521,6 @@ class ListBook( wx.Panel ):
             
         
     
-class ListCtrlAutoWidth( wx.ListCtrl, ListCtrlAutoWidthMixin ):
-    
-    def __init__( self, parent, height ):
-        
-        wx.ListCtrl.__init__( self, parent, size=( -1, height ), style=wx.LC_REPORT )
-        ListCtrlAutoWidthMixin.__init__( self )
-        
-    
-    def GetAllSelected( self ):
-        
-        indices = []
-        
-        i = self.GetFirstSelected()
-        
-        while i != -1:
-            
-            indices.append( i )
-            
-            i = self.GetNextSelected( i )
-            
-        
-        return indices
-        
-    
-    def RemoveAllSelected( self ):
-        
-        indices = self.GetAllSelected()
-        
-        indices.reverse() # so we don't screw with the indices of deletees below
-        
-        for index in indices: self.DeleteItem( index )
-        
-    
 class ListBox( wx.ScrolledWindow ):
     
     def __init__( self, parent, min_height = 250 ):
@@ -2043,6 +2027,39 @@ class ListBoxMessagesPredicates( ListBoxMessages ):
         self._TextsHaveChanged()
         
     
+class ListCtrlAutoWidth( wx.ListCtrl, ListCtrlAutoWidthMixin ):
+    
+    def __init__( self, parent, height ):
+        
+        wx.ListCtrl.__init__( self, parent, size=( -1, height ), style=wx.LC_REPORT )
+        ListCtrlAutoWidthMixin.__init__( self )
+        
+    
+    def GetAllSelected( self ):
+        
+        indices = []
+        
+        i = self.GetFirstSelected()
+        
+        while i != -1:
+            
+            indices.append( i )
+            
+            i = self.GetNextSelected( i )
+            
+        
+        return indices
+        
+    
+    def RemoveAllSelected( self ):
+        
+        indices = self.GetAllSelected()
+        
+        indices.reverse() # so we don't screw with the indices of deletees below
+        
+        for index in indices: self.DeleteItem( index )
+        
+    
 class NoneableSpinCtrl( wx.Panel ):
     
     def __init__( self, parent, message, none_phrase = 'no limit', max = 1000000, multiplier = 1, num_dimensions = 1 ):
diff --git a/include/ClientGUIDialogs.py b/include/ClientGUIDialogs.py
index 26adf095..351a79fe 100755
--- a/include/ClientGUIDialogs.py
+++ b/include/ClientGUIDialogs.py
@@ -126,6 +126,7 @@ class DialogAdvancedContentUpdate( Dialog ):
     
     ALL_MAPPINGS = 0
     SPECIFIC_MAPPINGS = 1
+    SPECIFIC_NAMESPACE = 2
     
     def __init__( self, parent, service_identifier, hashes = None ):
         
@@ -160,6 +161,7 @@ class DialogAdvancedContentUpdate( Dialog ):
             
             self._tag_type_dropdown.Append( 'all mappings', self.ALL_MAPPINGS )
             self._tag_type_dropdown.Append( 'specific tag\'s mappings', self.SPECIFIC_MAPPINGS )
+            self._tag_type_dropdown.Append( 'specific namespace\'s mappings', self.SPECIFIC_NAMESPACE )
             
             self._tag_type_dropdown.Select( 0 )
             
@@ -243,7 +245,15 @@ class DialogAdvancedContentUpdate( Dialog ):
         tag_type = self._tag_type_dropdown.GetChoice()
         
         if tag_type == self.ALL_MAPPINGS: tag = None
-        else: tag = self._tag
+        elif tag_type == self.SPECIFIC_MAPPINGS: tag = ( 'tag', self._tag )
+        elif tag_type == self.SPECIFIC_NAMESPACE:
+            
+            tag = self._tag
+            
+            if tag.endswith( ':' ): tag = tag[:-1]
+            
+            tag = ( 'namespace', tag )
+            
         
         if tag == '': return
         
diff --git a/include/ClientGUIMedia.py b/include/ClientGUIMedia.py
index 3e2d2879..e2e5d587 100755
--- a/include/ClientGUIMedia.py
+++ b/include/ClientGUIMedia.py
@@ -1144,7 +1144,7 @@ class MediaPanelThumbnails( MediaPanel ):
             '''
             self._thumbnails_being_faded_in[ hash ] = ( bmp, None, canvas_bmp, x, y, 0 )
             
-            if not self._timer_animation.IsRunning(): self._timer_animation.Start( 0, wx.TIMER_ONE_SHOT )
+            if not self._timer_animation.IsRunning(): self._timer_animation.Start( 1, wx.TIMER_ONE_SHOT )
             
         
     
@@ -1913,7 +1913,8 @@ class MediaPanelThumbnails( MediaPanel ):
                 
                 image = original_bmp.ConvertToImage()
                 
-                image.InitAlpha()
+                try: image.InitAlpha()
+                except: pass
                 
                 image = image.AdjustChannels( 1, 1, 1, 0.25 )
                 
diff --git a/include/HydrusAudioHandling.py b/include/HydrusAudioHandling.py
index 0206ade2..b92d0922 100644
--- a/include/HydrusAudioHandling.py
+++ b/include/HydrusAudioHandling.py
@@ -4,13 +4,14 @@ import hsaudiotag.flac
 import hsaudiotag.mpeg
 import hsaudiotag.ogg
 import HydrusConstants as HC
-import mp3play
 import os
 import threading
 import time
 import traceback
 import wx
 
+if HC.PLATFORM_WINDOWS: import mp3play
+
 parsed_noises = {}
 
 def GetFLACDuration( path ):
@@ -63,6 +64,8 @@ def GetWMADuration( path ):
     
 def PlayNoise( name ):
     
+    if HC.PLATFORM_OSX: return
+    
     if name not in parsed_noises:
         
         if name == 'success': filename = 'success.mp3'
diff --git a/include/HydrusConstants.py b/include/HydrusConstants.py
index a3fdee5a..57d58062 100755
--- a/include/HydrusConstants.py
+++ b/include/HydrusConstants.py
@@ -19,6 +19,12 @@ import urlparse
 import wx
 import yaml
 
+PLATFORM_WINDOWS = False
+PLATFORM_OSX  = False
+
+if sys.platform == 'win32': PLATFORM_WINDOWS = True
+elif sys.platform == 'darwin': PLATFORM_OSX = True
+
 options = {}
 
 # dirs
@@ -39,7 +45,7 @@ TEMP_DIR = BASE_DIR + os.path.sep + 'temp'
 # Misc
 
 NETWORK_VERSION = 12
-SOFTWARE_VERSION = 96
+SOFTWARE_VERSION = 97
 
 UNSCALED_THUMBNAIL_DIMENSIONS = ( 200, 200 )
 
diff --git a/include/HydrusNATPunch.py b/include/HydrusNATPunch.py
index 6c51b91e..12df8316 100644
--- a/include/HydrusNATPunch.py
+++ b/include/HydrusNATPunch.py
@@ -1,6 +1,8 @@
+import HydrusConstants as HC
 import os
 import socket
-import win32com.client
+
+if HC.PLATFORM_WINDOWS: import win32com.client
 
 def GetLocalIP(): return socket.gethostbyname( socket.gethostname() )