Blinker

@@ -15,8 +15,9 @@ namespace Blinker {

  */

 bool SyncRecv::checkName(const std::string &playlist, const std::string &sync)

 {

-  std::string::size_type pos;

+  std::string::size_type pos, noprefix;

   std::string noext;

+  unsigned int underscore;

   // full match

   if (playlist == sync)

@@ -28,13 +29,19 @@ bool SyncRecv::checkName(const std::string &playlist, const std::string &sync)

   if (noext == sync)

     return true;

-  // match without number prefix "[0-9]*[._-]?"

-  for (pos = 0; pos < noext.length() && std::isdigit(noext.at(pos)); ++pos);

-  if (pos < noext.length() &&

-      (noext.at(pos) == '.' || noext.at(pos) == '_' || noext.at(pos) == '-'))

-    ++pos;

-  noext = noext.substr(pos);

-  if (noext == sync)

+  // match without ignore prefix ".*__"

+  noprefix = 0;

+  underscore = 0;

+  for (pos = 0; pos < noext.length(); ++pos) {

+    if (noext.at(pos) == '_') {

+      underscore++;

+      if (underscore >= 2)

+        noprefix = pos + 1;

+    } else {

+      underscore = 0;

+    }

+  }

+  if (noext.substr(noprefix) == sync)

     return true;

   // no match