Log nr

couchpotato/core/plugins/log/main.py

@@ -2,6 +2,7 @@ from couchpotato.api import addApiView
 from couchpotato.core.helpers.request import jsonified, getParam
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
+import os
 
 
 class Logging(Plugin):
@@ -12,10 +13,22 @@ class Logging(Plugin):
     def get(self):
 
         nr = int(getParam('nr', 0))
-        path = '%s%s' % (Env.get('log_path'), '.%s' % nr if nr > 0 else '')
+
+        total = 1
+        for x in range(0, 50):
+            path = '%s%s' % (Env.get('log_path'), '.%s' % x if x > 0 else '')
+
+            # Set current path
+            if x is nr:
+                current_path = path
+
+            # Check see if the log exists
+            if not os.path.isfile(path):
+                total = x
+                break
 
         # Reverse
-        f = open(path, 'r')
+        f = open(current_path, 'r')
         lines = []
         for line in f.readlines():
             lines.insert(0, line)
@@ -27,4 +40,5 @@ class Logging(Plugin):
         return jsonified({
             'success': True,
             'log': log,
+            'total': total,
         })

couchpotato/core/providers/trailer/hdtrailers/main.py

@@ -45,7 +45,6 @@ class HDTrailers(TrailerProvider):
         results = {'480p':[], '720p':[], '1080p':[]}
 
         url = "%s?%s" % (self.url['backup'], urlencode({'s':movie}))
-
         data = self.urlopen(url)
 
         try:
@@ -63,7 +62,6 @@ class HDTrailers(TrailerProvider):
                     except:
                         pass
 
-
         except AttributeError:
             log.debug('No trailers found in via alternative.')
 
@@ -85,10 +83,8 @@ class HDTrailers(TrailerProvider):
                 if 'trailer' in trtext and not 'clip' in trtext and provider in trtext:
                     nr = 0
                     resolutions = tr.findAll('td', attrs = {'class':'bottomTableResolution'})
-                    #sizes = tr.findNext('tr').findAll('td', attrs = {'class':'bottomTableFileSize'})
                     for res in resolutions:
                         results[str(res.a.contents[0])].insert(0, res.a['href'])
-                        #int(sizes[nr].contents[0].replace('MB', ''))
                         nr += 1
 
             return results