use python logging

oml/item/api.py

@@ -2,6 +2,8 @@
 # vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division
 
+import logging
+
 import json
 from oxflask.api import actions
 from oxflask.shortcuts import returns_json
@@ -16,6 +18,8 @@ import meta
 
 import utils
 
+logger = logging.getLogger('oml.item.api')
+
 @returns_json
 def find(request):
     '''
@@ -91,19 +95,19 @@ actions.register(get)
 def edit(request):
     response = {}
     data = json.loads(request.form['data']) if 'data' in request.form else {}
-    print 'edit', data
+    logger.debug('edit', data)
     item = models.Item.get(data['id'])
     keys = filter(lambda k: k in models.Item.id_keys, data.keys())
-    print item, keys
+    logger.debug(item, keys)
     if item and keys and item.json()['mediastate'] == 'available':
         key = keys[0]
-        print 'update mainid', key, data[key]
+        logger.debug('update mainid %s %s', key, data[key])
         if key in ('isbn10', 'isbn13'):
             data[key] = utils.normalize_isbn(data[key])
         item.update_mainid(key, data[key])
         response = item.json()
     else:
-        print 'can only edit available items'
+        logger.info('can only edit available items')
         response = item.json()
     return response
 actions.register(edit, cache=False)
@@ -111,7 +115,7 @@ actions.register(edit, cache=False)
 @returns_json
 def remove(request):
     data = json.loads(request.form['data']) if 'data' in request.form else {}
-    print 'remove files', data['ids']
+    logger.debug('remove files', data)
     if 'ids' in data and data['ids']:
         for i in models.Item.query.filter(models.Item.id.in_(data['ids'])):
             i.remove_file()
@@ -135,7 +139,7 @@ def findMetadata(request):
     '''
     response = {}
     data = json.loads(request.form['data']) if 'data' in request.form else {}
-    print 'findMetadata', data
+    logger.debug('findMetadata %s', data)
     response['items'] = meta.find(**data)
     return response
 actions.register(findMetadata)
@@ -143,7 +147,7 @@ actions.register(findMetadata)
 @returns_json
 def getMetadata(request):
     data = json.loads(request.form['data']) if 'data' in request.form else {}
-    print 'getMetadata', data
+    logger.debug('getMetadata %s', data)
     key, value = data.iteritems().next()
     if key in ('isbn10', 'isbn13'):
         value = utils.normalize_isbn(value)
@@ -191,7 +195,7 @@ actions.register(scan, cache=False)
 @returns_json
 def _import(request):
     data = json.loads(request.form['data']) if 'data' in request.form else {}
-    print 'api.import', data
+    logger.debug('api.import %s', data)
     state.main.add_callback(state.websockets[0].put, json.dumps(['import', data]))
     return {}
 actions.register(_import, 'import', cache=False)

oml/item/models.py

@@ -10,6 +10,7 @@ import hashlib
 from datetime import datetime
 from StringIO import StringIO
 import shutil
+import logging
 
 import Image
 import ox
@@ -33,6 +34,8 @@ from covers import covers
 from changelog import Changelog
 from websocket import trigger_event
 
+logger = logging.getLogger('oml.item.model')
+
 class Work(db.Model):
 
     created = db.Column(db.DateTime())
@@ -278,8 +281,9 @@ class Item(db.Model):
             if k != key:
                 if k in self.meta:
                     del self.meta[k]
-        print 'mainid', 'mainid' in self.meta, self.meta.get('mainid')
-        print 'key', key, self.meta.get(key)
+        logger.debug('mainid %s %s', 'mainid' in self.meta, self.meta.get('mainid'))
+        logger.debug('key %s %s', key, self.meta.get(key))
+
         # get metadata from external resources
         self.scrape()
         self.update()
@@ -319,12 +323,12 @@ class Item(db.Model):
 
     def scrape(self):
         mainid = self.meta.get('mainid')
-        print 'scrape', mainid, self.meta.get(mainid)
+        logger.debug('scrape %s %s', mainid, self.meta.get(mainid))
         if mainid:
             m = meta.lookup(mainid, self.meta[mainid])
             self.meta.update(m)
         else:
-            print 'FIX UPDATE', mainid
+            logger.debug('FIX UPDATE %s', mainid)
         self.update()
 
     def queue_download(self):
@@ -339,7 +343,7 @@ class Item(db.Model):
         f = File.get(self.id)
         content_id = media.get_id(data=content)
         if content_id != self.id:
-            print 'INVALID CONTENT', self.id, 'vs', content_id
+            logger.debug('INVALID CONTENT %s vs %s', self.id, content_id)
             return False
         if not f:
             path = 'Downloads/%s.%s' % (self.id, self.info['extension'])
@@ -355,12 +359,13 @@ class Item(db.Model):
                 self.added = datetime.now()
                 Changelog.record(u, 'additem', self.id, self.info)
                 self.update()
+                f.move()
                 trigger_event('transfer', {
                     'id': self.id, 'progress': 1
                 })
                 return True
         else:
-            print 'TRIED TO SAVE EXISTING FILE!!!'
+            logger.debug('TRIED TO SAVE EXISTING FILE!!!')
             self.transferprogress = 1
             self.update()
         return False
@@ -368,7 +373,7 @@ class Item(db.Model):
     def remove_file(self):
         for f in self.files.all():
             path = f.fullpath()
-            print path
+            logger.debug('remove file %s', path)
             if os.path.exists(path):
                 os.unlink(path)
             db.session.delete(f)
@@ -484,7 +489,6 @@ class File(db.Model):
         if author.startswith('.'):
             author = '_' + author[1:]
         filename = '%s.%s' % (title, extension)
-        print self.sha1, author, filename
         new_path = os.path.join(author[0].upper(), author, filename)
         if self.path == new_path:
             return
@@ -501,7 +505,6 @@ class File(db.Model):
             shutil.move(current_path, path)
             self.path = new_path
             self.save()
-            print 'move', current_path, new_path
 
     def save(self):
         db.session.add(self)

oml/item/scan.py

@@ -31,7 +31,6 @@ def remove_missing():
             path = f.item.get_path()
             if not os.path.exists(path):
                 dirty = True
-                print 'file gone', f, path
                 f.item.remove_file()
         if dirty:
             db.session.commit()

oml/item/views.py

@@ -67,7 +67,6 @@ def cover(id, size=None):
     if not data:
         data = covers[id]
     if not data:
-        print 'check for cover', id
         data = item.update_cover()
         if not data:
             data = covers.black()