Normalize line endings to avoid line endings merge conflicts

1 files changed, 56 insertions, 56 deletions

diff --git a/module/plugins/hoster/RedtubeCom.py b/module/plugins/hoster/RedtubeCom.py
index 9ffafd905..c2083e679 100644
--- a/module/plugins/hoster/RedtubeCom.py
+++ b/module/plugins/hoster/RedtubeCom.py
@@ -1,56 +1,56 @@
-#!/usr/bin/env python

-# -*- coding: utf-8 -*-

-

-import re

-from module.plugins.Hoster import Hoster

-from module.unescape import unescape

-

-class RedtubeCom(Hoster):

-    __name__ = "RedtubeCom"

-    __type__ = "hoster"

-    __pattern__ = r'http://[\w\.]*?redtube\.com/\d+'

-    __version__ = "0.2"

-    __description__ = """Redtube.com Download Hoster"""

-    __author_name__ = ("jeix")

-    __author_mail__ = ("jeix@hasnomail.de")

-        

-    def process(self, pyfile):

-        self.download_html()

-        if not self.file_exists():

-            self.offline()

-            

-        pyfile.name = self.get_file_name()

-        self.download(self.get_file_url())

-        

-    def download_html(self):

-        url = self.pyfile.url

-        self.html = self.load(url)

-

-    def get_file_url(self):

-        """ returns the absolute downloadable filepath

-        """

-        if self.html is None:

-            self.download_html()

-

-        file_url = unescape(re.search(r'hashlink=(http.*?)"', self.html).group(1))

-

-        return file_url

-    

-    def get_file_name(self):

-        if self.html is None:

-            self.download_html()

-            

-        name = re.search('<title>(.*?)- RedTube - Free Porn Videos</title>', self.html).group(1).strip() + ".flv"        

-        return name

-

-    def file_exists(self):

-        """ returns True or False

-        """

-        if self.html is None:

-            self.download_html()

-        

-        if re.search(r'This video has been removed.', self.html) is not None:

-            return False

-        else:

-            return True

-            

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import re
+from module.plugins.Hoster import Hoster
+from module.unescape import unescape
+
+class RedtubeCom(Hoster):
+    __name__ = "RedtubeCom"
+    __type__ = "hoster"
+    __pattern__ = r'http://[\w\.]*?redtube\.com/\d+'
+    __version__ = "0.2"
+    __description__ = """Redtube.com Download Hoster"""
+    __author_name__ = ("jeix")
+    __author_mail__ = ("jeix@hasnomail.de")
+        
+    def process(self, pyfile):
+        self.download_html()
+        if not self.file_exists():
+            self.offline()
+            
+        pyfile.name = self.get_file_name()
+        self.download(self.get_file_url())
+        
+    def download_html(self):
+        url = self.pyfile.url
+        self.html = self.load(url)
+
+    def get_file_url(self):
+        """ returns the absolute downloadable filepath
+        """
+        if self.html is None:
+            self.download_html()
+
+        file_url = unescape(re.search(r'hashlink=(http.*?)"', self.html).group(1))
+
+        return file_url
+    
+    def get_file_name(self):
+        if self.html is None:
+            self.download_html()
+            
+        name = re.search('<title>(.*?)- RedTube - Free Porn Videos</title>', self.html).group(1).strip() + ".flv"        
+        return name
+
+    def file_exists(self):
+        """ returns True or False
+        """
+        if self.html is None:
+            self.download_html()
+        
+        if re.search(r'This video has been removed.', self.html) is not None:
+            return False
+        else:
+            return True
+