From 8442e66c8d8accf07538d6c46407c8b465145dc8 Mon Sep 17 00:00:00 2001
From: a-sum-duma <a-sum-duma@users.noreply.github.com>
Date: Tue, 28 Jul 2020 13:34:44 +0200
Subject: [PATCH 01/10] Define language code types and allow to access language
 codes by type

---
 libqnapi/src/subtitlelanguage.cpp | 260 +++++++++++++++---------------
 libqnapi/src/subtitlelanguage.h   |  23 ++-
 2 files changed, 144 insertions(+), 139 deletions(-)

diff --git a/libqnapi/src/subtitlelanguage.cpp b/libqnapi/src/subtitlelanguage.cpp
index 9ab5ea8..1c95829 100644
--- a/libqnapi/src/subtitlelanguage.cpp
+++ b/libqnapi/src/subtitlelanguage.cpp
@@ -24,185 +24,179 @@ void SubtitleLanguage::setLanguage(QString source) {
   idx = -1;
 
   if (source.length() == 2) {
-    idx = codes2l.indexOf(source.toLower());
+    idx = strings[LCT_TWO_LETTER].indexOf(source.toLower());
   } else if (source.length() == 3) {
-    idx = codes3l.indexOf(source.toLower());
+    idx = strings[LCT_TRI_LETTER].indexOf(source.toLower());
   } else {
-    idx = names.indexOf(source);
+    idx = strings[LCT_NONE].indexOf(source);
   }
 }
 
-QString SubtitleLanguage::toTwoLetter() {
+/**
+ * Convert selected language to a string.
+ *
+ * @param langCodeType Type of language code or #LCT_NONE to get full name of
+ *                     the langage.
+ * @return Language string or empty string if selected language coundn't be
+ *         recognized or wasn't selected at all.
+ *
+ * @see #SubtitleLanguage::setLanguage
+ */
+QString SubtitleLanguage::toString(LangCodeType langCodeType) const {
   if (idx > -1) {
-    return codes2l.at(idx);
+    return strings.at(langCodeType).at(idx);
   }
   return "";
 }
 
-QString SubtitleLanguage::toTriLetter() {
-  if (idx > -1) {
-    return codes3l.at(idx);
-  }
-  return "";
-}
-
-QString SubtitleLanguage::toFullName() {
-  if (idx > -1) {
-    return names.at(idx);
-  }
-  return "";
-}
-
-QStringList SubtitleLanguage::listLanguages() { return names; }
-
-QStringList SubtitleLanguage::listLanguageTwoLetterCodes() { return codes2l; }
+QStringList SubtitleLanguage::listLanguages(LangCodeType langCodeType) const { return strings.at(langCodeType); }
 
 void SubtitleLanguage::fill_tables() {
-  codes2l << "sq";
-  codes3l << "alb";
-  names << QObject::tr("Albanian");
+  strings[LCT_TWO_LETTER] << "sq";
+  strings[LCT_TRI_LETTER] << "alb";
+  strings[LCT_NONE] << QObject::tr("Albanian");
 
-  codes2l << "en";
-  codes3l << "eng";
-  names << QObject::tr("English");
+  strings[LCT_TWO_LETTER] << "en";
+  strings[LCT_TRI_LETTER] << "eng";
+  strings[LCT_NONE] << QObject::tr("English");
 
-  codes2l << "ar";
-  codes3l << "ara";
-  names << QObject::tr("Arabic");
+  strings[LCT_TWO_LETTER] << "ar";
+  strings[LCT_TRI_LETTER] << "ara";
+  strings[LCT_NONE] << QObject::tr("Arabic");
 
-  codes2l << "bg";
-  codes3l << "bul";
-  names << QObject::tr("Bulgarian");
+  strings[LCT_TWO_LETTER] << "bg";
+  strings[LCT_TRI_LETTER] << "bul";
+  strings[LCT_NONE] << QObject::tr("Bulgarian");
 
-  codes2l << "zh";
-  codes3l << "chi";
-  names << QObject::tr("Chinese");
+  strings[LCT_TWO_LETTER] << "zh";
+  strings[LCT_TRI_LETTER] << "chi";
+  strings[LCT_NONE] << QObject::tr("Chinese");
 
-  codes2l << "hr";
-  codes3l << "hrv";
-  names << QObject::tr("Croatian");
+  strings[LCT_TWO_LETTER] << "hr";
+  strings[LCT_TRI_LETTER] << "hrv";
+  strings[LCT_NONE] << QObject::tr("Croatian");
 
-  codes2l << "cs";
-  codes3l << "cze";
-  names << QObject::tr("Czech");
+  strings[LCT_TWO_LETTER] << "cs";
+  strings[LCT_TRI_LETTER] << "cze";
+  strings[LCT_NONE] << QObject::tr("Czech");
 
-  codes2l << "da";
-  codes3l << "dan";
-  names << QObject::tr("Danish");
+  strings[LCT_TWO_LETTER] << "da";
+  strings[LCT_TRI_LETTER] << "dan";
+  strings[LCT_NONE] << QObject::tr("Danish");
 
-  codes2l << "et";
-  codes3l << "est";
-  names << QObject::tr("Estonian");
+  strings[LCT_TWO_LETTER] << "et";
+  strings[LCT_TRI_LETTER] << "est";
+  strings[LCT_NONE] << QObject::tr("Estonian");
 
-  codes2l << "fi";
-  codes3l << "fin";
-  names << QObject::tr("Finnish");
+  strings[LCT_TWO_LETTER] << "fi";
+  strings[LCT_TRI_LETTER] << "fin";
+  strings[LCT_NONE] << QObject::tr("Finnish");
 
-  codes2l << "fr";
-  codes3l << "fre";
-  names << QObject::tr("French");
+  strings[LCT_TWO_LETTER] << "fr";
+  strings[LCT_TRI_LETTER] << "fre";
+  strings[LCT_NONE] << QObject::tr("French");
 
-  codes2l << "gl";
-  codes3l << "glg";
-  names << QObject::tr("Galician");
+  strings[LCT_TWO_LETTER] << "gl";
+  strings[LCT_TRI_LETTER] << "glg";
+  strings[LCT_NONE] << QObject::tr("Galician");
 
-  codes2l << "el";
-  codes3l << "ell";
-  names << QObject::tr("Greek");
+  strings[LCT_TWO_LETTER] << "el";
+  strings[LCT_TRI_LETTER] << "ell";
+  strings[LCT_NONE] << QObject::tr("Greek");
 
-  codes2l << "he";
-  codes3l << "heb";
-  names << QObject::tr("Hebrew");
+  strings[LCT_TWO_LETTER] << "he";
+  strings[LCT_TRI_LETTER] << "heb";
+  strings[LCT_NONE] << QObject::tr("Hebrew");
 
-  codes2l << "es";
-  codes3l << "spa";
-  names << QObject::tr("Spanish");
+  strings[LCT_TWO_LETTER] << "es";
+  strings[LCT_TRI_LETTER] << "spa";
+  strings[LCT_NONE] << QObject::tr("Spanish");
 
-  codes2l << "nl";
-  codes3l << "dut";
-  names << QObject::tr("Dutch");
+  strings[LCT_TWO_LETTER] << "nl";
+  strings[LCT_TRI_LETTER] << "dut";
+  strings[LCT_NONE] << QObject::tr("Dutch");
 
-  codes2l << "id";
-  codes3l << "ind";
-  names << QObject::tr("Indonesian");
+  strings[LCT_TWO_LETTER] << "id";
+  strings[LCT_TRI_LETTER] << "ind";
+  strings[LCT_NONE] << QObject::tr("Indonesian");
 
-  codes2l << "ja";
-  codes3l << "jpn";
-  names << QObject::tr("Japanese");
+  strings[LCT_TWO_LETTER] << "ja";
+  strings[LCT_TRI_LETTER] << "jpn";
+  strings[LCT_NONE] << QObject::tr("Japanese");
 
-  codes2l << "ko";
-  codes3l << "kor";
-  names << QObject::tr("Korean");
+  strings[LCT_TWO_LETTER] << "ko";
+  strings[LCT_TRI_LETTER] << "kor";
+  strings[LCT_NONE] << QObject::tr("Korean");
 
-  codes2l << "mk";
-  codes3l << "mac";
-  names << QObject::tr("Macedonian");
+  strings[LCT_TWO_LETTER] << "mk";
+  strings[LCT_TRI_LETTER] << "mac";
+  strings[LCT_NONE] << QObject::tr("Macedonian");
 
-  codes2l << "de";
-  codes3l << "ger";
-  names << QObject::tr("German");
+  strings[LCT_TWO_LETTER] << "de";
+  strings[LCT_TRI_LETTER] << "ger";
+  strings[LCT_NONE] << QObject::tr("German");
 
-  codes2l << "no";
-  codes3l << "nor";
-  names << QObject::tr("Norwegian");
+  strings[LCT_TWO_LETTER] << "no";
+  strings[LCT_TRI_LETTER] << "nor";
+  strings[LCT_NONE] << QObject::tr("Norwegian");
 
-  codes2l << "oc";
-  codes3l << "oci";
-  names << QObject::tr("Occitan");
+  strings[LCT_TWO_LETTER] << "oc";
+  strings[LCT_TRI_LETTER] << "oci";
+  strings[LCT_NONE] << QObject::tr("Occitan");
 
-  codes2l << "fa";
-  codes3l << "per";
-  names << QObject::tr("Persian (farsi)");
+  strings[LCT_TWO_LETTER] << "fa";
+  strings[LCT_TRI_LETTER] << "per";
+  strings[LCT_NONE] << QObject::tr("Persian (farsi)");
 
-  codes2l << "pl";
-  codes3l << "pol";
-  names << QObject::tr("Polish");
+  strings[LCT_TWO_LETTER] << "pl";
+  strings[LCT_TRI_LETTER] << "pol";
+  strings[LCT_NONE] << QObject::tr("Polish");
 
-  codes2l << "pt";
-  codes3l << "por";
-  names << QObject::tr("Portuguese");
+  strings[LCT_TWO_LETTER] << "pt";
+  strings[LCT_TRI_LETTER] << "por";
+  strings[LCT_NONE] << QObject::tr("Portuguese");
 
-  codes2l << "pb";
-  codes3l << "pob";
-  names << QObject::tr("Portuguese-BR");
+  strings[LCT_TWO_LETTER] << "pb";
+  strings[LCT_TRI_LETTER] << "pob";
+  strings[LCT_NONE] << QObject::tr("Portuguese-BR");
 
-  codes2l << "ru";
-  codes3l << "rus";
-  names << QObject::tr("Russian");
+  strings[LCT_TWO_LETTER] << "ru";
+  strings[LCT_TRI_LETTER] << "rus";
+  strings[LCT_NONE] << QObject::tr("Russian");
 
-  codes2l << "ro";
-  codes3l << "rum";
-  names << QObject::tr("Romanian");
+  strings[LCT_TWO_LETTER] << "ro";
+  strings[LCT_TRI_LETTER] << "rum";
+  strings[LCT_NONE] << QObject::tr("Romanian");
 
-  codes2l << "sr";
-  codes3l << "scc";
-  names << QObject::tr("Serbian");
+  strings[LCT_TWO_LETTER] << "sr";
+  strings[LCT_TRI_LETTER] << "scc";
+  strings[LCT_NONE] << QObject::tr("Serbian");
 
-  codes2l << "sl";
-  codes3l << "slv";
-  names << QObject::tr("Slovenian");
+  strings[LCT_TWO_LETTER] << "sl";
+  strings[LCT_TRI_LETTER] << "slv";
+  strings[LCT_NONE] << QObject::tr("Slovenian");
 
-  codes2l << "sv";
-  codes3l << "swe";
-  names << QObject::tr("Swedish");
+  strings[LCT_TWO_LETTER] << "sv";
+  strings[LCT_TRI_LETTER] << "swe";
+  strings[LCT_NONE] << QObject::tr("Swedish");
 
-  codes2l << "sk";
-  codes3l << "slo";
-  names << QObject::tr("Slovak");
+  strings[LCT_TWO_LETTER] << "sk";
+  strings[LCT_TRI_LETTER] << "slo";
+  strings[LCT_NONE] << QObject::tr("Slovak");
 
-  codes2l << "tr";
-  codes3l << "tur";
-  names << QObject::tr("Turkish");
+  strings[LCT_TWO_LETTER] << "tr";
+  strings[LCT_TRI_LETTER] << "tur";
+  strings[LCT_NONE] << QObject::tr("Turkish");
 
-  codes2l << "vi";
-  codes3l << "vie";
-  names << QObject::tr("Vietnamese");
+  strings[LCT_TWO_LETTER] << "vi";
+  strings[LCT_TRI_LETTER] << "vie";
+  strings[LCT_NONE] << QObject::tr("Vietnamese");
 
-  codes2l << "hu";
-  codes3l << "hun";
-  names << QObject::tr("Hungarian");
+  strings[LCT_TWO_LETTER] << "hu";
+  strings[LCT_TRI_LETTER] << "hun";
+  strings[LCT_NONE] << QObject::tr("Hungarian");
 
-  codes2l << "it";
-  codes3l << "ita";
-  names << QObject::tr("Italian");
+  strings[LCT_TWO_LETTER] << "it";
+  strings[LCT_TRI_LETTER] << "ita";
+  strings[LCT_NONE] << QObject::tr("Italian");
 }
diff --git a/libqnapi/src/subtitlelanguage.h b/libqnapi/src/subtitlelanguage.h
index 2ef6e0c..ff38c9f 100644
--- a/libqnapi/src/subtitlelanguage.h
+++ b/libqnapi/src/subtitlelanguage.h
@@ -17,6 +17,15 @@
 
 #include <QObject>
 #include <QStringList>
+#include <array>
+
+/** Language code types. */
+enum LangCodeType {
+  LCT_NONE = 0,       ///< No language code.
+  LCT_TWO_LETTER = 1, ///< Two-letter language code.
+  LCT_TRI_LETTER = 2, ///< Three-letter language code.
+  LCT_END,            ///< End marker.
+};
 
 class SubtitleLanguage {
  public:
@@ -24,15 +33,17 @@ class SubtitleLanguage {
 
   void setLanguage(QString source);
 
-  QString toTwoLetter();
-  QString toTriLetter();
-  QString toFullName();
+  QString toString(LangCodeType langCodeType = LCT_NONE) const;
+
+  QString toTwoLetter() const { return toString(LCT_TWO_LETTER); }
+  QString toTriLetter() const { return toString(LCT_TRI_LETTER); }
+  QString toFullName() const { return toString(LCT_NONE); }
 
-  QStringList listLanguages();
-  QStringList listLanguageTwoLetterCodes();
+  QStringList listLanguages(LangCodeType langCodeType = LCT_NONE) const;
+  QStringList listLanguageTwoLetterCodes() const { return listLanguages(LCT_TWO_LETTER); }
 
  private:
-  QStringList codes2l, codes3l, names;
+  std::array<QStringList, LCT_END> strings;
   int idx;
 
   void fill_tables();

From c34756e373467027d8c684404af1436171ddc757 Mon Sep 17 00:00:00 2001
From: a-sum-duma <a-sum-duma@users.noreply.github.com>
Date: Tue, 28 Jul 2020 13:45:47 +0200
Subject: [PATCH 02/10] Add "language code in file name" setting to QNapi
 config and GUI

---
 gui/src/forms/frmoptions.cpp          |  5 ++
 gui/ui/frmoptions.ui                  | 36 ++++++++--
 libqnapi/src/config/configreader.cpp  |  2 +
 libqnapi/src/config/configwriter.cpp  |  2 +
 libqnapi/src/config/generalconfig.cpp |  1 +
 libqnapi/src/config/generalconfig.h   | 97 +++++++++++++++++----------
 6 files changed, 104 insertions(+), 39 deletions(-)

diff --git a/gui/src/forms/frmoptions.cpp b/gui/src/forms/frmoptions.cpp
index abbbf3e..a9bad2c 100644
--- a/gui/src/forms/frmoptions.cpp
+++ b/gui/src/forms/frmoptions.cpp
@@ -347,6 +347,9 @@ void frmOptions::writeConfig() {
               ui.cbLangBackup->itemData(ui.cbLangBackup->currentIndex())
                   .toString())
           .setNoBackup(ui.cbNoBackup->isChecked())
+          .setLangCodeInFileName(
+              static_cast<LangCodeType>(
+                  ui.cbLangCodeInFileName->currentIndex()))
           .setQuietBatch(ui.cbQuietBatch->isChecked())
           .setSearchPolicy(
               static_cast<SearchPolicy>(ui.cbSearchPolicy->currentIndex()))
@@ -419,6 +422,8 @@ void frmOptions::readConfig(const QNapiConfig &config) {
   ui.cbLangBackup->setCurrentIndex(ui.cbLangBackup->findData(
       SubtitleLanguage(config.generalConfig().backupLanguage()).toTwoLetter()));
   ui.cbNoBackup->setChecked(config.generalConfig().noBackup());
+  ui.cbLangCodeInFileName->setCurrentIndex(
+      config.generalConfig().langCodeInFileName());
   ui.cbQuietBatch->setChecked(config.generalConfig().quietBatch());
 
   ui.twEngines->clear();
diff --git a/gui/ui/frmoptions.ui b/gui/ui/frmoptions.ui
index 38aa510..ca17757 100644
--- a/gui/ui/frmoptions.ui
+++ b/gui/ui/frmoptions.ui
@@ -28,7 +28,7 @@
        <string>General</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout">
-       <item row="10" column="0" colspan="3">
+       <item row="11" column="0" colspan="3">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -41,7 +41,7 @@
          </property>
         </spacer>
        </item>
-       <item row="7" column="0" colspan="3">
+       <item row="8" column="0" colspan="3">
         <widget class="QCheckBox" name="cbQuietBatch">
          <property name="toolTip">
           <string>Do not show any windows while retrieving subtitles in command-line</string>
@@ -88,14 +88,14 @@
          </property>
         </widget>
        </item>
-       <item row="8" column="0" colspan="2">
+       <item row="9" column="0" colspan="2">
         <widget class="QCheckBox" name="cbChangePermissions">
          <property name="text">
           <string>Subtitles file permissions: </string>
          </property>
         </widget>
        </item>
-       <item row="8" column="2">
+       <item row="9" column="2">
         <layout class="QHBoxLayout" name="_2">
          <property name="spacing">
           <number>6</number>
@@ -157,7 +157,7 @@
          </item>
         </layout>
        </item>
-       <item row="9" column="0" colspan="3">
+       <item row="10" column="0" colspan="3">
         <widget class="QCheckBox" name="cbShowDockIcon">
          <property name="text">
           <string>Show icon in the system tray (requires application restart)</string>
@@ -274,6 +274,32 @@
          </property>
         </widget>
        </item>
+       <item row="7" column="0" colspan="2">
+        <widget class="QLabel" name="lbLangCodeInFileName">
+         <property name="text">
+          <string>Add language code to subtitle file name:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="2">
+        <widget class="QComboBox" name="cbLangCodeInFileName">
+         <item>
+          <property name="text">
+           <string>No</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Two-letter</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Three-letter</string>
+          </property>
+         </item>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabDownloadEngines">
diff --git a/libqnapi/src/config/configreader.cpp b/libqnapi/src/config/configreader.cpp
index b31a290..5fd1f89 100644
--- a/libqnapi/src/config/configreader.cpp
+++ b/libqnapi/src/config/configreader.cpp
@@ -75,6 +75,8 @@ const GeneralConfig ConfigReader::readGeneralConfig(
       settings.value("qnapi/language", preferredLangCode).toString(),
       settings.value("qnapi/language_backup", backupLangCode).toString(),
       settings.value("qnapi/no_backup", false).toBool(),
+      static_cast<LangCodeType>(
+          settings.value("qnapi/lang_code_in_file_name", LCT_NONE).toInt()),
       settings.value("qnapi/quiet_batch", false).toBool(),
       static_cast<SearchPolicy>(
           settings.value("qnapi/search_policy", SP_BREAK_IF_FOUND).toInt()),
diff --git a/libqnapi/src/config/configwriter.cpp b/libqnapi/src/config/configwriter.cpp
index 3e4a228..0741ff1 100644
--- a/libqnapi/src/config/configwriter.cpp
+++ b/libqnapi/src/config/configwriter.cpp
@@ -50,6 +50,8 @@ void ConfigWriter::writeGeneralConfig(const GeneralConfig& generalConfig,
   settings.setValue("qnapi/language", generalConfig.language());
   settings.setValue("qnapi/language_backup", generalConfig.backupLanguage());
   settings.setValue("qnapi/no_backup", generalConfig.noBackup());
+  settings.setValue("qnapi/lang_code_in_file_name",
+                    generalConfig.langCodeInFileName());
   settings.setValue("qnapi/quiet_batch", generalConfig.quietBatch());
   settings.setValue("qnapi/search_policy", generalConfig.searchPolicy());
   settings.setValue("qnapi/download_policy", generalConfig.downloadPolicy());
diff --git a/libqnapi/src/config/generalconfig.cpp b/libqnapi/src/config/generalconfig.cpp
index 669d13c..6537061 100644
--- a/libqnapi/src/config/generalconfig.cpp
+++ b/libqnapi/src/config/generalconfig.cpp
@@ -23,6 +23,7 @@ QString GeneralConfig::toString() const {
                   << "language: " << language() << endl
                   << "backupLanguage: " << backupLanguage() << endl
                   << "noBackup: " << noBackup() << endl
+                  << "langCodeInFileName: " << langCodeInFileName() << endl
                   << "quietBatch: " << quietBatch() << endl
                   << "searchPolicy: " << searchPolicy() << endl
                   << "downloadPolicy: " << downloadPolicy() << endl
diff --git a/libqnapi/src/config/generalconfig.h b/libqnapi/src/config/generalconfig.h
index 9678133..caddbd6 100644
--- a/libqnapi/src/config/generalconfig.h
+++ b/libqnapi/src/config/generalconfig.h
@@ -15,6 +15,7 @@
 #ifndef GENERALCONFIG_H
 #define GENERALCONFIG_H
 
+#include "../subtitlelanguage.h"
 #include <QString>
 
 enum SearchPolicy {
@@ -37,6 +38,7 @@ class GeneralConfig {
   QString language_;
   QString backupLanguage_;
   bool noBackup_;
+  LangCodeType langCodeInFileName_;
   bool quietBatch_;
   SearchPolicy searchPolicy_;
   DownloadPolicy downloadPolicy_;
@@ -48,7 +50,8 @@ class GeneralConfig {
   GeneralConfig(const QString& uiLanguage, const QString& p7zipPath,
                 const QString& tmpPath, const QString& language,
                 const QString& backupLanguage, const bool& noBackup,
-                const bool& quietBatch, const SearchPolicy& searchPolicy,
+                const LangCodeType& langCodeInFileName, const bool& quietBatch,
+                const SearchPolicy& searchPolicy,
                 const DownloadPolicy& downloadPolicy,
                 const bool& changePermissionsEnabled,
                 const QString& changePermissionsTo)
@@ -58,18 +61,37 @@ class GeneralConfig {
         language_(language),
         backupLanguage_(backupLanguage),
         noBackup_(noBackup),
+        langCodeInFileName_(langCodeInFileName),
         quietBatch_(quietBatch),
         searchPolicy_(searchPolicy),
         downloadPolicy_(downloadPolicy),
         changePermissionsEnabled_(changePermissionsEnabled),
         changePermissionsTo_(changePermissionsTo) {}
 
+  /* TODO: Fill in versions. */
+  /**
+   * @deprecated Since X.X.X. Will be removed in X.X.X.
+   *             Use constructor that accepts #LangCodeType.
+   */
+  Q_DECL_DEPRECATED_X("use constructor that accepts LangCodeType")
+  GeneralConfig(const QString& uiLanguage, const QString& p7zipPath,
+                const QString& tmpPath, const QString& language,
+                const QString& backupLanguage, const bool& noBackup,
+                const bool& quietBatch, const SearchPolicy& searchPolicy,
+                const DownloadPolicy& downloadPolicy,
+                const bool& changePermissionsEnabled,
+                const QString& changePermissionsTo)
+      : GeneralConfig(uiLanguage, p7zipPath, tmpPath, language, backupLanguage,
+          noBackup, LCT_NONE, quietBatch, searchPolicy, downloadPolicy,
+          changePermissionsEnabled, changePermissionsTo) {}
+
   QString uiLanguage() const { return uiLanguage_; }
   QString p7zipPath() const { return p7zipPath_; }
   QString tmpPath() const { return tmpPath_; }
   QString language() const { return language_; }
   QString backupLanguage() const { return backupLanguage_; }
   bool noBackup() const { return noBackup_; }
+  LangCodeType langCodeInFileName() const { return langCodeInFileName_; }
   bool quietBatch() const { return quietBatch_; }
   SearchPolicy searchPolicy() const { return searchPolicy_; }
   DownloadPolicy downloadPolicy() const { return downloadPolicy_; }
@@ -78,72 +100,79 @@ class GeneralConfig {
 
   const GeneralConfig setUiLanguage(const QString& uiLanguage) const {
     return GeneralConfig(uiLanguage, p7zipPath_, tmpPath_, language_,
-                         backupLanguage_, noBackup_, quietBatch_, searchPolicy_,
-                         downloadPolicy_, changePermissionsEnabled_,
-                         changePermissionsTo_);
+                         backupLanguage_, noBackup_, langCodeInFileName_,
+                         quietBatch_, searchPolicy_, downloadPolicy_,
+                         changePermissionsEnabled_, changePermissionsTo_);
   }
   const GeneralConfig setP7zipPath(const QString& p7zipPath) const {
     return GeneralConfig(uiLanguage_, p7zipPath, tmpPath_, language_,
-                         backupLanguage_, noBackup_, quietBatch_, searchPolicy_,
-                         downloadPolicy_, changePermissionsEnabled_,
-                         changePermissionsTo_);
+                         backupLanguage_, noBackup_, langCodeInFileName_,
+                         quietBatch_, searchPolicy_, downloadPolicy_,
+                         changePermissionsEnabled_, changePermissionsTo_);
   }
   const GeneralConfig setTmpPath(const QString& tmpPath) const {
     return GeneralConfig(uiLanguage_, p7zipPath_, tmpPath, language_,
-                         backupLanguage_, noBackup_, quietBatch_, searchPolicy_,
-                         downloadPolicy_, changePermissionsEnabled_,
-                         changePermissionsTo_);
+                         backupLanguage_, noBackup_, langCodeInFileName_,
+                         quietBatch_, searchPolicy_, downloadPolicy_,
+                         changePermissionsEnabled_, changePermissionsTo_);
   }
   const GeneralConfig setLanguage(const QString& language) const {
     return GeneralConfig(uiLanguage_, p7zipPath_, tmpPath_, language,
-                         backupLanguage_, noBackup_, quietBatch_, searchPolicy_,
-                         downloadPolicy_, changePermissionsEnabled_,
-                         changePermissionsTo_);
+                         backupLanguage_, noBackup_, langCodeInFileName_,
+                         quietBatch_, searchPolicy_, downloadPolicy_,
+                         changePermissionsEnabled_, changePermissionsTo_);
   }
   const GeneralConfig setBackupLanguage(const QString& backupLanguage) const {
     return GeneralConfig(uiLanguage_, p7zipPath_, tmpPath_, language_,
-                         backupLanguage, noBackup_, quietBatch_, searchPolicy_,
-                         downloadPolicy_, changePermissionsEnabled_,
-                         changePermissionsTo_);
+                         backupLanguage, noBackup_, langCodeInFileName_,
+                         quietBatch_, searchPolicy_, downloadPolicy_,
+                         changePermissionsEnabled_, changePermissionsTo_);
   }
   const GeneralConfig setNoBackup(const bool& noBackup) const {
     return GeneralConfig(uiLanguage_, p7zipPath_, tmpPath_, language_,
-                         backupLanguage_, noBackup, quietBatch_, searchPolicy_,
-                         downloadPolicy_, changePermissionsEnabled_,
-                         changePermissionsTo_);
+                         backupLanguage_, noBackup, langCodeInFileName_,
+                         quietBatch_, searchPolicy_, downloadPolicy_,
+                         changePermissionsEnabled_, changePermissionsTo_);
+  }
+  const GeneralConfig setLangCodeInFileName(
+      const LangCodeType& langCodeInFileName) const {
+    return GeneralConfig(uiLanguage_, p7zipPath_, tmpPath_, language_,
+                         backupLanguage_, noBackup_, langCodeInFileName,
+                         quietBatch_, searchPolicy_, downloadPolicy_,
+                         changePermissionsEnabled_, changePermissionsTo_);
   }
   const GeneralConfig setQuietBatch(const bool& quietBatch) const {
     return GeneralConfig(uiLanguage_, p7zipPath_, tmpPath_, language_,
-                         backupLanguage_, noBackup_, quietBatch, searchPolicy_,
-                         downloadPolicy_, changePermissionsEnabled_,
-                         changePermissionsTo_);
+                         backupLanguage_, noBackup_, langCodeInFileName_,
+                         quietBatch, searchPolicy_, downloadPolicy_,
+                         changePermissionsEnabled_, changePermissionsTo_);
   }
   const GeneralConfig setSearchPolicy(const SearchPolicy& searchPolicy) const {
     return GeneralConfig(uiLanguage_, p7zipPath_, tmpPath_, language_,
-                         backupLanguage_, noBackup_, quietBatch_, searchPolicy,
-                         downloadPolicy_, changePermissionsEnabled_,
-                         changePermissionsTo_);
+                         backupLanguage_, noBackup_, langCodeInFileName_,
+                         quietBatch_, searchPolicy, downloadPolicy_,
+                         changePermissionsEnabled_, changePermissionsTo_);
   }
   const GeneralConfig setDownloadPolicy(
       const DownloadPolicy& downloadPolicy) const {
     return GeneralConfig(uiLanguage_, p7zipPath_, tmpPath_, language_,
-                         backupLanguage_, noBackup_, quietBatch_, searchPolicy_,
-                         downloadPolicy, changePermissionsEnabled_,
-                         changePermissionsTo_);
+                         backupLanguage_, noBackup_, langCodeInFileName_,
+                         quietBatch_, searchPolicy_, downloadPolicy,
+                         changePermissionsEnabled_, changePermissionsTo_);
   }
   const GeneralConfig setChangePermissionsEnabled(
       const bool& changePermissionsEnabled) const {
     return GeneralConfig(uiLanguage_, p7zipPath_, tmpPath_, language_,
-                         backupLanguage_, noBackup_, quietBatch_, searchPolicy_,
-                         downloadPolicy_, changePermissionsEnabled,
-                         changePermissionsTo_);
+                         backupLanguage_, noBackup_, langCodeInFileName_,
+                         quietBatch_, searchPolicy_, downloadPolicy_,
+                         changePermissionsEnabled, changePermissionsTo_);
   }
   const GeneralConfig setChangePermissionsTo(
       const QString& changePermissionsTo) const {
     return GeneralConfig(uiLanguage_, p7zipPath_, tmpPath_, language_,
-                         backupLanguage_, noBackup_, quietBatch_, searchPolicy_,
-                         downloadPolicy_, changePermissionsEnabled_,
-                         changePermissionsTo);
+                         backupLanguage_, noBackup_, langCodeInFileName_,
+                         quietBatch_, searchPolicy_, downloadPolicy_,
+                         changePermissionsEnabled_, changePermissionsTo);
   }
 
   QString toString() const;

From 73b5363858dcb0b91be24b55802f757ec66b1548 Mon Sep 17 00:00:00 2001
From: a-sum-duma <a-sum-duma@users.noreply.github.com>
Date: Tue, 28 Jul 2020 13:47:10 +0200
Subject: [PATCH 03/10] Add support for language codes in subtitles file names
 to subtitle matcher

---
 libqnapi/src/libqnapi.cpp        |  1 +
 libqnapi/src/subtitlematcher.cpp | 50 ++++++++++++++++++++++++++------
 libqnapi/src/subtitlematcher.h   | 27 +++++++++++++++--
 3 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/libqnapi/src/libqnapi.cpp b/libqnapi/src/libqnapi.cpp
index 22c537d..b7ece4f 100644
--- a/libqnapi/src/libqnapi.cpp
+++ b/libqnapi/src/libqnapi.cpp
@@ -119,6 +119,7 @@ QSharedPointer<const SubtitleMatcher> LibQNapi::subtitleMatcher(
     const QNapiConfig& config) {
   return QSharedPointer<const SubtitleMatcher>(
       new SubtitleMatcher(config.generalConfig().noBackup(),
+                          config.generalConfig().langCodeInFileName(),
                           config.postProcessingConfig().enabled(),
                           config.postProcessingConfig().subFormat(),
                           config.postProcessingConfig().subExtension(),
diff --git a/libqnapi/src/subtitlematcher.cpp b/libqnapi/src/subtitlematcher.cpp
index 09dd402..7f8219d 100644
--- a/libqnapi/src/subtitlematcher.cpp
+++ b/libqnapi/src/subtitlematcher.cpp
@@ -16,12 +16,14 @@
 #include <QDir>
 
 SubtitleMatcher::SubtitleMatcher(
-    bool _noBackup, bool _isPostProcessingEnabled, QString _ppSubFormat,
+    bool _noBackup, LangCodeType _langCodeInFileName,
+    bool _isPostProcessingEnabled, QString _ppSubFormat,
     QString _ppSubExtension, bool _changePermissions,
     QString _changePermissionsTo,
     const QSharedPointer<const SubtitleFormatsRegistry>&
         subtitleFormatsRegistry)
     : noBackup(_noBackup),
+      langCodeInFileName(_langCodeInFileName),
       isPostProcessingEnabled(_isPostProcessingEnabled),
       ppSubFormat(_ppSubFormat),
       ppSubExtension(_ppSubExtension),
@@ -29,8 +31,23 @@ SubtitleMatcher::SubtitleMatcher(
       changePermissionsTo(_changePermissionsTo),
       subtitleFormatsRegistry(subtitleFormatsRegistry) {}
 
+/**
+ * Copy temporary subtitles file into rightful place.
+ *
+ * Given temporary file will be placed next to the given video file
+ * and renamed to match video file name. Optional features will be
+ * applied accordingly to given settings.
+ *
+ * @param subtitlesTmpFilePath Path to the temporary file.
+ * @param targetMovieFilePath Path to the video file.
+ * @param subtitlesLanguage Language of the subtitles. Used only when "language
+ *                          code in file name" option is different then
+ *                          #LCT_NONE.
+ * @return Success or failure.
+ */
 bool SubtitleMatcher::matchSubtitles(QString subtitlesTmpFilePath,
-                                     QString targetMovieFilePath) const {
+                                     QString targetMovieFilePath,
+                                     QString subtitlesLanguage) const {
   QFileInfo subtitlesTmpFileInfo(subtitlesTmpFilePath);
 
   if (!subtitlesTmpFileInfo.exists()) return false;
@@ -38,11 +55,12 @@ bool SubtitleMatcher::matchSubtitles(QString subtitlesTmpFilePath,
   QString targetExtension = selectTargetExtension(subtitlesTmpFileInfo);
 
   QString targetSubtitlesFilePath =
-      constructSubtitlePath(targetMovieFilePath, targetExtension);
+      constructSubtitlePath(targetMovieFilePath, targetExtension,
+      subtitlesLanguage);
 
   if (!isWritablePath(targetSubtitlesFilePath)) return false;
 
-  removeOrCopy(targetMovieFilePath, targetSubtitlesFilePath);
+  removeOrCopy(targetMovieFilePath, targetSubtitlesFilePath, subtitlesLanguage);
 
   bool result = false;
 
@@ -79,11 +97,23 @@ QString SubtitleMatcher::selectTargetExtension(
 
 QString SubtitleMatcher::constructSubtitlePath(QString targetMovieFilePath,
                                                QString targetExtension,
+                                               QString subtitlesLanguage,
                                                QString baseSuffix) const {
   QFileInfo targetMovieFileInfo(targetMovieFilePath);
-  return targetMovieFileInfo.path() + QDir::separator() +
-         targetMovieFileInfo.completeBaseName() + baseSuffix + "." +
-         targetExtension;
+  QString ret = targetMovieFileInfo.path() + QDir::separator() +
+         targetMovieFileInfo.completeBaseName() + baseSuffix + ".";
+
+  if (langCodeInFileName != LCT_NONE) {
+    QString langCode = SubtitleLanguage(subtitlesLanguage).toString(
+        langCodeInFileName);
+    if (!langCode.isEmpty()) {
+      ret += langCode;
+      ret += ".";
+    }
+  }
+
+  ret += targetExtension;
+  return ret;
 }
 
 bool SubtitleMatcher::isWritablePath(QString path) const {
@@ -92,12 +122,14 @@ bool SubtitleMatcher::isWritablePath(QString path) const {
 }
 
 void SubtitleMatcher::removeOrCopy(QString targetMoviefilePath,
-                                   QString targetSubtitlesFilePath) const {
+                                   QString targetSubtitlesFilePath,
+                                   QString subtitlesLanguage) const {
   if (QFile::exists(targetSubtitlesFilePath)) {
     if (!noBackup) {
       QFileInfo targetSubtitlesFileInfo(targetSubtitlesFilePath);
       QString newName = constructSubtitlePath(
-          targetMoviefilePath, targetSubtitlesFileInfo.suffix(), tr("_copy"));
+          targetMoviefilePath, targetSubtitlesFileInfo.suffix(),
+          subtitlesLanguage, tr("_copy"));
 
       if (QFile::exists(newName)) QFile::remove(newName);
 
diff --git a/libqnapi/src/subtitlematcher.h b/libqnapi/src/subtitlematcher.h
index f06b9ff..8eed15a 100644
--- a/libqnapi/src/subtitlematcher.h
+++ b/libqnapi/src/subtitlematcher.h
@@ -15,6 +15,7 @@
 #ifndef SUBTITLE_MATCHER_H
 #define SUBTITLE_MATCHER_H
 
+#include "subtitlelanguage.h"
 #include "subconvert/subtitleformatsregistry.h"
 
 #include <QFileInfo>
@@ -23,28 +24,48 @@
 class SubtitleMatcher : public QObject {
   Q_OBJECT
  public:
+  SubtitleMatcher(bool _noBackup, LangCodeType _langCodeInFileName,
+                  bool _isPostProcessingEnabled, QString _ppSubFormat,
+                  QString _ppSubExtension, bool _changePermissions,
+                  QString _changePermissionsTo,
+                  const QSharedPointer<const SubtitleFormatsRegistry>
+                      &subtitleFormatsRegistry);
+
+  /* TODO: Fill in versions. */
+  /**
+   * @deprecated Since X.X.X. Will be removed in X.X.X.
+   *             Use constructor that accepts #LangCodeType.
+   */
+  Q_DECL_DEPRECATED_X("use constructor that accepts LangCodeType")
   SubtitleMatcher(bool _noBackup, bool _isPostProcessingEnabled,
                   QString _ppSubFormat, QString _ppSubExtension,
                   bool _changePermissions, QString _changePermissionsTo,
                   const QSharedPointer<const SubtitleFormatsRegistry>
-                      &subtitleFormatsRegistry);
+                      &subtitleFormatsRegistry)
+      : SubtitleMatcher(_noBackup, LCT_NONE, _isPostProcessingEnabled,
+                        _ppSubFormat, _ppSubExtension, _changePermissions,
+                        _changePermissionsTo, subtitleFormatsRegistry) {}
 
   bool matchSubtitles(QString subtitlesTmpFilePath,
-                      QString targetMovieFilePath) const;
+                      QString targetMovieFilePath,
+                      QString subtitlesLanguage = QString()) const;
 
  private:
   QString selectTargetExtension(QFileInfo subtitlesTmpFileInfo) const;
   QString constructSubtitlePath(QString targetMovieFilePath,
                                 QString targetExtension,
+                                QString subtitlesLanguage,
                                 QString baseSuffix = "") const;
   bool isWritablePath(QString path) const;
   void removeOrCopy(QString targetMoviefilePath,
-                    QString targetSubtitlesFilePath) const;
+                    QString targetSubtitlesFilePath,
+                    QString subtitlesLanguage) const;
   bool dryCopy(QString srcFilePath, QString dstFilePath) const;
   void fixFilePermissions(QString targetSubtitlesFilePath,
                           QString changePermissionsTo) const;
 
   bool noBackup;
+  LangCodeType langCodeInFileName;
   bool isPostProcessingEnabled;
   QString ppSubFormat;
   QString ppSubExtension;

From b027f79d60371ac88f2f9c39d5f6552f8bb90cd6 Mon Sep 17 00:00:00 2001
From: a-sum-duma <a-sum-duma@users.noreply.github.com>
Date: Tue, 28 Jul 2020 13:48:09 +0200
Subject: [PATCH 04/10] Pass subtitles language to subtitle matcher

---
 cli/src/clisubtitlesdownloader.cpp | 26 +++++++++++---------------
 gui/src/forms/frmprogress.cpp      |  7 ++++---
 libqnapi/src/qnapi.cpp             | 24 ++++++++++++++++--------
 libqnapi/src/qnapi.h               | 29 +++++++++++++++++++++++++++--
 4 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/cli/src/clisubtitlesdownloader.cpp b/cli/src/clisubtitlesdownloader.cpp
index 3e5e16a..a8c5599 100644
--- a/cli/src/clisubtitlesdownloader.cpp
+++ b/cli/src/clisubtitlesdownloader.cpp
@@ -115,8 +115,7 @@ void printSubtitlesList(const Console& c, QNapi& napi) {
   }
 }
 
-Maybe<int> selectSubtitles(const Console& c, const QNapiConfig& config,
-                           QNapi& napi) {
+bool selectSubtitles(const Console& c, const QNapiConfig& config, QNapi& napi) {
   bool showList = false;
   bool napiShowList = napi.needToShowList();
 
@@ -129,30 +128,29 @@ Maybe<int> selectSubtitles(const Console& c, const QNapiConfig& config,
   }
 
   if (!showList) {
-    return just(napi.bestIdx());
+    napi.selectSubtitlesByIdx(napi.bestIdx());
   } else {
     QList<SubtitleInfo> subtitlesList = napi.listSubtitles();
 
     printSubtitlesList(c, napi);
     int selIdx = c.inputNumber(tr("Select subtitles to download: "), 0,
                                subtitlesList.size());
-    if (selIdx == 0) {
-      return nothing();
-    } else {
-      return just(selIdx - 1);
-    }
+    if (selIdx == 0) return false;
+    napi.selectSubtitlesByIdx(selIdx - 1);
   }
+
+  return true;
 }
 
-int finishSubtitles(int selIdx, const Console& c, QNapi& napi) {
+int finishSubtitles(const Console& c, QNapi& napi) {
   c.printLineOrdinary(tr("Downloading subtitles..."));
-  if (!napi.download(selIdx)) {
+  if (!napi.download()) {
     c.printLineError(tr("Unable to download subtitles!"));
     return EC_COULD_NOT_DOWNLOAD;
   }
 
   c.printLineOrdinary(tr("Unpacking subtitles..."));
-  if (!napi.unpack(selIdx)) {
+  if (!napi.unpack()) {
     c.printLineError(tr("Failed to unpack subtitles!"));
     return EC_COULD_NOT_UNARCHIVE;
   }
@@ -197,10 +195,8 @@ int downloadForMovie(const Console& c, const QString& movieFilePath, int i,
     return EC_SUBTITLES_NOT_FOUND;
   }
 
-  Maybe<int> selIdx = selectSubtitles(c, config, napi);
-
-  if (selIdx) {
-    return finishSubtitles(selIdx.value(), c, napi);
+  if (selectSubtitles(c, config, napi)) {
+    return finishSubtitles(c, napi);
   }
 
   napi.cleanup();
diff --git a/gui/src/forms/frmprogress.cpp b/gui/src/forms/frmprogress.cpp
index e5e2453..38cbb31 100644
--- a/gui/src/forms/frmprogress.cpp
+++ b/gui/src/forms/frmprogress.cpp
@@ -355,11 +355,12 @@ void GetThread::run() {
       subStatusList << SubtitleInfo::fromFailed(queue[i]);
       continue;
     }
+    napi.selectSubtitlesByIdx(selIdx);
 
     emit progressChange(i, queue.size(), 0.5);
     emit actionChange(tr("Downloading subtitles file..."));
 
-    if (!napi.download(selIdx)) {
+    if (!napi.download()) {
       ABORT_POINT
 
       ++napiFail;
@@ -372,7 +373,7 @@ void GetThread::run() {
     emit progressChange(i, queue.size(), 0.65f);
     emit actionChange(tr("Unpacking subtitles file..."));
 
-    if (!napi.unpack(selIdx)) {
+    if (!napi.unpack()) {
       ++napiFail;
       subStatusList << SubtitleInfo::fromFailed(queue[i]);
       continue;
@@ -398,7 +399,7 @@ void GetThread::run() {
     }
 
     ++napiSuccess;
-    subStatusList << napi.listSubtitles().at(selIdx);
+    subStatusList << napi.getSelectedSubtitles();
 
     napi.cleanup();
 
diff --git a/libqnapi/src/qnapi.cpp b/libqnapi/src/qnapi.cpp
index 61ffb3b..28afcc7 100644
--- a/libqnapi/src/qnapi.cpp
+++ b/libqnapi/src/qnapi.cpp
@@ -61,6 +61,7 @@ void QNapi::clearSubtitlesList() {
   foreach (QSharedPointer<SubtitleDownloadEngine> e, enginesList) {
     e->clearSubtitlesList();
   }
+  currentSubtitles = SubtitleInfo();
 }
 
 void QNapi::checksum() {
@@ -143,15 +144,21 @@ bool QNapi::needToShowList() {
 
 int QNapi::bestIdx() { return theBestIdx; }
 
-bool QNapi::download(int i) {
-  SubtitleInfo s = subtitlesList[i];
-  currentEngine = engineByName(s.engine);
-  if (!currentEngine) return false;
-  return currentEngine->download(s.id);
+/**
+ * Select subtitles to be processed.
+ * @param i Index into the list of subtitles.
+ */
+void QNapi::selectSubtitlesByIdx(int i) {
+  currentSubtitles = subtitlesList.at(i);
 }
 
-bool QNapi::unpack(int i) {
-  return currentEngine ? currentEngine->unpack(subtitlesList[i].id) : false;
+bool QNapi::download() {
+  currentEngine = engineByName(currentSubtitles.engine);
+  return currentEngine && currentEngine->download(currentSubtitles.id);
+}
+
+bool QNapi::unpack() {
+  return currentEngine && currentEngine->unpack(currentSubtitles.id);
 }
 
 bool QNapi::matchSubtitles() {
@@ -159,7 +166,8 @@ bool QNapi::matchSubtitles() {
     QSharedPointer<const SubtitleMatcher> matcher =
         LibQNapi::subtitleMatcher(config);
     return matcher->matchSubtitles(currentEngine->subtitlesTmp,
-                                   currentEngine->movie);
+                                   currentEngine->movie,
+                                   currentSubtitles.lang);
   }
 
   return false;
diff --git a/libqnapi/src/qnapi.h b/libqnapi/src/qnapi.h
index 005241c..6072c3a 100644
--- a/libqnapi/src/qnapi.h
+++ b/libqnapi/src/qnapi.h
@@ -49,11 +49,35 @@ class QNapi {
   bool needToShowList();
   int bestIdx();
 
-  bool download(int i);
-  bool unpack(int i);
+  void selectSubtitlesByIdx(int i);
+
+  /**
+   * Get subtitles selected to be processed.
+   * @return The subtitles.
+   */
+  const SubtitleInfo& getSelectedSubtitles() const { return currentSubtitles; }
+
+  bool download();
+  bool unpack();
   bool matchSubtitles();
   void postProcessSubtitles() const;
 
+  /* TODO: Fill in versions. */
+  /**
+   * @deprecated Since X.X.X. Will be removed in X.X.X.
+   *             Use selectSubtitlesByIdx(i) + download().
+   */
+  Q_DECL_DEPRECATED_X("use selectSubtitlesByIdx(i) + download()")
+  bool download(int i) { return selectSubtitlesByIdx(i), download(); }
+
+  /* TODO: Fill in versions. */
+  /**
+   * @deprecated Since X.X.X. Will be removed in X.X.X.
+   *             Use unpack().
+   */
+  Q_DECL_DEPRECATED_X("use unpack()")
+  bool unpack(int) { return unpack(); };
+
   void cleanup();
   QString error();
 
@@ -66,6 +90,7 @@ class QNapi {
   QString errorMsg;
   QList<QSharedPointer<SubtitleDownloadEngine>> enginesList;
   QList<SubtitleInfo> subtitlesList;
+  SubtitleInfo currentSubtitles; ///< Subtitles selected to be processed.
   QSharedPointer<SubtitleDownloadEngine> currentEngine;
 
   // najlepszy indeks napisow

From 649c10a6d41d13c3dc4b252693cb9d9e96cecda4 Mon Sep 17 00:00:00 2001
From: a-sum-duma <a-sum-duma@users.noreply.github.com>
Date: Tue, 28 Jul 2020 13:49:02 +0200
Subject: [PATCH 05/10] Support language codes in file names while
 batch-downloading

---
 gui/src/forms/frmscan.cpp | 21 +++++++++++++++++----
 gui/src/forms/frmscan.h   |  4 ++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/gui/src/forms/frmscan.cpp b/gui/src/forms/frmscan.cpp
index f349b9d..060b1c0 100644
--- a/gui/src/forms/frmscan.cpp
+++ b/gui/src/forms/frmscan.cpp
@@ -236,7 +236,11 @@ void frmScan::accept() {
   QDialog::accept();
 }
 
-ScanFilesThread::ScanFilesThread() : staticConfig(LibQNapi::staticConfig()) {}
+ScanFilesThread::ScanFilesThread()
+    : subExtensionFilters(LibQNapi::staticConfig()->subtitleExtensionsFilter()
+          .split(" ")),
+      subLangFilter("^()|(\\.[a-z][a-z][a-z]?)$",
+          QRegularExpression::CaseInsensitiveOption) {}
 
 void ScanFilesThread::run() {
   abort = false;
@@ -264,6 +268,14 @@ bool ScanFilesThread::doScan(const QString &path, QDir::Filters filters) {
 
   emit folderChange(myPath);
 
+  QStringList subtitlesBaseNames;
+  if (skipIfSubtitlesExists) {
+    for (const auto &s : QDir(myPath).entryInfoList(subExtensionFilters,
+        QDir::Files | QDir::Hidden)) {
+      subtitlesBaseNames << s.completeBaseName();
+    }
+  }
+
   QFileInfoList list = QDir(myPath).entryInfoList(scanFilters, filters);
 
   for (QFileInfoList::iterator p = list.begin(); p != list.end(); p++) {
@@ -276,9 +288,10 @@ bool ScanFilesThread::doScan(const QString &path, QDir::Filters filters) {
 
       bool subtitleFileFound = false;
       if (skipIfSubtitlesExists) {
-        foreach (QString subExt, staticConfig->subtitleExtensions()) {
-          if (QFile::exists((*p).absolutePath() + "/" +
-                            (*p).completeBaseName() + "." + subExt)) {
+        QString baseName = (*p).completeBaseName();
+        for (const auto &subBaseName : subtitlesBaseNames) {
+          if (subBaseName.startsWith(baseName, Qt::CaseInsensitive) &&
+              subLangFilter.match(subBaseName, baseName.length()).hasMatch()) {
             subtitleFileFound = true;
             break;
           }
diff --git a/gui/src/forms/frmscan.h b/gui/src/forms/frmscan.h
index 78fd9d2..c520b77 100644
--- a/gui/src/forms/frmscan.h
+++ b/gui/src/forms/frmscan.h
@@ -52,9 +52,9 @@ class ScanFilesThread : public QNapiThread {
  private:
   bool doScan(const QString &path, QDir::Filters filters);
 
-  QSharedPointer<const StaticConfig> staticConfig;
   QString searchPath;
-  QStringList scanFilters, skipFilters;
+  QStringList scanFilters, skipFilters, subExtensionFilters;
+  QRegularExpression subLangFilter;
   bool skipIfSubtitlesExists, followSymLinks;
   QSet<QString> visited;
 };

From 459747db68023bee6e89b5ac9ab49059eb162655 Mon Sep 17 00:00:00 2001
From: a-sum-duma <a-sum-duma@users.noreply.github.com>
Date: Tue, 28 Jul 2020 13:49:56 +0200
Subject: [PATCH 06/10] Update translation files

---
 translations/qnapi_it.ts | 200 +++++++++++++++++++++------------------
 translations/qnapi_pl.ts | 200 +++++++++++++++++++++------------------
 2 files changed, 220 insertions(+), 180 deletions(-)

diff --git a/translations/qnapi_it.ts b/translations/qnapi_it.ts
index fce3cba..9495d18 100644
--- a/translations/qnapi_it.ts
+++ b/translations/qnapi_it.ts
@@ -122,62 +122,62 @@
         <translation> (cattiva qualità)</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="137"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="136"/>
         <source>Select subtitles to download: </source>
         <translation>Selezionare sottotitoli da scaricare: </translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="148"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="146"/>
         <source>Downloading subtitles...</source>
         <translation>Scaricamento sottotitoli...</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="150"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="148"/>
         <source>Unable to download subtitles!</source>
         <translation>Impossibile scaricare sottotitoli!</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="154"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="152"/>
         <source>Unpacking subtitles...</source>
         <translation>Scompattamento sottotitoli...</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="156"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="154"/>
         <source>Failed to unpack subtitles!</source>
         <translation>Impossibile scompattare i sottotitoli!</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="161"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="159"/>
         <source>Post-processing subtitles file...</source>
         <translation>Post-elaborazione file sottotitoli...</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="165"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="163"/>
         <source>Adjusting subtitles...</source>
         <translation>Adattamento sottotitoli...</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="167"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="165"/>
         <source>Could not adjust subtitles!</source>
         <translation>Impossibile adattare i sottotitoli!</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="178"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="176"/>
         <source>Downloading subtitles for &apos;%1&apos; [%2/%3]</source>
         <translation>Scaricamento sottotitoli per &apos;%1&apos; [%2/%3]</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="186"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="184"/>
         <source>No permission to write to the directory &apos;%1&apos;!</source>
         <translation>Mancano i permessi per scrivere nella cartella &apos;%1&apos;!</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="196"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="194"/>
         <source>Subtitles not found!</source>
         <translation>Sottotitoli non trovati!</translation>
     </message>
     <message numerus="yes">
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="228"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="224"/>
         <source>Processing of remaining %n file(s) was ignored due to critical error.</source>
         <translation>
             <numerusform>L&apos;elaborazione di un file rimanente è stato ignorato a causa di un errore critico.</numerusform>
@@ -282,27 +282,27 @@
         <translation>Ricerca sottotitoli in lingua alternativa [%1] (%2)...</translation>
     </message>
     <message>
-        <location filename="../gui/src/forms/frmprogress.cpp" line="360"/>
+        <location filename="../gui/src/forms/frmprogress.cpp" line="361"/>
         <source>Downloading subtitles file...</source>
         <translation>Scaricamento file sottotitoli...</translation>
     </message>
     <message>
-        <location filename="../gui/src/forms/frmprogress.cpp" line="373"/>
+        <location filename="../gui/src/forms/frmprogress.cpp" line="374"/>
         <source>Unpacking subtitles file...</source>
         <translation>Scompattamento file sottotitoli...</translation>
     </message>
     <message>
-        <location filename="../gui/src/forms/frmprogress.cpp" line="383"/>
+        <location filename="../gui/src/forms/frmprogress.cpp" line="384"/>
         <source>Post-processing subtitles...</source>
         <translation>Post-elaborazione sottotitoli...</translation>
     </message>
     <message>
-        <location filename="../gui/src/forms/frmprogress.cpp" line="388"/>
+        <location filename="../gui/src/forms/frmprogress.cpp" line="389"/>
         <source>Adjusting subtitles...</source>
         <translation>Adattamento sottotitoli...</translation>
     </message>
     <message>
-        <location filename="../gui/src/forms/frmprogress.cpp" line="396"/>
+        <location filename="../gui/src/forms/frmprogress.cpp" line="397"/>
         <source>Could not adjust subtitles!</source>
         <translation>Impossibile adattare i sottotitoli!</translation>
     </message>
@@ -503,187 +503,187 @@
         <translation>Sottotitoli scaricati e processati da QNapi |</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="63"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="57"/>
         <source>Albanian</source>
         <translation>Albanese</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="67"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="61"/>
         <source>English</source>
         <translation>Inglese</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="71"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="65"/>
         <source>Arabic</source>
         <translation>Arabo</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="75"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="69"/>
         <source>Bulgarian</source>
         <translation>Bulgaro</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="79"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="73"/>
         <source>Chinese</source>
         <translation>Cinese</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="83"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="77"/>
         <source>Croatian</source>
         <translation>Croato</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="87"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="81"/>
         <source>Czech</source>
         <translation>Ceco</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="91"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="85"/>
         <source>Danish</source>
         <translation>Danese</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="95"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="89"/>
         <source>Estonian</source>
         <translation>Estone</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="99"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="93"/>
         <source>Finnish</source>
         <translation>Finlandese</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="103"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="97"/>
         <source>French</source>
         <translation>Francese</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="107"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="101"/>
         <source>Galician</source>
         <translation>Gallego</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="111"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="105"/>
         <source>Greek</source>
         <translation>Greco</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="115"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="109"/>
         <source>Hebrew</source>
         <translation>Ebraico</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="119"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="113"/>
         <source>Spanish</source>
         <translation>Spagnolo</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="123"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="117"/>
         <source>Dutch</source>
         <translation>Olandese</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="127"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="121"/>
         <source>Indonesian</source>
         <translation>Indonesiano</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="131"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="125"/>
         <source>Japanese</source>
         <translation>Giapponese</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="135"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="129"/>
         <source>Korean</source>
         <translation>Coreano</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="139"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="133"/>
         <source>Macedonian</source>
         <translation>Macedone</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="143"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="137"/>
         <source>German</source>
         <translation>Tedesco</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="147"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="141"/>
         <source>Norwegian</source>
         <translation>Norvegese</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="151"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="145"/>
         <source>Occitan</source>
         <translation>Occitano</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="155"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="149"/>
         <source>Persian (farsi)</source>
         <translation>Persiano (farsi)</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="159"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="153"/>
         <source>Polish</source>
         <translation>Polacco</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="163"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="157"/>
         <source>Portuguese</source>
         <translation>Portoghese</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="167"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="161"/>
         <source>Portuguese-BR</source>
         <translation>Portoghese-BR</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="171"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="165"/>
         <source>Russian</source>
         <translation>Russo</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="175"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="169"/>
         <source>Romanian</source>
         <translation>Romeno</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="179"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="173"/>
         <source>Serbian</source>
         <translation>Serbo</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="183"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="177"/>
         <source>Slovenian</source>
         <translation>Sloveno</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="187"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="181"/>
         <source>Swedish</source>
         <translation>Svedese</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="191"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="185"/>
         <source>Slovak</source>
         <translation>Slovacco</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="195"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="189"/>
         <source>Turkish</source>
         <translation>Turco</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="199"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="193"/>
         <source>Vietnamese</source>
         <translation>Vietnamita</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="203"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="197"/>
         <source>Hungarian</source>
         <translation>Ungherese</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="207"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="201"/>
         <source>Italian</source>
         <translation>Italiano</translation>
     </message>
@@ -708,7 +708,7 @@
         <translation>QNapi: operazione conclusa.</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/qnapi.cpp" line="89"/>
+        <location filename="../libqnapi/src/qnapi.cpp" line="90"/>
         <source>No subtitles found!</source>
         <translation>Nessun sottotitolo trovato!</translation>
     </message>
@@ -756,7 +756,7 @@
 <context>
     <name>SubtitleMatcher</name>
     <message>
-        <location filename="../libqnapi/src/subtitlematcher.cpp" line="100"/>
+        <location filename="../libqnapi/src/subtitlematcher.cpp" line="132"/>
         <source>_copy</source>
         <translation>_copia</translation>
     </message>
@@ -1204,7 +1204,7 @@
     </message>
     <message>
         <location filename="../gui/ui/frmoptions.ui" line="230"/>
-        <location filename="../gui/src/forms/frmoptions.cpp" line="405"/>
+        <location filename="../gui/src/forms/frmoptions.cpp" line="408"/>
         <source>Auto-detected based on system language (%1)</source>
         <translation>Autorilevamento in base alla lingua di sistema (%1)</translation>
     </message>
@@ -1232,164 +1232,184 @@
         <translation>Il cambiamento alla lingua della UI verrà attuato al prossimo avvio dell&apos;applicazione</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="281"/>
+        <location filename="../gui/ui/frmoptions.ui" line="280"/>
+        <source>Add language code to subtitle file name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/ui/frmoptions.ui" line="288"/>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/ui/frmoptions.ui" line="293"/>
+        <source>Two-letter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/ui/frmoptions.ui" line="298"/>
+        <source>Three-letter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/ui/frmoptions.ui" line="307"/>
         <source>Subtitles download engines</source>
         <translation>Motori di scaricamento sottotitoli</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="287"/>
+        <location filename="../gui/ui/frmoptions.ui" line="313"/>
         <source>Available engines to download subtitles from:</source>
         <translation>Motori disponibili da cui scaricare sottotitoli:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="300"/>
+        <location filename="../gui/ui/frmoptions.ui" line="326"/>
         <source>Subtitles download policy:</source>
         <translation>Politiche scaricamento sottotitoli:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="314"/>
+        <location filename="../gui/ui/frmoptions.ui" line="340"/>
         <source>Always show a list of available subtitles</source>
         <translation>Mostra sempre una lista di sottotitoli disponibili</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="319"/>
+        <location filename="../gui/ui/frmoptions.ui" line="345"/>
         <source>Show a list of available subtitles only if needed</source>
         <translation>Mostra una lista di sottotitoli disponibili solo se necessario</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="324"/>
+        <location filename="../gui/ui/frmoptions.ui" line="350"/>
         <source>Always obtain first matching subtitles and never show a list</source>
         <translation>Ottieni sempre i primi sottotitoli corrispondenti e non mostrare mai una lista</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="357"/>
+        <location filename="../gui/ui/frmoptions.ui" line="383"/>
         <source>Move up</source>
         <translation>Sposta in su</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="374"/>
+        <location filename="../gui/ui/frmoptions.ui" line="400"/>
         <source>Subtitles search policy:</source>
         <translation>Politiche ricerca sottotitoli:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="384"/>
+        <location filename="../gui/ui/frmoptions.ui" line="410"/>
         <source>Move down  </source>
         <translation>Sposta in giù  </translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="398"/>
+        <location filename="../gui/ui/frmoptions.ui" line="424"/>
         <source>Information</source>
         <translation>Informazioni</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="412"/>
+        <location filename="../gui/ui/frmoptions.ui" line="438"/>
         <source>Configure</source>
         <translation>Configura</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="427"/>
+        <location filename="../gui/ui/frmoptions.ui" line="453"/>
         <source>Stop the search after finding a matching subtitles (faster)</source>
         <translation>Interrompi la ricerca dopo aver trovato sottotitoli (veloce)</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="432"/>
+        <location filename="../gui/ui/frmoptions.ui" line="458"/>
         <source>Search all available subtitles (slower)</source>
         <translation>Cerca tutti i sottotitoli disponibili (lento)</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="437"/>
+        <location filename="../gui/ui/frmoptions.ui" line="463"/>
         <source>Find all subtitles, also in alternative language (slowest)</source>
         <translation>Trova tutti i sottotitoli, anche in lingua alternativa (molto lento)</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="446"/>
+        <location filename="../gui/ui/frmoptions.ui" line="472"/>
         <source>Subtitles post-processing</source>
         <translation>Post-elaborazione sottotitoli</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="452"/>
+        <location filename="../gui/ui/frmoptions.ui" line="478"/>
         <source>Enable post-processing for downloaded subtitles</source>
         <translation>Abilita post-elaborazione per i sottotitoli scaricati</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="466"/>
+        <location filename="../gui/ui/frmoptions.ui" line="492"/>
         <source>Character encoding:</source>
         <translation>Codifica caratteri:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="480"/>
-        <location filename="../gui/ui/frmoptions.ui" line="691"/>
+        <location filename="../gui/ui/frmoptions.ui" line="506"/>
+        <location filename="../gui/ui/frmoptions.ui" line="717"/>
         <source>Keep the original</source>
         <translation>Conserva l&apos;originale</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="485"/>
+        <location filename="../gui/ui/frmoptions.ui" line="511"/>
         <source>Convert (settings below)</source>
         <translation>Converti (impostazioni sotto)</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="490"/>
+        <location filename="../gui/ui/frmoptions.ui" line="516"/>
         <source>Replace diacritic characters with their ASCII equivalents</source>
         <translation>Sostituisci caratteri diacritici con gli equivalenti ASCII</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="527"/>
+        <location filename="../gui/ui/frmoptions.ui" line="553"/>
         <source>From:</source>
         <translation>Da:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="580"/>
+        <location filename="../gui/ui/frmoptions.ui" line="606"/>
         <source>To:</source>
         <translation>A:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="650"/>
+        <location filename="../gui/ui/frmoptions.ui" line="676"/>
         <source>Show all available character encodings</source>
         <translation>Mostra tutte le codifiche carattere disponibili</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="677"/>
+        <location filename="../gui/ui/frmoptions.ui" line="703"/>
         <source>Subtitles format:</source>
         <translation>Formato sottotitoli:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="699"/>
+        <location filename="../gui/ui/frmoptions.ui" line="725"/>
         <source>Subtitles extension:</source>
         <translation>Estensione sottotitoli:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="713"/>
+        <location filename="../gui/ui/frmoptions.ui" line="739"/>
         <location filename="../gui/src/forms/frmoptions.cpp" line="257"/>
         <source>Default</source>
         <translation>Predefinita</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="739"/>
+        <location filename="../gui/ui/frmoptions.ui" line="765"/>
         <source>Do not add information about QNapi while converting between formats</source>
         <translation>Non aggiungere informazioni su QNapi nella conversione tra formati</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="749"/>
+        <location filename="../gui/ui/frmoptions.ui" line="775"/>
         <source>Attempt to automatically detect encoding</source>
         <translation>Tenta di riconoscere automaticamente la codifica</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="759"/>
+        <location filename="../gui/ui/frmoptions.ui" line="785"/>
         <source>Remove subtitles lines that contain the following words:</source>
         <translation>Rimuovi linee sottotitoli che contengono le parole seguenti:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="783"/>
+        <location filename="../gui/ui/frmoptions.ui" line="809"/>
         <source>Restore defaults</source>
         <translation>Ripristina predefiniti</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="803"/>
+        <location filename="../gui/ui/frmoptions.ui" line="829"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="810"/>
+        <location filename="../gui/ui/frmoptions.ui" line="836"/>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
diff --git a/translations/qnapi_pl.ts b/translations/qnapi_pl.ts
index 54e8fd6..932d84b 100644
--- a/translations/qnapi_pl.ts
+++ b/translations/qnapi_pl.ts
@@ -122,62 +122,62 @@
         <translation> (zle)</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="137"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="136"/>
         <source>Select subtitles to download: </source>
         <translation>Wybierz napisy do pobrania: </translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="148"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="146"/>
         <source>Downloading subtitles...</source>
         <translation>Pobieranie napisow...</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="150"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="148"/>
         <source>Unable to download subtitles!</source>
         <translation>Nie udalo sie pobrac napisow!</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="154"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="152"/>
         <source>Unpacking subtitles...</source>
         <translation>Rozpakowywanie napisow...</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="156"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="154"/>
         <source>Failed to unpack subtitles!</source>
         <translation>Nie udalo sie rozpakowac napisow!</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="161"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="159"/>
         <source>Post-processing subtitles file...</source>
         <translation>Przetwarzanie napisow...</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="165"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="163"/>
         <source>Adjusting subtitles...</source>
         <translation>Dopasowywanie napisów...</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="167"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="165"/>
         <source>Could not adjust subtitles!</source>
         <translation>Nie udało się dopasować napisów!</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="178"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="176"/>
         <source>Downloading subtitles for &apos;%1&apos; [%2/%3]</source>
         <translation>Pobieranie napisow dla &apos;%1&apos; [%2/%3]</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="186"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="184"/>
         <source>No permission to write to the directory &apos;%1&apos;!</source>
         <translation>Brak uprawnień zapisu do katalogu &apos;%1&apos;!</translation>
     </message>
     <message>
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="196"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="194"/>
         <source>Subtitles not found!</source>
         <translation>Nie znaleziono napisow!</translation>
     </message>
     <message numerus="yes">
-        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="228"/>
+        <location filename="../cli/src/clisubtitlesdownloader.cpp" line="224"/>
         <source>Processing of remaining %n file(s) was ignored due to critical error.</source>
         <translation>
             <numerusform>Pobieranie pozostalego 1 pliku przerwane z powodu bledu.</numerusform>
@@ -283,27 +283,27 @@
         <translation>Szukanie napisów w języku zapasowym [%1] (%2)...</translation>
     </message>
     <message>
-        <location filename="../gui/src/forms/frmprogress.cpp" line="360"/>
+        <location filename="../gui/src/forms/frmprogress.cpp" line="361"/>
         <source>Downloading subtitles file...</source>
         <translation>Pobieranie napisów dla pliku...</translation>
     </message>
     <message>
-        <location filename="../gui/src/forms/frmprogress.cpp" line="373"/>
+        <location filename="../gui/src/forms/frmprogress.cpp" line="374"/>
         <source>Unpacking subtitles file...</source>
         <translation>Rozpakowywanie napisów...</translation>
     </message>
     <message>
-        <location filename="../gui/src/forms/frmprogress.cpp" line="383"/>
+        <location filename="../gui/src/forms/frmprogress.cpp" line="384"/>
         <source>Post-processing subtitles...</source>
         <translation>Przetwarzanie napisów...</translation>
     </message>
     <message>
-        <location filename="../gui/src/forms/frmprogress.cpp" line="388"/>
+        <location filename="../gui/src/forms/frmprogress.cpp" line="389"/>
         <source>Adjusting subtitles...</source>
         <translation>Dopasowywanie napisów...</translation>
     </message>
     <message>
-        <location filename="../gui/src/forms/frmprogress.cpp" line="396"/>
+        <location filename="../gui/src/forms/frmprogress.cpp" line="397"/>
         <source>Could not adjust subtitles!</source>
         <translation>Nie udało się dopasować napisów!</translation>
     </message>
@@ -519,7 +519,7 @@
         <translation>QNapi: zakończono.</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/qnapi.cpp" line="89"/>
+        <location filename="../libqnapi/src/qnapi.cpp" line="90"/>
         <source>No subtitles found!</source>
         <translation>Nie znaleziono napisów!</translation>
     </message>
@@ -529,187 +529,187 @@
         <translation>Napisy pobrane i przetworzone programem QNapi|</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="63"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="57"/>
         <source>Albanian</source>
         <translation>Albański</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="67"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="61"/>
         <source>English</source>
         <translation>Angielski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="71"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="65"/>
         <source>Arabic</source>
         <translation>Arabski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="75"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="69"/>
         <source>Bulgarian</source>
         <translation>Bułgarski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="79"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="73"/>
         <source>Chinese</source>
         <translation>Chiński</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="83"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="77"/>
         <source>Croatian</source>
         <translation>Chorwacki</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="87"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="81"/>
         <source>Czech</source>
         <translation>Czeski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="91"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="85"/>
         <source>Danish</source>
         <translation>Duński</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="95"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="89"/>
         <source>Estonian</source>
         <translation>Estoński</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="99"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="93"/>
         <source>Finnish</source>
         <translation>Fiński</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="103"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="97"/>
         <source>French</source>
         <translation>Francuski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="107"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="101"/>
         <source>Galician</source>
         <translation>Galicyjski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="111"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="105"/>
         <source>Greek</source>
         <translation>Grecki</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="115"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="109"/>
         <source>Hebrew</source>
         <translation>Hebrajski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="119"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="113"/>
         <source>Spanish</source>
         <translation>Hiszpanski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="123"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="117"/>
         <source>Dutch</source>
         <translation>Holenderski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="127"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="121"/>
         <source>Indonesian</source>
         <translation>Indonezyjski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="131"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="125"/>
         <source>Japanese</source>
         <translation>Japoński</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="135"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="129"/>
         <source>Korean</source>
         <translation>Koreański</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="139"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="133"/>
         <source>Macedonian</source>
         <translation>Macedoński</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="143"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="137"/>
         <source>German</source>
         <translation>Niemiecki</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="147"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="141"/>
         <source>Norwegian</source>
         <translation>Norweski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="151"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="145"/>
         <source>Occitan</source>
         <translation>Oksytański</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="155"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="149"/>
         <source>Persian (farsi)</source>
         <translation>Perski (farsi)</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="159"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="153"/>
         <source>Polish</source>
         <translation>Polski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="163"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="157"/>
         <source>Portuguese</source>
         <translation>Portugalski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="167"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="161"/>
         <source>Portuguese-BR</source>
         <translation>Portugalski-BR</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="171"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="165"/>
         <source>Russian</source>
         <translation>Rosyjski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="175"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="169"/>
         <source>Romanian</source>
         <translation>Rumuński</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="179"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="173"/>
         <source>Serbian</source>
         <translation>Serbski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="183"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="177"/>
         <source>Slovenian</source>
         <translation>Słoweński</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="187"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="181"/>
         <source>Swedish</source>
         <translation>Szwedzki</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="191"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="185"/>
         <source>Slovak</source>
         <translation>Słowacki</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="195"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="189"/>
         <source>Turkish</source>
         <translation>Turecki</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="199"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="193"/>
         <source>Vietnamese</source>
         <translation>Wietnamski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="203"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="197"/>
         <source>Hungarian</source>
         <translation>Węgierski</translation>
     </message>
     <message>
-        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="207"/>
+        <location filename="../libqnapi/src/subtitlelanguage.cpp" line="201"/>
         <source>Italian</source>
         <translation>Włoski</translation>
     </message>
@@ -757,7 +757,7 @@
 <context>
     <name>SubtitleMatcher</name>
     <message>
-        <location filename="../libqnapi/src/subtitlematcher.cpp" line="100"/>
+        <location filename="../libqnapi/src/subtitlematcher.cpp" line="132"/>
         <source>_copy</source>
         <translation>_kopia</translation>
     </message>
@@ -1204,7 +1204,7 @@
     </message>
     <message>
         <location filename="../gui/ui/frmoptions.ui" line="230"/>
-        <location filename="../gui/src/forms/frmoptions.cpp" line="405"/>
+        <location filename="../gui/src/forms/frmoptions.cpp" line="408"/>
         <source>Auto-detected based on system language (%1)</source>
         <translation>Wykryty automatycznie z ustawień systemu (%1)</translation>
     </message>
@@ -1232,164 +1232,184 @@
         <translation>Zmiana języka nastąpi przy następnym uruchomieniu aplikacji</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="281"/>
+        <location filename="../gui/ui/frmoptions.ui" line="280"/>
+        <source>Add language code to subtitle file name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/ui/frmoptions.ui" line="288"/>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/ui/frmoptions.ui" line="293"/>
+        <source>Two-letter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/ui/frmoptions.ui" line="298"/>
+        <source>Three-letter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/ui/frmoptions.ui" line="307"/>
         <source>Subtitles download engines</source>
         <translation>Moduły pobierania napisów</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="287"/>
+        <location filename="../gui/ui/frmoptions.ui" line="313"/>
         <source>Available engines to download subtitles from:</source>
         <translation>Dostępne moduły pobierania napisów:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="300"/>
+        <location filename="../gui/ui/frmoptions.ui" line="326"/>
         <source>Subtitles download policy:</source>
         <translation>Polityka pobierania napisów:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="314"/>
+        <location filename="../gui/ui/frmoptions.ui" line="340"/>
         <source>Always show a list of available subtitles</source>
         <translation>Zawsze pokazuj listę dostępnych napisów</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="319"/>
+        <location filename="../gui/ui/frmoptions.ui" line="345"/>
         <source>Show a list of available subtitles only if needed</source>
         <translation>Pokazuj listę dostępnych napisów tylko wtedy, gdy potrzeba</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="324"/>
+        <location filename="../gui/ui/frmoptions.ui" line="350"/>
         <source>Always obtain first matching subtitles and never show a list</source>
         <translation>Zawsze pobieraj pierwsze pasujące napisy i nigdy nie pokazuj listy</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="357"/>
+        <location filename="../gui/ui/frmoptions.ui" line="383"/>
         <source>Move up</source>
         <translation>Przesuń do góry</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="374"/>
+        <location filename="../gui/ui/frmoptions.ui" line="400"/>
         <source>Subtitles search policy:</source>
         <translation>Wyszukiwanie napisów:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="384"/>
+        <location filename="../gui/ui/frmoptions.ui" line="410"/>
         <source>Move down  </source>
         <translation>Przesuń na dół  </translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="398"/>
+        <location filename="../gui/ui/frmoptions.ui" line="424"/>
         <source>Information</source>
         <translation>Informacje</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="412"/>
+        <location filename="../gui/ui/frmoptions.ui" line="438"/>
         <source>Configure</source>
         <translation>Konfiguruj</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="427"/>
+        <location filename="../gui/ui/frmoptions.ui" line="453"/>
         <source>Stop the search after finding a matching subtitles (faster)</source>
         <translation>Przerwij wyszukiwanie po znalezieniu pasujących napisów (szybciej)</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="432"/>
+        <location filename="../gui/ui/frmoptions.ui" line="458"/>
         <source>Search all available subtitles (slower)</source>
         <translation>Wyszukaj wszystkie dostępne napisy (wolniej)</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="437"/>
+        <location filename="../gui/ui/frmoptions.ui" line="463"/>
         <source>Find all subtitles, also in alternative language (slowest)</source>
         <translation>Wyszukaj wszystkie napisy, także w zapasowym języku (najwolniej)</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="446"/>
+        <location filename="../gui/ui/frmoptions.ui" line="472"/>
         <source>Subtitles post-processing</source>
         <translation>Przetwarzanie napisów</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="452"/>
+        <location filename="../gui/ui/frmoptions.ui" line="478"/>
         <source>Enable post-processing for downloaded subtitles</source>
         <translation>Włącz przetwarzanie pobranych napisów</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="466"/>
+        <location filename="../gui/ui/frmoptions.ui" line="492"/>
         <source>Character encoding:</source>
         <translation>Kodowanie znaków:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="480"/>
-        <location filename="../gui/ui/frmoptions.ui" line="691"/>
+        <location filename="../gui/ui/frmoptions.ui" line="506"/>
+        <location filename="../gui/ui/frmoptions.ui" line="717"/>
         <source>Keep the original</source>
         <translation>Pozostaw oryginalne</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="485"/>
+        <location filename="../gui/ui/frmoptions.ui" line="511"/>
         <source>Convert (settings below)</source>
         <translation>Konwertuj (ustawienia poniżej)</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="490"/>
+        <location filename="../gui/ui/frmoptions.ui" line="516"/>
         <source>Replace diacritic characters with their ASCII equivalents</source>
         <translation>Zamień znaki diakrytyczne na ich odpowiedniki ASCII</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="527"/>
+        <location filename="../gui/ui/frmoptions.ui" line="553"/>
         <source>From:</source>
         <translation>Z:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="580"/>
+        <location filename="../gui/ui/frmoptions.ui" line="606"/>
         <source>To:</source>
         <translation>Na:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="650"/>
+        <location filename="../gui/ui/frmoptions.ui" line="676"/>
         <source>Show all available character encodings</source>
         <translation>Pokaż wszystkie dostępne kodowania znaków</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="677"/>
+        <location filename="../gui/ui/frmoptions.ui" line="703"/>
         <source>Subtitles format:</source>
         <translation>Format napisów:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="699"/>
+        <location filename="../gui/ui/frmoptions.ui" line="725"/>
         <source>Subtitles extension:</source>
         <translation>Rozszerzenie napisów:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="713"/>
+        <location filename="../gui/ui/frmoptions.ui" line="739"/>
         <location filename="../gui/src/forms/frmoptions.cpp" line="257"/>
         <source>Default</source>
         <translation>Domyślne</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="739"/>
+        <location filename="../gui/ui/frmoptions.ui" line="765"/>
         <source>Do not add information about QNapi while converting between formats</source>
         <translation>Nie dodawaj informacji o QNapi przy konwersji pomiędzy formatami</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="749"/>
+        <location filename="../gui/ui/frmoptions.ui" line="775"/>
         <source>Attempt to automatically detect encoding</source>
         <translation>Próbuj automatycznie wykrywać kodowanie źródłowe</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="759"/>
+        <location filename="../gui/ui/frmoptions.ui" line="785"/>
         <source>Remove subtitles lines that contain the following words:</source>
         <translation>Usuń z pliku z napisami linie, które zawierają następujące słowa:</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="783"/>
+        <location filename="../gui/ui/frmoptions.ui" line="809"/>
         <source>Restore defaults</source>
         <translation>Przywróć domyślne</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="803"/>
+        <location filename="../gui/ui/frmoptions.ui" line="829"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../gui/ui/frmoptions.ui" line="810"/>
+        <location filename="../gui/ui/frmoptions.ui" line="836"/>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>

From 6a22e90fb3acda75b739cbdb9e13f5aadd6b64ce Mon Sep 17 00:00:00 2001
From: a-sum-duma <a-sum-duma@users.noreply.github.com>
Date: Tue, 28 Jul 2020 13:50:31 +0200
Subject: [PATCH 07/10] Polish translation for "language code in file name"
 setting

---
 translations/qnapi_pl.qm | Bin 38524 -> 38880 bytes
 translations/qnapi_pl.ts |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/translations/qnapi_pl.qm b/translations/qnapi_pl.qm
index c4adfdf1e8abf72d4432afbf27116d133b6d0cae..bc2baea3dbac810ca3fcd72d5bcf59c0a3e2ae53 100644
GIT binary patch
delta 1698
zcmZ`(SyWS36y2F#^71kWqT&Qus0a!PV6low85HLriY`S_gG7vkfCvN-h?GG@Y{5sn
ztRrfn&J)g3Tcyt6gchZirLd^lRn!W8fV%9_toE-T@9lT*yZ4@b_SxsYJ0N^~SXkyH
zI9=XH>sFcvNFo4pJs>>{M9c)d<v`v!V8I9=qpLh7JT&<*B;Vx%MY&+AssO<~JGvKw
zxjhWnunWw?7(l-b{uizQ6I(In!Y@F0G`<+*1S~R?x4YUJpkGhN`mV;@$tEDT0P}YJ
z30TB1R%Zf%Cy*$tqr+~Yq>mnmb4TgBGr&k2s^-@K$&0W@rv>~X?U-;9C!!jGv<Il|
zE&)O>qFEkEK@Z~5q3b~6Ts-}LCor@d&wjrKOkFw#&#y%TGfttS%@Z(n37lIge+N!5
zU@{A&_7iAke*=W|5)5nH3#2p&R%(v};tD&u9uZiZU4Y`Ve1kwMEb7I-7q|$m4*XzY
zkZonQ=<L*HAU#a<bK46NwZ)G938G86{eUH#MNiD<fgxF<j*Kv1-5;XAyMuseFVX7}
zw7%ems7rs4*d~knP9o`Mb&5U3tw81=v9>e-m|iOO%O_Q$Hj2&GGAdZHINd=FFdgEe
zFQUNT6?!_xTE&~D)B>xU?f7LAuN1km?c!V2?Lh21-e0uRHOP^)iHVjhsmcdR8A-a&
zCg3waJ0>>rKZ@Li1@U~lDBLew!K5_a0dg)eMddtk2xZo~bpq=%nUb(JU~Ck#!NCSZ
zZe=#sO(6k$_!zO)am{_E{$l}07c#dqL#WVU{5EmF{w-2rJ-N#qB=vapEjjG5G_p)Z
zYDVx4VqbN>Zz#F#sC4@)5^33SULtYzd?LLertm11Hd#rk!X47quSgn?%`)AVLu4ei
zEMOtk({hEMA#u0mOJvD=$!s1EWH~v#f&9N@g<JMfxo68x?WaJ><+3YoXUPW#WsN%x
zKvuKtzLtD5wMX_+w1URovYsDik^lTz^?NFNs1NIWqz336$ZFs2Cc6w}=k0F+bYAT8
zHlmX-oUL{uvOcBk*=2RGVWJ;<>6jx>(!*Z;T1)x6vDbGH`oClw%!^2e8uo7bO<*m@
z{#N1wjIyy$OQ>9<JK1Lk`jC8i?5pYb0qtA%L()S)7;eYGv2sPlDDq>lT$x7lTT<mJ
zo^)B`Bi9)g0}JoSC-=`C1jrzt=0=&AJLNOx6arqi<gt~-#MH=dVB!V)`8SNae4U9?
z9-#CW|H==Oes0^t71UDf_#NEtcM9TG#2w9eK~46IJ9k||##qAD`V1#ABe)AXx+6+z
zxQlP8R}3Ls-IAeX(+ckL?s;U>1>7~wRbb3>?o+O|licHO2S5>S#{uWLR-F~FzEF%W
zA3+9uqnJ=#2RKg4Rp@;lkg8pFG}ZDQQdi$PMP>6v3cpoxPOu6Xk)pUEwa^8$Ptm3e
zqw#*lOCixHtya7~%>%}}{CJtm)a*`Wz%frCz)v~t{UJaerqpYG0<z~Tmu@G6_AOJA
z7If7(+i`KQGW}j8HH^P<-AroItnJE*anx+-$N4ImZtNT7%_mgoIonj8_gct*5vq`2
zT0QreD#AG*m=vutOxQ;`RjSNqNGmT!m3V-5XUyc4Y>;FAI<+t&kko&s4sM`w+PwJ~
zcJ$Dk1oh?O9#Xnq{b<h+z*DJyI*w9Gsx*=JK8VQgp}a%9E8ovU!&??AYJ_rCj5-Pv
zkc2oGV5MgT-y-inFpg$4u+TV*W;5wK8D^M}fHeMsZJ?(|NL-x8Y_P<q8RCtarAcu{
zO=^;6Ra$JSDb;M$EHlx|Vn{Rw@H<UTHNE1SRJ|GK=>VgQNPwY7s89Oz^J&_7PUnm$
zq)@EPPf=1~q*2nx$p0-@L@iG-8okZN)Kp^%U!E5@vM=$rBJF>7$fK-D|E~YYq9O0F
F(?68={5b#s

delta 1455
zcmX9;c}x^{6#jO0c6VlHXIBsesRFKoKyeqa9!0bYf(i=a6-80NAR-`$;Z)di=?cU`
zhZ<Xtsub!0VxiUwL@O!^;#EW~wL~RGFhx{MQ#@*4yMKL|%zJt7eaG)%9rLb+DYKF7
zEw?o|l*|NFbwJo+V3Hd6JOfzm0b~r8#|G(>2cY;m7bx<DvZ@M@-Lar+5tO%FfYP<)
z*BzP2*75--lMg~mngH)@STR2y$eE3mN1g#m{)ny40{l)RiMdEEB`CHH1=g3K^xawD
zV-u=YH2}%`anxu4e8Mf5@DWZg>jct9p?SC%@NYr4Ivfb9#e<XWKw<@+es>s{FpR!G
z+JNAg1L$vy02ZCWK(9Lxze;BRI1jKAWDfIrVC!<3^U|+?fDtm6&SOBTt!#_oM}V!c
zpwlT?Mz<rdGhOPE8T5r6j5*{Vz!1gU9l8N5&1UYmo}=$e%)no_fb=lQg_&haX_Pkx
zchj1A@?UzN1BxCCPDzko&b0&9eULv&q_*+d@`20%z<fmha(EUH;VFORLG=YY<*!3)
z>5LS1)Vxc;k|EYm>I*C^Wqk@lfn{H^i5X=;!T_6Yr2~`$?2gZt0k$gEoH+#P88gm0
z`T@IlK{JrO$AWp1G*<4!2eUV;p8zq@QlNZ`T~t*8P~4(O_u315;$y)iE2&HF$`p*3
z-phj=vac#rJ8uKq^OQTvCECGXxl=zxT~nk;)=oBEN@ETFrgCM+fBH==Qr^m%L&YDI
zccntWUZLy@cmzz=EC05R2U5nUm<}>kLZ!;>#U3)&epPsxmgp6vC#<*X;0q#U!)VDx
z;p85qy2jF2m{s>Oh?>IHs>i#D3b$`K<Gz#RC>`g!hJ@X$kdhRxro0PW$}t=IeV@z8
z842Vc<%;$lC*7BFXHL)naU*v{-$;h2<vI^X16g~xE&~}T_zgEG-vng#b8o(10+hVu
zb?-@ke=pwtR0A;5k2k!n1UByCSDxqrjGp|)URq~UDPL_v%X*dajT<h)gg_tua=kUM
z>nHx|7Y1TN&$oX|IAxH(p178rpUnT7euF}Dh5x<Skr*-YPm4*OsY85UjV&4RJpW>0
z7dh!I{~`G|fC;kT*ci2@VluELS1qOy?Md}&twg-!{;4)buLIWHR?i=uI|ksO4$;#k
ziQei(%ZmWdo9dWDX4<q}s#V6xMo6|QSGCzi5NqiCbu*+u)ijeR6gJcBI98~9rvY~O
z3qNE&r?mA6P3;OYM3m6%HIc{^gbT(Fx-D5~c}t;*sunIrO(0uV2(6VXi99=@&G{-Y
zy<hnM*4$L#;jk5;39_KWIpML9o{$Vr&CGHSATmNTx0+IK9g?dF^}0{2zP4ceI7#H3
zyk(k0-7PeJzotpH74S&aTvKf(>NaS4jg%IT6PiJW)+mY5y!u%JVy8)woMZ5|I?=b@
z9q{!LL*AbR)B$3s^Lb#Kt+@W+0$@~`m=H_le)bkzTP3F72`4MO6n8DAP-aDl6*DMg
zX|JTqobl5L@x~((diepZ`<)*0pP-#Ho2pmTYs2g*H1i^~(Q}Ve;(N4-XNfCMr8cRC
zx-)i5llWQI`GGnn%#Vz|NH_aB$(hqH<?vG{Y@euWHNPRI&AJCi#{=%7?&%CVX>(6J
uJ%UYg^1Hv(5$7aLb90t<uhBH<)!N90YjO9q4Q=V?1gSmWt--sX&gNg0vb((i

diff --git a/translations/qnapi_pl.ts b/translations/qnapi_pl.ts
index 932d84b..3e0e609 100644
--- a/translations/qnapi_pl.ts
+++ b/translations/qnapi_pl.ts
@@ -1234,22 +1234,22 @@
     <message>
         <location filename="../gui/ui/frmoptions.ui" line="280"/>
         <source>Add language code to subtitle file name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodawaj kod języka do nazwy pliku napisów:</translation>
     </message>
     <message>
         <location filename="../gui/ui/frmoptions.ui" line="288"/>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <location filename="../gui/ui/frmoptions.ui" line="293"/>
         <source>Two-letter</source>
-        <translation type="unfinished"></translation>
+        <translation>Dwuliterowy</translation>
     </message>
     <message>
         <location filename="../gui/ui/frmoptions.ui" line="298"/>
         <source>Three-letter</source>
-        <translation type="unfinished"></translation>
+        <translation>Trzyliterowy</translation>
     </message>
     <message>
         <location filename="../gui/ui/frmoptions.ui" line="307"/>

From 54754a237fe785433801cf0a593106a5186b98eb Mon Sep 17 00:00:00 2001
From: a-sum-duma <a-sum-duma@users.noreply.github.com>
Date: Fri, 31 Jul 2020 18:30:40 +0200
Subject: [PATCH 08/10] Fix: Q_DECL_DEPRECATED_X was not in QT 5.2 yet, replace
 with Q_DECL_DEPRECATED

---
 libqnapi/src/config/generalconfig.h | 2 +-
 libqnapi/src/qnapi.h                | 4 ++--
 libqnapi/src/subtitlematcher.h      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libqnapi/src/config/generalconfig.h b/libqnapi/src/config/generalconfig.h
index caddbd6..5cd4eff 100644
--- a/libqnapi/src/config/generalconfig.h
+++ b/libqnapi/src/config/generalconfig.h
@@ -73,7 +73,7 @@ class GeneralConfig {
    * @deprecated Since X.X.X. Will be removed in X.X.X.
    *             Use constructor that accepts #LangCodeType.
    */
-  Q_DECL_DEPRECATED_X("use constructor that accepts LangCodeType")
+  Q_DECL_DEPRECATED
   GeneralConfig(const QString& uiLanguage, const QString& p7zipPath,
                 const QString& tmpPath, const QString& language,
                 const QString& backupLanguage, const bool& noBackup,
diff --git a/libqnapi/src/qnapi.h b/libqnapi/src/qnapi.h
index 6072c3a..5df1d11 100644
--- a/libqnapi/src/qnapi.h
+++ b/libqnapi/src/qnapi.h
@@ -67,7 +67,7 @@ class QNapi {
    * @deprecated Since X.X.X. Will be removed in X.X.X.
    *             Use selectSubtitlesByIdx(i) + download().
    */
-  Q_DECL_DEPRECATED_X("use selectSubtitlesByIdx(i) + download()")
+  Q_DECL_DEPRECATED
   bool download(int i) { return selectSubtitlesByIdx(i), download(); }
 
   /* TODO: Fill in versions. */
@@ -75,7 +75,7 @@ class QNapi {
    * @deprecated Since X.X.X. Will be removed in X.X.X.
    *             Use unpack().
    */
-  Q_DECL_DEPRECATED_X("use unpack()")
+  Q_DECL_DEPRECATED
   bool unpack(int) { return unpack(); };
 
   void cleanup();
diff --git a/libqnapi/src/subtitlematcher.h b/libqnapi/src/subtitlematcher.h
index 8eed15a..49636fd 100644
--- a/libqnapi/src/subtitlematcher.h
+++ b/libqnapi/src/subtitlematcher.h
@@ -36,7 +36,7 @@ class SubtitleMatcher : public QObject {
    * @deprecated Since X.X.X. Will be removed in X.X.X.
    *             Use constructor that accepts #LangCodeType.
    */
-  Q_DECL_DEPRECATED_X("use constructor that accepts LangCodeType")
+  Q_DECL_DEPRECATED
   SubtitleMatcher(bool _noBackup, bool _isPostProcessingEnabled,
                   QString _ppSubFormat, QString _ppSubExtension,
                   bool _changePermissions, QString _changePermissionsTo,

From 5272ae9efed3259a11a46f6e109bb30e7fe15d39 Mon Sep 17 00:00:00 2001
From: a-sum-duma <a-sum-duma@users.noreply.github.com>
Date: Tue, 26 Jul 2022 12:03:22 +0200
Subject: [PATCH 09/10] Path utils

Module for changing file paths
---
 gui/src/forms/frmscan.cpp        |  18 ++--
 gui/src/forms/frmscan.h          |   1 -
 libqnapi/libqnapi.pro            |   2 +
 libqnapi/src/subtitlelanguage.h  |   2 +
 libqnapi/src/subtitlematcher.cpp |  46 +++------
 libqnapi/src/subtitlematcher.h   |   8 +-
 libqnapi/src/utils/pathutils.cpp |  70 ++++++++++++++
 libqnapi/src/utils/pathutils.h   | 160 +++++++++++++++++++++++++++++++
 8 files changed, 258 insertions(+), 49 deletions(-)
 create mode 100644 libqnapi/src/utils/pathutils.cpp
 create mode 100644 libqnapi/src/utils/pathutils.h

diff --git a/gui/src/forms/frmscan.cpp b/gui/src/forms/frmscan.cpp
index 060b1c0..e61120a 100644
--- a/gui/src/forms/frmscan.cpp
+++ b/gui/src/forms/frmscan.cpp
@@ -14,6 +14,7 @@
 
 #include "frmscan.h"
 #include "libqnapi.h"
+#include "utils/pathutils.h"
 
 frmScan::frmScan(QWidget *parent, Qt::WindowFlags f)
     : QDialog(parent, f), scanConfig(LibQNapi::loadConfig().scanConfig()) {
@@ -238,9 +239,7 @@ void frmScan::accept() {
 
 ScanFilesThread::ScanFilesThread()
     : subExtensionFilters(LibQNapi::staticConfig()->subtitleExtensionsFilter()
-          .split(" ")),
-      subLangFilter("^()|(\\.[a-z][a-z][a-z]?)$",
-          QRegularExpression::CaseInsensitiveOption) {}
+          .split(" ")) {}
 
 void ScanFilesThread::run() {
   abort = false;
@@ -272,7 +271,15 @@ bool ScanFilesThread::doScan(const QString &path, QDir::Filters filters) {
   if (skipIfSubtitlesExists) {
     for (const auto &s : QDir(myPath).entryInfoList(subExtensionFilters,
         QDir::Files | QDir::Hidden)) {
-      subtitlesBaseNames << s.completeBaseName();
+
+      QString completeBaseName = s.completeBaseName();
+      subtitlesBaseNames << completeBaseName;
+
+      QString completeBaseNameWithoutLang = ChangeFilePath()
+          .removeLanguageCode().removeExtension().apply(s.fileName());
+      if (completeBaseName != completeBaseNameWithoutLang) {
+        subtitlesBaseNames << completeBaseNameWithoutLang;
+      }
     }
   }
 
@@ -290,8 +297,7 @@ bool ScanFilesThread::doScan(const QString &path, QDir::Filters filters) {
       if (skipIfSubtitlesExists) {
         QString baseName = (*p).completeBaseName();
         for (const auto &subBaseName : subtitlesBaseNames) {
-          if (subBaseName.startsWith(baseName, Qt::CaseInsensitive) &&
-              subLangFilter.match(subBaseName, baseName.length()).hasMatch()) {
+          if (subBaseName.compare(baseName, Qt::CaseInsensitive) == 0) {
             subtitleFileFound = true;
             break;
           }
diff --git a/gui/src/forms/frmscan.h b/gui/src/forms/frmscan.h
index c520b77..7209b59 100644
--- a/gui/src/forms/frmscan.h
+++ b/gui/src/forms/frmscan.h
@@ -54,7 +54,6 @@ class ScanFilesThread : public QNapiThread {
 
   QString searchPath;
   QStringList scanFilters, skipFilters, subExtensionFilters;
-  QRegularExpression subLangFilter;
   bool skipIfSubtitlesExists, followSymLinks;
   QSet<QString> visited;
 };
diff --git a/libqnapi/libqnapi.pro b/libqnapi/libqnapi.pro
index c939b1b..dc69f89 100644
--- a/libqnapi/libqnapi.pro
+++ b/libqnapi/libqnapi.pro
@@ -50,6 +50,7 @@ SOURCES += src/config/configreader.cpp \
     src/utils/console.cpp \
     src/utils/encodingutils.cpp \
     src/utils/p7zipdecoder.cpp \
+    src/utils/pathutils.cpp \
     src/utils/synchttp.cpp \
     src/utils/syncxmlrpc.cpp \
     src/qnapi.cpp \
@@ -103,6 +104,7 @@ HEADERS += src/config/configreader.h \
     src/subtitlepostprocessor.h \
     src/utils/console.h \
     src/utils/encodingutils.h \
+    src/utils/pathutils.h \
     src/utils/p7zipdecoder.h \
     src/utils/synchttp.h \
     src/utils/syncxmlrpc.h \
diff --git a/libqnapi/src/subtitlelanguage.h b/libqnapi/src/subtitlelanguage.h
index ff38c9f..63a3a33 100644
--- a/libqnapi/src/subtitlelanguage.h
+++ b/libqnapi/src/subtitlelanguage.h
@@ -33,6 +33,8 @@ class SubtitleLanguage {
 
   void setLanguage(QString source);
 
+  bool isValid() const { return idx >= 0; }
+
   QString toString(LangCodeType langCodeType = LCT_NONE) const;
 
   QString toTwoLetter() const { return toString(LCT_TWO_LETTER); }
diff --git a/libqnapi/src/subtitlematcher.cpp b/libqnapi/src/subtitlematcher.cpp
index 7f8219d..a779ea5 100644
--- a/libqnapi/src/subtitlematcher.cpp
+++ b/libqnapi/src/subtitlematcher.cpp
@@ -13,6 +13,8 @@
 *****************************************************************************/
 
 #include "subtitlematcher.h"
+#include "utils/pathutils.h"
+
 #include <QDir>
 
 SubtitleMatcher::SubtitleMatcher(
@@ -52,15 +54,14 @@ bool SubtitleMatcher::matchSubtitles(QString subtitlesTmpFilePath,
 
   if (!subtitlesTmpFileInfo.exists()) return false;
 
-  QString targetExtension = selectTargetExtension(subtitlesTmpFileInfo);
-
-  QString targetSubtitlesFilePath =
-      constructSubtitlePath(targetMovieFilePath, targetExtension,
-      subtitlesLanguage);
+  QString targetSubtitlesFilePath = ChangeFilePath()
+      .setExtension(selectTargetExtension(subtitlesTmpFileInfo))
+      .addLanguageCode(subtitlesLanguage, langCodeInFileName)
+      .apply(targetMovieFilePath);
 
   if (!isWritablePath(targetSubtitlesFilePath)) return false;
 
-  removeOrCopy(targetMovieFilePath, targetSubtitlesFilePath, subtitlesLanguage);
+  removeOrCopy(targetSubtitlesFilePath);
 
   bool result = false;
 
@@ -95,42 +96,17 @@ QString SubtitleMatcher::selectTargetExtension(
   return targetExtension;
 }
 
-QString SubtitleMatcher::constructSubtitlePath(QString targetMovieFilePath,
-                                               QString targetExtension,
-                                               QString subtitlesLanguage,
-                                               QString baseSuffix) const {
-  QFileInfo targetMovieFileInfo(targetMovieFilePath);
-  QString ret = targetMovieFileInfo.path() + QDir::separator() +
-         targetMovieFileInfo.completeBaseName() + baseSuffix + ".";
-
-  if (langCodeInFileName != LCT_NONE) {
-    QString langCode = SubtitleLanguage(subtitlesLanguage).toString(
-        langCodeInFileName);
-    if (!langCode.isEmpty()) {
-      ret += langCode;
-      ret += ".";
-    }
-  }
-
-  ret += targetExtension;
-  return ret;
-}
-
 bool SubtitleMatcher::isWritablePath(QString path) const {
   QFileInfo pathFileInfo(path);
   return QFileInfo(pathFileInfo.absolutePath()).isWritable();
 }
 
-void SubtitleMatcher::removeOrCopy(QString targetMoviefilePath,
-                                   QString targetSubtitlesFilePath,
-                                   QString subtitlesLanguage) const {
+void SubtitleMatcher::removeOrCopy(QString targetSubtitlesFilePath) const {
   if (QFile::exists(targetSubtitlesFilePath)) {
     if (!noBackup) {
-      QFileInfo targetSubtitlesFileInfo(targetSubtitlesFilePath);
-      QString newName = constructSubtitlePath(
-          targetMoviefilePath, targetSubtitlesFileInfo.suffix(),
-          subtitlesLanguage, tr("_copy"));
-
+      QString newName = ChangeFilePath()
+          .addToBaseName(tr("_copy"))
+          .apply(targetSubtitlesFilePath);
       if (QFile::exists(newName)) QFile::remove(newName);
 
       QFile::rename(targetSubtitlesFilePath, newName);
diff --git a/libqnapi/src/subtitlematcher.h b/libqnapi/src/subtitlematcher.h
index 49636fd..a59db4a 100644
--- a/libqnapi/src/subtitlematcher.h
+++ b/libqnapi/src/subtitlematcher.h
@@ -52,14 +52,8 @@ class SubtitleMatcher : public QObject {
 
  private:
   QString selectTargetExtension(QFileInfo subtitlesTmpFileInfo) const;
-  QString constructSubtitlePath(QString targetMovieFilePath,
-                                QString targetExtension,
-                                QString subtitlesLanguage,
-                                QString baseSuffix = "") const;
   bool isWritablePath(QString path) const;
-  void removeOrCopy(QString targetMoviefilePath,
-                    QString targetSubtitlesFilePath,
-                    QString subtitlesLanguage) const;
+  void removeOrCopy(QString targetSubtitlesFilePath) const;
   bool dryCopy(QString srcFilePath, QString dstFilePath) const;
   void fixFilePermissions(QString targetSubtitlesFilePath,
                           QString changePermissionsTo) const;
diff --git a/libqnapi/src/utils/pathutils.cpp b/libqnapi/src/utils/pathutils.cpp
new file mode 100644
index 0000000..6c64797
--- /dev/null
+++ b/libqnapi/src/utils/pathutils.cpp
@@ -0,0 +1,70 @@
+/*****************************************************************************
+** QNapi
+** Copyright (C) 2008-2017 Piotr Krzemiński <pio.krzeminski@gmail.com>
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+*****************************************************************************/
+
+#include "pathutils.h"
+
+#include <QDir>
+#include <QTextStream>
+
+QString ChangeFilePath::apply(const QString &path) const {
+  // search backward and only until directory separator,
+  // both 'from' and 'to' are inclusive
+  auto findDot = [&path] (int from, int to = 0) {
+    for (; from >= to; from--) {
+      if (path[from] == '.') return from;
+      if (path[from] == QDir::separator()) break;
+    }
+    return -1;
+  };
+
+  // position of the dot that precedes file extension
+  int extDotPos = findDot(path.length() - 1);
+  // accounts for file extension including the dot
+  int extLength = extDotPos < 0 ? 0 : path.length() - extDotPos;
+
+  // accounts for existing language code including the preceding dot
+  int langCodeLength = 0;
+  if (extDotPos >= 0 &&
+      // no need to bother if we don't need it
+      (!addToBaseNameStr.isEmpty() || doRemoveLanguageCode)) {
+    int dotPos = findDot(extDotPos - 1, qMax(0, extDotPos - 4));
+    if (dotPos >= 0) {
+      SubtitleLanguage lang(path.mid(dotPos + 1, extDotPos - dotPos - 1));
+      if (lang.isValid()) langCodeLength = extDotPos - dotPos;
+    }
+  }
+
+  QString ret = path.left(path.length() - extLength - langCodeLength);
+
+  ret += addToBaseNameStr;
+
+  if (!doRemoveLanguageCode && langCodeLength > 0) {
+    ret += path.midRef(
+        path.length() - extLength - langCodeLength, langCodeLength);
+  }
+
+  if (addLanguageCodeLang.isValid() && addLanguageCodeType != LCT_NONE) {
+    ret += '.';
+    ret += addLanguageCodeLang.toString(addLanguageCodeType);
+  }
+
+  if (!doRemoveExtension) ret += path.rightRef(extLength);
+
+  if (!addExtensionStr.isEmpty()) {
+    ret += '.';
+    ret += addExtensionStr;
+  }
+
+  return ret;
+}
diff --git a/libqnapi/src/utils/pathutils.h b/libqnapi/src/utils/pathutils.h
new file mode 100644
index 0000000..f1b3545
--- /dev/null
+++ b/libqnapi/src/utils/pathutils.h
@@ -0,0 +1,160 @@
+/*****************************************************************************
+** QNapi
+** Copyright (C) 2008-2017 Piotr Krzemiński <pio.krzeminski@gmail.com>
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+*****************************************************************************/
+
+#ifndef PATHUTILS_H
+#define PATHUTILS_H
+
+#include "subtitlelanguage.h"
+
+#include <QString>
+
+class ChangeFilePath {
+ public:
+  /**
+   * Add a given string before file extension and before language code.
+   *
+   * Add \a str to the complete base name of the file, excluding language code
+   * if the file name has one.
+   *
+   * Examples (add 'X' string):
+   *    a.b.c   -> a.bX.c
+   *    a.eng.c -> aX.eng.c
+   *    a       -> aX
+   *
+   * If this function is called multiple times on the same \c ChangeFilePath
+   * object, only the last call will be taken into account.
+   *
+   * @param str The string to add.
+   * @return *this
+   */
+  ChangeFilePath &addToBaseName(const QString &str) {
+    addToBaseNameStr = str;
+    return *this;
+  }
+
+  /**
+   * Remove file extension.
+   *
+   * Examples:
+   *    a.b.c -> a.b
+   *    a.    -> a
+   *    .a    ->
+   *    a     -> a
+   *
+   * @return *this
+   */
+  ChangeFilePath &removeExtension() {
+    doRemoveExtension = true;
+    return *this;
+  }
+
+  /**
+   * Add file extension.
+   *
+   * Add an extension to a file name. If the file name already has an extension,
+   * it won't be removed (unless \c removeExtension is set).
+   *
+   * If this function is called multiple times on the same \c ChangeFilePath
+   * object, only the last call will be taken into account.
+   *
+   * @param ext File extension to add.
+   * @return *this
+   */
+  ChangeFilePath &addExtension(const QString &ext) {
+    addExtensionStr = ext;
+    return *this;
+  }
+
+  /**
+   * Change file extension.
+   *
+   * Change file extension to a given string. If file has no extension, add one.
+   * Same as \c removeExtension + \c addExtension.
+   *
+   * @param ext New file extension.
+   * @return *this
+   */
+  ChangeFilePath &setExtension(const QString &ext) {
+    return removeExtension().addExtension(ext);
+  }
+
+  /**
+   * Remove language code from a file name.
+   *
+   * Remove language code from a file name if it has one.
+   * Examples:
+   *    a.b.c   -> a.b.c
+   *    a.eng.c -> a.c
+   *    eng.b.c -> eng.b.c
+   *    a.eng   -> a.eng
+   *
+   * \c removeLanguageCode can be combined with \c addLanguageCode. The order
+   * in which these two functions were called makes no diffrence,
+   * \c removeLanguageCode will cause removal of the language code that was
+   * present in original file name only.
+   *
+   * @return *this
+   */
+  ChangeFilePath &removeLanguageCode() {
+    doRemoveLanguageCode = true;
+    return *this;
+  }
+
+  /**
+   * Add language code to a file name.
+   *
+   * Add \c lang language code to a file name. If the file name already
+   * has a language code, it won't be removed (unless \c removeLanguageCode is
+   * set). If \a type is \c LCT_NONE, nothing will be added.
+   *
+   * Examples (add 'fra' code):
+   *    a.b.c   -> a.b.fra.c
+   *    a.eng.c -> a.eng.fra.c
+   *
+   * Examples (add 'fra' code with \c removeLanguageCode also set):
+   *    a.b.c   -> a.b.fra.c
+   *    a.eng.c -> a.fra.c
+   *
+   * If this function is called multiple times on the same \c ChangeFilePath
+   * object, only the last call will be taken into account.
+   *
+   * @param lang The language.
+   * @param type Type of the code to add.
+   * @return *this
+   */
+  ChangeFilePath &addLanguageCode(const SubtitleLanguage &lang,
+                                  LangCodeType type) {
+    addLanguageCodeLang = lang;
+    addLanguageCodeType = type;
+    return *this;
+  }
+
+  /**
+   * Apply changes on a given string.
+   * @param path File path to modify.
+   * @return Modified file path.
+   */
+  QString apply(const QString &path) const;
+
+ private:
+  QString addToBaseNameStr;
+  bool doRemoveExtension = false;
+  QString addExtensionStr;
+  bool doRemoveLanguageCode = false;
+  SubtitleLanguage addLanguageCodeLang;
+  LangCodeType addLanguageCodeType = LCT_NONE;
+};
+
+#endif // PATHUTILS_H
+

From cd88532775f9ddee307995691d2d1cd3008e0bf8 Mon Sep 17 00:00:00 2001
From: a-sum-duma <a-sum-duma@users.noreply.github.com>
Date: Tue, 26 Jul 2022 12:05:26 +0200
Subject: [PATCH 10/10] Support language codes in file names while converting
 subtitles

---
 gui/src/forms/frmconvert.cpp | 41 ++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/gui/src/forms/frmconvert.cpp b/gui/src/forms/frmconvert.cpp
index 690892c..1aee66a 100644
--- a/gui/src/forms/frmconvert.cpp
+++ b/gui/src/forms/frmconvert.cpp
@@ -16,6 +16,7 @@
 #include "libqnapi.h"
 #include "movieinfo/movieinfoprovider.h"
 #include "qnapiopendialog.h"
+#include "utils/pathutils.h"
 
 #include <QDesktopServices>
 #include <QDesktopWidget>
@@ -148,21 +149,35 @@ void frmConvert::checkFPSNeeded() {
   ui.pbMovieFPSSelect->setEnabled(fpsNeeded);
 
   if (fpsNeeded) {
-    QFileInfo srcSubFI(ui.leSrcSubFile->text());
-
-    QString movieFilePathBase =
-        srcSubFI.absoluteDir().filePath(srcSubFI.completeBaseName());
-
-    foreach (QString movieExt, staticConfig->movieExtensions()) {
-      QString movieFilePath = movieFilePathBase + "." + movieExt;
-      if (QFileInfo(movieFilePath).exists()) {
-        Maybe<QString> maybeFPS = determineMovieFPS(movieFilePath);
-        if (maybeFPS) {
-          ui.cbMovieFPS->setCurrentText(maybeFPS.value());
-          ui.cbFPSTo->setCurrentText(maybeFPS.value());
+    QString srcSubAbsoluteFilePath =
+        QFileInfo(ui.leSrcSubFile->text()).absoluteFilePath();
+
+    QString movieFilePathBase = ChangeFilePath()
+        .removeExtension().apply(srcSubAbsoluteFilePath);
+
+    auto determineFPSFromPathBase = [this, &movieFilePathBase] () {
+      foreach (QString movieExt, staticConfig->movieExtensions()) {
+        QString movieFilePath = movieFilePathBase + "." + movieExt;
+        if (QFileInfo(movieFilePath).exists()) {
+          Maybe<QString> maybeFPS = determineMovieFPS(movieFilePath);
+          if (maybeFPS) {
+            ui.cbMovieFPS->setCurrentText(maybeFPS.value());
+            ui.cbFPSTo->setCurrentText(maybeFPS.value());
+          }
+          return true;
         }
-        break;
       }
+      return false;
+    };
+
+    if (determineFPSFromPathBase()) return;
+
+    // try removing language code from file name
+    QString movieFilePathBaseWithoutLang = ChangeFilePath()
+        .removeExtension().removeLanguageCode().apply(srcSubAbsoluteFilePath);
+    if (movieFilePathBase != movieFilePathBaseWithoutLang) {
+      movieFilePathBase = movieFilePathBaseWithoutLang;
+      determineFPSFromPathBase();
     }
   }
 }