diff --git a/cinera/cinera.c b/cinera/cinera.c index cae5b8d..5f2b4d9 100644 --- a/cinera/cinera.c +++ b/cinera/cinera.c @@ -14,7 +14,7 @@ typedef struct version CINERA_APP_VERSION = { .Major = 0, .Minor = 5, - .Patch = 29 + .Patch = 30 }; // TODO(matt): Copy in the DB 3 stuff from cinera_working.c diff --git a/cinera/cinera.css b/cinera/cinera.css index 0f22a0c..f4de236 100644 --- a/cinera/cinera.css +++ b/cinera/cinera.css @@ -56,10 +56,6 @@ width: 100%; } -#cineraIndex #cineraIndexEntries.sort_reverse { - flex-flow: column-reverse; -} - #cineraResults .dayContainer { display: flex; } diff --git a/cinera/cinera_search.js b/cinera/cinera_search.js index 2af9ed4..242cf35 100644 --- a/cinera/cinera_search.js +++ b/cinera/cinera_search.js @@ -15,12 +15,12 @@ indexSort.addEventListener("click", function(ev) { if(indexSortChronological) { this.firstChild.nodeValue = "Sort: New to Old ⏷" - indexEntries.classList.add("sort_reverse"); + indexEntries.style.flexFlow = "column-reverse"; } else { this.firstChild.nodeValue = "Sort: Old to New ⏶" - indexEntries.classList.remove("sort_reverse"); + indexEntries.style.flexFlow = "column"; } indexSortChronological = !indexSortChronological; }); @@ -96,7 +96,8 @@ function runSearch() { if (queryStr && queryStr.length > 0) { indexContainer.style.display = "none"; if (episodes.length > 0) { - var query = new RegExp(queryStr.replace("(", "\\(").replace(")", "\\)").replace(/(^|[^\\])\\$/, "$1"), "gi"); + var query = new RegExp(queryStr.replace("(", "\\(").replace(")", "\\)").replace(/\|+/, "\|").replace(/\|$/, "").replace(/(^|[^\\])\\$/, "$1"), "gi"); + console.log(query); for (var i = 0; i < episodes.length; ++i) { var episode = episodes[i]; var matches = []; diff --git a/hmml_to_youtube/hmml.a b/hmml_to_youtube/hmml.a index db29015..c0a44bf 100644 Binary files a/hmml_to_youtube/hmml.a and b/hmml_to_youtube/hmml.a differ diff --git a/hmml_to_youtube/hmmlib.h b/hmml_to_youtube/hmmlib.h index 980d092..57b385d 100644 --- a/hmml_to_youtube/hmmlib.h +++ b/hmml_to_youtube/hmmlib.h @@ -24,6 +24,10 @@ typedef struct { char** annotators; size_t annotator_count; + + char* template; + char* medium; + } HMML_VideoMetaData; typedef struct { @@ -95,4 +99,10 @@ HMML_Output hmml_parse_file (FILE* file); void hmml_dump (HMML_Output* output); void hmml_free (HMML_Output* output); +// Version + +extern const struct HMML_Version { + int Major, Minor, Patch; +} hmml_version; + #endif