writing a bit of doc, moving crawler together

7 files changed, 32 insertions, 29 deletions

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 5a6f2cc0..dfac5267 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -1,6 +1,8 @@
-pyAggr3g470r is a free software written and maintained
+Original author
+---------------
+JARR is a free software written and maintained
 by Cédric Bonhomme https://www.cedricbonhomme.org
 
 Contributors
-````````````
+------------
 - François Schmidts http://1pxsolidblack.pl/
diff --git a/CHANGELOG.md b/CHANGELOG.rst
index 1f3edea2..185dea8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 Release History
 =================
 
+current
+-------
+    New:
+     * Redoing entierly the home page with react, JARR is going on toward a one page app.
+     * Implementing categories
+    Improvements:
+     * Code re-arangement: move all code to /src/
+
 6.7 (2015-07-21)
 ----------------
     New:
@@ -17,8 +25,7 @@ Release History
 6.6 (2015-06-02)
 ----------------
     New:
-     * it is now possible to sort the list of articles by feed title or
-     article title;
+     * it is now possible to sort the list of articles by feed title or article title;
      * added base unittests.
     Improvements:
      * fixed some minor bugs;
@@ -56,8 +63,7 @@ Release History
     Improvements:
      * new CSS;
      * improved installation script;
-     * it is now possible to delete all duplicate articles with one HTTP
-     delete request.
+     * it is now possible to delete all duplicate articles with one HTTP delete request.
 
 6.4 (2015-03-17)
 ----------------
diff --git a/README.rst b/README.rst
index fbfda039..5d9733f8 100644
--- a/README.rst
+++ b/README.rst
@@ -1,15 +1,14 @@
-++++
+====
 JARR
-++++
+====
 
 Presentation
-============
+------------
 
-`JARR (Just Another RSS Reader) <https://github.com/JARR-aggregator/JARR>`_ is a
-web-based news aggregator.
+`JARR (Just Another RSS Reader) <https://github.com/JARR-aggregator/JARR>`_ is a web-based news aggregator and reader.
 
 Main features
-=============
+-------------
 
 * can be easily deployed on Heroku or on a traditional server;
 * multiple users can use a JARR instance;
@@ -21,37 +20,33 @@ Main features
 * detection of inactive feeds;
 * share articles with Google +, Pinboard and reddit.
 
-The core technologies are `Flask <http://flask.pocoo.org>`_,
-`asyncio <https://www.python.org/dev/peps/pep-3156/>`_ and
-`SQLAlchemy <http://www.sqlalchemy.org>`_.
+The core technologies are `Flask <http://flask.pocoo.org>`_, `asyncio <https://www.python.org/dev/peps/pep-3156/>`_ and `SQLAlchemy <http://www.sqlalchemy.org>`_.
 
 Python 3.5 is recommended.
 
 Documentation
-=============
+-------------
 
 A documentation is available `here <https://jarr.readthedocs.org>`_ and provides
 different ways to install JARR.
 
 Internationalization
-====================
+--------------------
 
 JARR is translated into English and French.
 
 Donation
-========
+--------
 
-If you wish and if you like *JARR*, you can donate via bitcoin
-`1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ <https://blockexplorer.com/address/1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ>`_.
+If you wish and if you like *JARR*, you can donate via bitcoin `1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ <https://blockexplorer.com/address/1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ>`_.
 Thank you!
 
 License
-=======
+-------
 
-`JARR <https://github.com/JARR-aggregator/JARR>`_
-is under the `GNU Affero General Public License version 3 <https://www.gnu.org/licenses/agpl-3.0.html>`_.
+`JARR <https://github.com/JARR-aggregator/JARR>`_ is under the `GNU Affero General Public License version 3 <https://www.gnu.org/licenses/agpl-3.0.html>`_.
 
 Contact
-=======
+-------
 
 `My home page <https://www.cedricbonhomme.org>`_.
diff --git a/src/crawler.py b/src/crawler/classic_crawler.py
index 0598c418..0598c418 100644
--- a/src/crawler.py
+++ b/src/crawler/classic_crawler.py
diff --git a/src/web/lib/crawler.py b/src/crawler/http_crawler.py
index f480fe96..f480fe96 100644
--- a/src/web/lib/crawler.py
+++ b/src/crawler/http_crawler.py
diff --git a/src/manager.py b/src/manager.py
index f7240670..781d742b 100755
--- a/src/manager.py
+++ b/src/manager.py
@@ -32,7 +32,7 @@ def db_create():
 @manager.command
 def fetch(limit=100, retreive_all=False):
     "Crawl the feeds with the client crawler."
-    from web.lib.crawler import CrawlerScheduler
+    from crawler.http_crawler import CrawlerScheduler
     scheduler = CrawlerScheduler(conf.API_LOGIN, conf.API_PASSWD)
     scheduler.run(limit=limit, retreive_all=retreive_all)
     scheduler.wait()
@@ -47,7 +47,7 @@ def fetch_asyncio(user_id, feed_id):
         populate_g()
         from flask import g
         from web.models import User
-        import crawler
+        from crawler import classic_crawler
         users = []
         try:
             users = User.query.filter(User.id == int(user_id)).all()
@@ -67,7 +67,7 @@ def fetch_asyncio(user_id, feed_id):
             if user.activation_key == "":
                 print("Fetching articles for " + user.nickname)
                 g.user = user
-                crawler.retrieve_feed(loop, g.user, feed_id)
+                classic_crawler.retrieve_feed(loop, g.user, feed_id)
         loop.close()
 
 from scripts.probes import ArticleProbe, FeedProbe
diff --git a/src/web/utils.py b/src/web/utils.py
index fcd791e8..1d4b30ab 100755
--- a/src/web/utils.py
+++ b/src/web/utils.py
@@ -109,8 +109,8 @@ def fetch(id, feed_id=None):
     Fetch the feeds in a new processus.
     The "asyncio" crawler is launched with the manager.
     """
-    cmd = [sys.executable, conf.BASE_DIR+'/manager.py', 'fetch_asyncio', str(id),
-            str(feed_id)]
+    cmd = [sys.executable, conf.BASE_DIR + '/manager.py', 'fetch_asyncio',
+           str(id), str(feed_id)]
     return subprocess.Popen(cmd, stdout=subprocess.PIPE)
 
 def history(user_id, year=None, month=None):