remove transfers table

oml/item/models.py

@@ -115,12 +115,13 @@ class Item(db.Model):
             cls.remove_many(remove)
 
     def add_user(self, user):
+        from user.models import list_items
         if not user in self.users:
             self.users.append(user)
         l = user.library
         if not self in l.items:
-            l.items.append(self)
-            state.db.session.add(l)
+            q = list_items.insert({'item_id': self.id, 'list_id': l.id})
+            state.db.session.execute(q)
 
     def json(self, keys=None):
         j  = {}
@@ -507,10 +508,11 @@ class Item(db.Model):
     def queue_download(self):
         u = state.user()
         if not u in self.users:
-            state.downloads.transfers[self.id] = {
-                'added': datetime.utcnow(),
-                'progress': 0
-            }
+            if not self.id in state.downloads.transfers:
+                state.downloads.transfers[self.id] = {
+                    'added': datetime.utcnow(),
+                    'progress': 0
+                }
             logger.debug('queue %s for download', self.id)
             self.add_user(u)
 
@@ -781,37 +783,6 @@ class File(db.Model):
         state.db.session.add(self)
         state.db.session.commit()
 
-
-class Transfer(db.Model):
-    __tablename__ = 'transfer'
-
-    item_id = sa.Column(sa.String(32), sa.ForeignKey('item.id'), primary_key=True)
-    item = sa.orm.relationship('Item', backref=sa.orm.backref('transfer', lazy='dynamic'))
-
-    added = sa.Column(sa.DateTime())
-    progress = sa.Column(sa.Float())
-
-    def __repr__(self):
-        return '='.join(map(str, [self.item_id, self.progress]))
-
-    @classmethod
-    def get(cls, item_id):
-        return cls.query.filter_by(item_id=item_id).first()
-
-    @classmethod
-    def get_or_create(cls, item_id):
-        t = cls.get(item_id)
-        if not t:
-            t = cls(item_id=item_id)
-            t.added = datetime.utcnow()
-            t.progress = 0
-            t.save()
-        return t
-
-    def save(self):
-        state.db.session.add(self)
-        state.db.session.commit()
-
 def remove_unused_names():
     used = list(set(
         get_sort_name(a)