Skip to content

Commit

Permalink
lyricwiki - Add Perl helper option for fetching lyrics:
Browse files Browse the repository at this point in the history 
Lyrics plugins have stopped working due to the lyricwiki site going
defunct, & I doubt they'll fix, so I added a Perl helper that uses
David Precious's Lyrics::Fetcher::* modules on CPAN to randomly choose a
working lyrics site.  This offloads site maint. from Fauxdacious to there!
Old code remains operational if user does not specify the helper
([Settings].[Advanced]) in case they fix, or site goes back online later!
NOTE:  User MUST also install Lyrics::Fetcher, and at least
Lyrics::Fetcher::Genus, and optionally Lyrics::Fetcher::Musixmatch
and Lyrics::Fetcher::AZLyrics from CPAN!
  • Loading branch information
@wildstar84
wildstar84 committed Oct 23, 2020
1 parent 83d3179 commit f33d6b8
Show file tree
Hide file tree
Showing 2 changed files with 120 additions and 14 deletions.
67 changes: 60 additions & 7 deletions src/lyricwiki-qt/lyricwiki.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,15 +372,68 @@ static void get_lyrics_step_1 ()
return;
}

StringBuf title_buf = str_encode_percent (state.title);
StringBuf artist_buf = str_encode_percent (state.artist);
String lyric_helper = aud_get_str ("audacious", "lyric_helper");
if (lyric_helper[0]) //JWT:WE HAVE A PERL HELPER, LESSEE IF IT CAN FIND/DOWNLOAD LYRICS FOR US:
{
bool lyrics_found = false;
GStatBuf statbuf;
AUDINFO ("----HELPER FOUND: WILL DO (%s)\n", (const char *) str_concat ({lyric_helper, " \"",
(const char *) state.artist, "\" \"",
(const char *) state.title, "\" ", aud_get_path (AudPath::UserDir)}));
#ifdef _WIN32
WinExec ((const char *) str_concat ({lyric_helper, " \"", (const char *) state.artist, "\" \"",
(const char *) state.title, "\" ", aud_get_path (AudPath::UserDir)}),
SW_HIDE);
#else
system ((const char *) str_concat ({lyric_helper, " \"", (const char *) state.artist, "\" \"",
(const char *) state.title, "\" ", aud_get_path (AudPath::UserDir)}));
#endif
String lyric_fid = String (str_concat ({aud_get_path (AudPath::UserDir), "/_tmp_lyrics.txt"}));
if (g_stat ((const char *) lyric_fid, & statbuf) == 0)
{
VFSFile lyrics_file ((const char *) lyric_fid, "r");
if (lyrics_file)
{
Index<char> lyrics = lyrics_file.read_all ();
if (lyrics.len () > 1)
{
lyrics_found = true;
update_lyrics_window (state.title, state.artist, (const char *) lyrics.begin ());
state.ok2save = true;
if (! strncmp ((const char *) state.filename, "file://", 7)
&& str_has_suffix_nocase ((const char *) state.filename, ".mp3"))
{
String error;
VFSFile file (state.filename, "r");
PluginHandle * decoder = aud_file_find_decoder (state.filename, true, file, & error);
bool can_write = aud_file_can_write_tuple (state.filename, decoder);
if (can_write)
state.ok2saveTag = true;
}
}
}
}
if (! lyrics_found)
{
update_lyrics_window (_("No lyrics Found"),
(const char *) str_concat ({"Title: ", (const char *) state.title, "\nArtist: ",
(const char *) state.artist}),
str_printf (_("Unable to fetch lyrics.")));
return;
}
}
else /* OLD "C" WAY: */
{
StringBuf title_buf = str_encode_percent (state.title);
StringBuf artist_buf = str_encode_percent (state.artist);

state.uri = String (str_printf ("https://lyrics.fandom.com/api.php?"
"action=lyrics&artist=%s&song=%s&fmt=xml", (const char *) artist_buf,
(const char *) title_buf));
state.uri = String (str_printf ("https://lyrics.fandom.com/api.php?"
"action=lyrics&artist=%s&song=%s&fmt=xml", (const char *) artist_buf,
(const char *) title_buf));

update_lyrics_window (state.title, state.artist, _("Connecting to lyrics.fandom.com ..."));
vfs_async_file_get_contents (state.uri, get_lyrics_step_2, nullptr);
update_lyrics_window (state.title, state.artist, _("Connecting to lyrics.fandom.com ..."));
vfs_async_file_get_contents (state.uri, get_lyrics_step_2, nullptr);
}
}

static void get_lyrics_step_0 (const char * uri, const Index<char> & buf, void *)
Expand Down
67 changes: 60 additions & 7 deletions src/lyricwiki/lyricwiki.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,15 +322,68 @@ static void get_lyrics_step_1 ()
return;
}

StringBuf title_buf = str_encode_percent (state.title);
StringBuf artist_buf = str_encode_percent (state.artist);
String lyric_helper = aud_get_str ("audacious", "lyric_helper");
if (lyric_helper[0]) //JWT:WE HAVE A PERL HELPER, LESSEE IF IT CAN FIND/DOWNLOAD LYRICS FOR US:
{
bool lyrics_found = false;
GStatBuf statbuf;
AUDINFO ("----HELPER FOUND: WILL DO (%s)\n", (const char *) str_concat ({lyric_helper, " \"",
(const char *) state.artist, "\" \"",
(const char *) state.title, "\" ", aud_get_path (AudPath::UserDir)}));
#ifdef _WIN32
WinExec ((const char *) str_concat ({lyric_helper, " \"", (const char *) state.artist, "\" \"",
(const char *) state.title, "\" ", aud_get_path (AudPath::UserDir)}),
SW_HIDE);
#else
system ((const char *) str_concat ({lyric_helper, " \"", (const char *) state.artist, "\" \"",
(const char *) state.title, "\" ", aud_get_path (AudPath::UserDir)}));
#endif
String lyric_fid = String (str_concat ({aud_get_path (AudPath::UserDir), "/_tmp_lyrics.txt"}));
if (g_stat ((const char *) lyric_fid, & statbuf) == 0)
{
VFSFile lyrics_file ((const char *) lyric_fid, "r");
if (lyrics_file)
{
Index<char> lyrics = lyrics_file.read_all ();
if (lyrics.len () > 1)
{
lyrics_found = true;
update_lyrics_window (state.title, state.artist, (const char *) lyrics.begin (), false);
gtk_widget_set_sensitive (save_button, true);
if (! strncmp ((const char *) state.filename, "file://", 7)
&& str_has_suffix_nocase ((const char *) state.filename, ".mp3"))
{
String error;
VFSFile file (state.filename, "r");
PluginHandle * decoder = aud_file_find_decoder (state.filename, true, file, & error);
bool can_write = aud_file_can_write_tuple (state.filename, decoder);
if (can_write)
gtk_widget_set_sensitive (tuple_save_button, true);
}
}
}
}
if (! lyrics_found)
{
update_lyrics_window (_("No lyrics Found"),
(const char *) str_concat ({"Title: ", (const char *) state.title, "\nArtist: ",
(const char *) state.artist}),
str_printf (_("Unable to fetch lyrics.")), false);
return;
}
}
else /* OLD "C" WAY: */
{
StringBuf title_buf = str_encode_percent (state.title);
StringBuf artist_buf = str_encode_percent (state.artist);

state.uri = String (str_printf ("https://lyrics.fandom.com/api.php?"
"action=lyrics&artist=%s&song=%s&fmt=xml", (const char *) artist_buf,
(const char *) title_buf));
state.uri = String (str_printf ("https://lyrics.fandom.com/api.php?"
"action=lyrics&artist=%s&song=%s&fmt=xml", (const char *) artist_buf,
(const char *) title_buf));

update_lyrics_window (state.title, state.artist, _("Connecting to lyrics.fandom.com ..."), false);
vfs_async_file_get_contents (state.uri, get_lyrics_step_2, nullptr);
update_lyrics_window (state.title, state.artist, _("Connecting to lyrics.fandom.com ..."), false);
vfs_async_file_get_contents (state.uri, get_lyrics_step_2, nullptr);
}
}

static void get_lyrics_step_0 (const char * uri, const Index<char> & buf, void *)
Expand Down

0 comments on commit f33d6b8

Please sign in to comment.