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

Post-processing: Convert character encoding only when needed. Fix #141 #158

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Post-processing: Convert character encoding only when needed. Fix #141 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 18 additions & 14 deletions libqnapi/src/subtitlepostprocessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ SubtitlePostProcessor::SubtitlePostProcessor(

void SubtitlePostProcessor::perform(const QString& movieFilePath,
const QString& subtitleFilePath) const {
if (!QFileInfo(subtitleFilePath).exists()) return;

if (ppConfig.removeLines()) {
ppRemoveLinesContainingWords(subtitleFilePath, ppConfig.removeLinesWords());
}
Expand All @@ -35,11 +37,9 @@ void SubtitlePostProcessor::perform(const QString& movieFilePath,
ppReplaceDiacriticsWithASCII(subtitleFilePath);
break;
case ECM_CHANGE:
if (!ppConfig.encodingAutoDetectFrom() ||
!ppChangeSubtitlesEncoding(subtitleFilePath, ppConfig.encodingTo())) {
ppChangeSubtitlesEncoding(subtitleFilePath, ppConfig.encodingFrom(),
ppChangeSubtitlesEncoding(subtitleFilePath,
ppDetermineEncodingFrom(subtitleFilePath),
ppConfig.encodingTo());
}
break;
case ECM_ORIGINAL:
// Nie ruszaj pobranych napisów!
Expand All @@ -55,7 +55,6 @@ void SubtitlePostProcessor::perform(const QString& movieFilePath,

bool SubtitlePostProcessor::ppReplaceDiacriticsWithASCII(
const QString& subtitleFilePath) const {
if (!QFileInfo(subtitleFilePath).exists()) return false;

QString from = encodingUtils.detectFileEncoding(subtitleFilePath);

Expand Down Expand Up @@ -84,6 +83,12 @@ bool SubtitlePostProcessor::ppReplaceDiacriticsWithASCII(
bool SubtitlePostProcessor::ppChangeSubtitlesEncoding(
const QString& subtitleFilePath, const QString& from,
const QString& to) const {

if (QString::compare(from, ppConfig.encodingTo(), Qt::CaseInsensitive) == 0) {
// The same encoding, conversion isn't required.
return false;
}

QFile f(subtitleFilePath);
if (!f.open(QIODevice::ReadOnly)) return false;

Expand All @@ -109,20 +114,19 @@ bool SubtitlePostProcessor::ppChangeSubtitlesEncoding(
return true;
}

bool SubtitlePostProcessor::ppChangeSubtitlesEncoding(
const QString& subtitleFilePath, const QString& to) const {
if (!QFileInfo(subtitleFilePath).exists()) return false;

QString from = encodingUtils.detectFileEncoding(subtitleFilePath);

if (from.isEmpty()) return false;
QString SubtitlePostProcessor::ppDetermineEncodingFrom(const QString& subtitleFilePath) const {
if (ppConfig.encodingAutoDetectFrom()) {
QString autodetectedFrom = encodingUtils.detectFileEncoding(subtitleFilePath);
if (!autodetectedFrom.isEmpty()) {
return autodetectedFrom;
}
}

return ppChangeSubtitlesEncoding(from, to);
return ppConfig.encodingFrom();
}

bool SubtitlePostProcessor::ppRemoveLinesContainingWords(
const QString& subtitleFilePath, QStringList wordList) const {
if (!QFileInfo(subtitleFilePath).exists()) return false;

wordList = wordList.filter(QRegExp("^(.+)$"));

Expand Down
3 changes: 1 addition & 2 deletions libqnapi/src/subtitlepostprocessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ class SubtitlePostProcessor {
bool ppReplaceDiacriticsWithASCII(const QString& subtitleFilePath) const;
bool ppChangeSubtitlesEncoding(const QString& subtitleFilePath,
const QString& from, const QString& to) const;
bool ppChangeSubtitlesEncoding(const QString& subtitleFilePath,
const QString& to) const;
QString ppDetermineEncodingFrom(const QString& subtitleFilePath) const;
bool ppRemoveLinesContainingWords(const QString& subtitleFilePath,
QStringList wordList) const;

Expand Down