More cleanup and adding the proper config editor

* Last release had the wrong revision of the config editor, that's fixed
NobahdiAtoll · Sep 12, 2016 · ce7237e · ce7237e
1 parent 8ddc415
commit ce7237e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/Package.ini b/Package.ini
@@ -1,7 +1,6 @@
 Name		=	Data Manager
 Author		=	docDoom; modded by T3KNOGHO57; Icon by 600WPMPO
-Version		=	2.03.5.722
+Version		=	2.03.48.770
 Image		=	dataMan.png
 Description	=	manages data in your ComicRack library
 KeepFiles	=	dataman.dat,user.ini
-
diff --git a/crdmgui.exe b/crdmgui.exe
diff --git a/dataman.ini b/dataman.ini
@@ -1,4 +1,4 @@
-Version = 2.03.1.718
+Version = 2.03.48.770
 ListDelimiter = ||
 ; ----------------------------------------------------
 ; Custom Vals

diff --git a/dmClasses.py b/dmClasses.py
@@ -926,7 +926,7 @@ def Contains(self, book):
         if dmGlobals.TraceFunctionMessages: print 'Method: dmRule:Contains(book)'
 
         getValue = self.GetFieldValue(book, self.Field) #get Value from book
-        compareValue = self.FieldConvert(self.ReplaceReferenceStrings(self.Value, book), self.Field)  #value to compare
+        compareValue = self.ReplaceReferenceStrings(self.Value, book)  #value to compare
 
         if self.Field in dmGlobals.FIELDSLIST: #search as string list            
             for check in getValue:
@@ -1018,7 +1018,7 @@ def StartsWithAnyOf(self, book):
     def NotStartsWithAnyOf(self, book):
         """Only applicable with string"""
         if dmGlobals.TraceFunctionMessages: print 'Method: dmRule:NotNotStartsWithAnyOf(book)'
-        return not StartsWithAnyOf(book)
+        return not self.StartsWithAnyOf(book)
 
     def Greater(self, book):
         """Only applicable with numeric, psuedo numeric, and date"""        

diff --git a/dmGlobals.py b/dmGlobals.py
@@ -6,12 +6,12 @@
 from System import Array
 from System import StringSplitOptions
 from iniReadWrite import *
-
+from System.Collections.Generic import Dictionary
 #clr.AddReference("ComicRack.Engine")
 from cYo.Projects.ComicRack.Engine import MangaYesNo, YesNo
 
-############Set Paths##############
 
+############Set Paths##############
 FOLDER = FileInfo(__file__).DirectoryName + Path.DirectorySeparatorChar.ToString()
 IMGFOLDER = FOLDER + 'images' + Path.DirectorySeparatorChar.ToString()
 DATFILE = Path.Combine(FOLDER, 'dataMan.dat') #can load 1.24 text files or 2.3.1 xml files saves as xml
@@ -58,6 +58,7 @@
 
 COMPARE_CASE_INSENSITIVE = True
 
+
 #############End set constant variables##################
 
 ######################Read From dataman.ini###############################

diff --git a/dmMod.py b/dmMod.py
@@ -4,6 +4,7 @@
 clr.AddReference('System.Windows.Forms')
 clr.AddReference('System.Drawing')
 
+
 import System.Drawing
 import System.Windows.Forms
 import System.Diagnostics

diff --git a/runProcess.py b/runProcess.py
@@ -132,6 +132,8 @@ def BgwProcessDoWork(self, sender, e):
         bookTouchCount = 0
         fieldTouchCount = 0
 
+        userVariables = Dictionary[str,str]()
+
         strReport = ''
 
         if System.IO.File.Exists(dmGlobals.LOGFILE):