Fixed some plugin search paths.

PicciMario · May 3, 2014 · 6fdf228 · 6fdf228
1 parent cbdef4a
commit 6fdf228
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/ipba2-plugins/plg_safarihistory.py b/ipba2-plugins/plg_safarihistory.py
@@ -23,7 +23,11 @@ def __init__(self, cursor, path, daemon = False):
 		self.cursor = cursor
 		self.backup_path = path
 
-		self.filename = os.path.join(self.backup_path, plugins_utils.realFileName(self.cursor, filename="History.plist", domaintype="HomeDomain", path="Library/Safari"))
+		filename = plugins_utils.realFileName(self.cursor, filename="History.plist", domaintype="HomeDomain", path="Library/Safari")
+		if filename == '':
+			filename = plugins_utils.realFileName(self.cursor, filename="History.plist", domaintype="AppDomain", path="Library/Safari", domain = "com.apple.mobilesafari")
+
+		self.filename = os.path.join(self.backup_path, filename)
 
 		if (not os.path.isfile(self.filename)):
 			raise Exception("Safari history file not found: \"%s\""%self.filename)

diff --git a/ipba2-plugins/plg_safaristate.py b/ipba2-plugins/plg_safaristate.py
@@ -23,7 +23,11 @@ def __init__(self, cursor, path, daemon = False):
 		self.cursor = cursor
 		self.backup_path = path
 
-		self.filename = os.path.join(self.backup_path, plugins_utils.realFileName(self.cursor, filename="SuspendState.plist", domaintype="HomeDomain"))
+		filename = plugins_utils.realFileName(self.cursor, filename="SuspendState.plist", domaintype="HomeDomain", path="Library/Safari")
+		if filename == '':
+			filename = plugins_utils.realFileName(self.cursor, filename="SuspendState.plist", domaintype="AppDomain", path="Library/Safari", domain = "com.apple.mobilesafari")
+
+		self.filename = os.path.join(self.backup_path, filename)
 
 		if (not os.path.isfile(self.filename)):
 			raise Exception("Safari State file not found: \"%s\""%self.filename)

diff --git a/ipba2-plugins/plg_viber.py b/ipba2-plugins/plg_viber.py
@@ -59,7 +59,10 @@ def __init__(self, cursor, path, daemon = False):
 		self.cursor = cursor
 		self.backup_path = path
 
-		self.fname_contacts = os.path.join(self.backup_path, plugins_utils.realFileName(self.cursor, filename="Contacts.data", domaintype="AppDomain"))
+		filename = plugins_utils.realFileName(self.cursor, filename="Contacts.data", domaintype="AppDomain", path="Documents", domain="com.viber")
+		if filename == '':
+			filename = plugins_utils.realFileName(self.cursor, filename="Contacts.data", domaintype="AppDomain")
+		self.fname_contacts = os.path.join(self.backup_path, filename)
 
 		# check if files exist
 		if (not os.path.isfile(self.fname_contacts)):