Make profiling a decorator

You can call it before any functions/methods using @utils.profiling()
<-- you can specify the sort order of the results, by default it sorts
by cumulative. It will print the results straight into the Kodi log.

resources/lib/utils.py

@@ -7,6 +7,7 @@ import inspect
 import json
 import pstats
 import sqlite3
+import StringIO
 import os
 from datetime import datetime, time
 import time
@@ -266,44 +267,26 @@ def reset():
         line1="Database reset has completed, Kodi will now restart to apply the changes.")
     xbmc.executebuiltin('RestartApp')
 
-def startProfiling():
+def profiling(sortby="cumulative"):
-    
+    # Will print results to Kodi log
-    pr = cProfile.Profile()
+    def decorator(func):
-    pr.enable()
+        def wrapper(*args, **kwargs):
-    
+            
-    return pr
+            pr = cProfile.Profile()
 
-def stopProfiling(pr, profileName):
+            pr.enable()
-    
+            result = func(*args, **kwargs)
-    pr.disable()
+            pr.disable()
-    ps = pstats.Stats(pr)
-    
-    profiles = xbmc.translatePath("%sprofiles/"
-                % xbmcaddon.Addon().getAddonInfo('profile')).decode('utf-8')
 
-    if not xbmcvfs.exists(profiles):
+            s = StringIO.StringIO()
-        # Create the profiles folder
+            ps = pstats.Stats(pr, stream=s).sort_stats(sortby)
-        xbmcvfs.mkdir(profiles)
+            ps.print_stats()
+            logMsg("EMBY Profiling", s.getvalue(), 1)
 
-    timestamp = time.strftime("%Y-%m-%d %H-%M-%S")
+            return result
-    profile = "%s%s_profile_(%s).tab" % (profiles, profileName, timestamp)
+
-    
+        return wrapper
-    f = xbmcvfs.File(profile, 'w')
+    return decorator
-    f.write("NumbCalls\tTotalTime\tCumulativeTime\tFunctionName\tFileName\r\n")
-    for (key, value) in ps.stats.items():
-        (filename, count, func_name) = key
-        (ccalls, ncalls, total_time, cumulative_time, callers) = value
-        try:
-            f.write(
-                "%s\t%s\t%s\t%s\t%s\r\n"
-                % (ncalls, "{:10.4f}".format(total_time),
-                    "{:10.4f}".format(cumulative_time), func_name, filename))
-        except ValueError:
-            f.write(
-                "%s\t%s\t%s\t%s\t%s\r\n"
-                % (ncalls, "{0}".format(total_time),
-                    "{0}".format(cumulative_time), func_name, filename))
-    f.close()
 
 def convertdate(date):
     try: