added getCaller function and cleaned up streamer

tools/helper.py

@@ -1,5 +1,12 @@
 # vim: set fileencoding=utf-8 :
 from htmlentitydefs import entitydefs
+import inspect
+
+def getCaller():
+    ret = ""
+    ret += str(inspect.stack()[2][1])
+    ret += ": "+str(inspect.stack()[2][2])
+    return ret
 
 def remove_html(txt):
     txt = txt.replace('&', '&') # cause things like ä are possible ~_~

tools/stream.py

@@ -48,15 +48,7 @@ def __hash__(self):
         return 'h %s' % hash(self.url)
 
     def __getattr__(self, key):
-        if key == 'title':
-            if config.dl_title:
-                return config.dl_title
-            return self.get_title()
-        elif(key == 'name'):
-            if config.dl_name:
-                return config.dl_name
-            return self.get_name()
-        elif key == 'subdir':
+        if key == 'subdir':
             return self.get_subdir()
         elif(key == 'stream_url'):
             return self.get_stream()
@@ -126,15 +118,13 @@ def get_stream(self):
         if stream and stream['url']:
             if stream['url'].endswith('\r\n'):
                 stream['url'] = stream['url'][:-2]
-        args = stream
-
-        self.stream_url = args['url']
-        if 'post' in args:
-            self.stream_post = args['post']
-        self.stream_type = defs.Stream.NONE
-        if not self.stream_url:
+        else:
             self.log.error('couldn\'t find a streamlink inside this url')
             return None
+
+        self.stream_url = stream['url']
+        if 'post' in stream:
+            self.stream_post = stream['post']
         for i in url2defs:
             if self.stream_url.find(i) > 0:
                 self.stream_type = url2defs[i]