zv0n/tv_rename
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TV_Rename: slight refactor and formatting

Browse Source
This commit is contained in:
zvon 2020-01-18 22:56:47 +01:00
parent efa1daf639
commit 3f6c97bda7
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tv_rename.cpp
View File

@ -131,24 +131,23 @@ std::vector< string > getEpisodeNames( const string &id, const string &season,
episodes.resize( epdata.size() ); episodes.resize( epdata.size() );
for ( auto &x : epdata ) { for ( auto &x : epdata ) {
if ( x["episodeName"].is_string() ) { if ( x["episodeName"].is_string() ) {
if ( dvd ) { size_t index = -1;
size_t index = x["dvdEpisodeNumber"].get< size_t >(); if ( dvd )
if ( index > episodes.size() ) index = x["dvdEpisodeNumber"].get< size_t >();
episodes.resize( index ); else
index--; index = x["airedEpisodeNumber"].get< size_t >();
episodes[index] =
toString( x["episodeName"].get< std::string >() ); if ( index == static_cast<size_t>( -1 ) )
} else { continue;
size_t index = x["airedEpisodeNumber"].get< size_t >();
if ( index > episodes.size() ) if ( index > episodes.size() )
episodes.resize( index ); episodes.resize( index );
index--; index--;
episodes[index] = episodes[index] =
toString( x["episodeName"].get< std::string >() ); toString( x["episodeName"].get< std::string >() );
// some eps have whitespace at the end // some eps have whitespace at the end
while ( isspace( episodes[index].back() ) ) while ( isspace( episodes[index].back() ) )
episodes[index].pop_back(); episodes[index].pop_back();
}
} }
} }
} else { } else {
@ -280,8 +279,8 @@ bool authenticate( const std::string &api_key ) {
return true; return true;
} }
void singleSeason( const string &path, const string &show, int season, string id, void singleSeason( const string &path, const string &show, int season,
const string &language, const string &pattern, string id, const string &language, const string &pattern,
const bool &linux, const bool &trust, const bool &linux, const bool &trust,
std::map< int, string > *files_ptr, bool print, bool dvd ) { std::map< int, string > *files_ptr, bool print, bool dvd ) {
#ifndef GUI #ifndef GUI
@ -306,7 +305,7 @@ void singleSeason( const string &path, const string &show, int season, string id
auto renamed_files = getRenamedFiles( show, season, id, language, pattern, auto renamed_files = getRenamedFiles( show, season, id, language, pattern,
linux, *files_ptr, dvd ); linux, *files_ptr, dvd );
if( renamed_files.empty() ) if ( renamed_files.empty() )
goto end; goto end;
if ( print || !trust ) { if ( print || !trust ) {
@ -344,8 +343,8 @@ end:
} }
} }
void singleSeason( const string &path, const string &show, int season, string id, void singleSeason( const string &path, const string &show, int season,
const string &language, const string &pattern, string id, const string &language, const string &pattern,
const size_t &flags, std::map< int, string > *files_ptr, const size_t &flags, std::map< int, string > *files_ptr,
bool print ) { bool print ) {
singleSeason( path, show, season, id, language, pattern, flags & TV_LINUX, singleSeason( path, show, season, id, language, pattern, flags & TV_LINUX,

8
tv_rename.hpp
View File

@ -25,14 +25,14 @@ using char_t = char;
#endif #endif
void singleSeason( const string &path, const string &show, int season, string id, void singleSeason( const string &path, const string &show, int season,
const string &language, const string &pattern, string id, const string &language, const string &pattern,
const bool &linux, const bool &trust, const bool &linux, const bool &trust,
std::map< int, string > *files_ptr = nullptr, std::map< int, string > *files_ptr = nullptr,
bool print = true, bool dvd = false ); bool print = true, bool dvd = false );
void singleSeason( const string &path, const string &show, int season, string id, void singleSeason( const string &path, const string &show, int season,
const string &language, const string &pattern, string id, const string &language, const string &pattern,
const size_t &flags, const size_t &flags,
std::map< int, string > *files_ptr = nullptr, std::map< int, string > *files_ptr = nullptr,
bool print = true ); bool print = true );