rss_converter_instagram.com.xsl: fix enclosure generation

[tweeper.git] / rss_converter_instagram.com.xsl

diff --git a/rss_converter_instagram.com.xsl b/rss_converter_instagram.com.xsl
index 1bb580f..cc540ce 100644 (file)
--- a/rss_converter_instagram.com.xsl
+++ b/rss_converter_instagram.com.xsl
@@ -32,8 +32,8 @@
         <xsl:text>https://instagram.com</xsl:text>
     </xsl:variable>
 
-    <xsl:template match="images">
-        <xsl:value-of disable-output-escaping="yes" select="php:function('Tweeper::generate_enclosure', string(./standard_resolution/url))"/>
+    <xsl:template match="display_src">
+        <xsl:value-of disable-output-escaping="yes" select="php:function('Tweeper::generate_enclosure', string(text()))"/>
     </xsl:template>
 
     <xsl:variable name="screen-name" select="//ProfilePage/XML_Serializer_Tag/user/full_name"/>
@@ -41,11 +41,22 @@
 
     <xsl:template match="//media/nodes/XML_Serializer_Tag">
         <xsl:variable name="item-content-image" select="./display_src"/>
+        <xsl:variable name="item-content-caption" select="./caption"/>
         <xsl:variable name="item-permalink" select="concat($BaseURL, '/p/', ./code, '/')"/>
-        <xsl:variable name="item-content-title" select="concat($user-name, ': ', $item-permalink, ', comments: ', ./comments/count, ', likes: ', ./likes/count)"/>
         <item>
             <title>
-                <xsl:value-of select="$item-content-title"/>
+                <xsl:variable name="title-length" select="140"/>
+                <!-- ellipsize, inspired from http://stackoverflow.com/questions/13622338 -->
+                <xsl:choose>
+                    <xsl:when test="string-length($item-content-caption) > $title-length">
+                        <xsl:variable name="truncated-length" select="$title-length - 3"/>
+                        <xsl:value-of select="normalize-space(substring($item-content-caption, 1, $truncated-length))"/>
+                        <xsl:text>...</xsl:text>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="normalize-space($item-content-caption)"/>
+                    </xsl:otherwise>
+                </xsl:choose>
             </title>
             <link>
                 <xsl:value-of select="$item-permalink"/>
@@ -59,12 +70,12 @@
             </pubDate>
             <description>
                 <xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
-                <p><xsl:value-of select="$item-content-title"/></p><br />
+                <p><xsl:value-of select="$item-content-caption"/></p><br />
                 <a href="{$item-permalink}"><img src="{$item-content-image}" /></a>
                 <xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
             </description>
             <xsl:if test="$generateEnclosure = 1">
-                <xsl:apply-templates select="./images"/>
+                <xsl:apply-templates select="./display_src"/>
             </xsl:if>
         </item>
     </xsl:template>