Add better values for EpCount and EpHiNo

diff --git a/localmylist/renameutils.cpp b/localmylist/renameutils.cpp
index edde002442164b8f53cd8dcc06156fdcf8337882..0f8fc06362c73fcea0439707de9f02d8774de90c 100644 (file)
--- a/localmylist/renameutils.cpp
+++ b/localmylist/renameutils.cpp
@@ -22,8 +22,8 @@ void setupRenameEnv(const QSqlRecord &record, RenameParser::Environment &env)
        env["GTl"] = record.value("group_name").toString();
 
        env["EpNo"] = record.value("epno").toString();
-       env["EpHiNo"] = record.value("episode_count").toString();
-       env["EpCount"] = "0"; // TODO This is missing from the data
+       env["EpHiNo"] = record.value("highest_epno").toString();
+       env["EpCount"] = record.value("episode_count").toString(); // TODO This is missing from the data, providing count of episodes in database
 
        QString year = record.value("year").toString().trimmed();
        if (!year.contains('-'))

diff --git a/localmylist/share/schema/schema.sql b/localmylist/share/schema/schema.sql
index e3259469af6e25d2ec1dcf41cec55c0e8e33108a..ad6c855ee8452aead1d4240ef8bb07a61736b1af 100644 (file)
--- a/localmylist/share/schema/schema.sql
+++ b/localmylist/share/schema/schema.sql
@@ -198,7 +198,16 @@ CREATE VIEW file_data AS
        SELECT f.fid, f.eid, f.aid, f.gid, f.anidb_update, f.entry_update, f.my_update, f.ed2k, f.size, f.length, f.extension, f.group_name, f.group_name_short, f.crc, f.release_date, f.version, f.censored, f.type, f.quality_id, f.quality, f.resolution, f.video_codec, f.audio_codec, f.audio_language, f.subtitle_language, f.aspect_ratio, f.my_watched, f.my_state, f.my_file_state, f.my_storage, f.my_source, f.my_other, a.title_romaji AS atitle, e.title_english AS eptitle FROM ((file f LEFT JOIN anime a ON ((f.aid = a.aid))) LEFT JOIN episode e ON ((f.eid = e.eid)));
 
 CREATE VIEW rename_data AS 
-       SELECT f.fid, f.eid, f.aid, f.gid, a.anidb_update AS anime_anidb_update, a.entry_update AS anime_entry_update, a.my_update AS anime_my_update, a.title_english AS anime_title_english, a.title_romaji AS anime_title_romaji, a.title_kanji AS anime_title_kanji, a.description, a.year, a.start_date, a.end_date, a.type AS anime_type, a.rating AS anime_rating, a.votes AS anime_votes, a.temp_rating, a.temp_votes, a.my_vote AS anime_my_vote, a.my_vote_date AS anime_my_vote_date, a.my_temp_vote, a.my_temp_vote_date, ( SELECT count(episode.eid) AS count FROM episode WHERE episode.aid = f.aid) AS episode_count, e.anidb_update AS episode_anidb_update, e.entry_update AS episode_entry_update, e.my_update AS episode_my_update, e.epno, e.title_english AS episode_title_english, e.title_romaji AS episode_title_romaji, e.title_kanji AS episode_title_kanji, e.length AS episode_length, e.airdate, e.state, e.special, e.recap, e.opening, e.ending, e.rating, e.votes, e.my_vote, e.my_vote_date, f.anidb_update, f.entry_update, f.my_update, f.ed2k, f.size, f.length, f.extension, f.group_name, f.group_name_short, f.crc, f.release_date, f.version, f.censored, f.type, f.quality_id, f.quality, f.resolution, f.video_codec, f.audio_codec, f.audio_language, f.subtitle_language, f.aspect_ratio, f.my_watched, f.my_state, f.my_file_state, f.my_storage, f.my_source, f.my_other, fl.host_id, fl.path, fl.renamed, fl.failed_rename
+       SELECT f.fid, f.eid, f.aid, f.gid, a.anidb_update AS anime_anidb_update, a.entry_update AS anime_entry_update, a.my_update AS anime_my_update, a.title_english AS anime_title_english,
+                       a.title_romaji AS anime_title_romaji, a.title_kanji AS anime_title_kanji, a.description, a.year, a.start_date, a.end_date, a.type AS anime_type, a.rating AS anime_rating, a.votes AS anime_votes,
+                       a.temp_rating, a.temp_votes, a.my_vote AS anime_my_vote, a.my_vote_date AS anime_my_vote_date, a.my_temp_vote, a.my_temp_vote_date,
+                       (SELECT count(episode.eid) AS count FROM episode WHERE episode.aid = f.aid) AS episode_count,
+                       (SELECT max(episode.epno) AS highest_epno FROM episode WHERE episode.aid = f.aid) AS highest_epno,
+               e.anidb_update AS episode_anidb_update, e.entry_update AS episode_entry_update, e.my_update AS episode_my_update, e.epno, e.title_english AS episode_title_english, e.title_romaji AS episode_title_romaji,
+                       e.title_kanji AS episode_title_kanji, e.length AS episode_length, e.airdate, e.state, e.special, e.recap, e.opening, e.ending, e.rating, e.votes, e.my_vote, e.my_vote_date,
+               f.anidb_update, f.entry_update, f.my_update, f.ed2k, f.size, f.length, f.extension, f.group_name, f.group_name_short, f.crc, f.release_date, f.version, f.censored, f.type, f.quality_id,
+                       f.quality, f.resolution, f.video_codec, f.audio_codec, f.audio_language, f.subtitle_language, f.aspect_ratio, f.my_watched, f.my_state, f.my_file_state, f.my_storage, f.my_source,
+                       f.my_other, fl.host_id, fl.path, fl.renamed, fl.failed_rename
        FROM file f
                JOIN anime a ON a.aid = f.aid
                JOIN episode e ON e.eid = f.eid