From 3f2c9f6624d69b2e6f51e215471171d405deea9e Mon Sep 17 00:00:00 2001
From: Alexandr Nesterenko <kuchaspama@gmail.com>
Date: Sun, 17 Jul 2016 11:26:13 -0700
Subject: [PATCH] link detect in progress

---
 feed.py                                         | 13 ++++++++++++-
 frontend/frontend/templates/base.html           |  6 ++----
 frontend/frontend/templates/frontend/index.html |  4 ++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/feed.py b/feed.py
index 9d34b9c..e432a06 100644
--- a/feed.py
+++ b/feed.py
@@ -46,6 +46,10 @@ def element_to_string(element):
         s.append(element.tail)
     return ''.join(s)
 
+def _build_link(doclink, link):
+    # todo
+    return link
+
 def _buildFeed(response, feed_config):
     tree = response.selector._root.getroottree()
 
@@ -58,6 +62,13 @@ def _buildFeed(response, feed_config):
                 element = node.xpath(feed_config['fields'][field_name])
                 if element:
                     item[field_name] = element_to_string(element[0])
+                    # get item link
+                    if field_name == 'title':
+                        anchor = element[0].xpath('ancestor-or-self::node()[name()="a"]')
+                        if anchor and anchor[0].get('href'):
+                            item['title_link'] = _build_link(feed_config['uri'], anchor[0].get('href'))
+                            
+                            
         if len(item) == len(feed_config['fields']): # all fields are required
             items.append(item)
 
@@ -73,7 +84,7 @@ def _buildFeed(response, feed_config):
     for item in items:
         feed.add_item(
             title=item['title'] if 'title' in item else '',  
-            link=feed_config['uri'],
+            link = item['title_link'] if 'title_link' in item else feed_config['uri'],
             description=item['description'] if 'description' in item else '', 
             #enclosure=Enclosure(fields[4], "32000", "image/jpeg") if  4 in fields else None, #"Image"
             pubdate=datetime.datetime.now()
diff --git a/frontend/frontend/templates/base.html b/frontend/frontend/templates/base.html
index 26f37f7..b5ef6f2 100644
--- a/frontend/frontend/templates/base.html
+++ b/frontend/frontend/templates/base.html
@@ -51,11 +51,9 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </a>
-        {% if index_page %}
+        {% block logo %}
             <a href="{% url 'index' %}" class="brand-pic"><img src="{% static 'frontend/images/apple-touch-icon-precomposed.png' %}" width="40" height="40" /></a>
-        {% else %}
-            <a href="{% url 'index' %}" class="brand">{% trans "brand" %}</a>
-        {% endif %}
+        {% endblock %}
 
         <div class="container-fluid nav-collapse">
           <ul class="nav pull-right">
diff --git a/frontend/frontend/templates/frontend/index.html b/frontend/frontend/templates/frontend/index.html
index f1e07bf..65a681d 100644
--- a/frontend/frontend/templates/frontend/index.html
+++ b/frontend/frontend/templates/frontend/index.html
@@ -2,6 +2,10 @@
 {% load staticfiles %}
 {% load i18n %}
 
+{% block logo %}
+    <a href="{% url 'index' %}" class="brand">{% trans "brand" %}</a>
+{% endblock %}
+
 {% block content %}
 <div class="welcom">
     <img src="{% static 'frontend/images/pol.png' %}" alt="Hi!" />