discomfitor pushed a commit to branch master.

http://git.enlightenment.org/apps/empc.git/commit/?id=dc03a8a1382b72b09ae7d2b2472c5b97188fee19

commit dc03a8a1382b72b09ae7d2b2472c5b97188fee19
Author: zmike <michael.blumenkra...@gmail.com>
Date:   Sun Dec 21 18:20:44 2014 -0500

    resync excetra with upstream
---
 src/modules/excetra.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/modules/excetra.c b/src/modules/excetra.c
index a5ab5ec..15fe805 100644
--- a/src/modules/excetra.c
+++ b/src/modules/excetra.c
@@ -70,11 +70,22 @@ lyricwiki_parse_lyric(Eina_Strbuf *buf)
      }
    s = eina_strbuf_string_get(buf);
    lyric_start = strstr(s, "phone_right.gif");
-   if (!lyric_start) goto error;
-   lyric_start = strstr(lyric_start, "</div>");
-   if (!lyric_start) goto error;
-   if (size - ((lyric_start - s) + sizeof("</div>") - 1) < 10) goto error;
-   lyric_start += sizeof("</div>") - 1;
+   if (lyric_start)
+     {
+        lyric_start = strstr(lyric_start, "</div>");
+        if (!lyric_start) goto error;
+        if (size - ((lyric_start - s) + sizeof("</div>") - 1) < 10) goto error;
+        lyric_start += sizeof("</div>") - 1;
+     }
+   else
+     {
+        lyric_start = strstr(s, "<div class='lyricbox'>");
+        if (!lyric_start) goto error;
+        lyric_start = strstr(lyric_start, "</script>");
+        if (!lyric_start) goto error;
+        if (size - ((lyric_start - s) + sizeof("</script>") - 1) < 10) goto 
error;
+        lyric_start += sizeof("</script>") - 1;
+     }
    lyric_end = strstr(lyric_start, "<!--");
    if (!lyric_end) goto error;
    lyric_end[0] = 0;

-- 


Reply via email to