Minor refactoring after CR

Author: vshlapakov

README.rst

@@ -451,25 +451,32 @@ Get a frontier slot by name::
 
 Add a request to the slot::
 
-    >>> slot.add([{'fp': '/some/path.html'}])
+    >>> slot.queue.add([{'fp': '/some/path.html'}])
     >>> slot.flush()
 
+Add a fingerprint only to the slot::
+
+    >>> slot.fingerprints.add(['fp1', 'fp2'])
+    >>> slot.flush()
+
+There are convenient shortcuts: ``f`` for ``fingerprints`` and ``q`` for ``queue``.
+
 Add requests with additional parameters::
 
-    >>> slot.add([{'fp': '/'}, {'fp': 'page1.html', 'p': 1, 'qdata': {'depth': 1}}])
+    >>> slot.q.add([{'fp': '/'}, {'fp': 'page1.html', 'p': 1, 'qdata': {'depth': 1}}])
     >>> slot.flush()
 
 To list requests for a given slot::
 
-    >>> reqs = slot.list()
+    >>> reqs = slot.q.list()
 
 To retrieve fingerprints for a given slot::
 
-    >>> fps = [req['requests'] for req in slot.iter()]
+    >>> fps = [req['requests'] for req in slot.q.iter()]
 
 To delete a batch of requests::
 
-    >>> slot.delete('00013967d8af7b0001')
+    >>> slot.q.delete('00013967d8af7b0001')
 
 To delete the whole slot from the frontier::
 

scrapinghub/client.py

@@ -1154,22 +1154,22 @@ class FrontierSlot(object):
 
     Usage:
 
-    - add request to a slot
+    - add request to a queue
         >>> data = [{'fp': 'page1.html', 'p': 1, 'qdata': {'depth': 1}}]
-        >>> slot.add('example.com', data)
+        >>> slot.q.add('example.com', data)
 
     - flush data for a slot
         >>> slot.flush()
 
     - read requests from a slot
-        >>> slot.iter()
+        >>> slot.q.iter()
         <generator object jldecode at 0x1049aa9e8>
-        >>> slot.list()
+        >>> slot.q.list()
         [{'id': '0115a8579633600006',
           'requests': [['page1.html', {'depth': 1}]]}]
 
     - delete a batch with requests from a slot
-        >>> slot.delete('0115a8579633600006')
+        >>> slot.q.delete('0115a8579633600006')
 
     - delete a whole slot
         >>> slot.delete()
@@ -1181,21 +1181,19 @@ def __init__(self, client, frontier, slot):
         self._frontier = frontier
         self.fingerprints = FrontierSlotFingerprints(self)
         self.queue = FrontierSlotQueue(self)
-        # proxy iter & list methods to FrontierSlotQueue instance
-        self.iter = self.queue.iter
-        self.list = self.queue.list
 
-    def add(self, fps):
-        """Add requests to slot."""
-        origin = self._frontier._frontiers._origin
-        return origin.add(self._frontier.key, self.key, fps)
+    @property
+    def f(self):
+        return self.fingerprints
+
+    @property
+    def q(self):
+        return self.queue
 
-    def delete(self, ids=None):
-        """Delete slot or some specific requests."""
+    def delete(self):
+        """Delete the slot."""
         origin = self._frontier._frontiers._origin
-        if ids is None:
-            return origin.delete_slot(self._frontier.key, self.key)
-        return self.queue.delete(ids)
+        return origin.delete_slot(self._frontier.key, self.key)
 
     def flush(self):
         """Flush data for the slot."""
@@ -1212,6 +1210,15 @@ def __init__(self, slot):
         self._frontier = slot._frontier
         self._slot = slot
 
+    def add(self, fps):
+        origin = self._frontier._frontiers._origin
+        writer = origin._get_writer(self._frontier.key, self.key)
+        fps = list(fps) if not isinstance(fps, list) else fps
+        if not all(isinstance(fp, string_types) for fp in fps):
+            raise ValueError('Fingerprint should be of a string type')
+        for fp in fps:
+            writer.write({'fp': fp})
+
     def iter(self, **kwargs):
         """Iterate through fingerprints."""
         origin = self._frontier._frontiers._origin
@@ -1231,6 +1238,11 @@ def __init__(self, slot):
         self._frontier = slot._frontier
         self._slot = slot
 
+    def add(self, fps):
+        """Add requests to slot."""
+        origin = self._frontier._frontiers._origin
+        return origin.add(self._frontier.key, self.key, fps)
+
     def iter(self, **kwargs):
         """Iterate through batches in queue."""
         origin = self._frontier._frontiers._origin