Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extract style tags and non dialogue words. #5

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Extract style tags and non dialogue words. #5

Changes from 22 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3e285ab
Extract style tags and non dialogue words.
MatejMecka Jan 2, 2018
8c97741
Update srtparser.h
MatejMecka Jan 2, 2018
b2e35c5
Update srtparser.h
MatejMecka Jan 2, 2018
72560fd
Update srtparser.h
MatejMecka Jan 2, 2018
24fbf16
Update srtparser.h
MatejMecka Jan 2, 2018
7defad5
tricked by a sign
MatejMecka Jan 2, 2018
617bde8
fixed some ifs
Jan 2, 2018
e1511e6
Update srtparser.h
MatejMecka Jan 2, 2018
779f07b
remove empty lines
MatejMecka Jan 2, 2018
80b60bc
increment variable
MatejMecka Jan 2, 2018
7fde062
Update srtparser.h
MatejMecka Jan 2, 2018
fdc9212
Update srtparser.h
MatejMecka Jan 14, 2018
c9ce550
Update srtparser.h
MatejMecka Jan 14, 2018
796ea56
Update srtparser.h
MatejMecka Jan 14, 2018
4241a68
don't merge
MatejMecka Jan 14, 2018
8c67266
Update srtparser.h
MatejMecka Jan 14, 2018
d89de38
Update srtparser.h
MatejMecka Jan 15, 2018
586106b
fix saurabh's suggestions
MatejMecka Jan 15, 2018
ff4d226
update pairs
MatejMecka Jan 15, 2018
2d70316
Update srtparser.h
MatejMecka Jan 15, 2018
1a67859
Update srtparser.h
MatejMecka Jan 15, 2018
b3a503d
fix small bug
MatejMecka Jan 15, 2018
c6ca75c
Update srtparser.h
MatejMecka Jan 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 26 additions & 22 deletions srtparser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ class SubtitleItem
std::vector<std::string> getNonDialogueWords(); //return string vector of non dialogue words
std::vector<std::string> getStyleTags(); //return string vector of style tags


void setStartTime(long int startTime); //set starting time
void setEndTime(long int endTime); //set ending time
void setText(std::string text); //set subtitle text
Expand Down Expand Up @@ -382,17 +381,12 @@ inline void SubtitleItem::extractInfo(bool keepHTML, bool doNotIgnoreNonDialogue
//stripping HTML tags
if(!keepHTML)
{
/*
* TODO : Before erasing, extract the words.
* std::vector<std::string> getStyleTags();
* int getStyleTagCount() const;
* std::vector<std::string> _styleTag;
* int _styleTagCount;
*/

int countP = 0;
std::string tag;
for(char& c : output) // replacing <...> with ~~~~
{

if(c=='<')
{
countP++;
Expand All @@ -403,34 +397,40 @@ inline void SubtitleItem::extractInfo(bool keepHTML, bool doNotIgnoreNonDialogue
{
if(countP!=0)
{
if(c != '>')
c = '~';

if(c != '>'){
tag += c;
c = '~';
}
else if(c == '>')
{
c = '~';
countP--;
_styleTagCount++;
if(tag[0] == '/'){
tag="";

}
else{
_styleTag.push_back(tag);
tag="";
}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This if else block can be simplified to a single if statement.

}
}
}

}

}

//stripping non dialogue data e.g. (applause)

if(!doNotIgnoreNonDialogues)
{
/*
* TODO : Before erasing, extract the words.
* std::vector<std::string> getNonDialogueWords();
* int getNonDialogueCount() const;
* std::vector<std::string> _nonDialogue;
* int _nonDialogueCount;
*/

int countP = 0;
std::string action;
for(char& c : output) // replacing (...) with ~~~~
{

if(c=='(')
{
countP++;
Expand All @@ -441,13 +441,17 @@ inline void SubtitleItem::extractInfo(bool keepHTML, bool doNotIgnoreNonDialogue
{
if(countP!=0)
{
if(c != ')')
if(c != ')'){
action.push_back(c);
c = '~';

}
else if(c == ')')
{
c = '~';
countP--;
_nonDialogueCount++;
_nonDialogue.push_back(action);
action="";
}
}
}
Expand Down Expand Up @@ -654,4 +658,4 @@ inline SubtitleWord::~SubtitleWord(void)
}


#endif //SRTPARSER_H
#endif //SRTPARSER_H