Merge pull request #1445 from philborman/master

Added python magic library, deluge label changes, cope with goodreads changing authorid

LazyLibrarian.py

@@ -85,6 +85,9 @@ def main():
     p.add_option('-p', '--pidfile',
                  dest='pidfile', default=None,
                  help="Store the process id in the given file")
+    p.add_option('--loglevel',
+                 dest='loglevel', default=None,
+                 help="Debug loglevel")
 
     options, args = p.parse_args()
 
@@ -120,6 +123,12 @@ def main():
         else:
             lazylibrarian.shutdown(restart=True, update=True)
 
+    if options.loglevel:
+        try:
+            lazylibrarian.LOGLEVEL = int(options.loglevel)
+        except:
+            pass
+
     if options.datadir:
         lazylibrarian.DATADIR = str(options.datadir)
     else:

data/interfaces/bookstrap/audio.html

@@ -13,7 +13,7 @@
         %endif
         <a href="audioWall" class="button btn btn-sm btn-primary"><i class="fa fa-calendar-check"></i> Recent AudioBooks</a>
         %if lazylibrarian.CONFIG['USER_ACCOUNTS'] == True:
-        <a href="rssFeed?user=${user}&type=AudioBook&limit=10" class="button btn btn-sm btn-primary" data-toggle="tooltip" title="RSS feed of recent additions"><i class="fa fa-rss"></i></a>
+        <a href="rssFeed?user=${user}&type=AudioBook&limit=10.xml" class="button btn btn-sm btn-primary" data-toggle="tooltip" title="RSS feed of recent downloads"><i class="fa fa-rss"></i></a>
         %endif
       </div>
       <div class="col-xs-2">

data/interfaces/bookstrap/books.html

@@ -14,7 +14,7 @@
         <a href="bookWall?have=0" class="button btn btn-sm btn-primary"><i class="fa fa-calendar-plus"></i> Additions</a>
         <a href="bookWall?have=1" class="button btn btn-sm btn-primary"><i class="fa fa-calendar-alt"></i> Downloads</a>
         %if lazylibrarian.CONFIG['USER_ACCOUNTS'] == True:
-        <a href="rssFeed?user=${user}&type=eBook&limit=10" class="button btn btn-sm btn-primary" data-toggle="tooltip" title="RSS feed of recent additions"><i class="fa fa-rss"></i></a>
+        <a href="rssFeed?user=${user}&type=eBook&limit=10.xml" class="button btn btn-sm btn-primary" data-toggle="tooltip" title="RSS feed of recent downloads"><i class="fa fa-rss"></i></a>
         %endif
       </div>
         %if len(languages) > 1:

data/interfaces/bookstrap/history.html

@@ -78,8 +78,10 @@ <h1>${title}</h1>
                         if ( ftype == 'None' ) {ftype = 'eBook'}
                         if ( ftype.match(/^[0-9.-]+$/) != null ) {ftype = 'Magazine'}
                         return ftype;} },
+                    { targets: [4], 'render': function(data, type, row) {
+                        return '<a data-toggle="tooltip" title="' + row[10] + '">' + row[4] + '</a>';} },
                     { targets: [6], 'render': function(data, type, row) {
-                        if ( row[9] < 0 ) { bar = data }
+                        if ( row[9] <= 0 ) { bar = data }
                         else {
                             if ( row[9] <= 25 ) { css = 'danger' }
                             else if ( row[9] <= 50 ) { css = 'warning' }

data/interfaces/bookstrap/magazines.html

@@ -14,7 +14,7 @@
         %endif
         <a href="magWall" class="button btn btn-sm btn-primary"><i class="fa fa-calendar-check"></i> Recent Issues</a>
         %if lazylibrarian.CONFIG['USER_ACCOUNTS'] == True:
-        <a href="rssFeed?user=${user}&type=Magazine&limit=10" class="button btn btn-sm btn-primary" data-toggle="tooltip" title="RSS feed of recent additions"><i class="fa fa-rss"></i></a>
+        <a href="rssFeed?user=${user}&type=Magazine&limit=10.xml" class="button btn btn-sm btn-primary" data-toggle="tooltip" title="RSS feed of recent downloads"><i class="fa fa-rss"></i></a>
         %endif
       </div>
       <div class="clearfix visible-xs"><hr/></div>

lazylibrarian/api.py

@@ -249,16 +249,23 @@ def _dic_from_query(query):
 
         return rows_as_dic
 
-    def getRSSFeed(self, **kwargs):
+    def _getRSSFeed(self, **kwargs):
         if 'feed' in kwargs:
             ftype = kwargs['feed']
         else:
-            ftype = 'book'
+            ftype = 'eBook'
 
         if 'limit' in kwargs:
             limit = kwargs['limit']
         else:
-            limit = '10'
+            limit = 10
+
+        # url might end in .xml
+        if not limit.isdigit():
+            try:
+                limit = int(limit.split('.')[0])
+            except (IndexError, ValueError):
+                limit = 10
 
         userid = 0
         scheme, netloc, path, qs, anchor = urlsplit(cherrypy.url())

lazylibrarian/common.py

@@ -478,7 +478,8 @@ def scheduleJob(action='Start', target=None):
             if not authcount:
                 minutes = 60
             else:
-                minutes = int(minutes / authcount)
+                # Allow a few minutes per task - interval starts from END of previous task
+                minutes = int(minutes / authcount) - 5
 
             if minutes < 10:  # set a minimum interval of 10 minutes so we don't upset goodreads/librarything api
                 minutes = 10
@@ -633,7 +634,7 @@ def showJobs():
             jobname = job.split(' ')[0].split('.')[2]
 
         # jobinterval = job.split('[')[1].split(']')[0]
-        jobtime = job.split('at: ')[1].split('.')[0]
+        jobtime = job.split('at: ')[1].split('.')[0].strip(')')
         jobtime = next_run(jobtime)
         timeparts = jobtime.split(' ')
         if timeparts[0] == '1' and timeparts[1].endswith('s'):
@@ -776,6 +777,24 @@ def logHeader():
         except ImportError:
             header += "cryptography: module missing\n"
 
+    try:
+        import magic
+    except ImportError:
+        try:
+            import lib.magic as magic
+        except ImportError:
+            magic = None
+
+    if magic:
+        try:
+            # noinspection PyProtectedMember
+            ver = magic.libmagic._name
+        except AttributeError:
+            ver = 'missing'
+        header += "magic library %s\n" % ver
+    else:
+        header += "magic module missing\n"
+
     return header