Annotation-Pushers
/
Annotation-System
1
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
Annotation-System/cinera/cinera.c

6822 lines
270 KiB
C
Raw Normal View History

hmml_to_html.c: Partially implement refs [#15] It is missing the onRefChanged() function PPiC 051
2017-03-10 14:19:25 +00:00
#if 0
ctime -begin ${0%.*}.ctm
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
#gcc -g -fsanitize=address -Wall -std=c99 -pipe $0 -o ${0%.*} hmml.a -lcurl
gcc -O2 -Wall -std=c99 -pipe $0 -o ${0%.*} hmml.a -lcurl
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
#clang -fsanitize=address -g -Wall -std=c99 -pipe $0 -o ${0%.*} hmml.a -lcurl
#clang -O2 -Wall -std=c99 -pipe $0 -o ${0%.*} hmml.a -lcurl
hmml_to_html.c: Partially implement refs [#15] It is missing the onRefChanged() function PPiC 051
2017-03-10 14:19:25 +00:00
ctime -end ${0%.*}.ctm
exit
#endif
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
typedef struct
{
unsigned int Major, Minor, Patch;
} version;
version CINERA_APP_VERSION = {
.Major = 0,
.Minor = 5,
cinera.c: Correctly set theme
2018-06-13 15:05:21 +00:00
.Patch = 61
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
};
cinera.c: Call MakeDir() in GenerateTopicColours()
2017-12-24 01:57:11 +00:00
// TODO(matt): Copy in the DB 3 stuff from cinera_working.c
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
#define CINERA_DB_VERSION 3
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
hmml_to_html.c: Organise CSS [#22]
2017-04-13 00:21:04 +00:00
#include <stdarg.h> // NOTE(matt): varargs
#include <stdio.h> // NOTE(matt): printf, sprintf, vsprintf, fprintf, perror
#include <stdlib.h> // NOTE(matt): calloc, malloc, free
hmml_to_html.c: Coloured authors
2017-03-23 00:34:59 +00:00
#include "hmmlib.h"
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
#include <getopt.h> // NOTE(matt): getopts
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
//#include "config.h" // TODO(matt): Implement config.h
hmml_to_html.c: Pull from insobot's quote store #25 Also fix the forced integration
2017-08-09 00:57:09 +00:00
#include <curl/curl.h>
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
#include <time.h>
#include <sys/stat.h>
hmml_to_html.c: Begin refactor
2017-08-23 20:30:08 +00:00
#include <sys/types.h>
#include <dirent.h>
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
#include <string.h> // NOTE(matt): strerror
#include <errno.h> //NOTE(matt): errno
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
#include <sys/inotify.h> // NOTE(matt): inotify
#include <unistd.h> // NOTE(matt): sleep()
hmml_to_html.c: Coloured authors
2017-03-23 00:34:59 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
typedef unsigned int bool;
#define TRUE 1
#define FALSE 0
#define DEBUG 0
#define DEBUG_MEM 0
bool PROFILING = 0;
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
clock_t TIMING_START;
#define START_TIMING_BLOCK(...) if(PROFILING) { printf(__VA_ARGS__); TIMING_START = clock(); }
#define END_TIMING_BLOCK() if(PROFILING) { printf("\e[1;34m%ld\e[0m\n", clock() - TIMING_START);}
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
#define Kilobytes(Bytes) Bytes << 10
#define Megabytes(Bytes) Bytes << 20
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
#define MAX_PROJECT_ID_LENGTH 31
#define MAX_PROJECT_NAME_LENGTH 63
#define MAX_BASE_URL_LENGTH 127
#define MAX_RELATIVE_PAGE_LOCATION_LENGTH 31
#define MAX_PLAYER_URL_PREFIX_LENGTH 15
#define MAX_BASE_FILENAME_LENGTH 31
#define MAX_TITLE_LENGTH 128 - (MAX_BASE_FILENAME_LENGTH + 1) - (int)sizeof(link_insertion_offsets) - (int)sizeof(unsigned short int) - 1 // NOTE(matt): We size this such that index_metadata is 128 bytes total
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
#define MAX_CUSTOM_SNIPPET_SHORT_LENGTH 255
#define MAX_CUSTOM_SNIPPET_LONG_LENGTH 1023
hmml_to_html.c: CSV "-escaping [#20] and EDITION EDITION gives us a way to conditionally handle and warn about features that depend on network infrastructure, notably member / project info
2017-06-10 16:47:47 +00:00
enum
{
hmml_to_html.c: Add keywords and sort topic dots
2017-08-19 21:41:51 +00:00
EDITION_SINGLE,
EDITION_PROJECT,
EDITION_NETWORK
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
} editions;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
enum
{
// NOTE(matt): https://tools.ietf.org/html/rfc5424#section-6.2.1
LOG_EMERGENCY,
LOG_ALERT,
LOG_CRITICAL,
LOG_ERROR,
LOG_WARNING,
LOG_NOTICE,
LOG_INFORMATIONAL,
LOG_DEBUG
} log_levels;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
enum
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
MODE_FORCEINTEGRATION = 1 << 0,
MODE_ONESHOT = 1 << 1,
MODE_EXAMINE = 1 << 2,
MODE_NOCACHE = 1 << 3,
MODE_NOPRIVACY = 1 << 4,
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
} modes;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
enum
{
RC_ARENA_FULL,
RC_ERROR_DIRECTORY,
RC_ERROR_FATAL,
RC_ERROR_FILE,
RC_ERROR_HMML,
RC_ERROR_MAX_REFS,
RC_ERROR_MEMORY,
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
RC_ERROR_PROJECT,
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
RC_ERROR_QUOTE,
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
RC_ERROR_SEEK,
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
RC_FOUND,
RC_UNFOUND,
RC_INVALID_REFERENCE,
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
RC_INVALID_TEMPLATE,
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
RC_PRIVATE_VIDEO,
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
RC_NOOP,
RC_RIP,
RC_SUCCESS
} returns;
typedef struct
{
void *Location;
void *Ptr;
char *ID;
int Size;
} arena;
cinera.css: Marker and categories style cinera_player_pre.js: Episode keyboard navigation. Also swap out A for K, and D for J cinera_player_pre.js: Handle the case in onRefChanged() in which the filter_container or filterState is not present cinera.c: Refetch quotes when processing a set of annotations >60 mins after the last fetch Flags: -w Force quote cache rebuild
2018-02-28 01:04:06 +00:00
typedef struct
{
// Universal
char CacheDir[256];
int Edition;
int LogLevel;
int Mode;
int UpdateInterval;
// Advisedly universal, although could be per-project
char *RootDir; // Absolute
char *RootURL;
char *CSSDir; // Relative to Root{Dir,URL}
char *ImagesDir; // Relative to Root{Dir,URL}
char *JSDir; // Relative to Root{Dir,URL}
// Per Project
char *ProjectID;
char *Theme;
char *DefaultMedium;
// Per Project - Input
char *ProjectDir; // Absolute
char *TemplatesDir; // Absolute
char *TemplateIndexLocation; // Relative to TemplatesDir ???
char *TemplatePlayerLocation; // Relative to TemplatesDir ???
// Per Project - Output
char *BaseDir; // Absolute
char *BaseURL;
char *IndexLocation; // Relative to Base{Dir,URL}
char *PlayerLocation; // Relative to Base{Dir,URL}
char *PlayerURLPrefix; /* NOTE(matt): This will become a full blown customisable output URL.
For now it simply replaces the ProjectID */
// Single Edition - Input
char SingleHMMLFilePath[256];
// Single Edition - Output
char *OutLocation;
char *OutIntegratedLocation;
} config;
// NOTE(matt): Globals
config Config = {};
arena MemoryArena;
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
time_t LastPrivacyCheck;
cinera.css: Marker and categories style cinera_player_pre.js: Episode keyboard navigation. Also swap out A for K, and D for J cinera_player_pre.js: Handle the case in onRefChanged() in which the filter_container or filterState is not present cinera.c: Refetch quotes when processing a set of annotations >60 mins after the last fetch Flags: -w Force quote cache rebuild
2018-02-28 01:04:06 +00:00
time_t LastQuoteFetch;
//
hmml_to_html.c: Partially implement refs [#15] It is missing the onRefChanged() function PPiC 051
2017-03-10 14:19:25 +00:00
typedef struct
{
char *Location;
char *Ptr;
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
char *ID;
hmml_to_html.c: Partially implement refs [#15] It is missing the onRefChanged() function PPiC 051
2017-03-10 14:19:25 +00:00
int Size;
} buffer;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
typedef struct
{
buffer Buffer;
FILE *Handle;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
char Path[256]; // NOTE(matt): Could this just be a char *?
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
int FileSize;
} file_buffer;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
// TODO(matt): Increment CINERA_DB_VERSION!
typedef struct
{
// NOTE(matt): Consider augmenting this to contain such stuff as: "hex signature"
unsigned int CurrentDBVersion; // NOTE(matt): Put this first to aid reliability
version CurrentAppVersion;
version CurrentHMMLVersion;
unsigned int InitialDBVersion;
version InitialAppVersion;
version InitialHMMLVersion;
unsigned short int EntryCount;
char ProjectID[MAX_PROJECT_ID_LENGTH + 1];
char ProjectName[MAX_PROJECT_NAME_LENGTH + 1];
char BaseURL[MAX_BASE_URL_LENGTH + 1];
char IndexLocation[MAX_RELATIVE_PAGE_LOCATION_LENGTH + 1];
char PlayerLocation[MAX_RELATIVE_PAGE_LOCATION_LENGTH + 1];
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
char PlayerURLPrefix[MAX_PLAYER_URL_PREFIX_LENGTH + 1]; // TODO(matt): Replace this with the OutputPath, when we add that
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
} index_header;
typedef struct
{
unsigned int PrevStart, NextStart;
unsigned short int PrevEnd, NextEnd;
} link_insertion_offsets; // NOTE(matt): Relative
typedef struct
{
link_insertion_offsets LinkOffsets;
unsigned short int Size;
char BaseFilename[MAX_BASE_FILENAME_LENGTH + 1];
char Title[MAX_TITLE_LENGTH + 1];
} index_metadata;
typedef struct
{
file_buffer File;
file_buffer Metadata;
index_header Header;
index_metadata Entry;
} index;
// TODO(matt): Increment CINERA_DB_VERSION!
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
typedef struct
{
buffer IncludesIndex;
buffer Search;
buffer Index; // NOTE(matt): This buffer is malloc'd separately, rather than claimed from the memory_arena
buffer IncludesPlayer;
buffer Menus;
buffer Player;
buffer ScriptPlayer;
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
char Custom0[MAX_CUSTOM_SNIPPET_SHORT_LENGTH + 1];
char Custom1[MAX_CUSTOM_SNIPPET_SHORT_LENGTH + 1];
char Custom2[MAX_CUSTOM_SNIPPET_SHORT_LENGTH + 1];
char Custom3[MAX_CUSTOM_SNIPPET_SHORT_LENGTH + 1];
char Custom4[MAX_CUSTOM_SNIPPET_SHORT_LENGTH + 1];
char Custom5[MAX_CUSTOM_SNIPPET_SHORT_LENGTH + 1];
char Custom6[MAX_CUSTOM_SNIPPET_SHORT_LENGTH + 1];
char Custom7[MAX_CUSTOM_SNIPPET_SHORT_LENGTH + 1];
char Custom8[MAX_CUSTOM_SNIPPET_SHORT_LENGTH + 1];
char Custom9[MAX_CUSTOM_SNIPPET_SHORT_LENGTH + 1];
char Custom10[MAX_CUSTOM_SNIPPET_SHORT_LENGTH + 1];
char Custom11[MAX_CUSTOM_SNIPPET_SHORT_LENGTH + 1];
char Custom12[MAX_CUSTOM_SNIPPET_LONG_LENGTH + 1];
char Custom13[MAX_CUSTOM_SNIPPET_LONG_LENGTH + 1];
char Custom14[MAX_CUSTOM_SNIPPET_LONG_LENGTH + 1];
char Custom15[MAX_CUSTOM_SNIPPET_LONG_LENGTH + 1];
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
char ProjectID[MAX_PROJECT_ID_LENGTH + 1];
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
char ProjectName[MAX_PROJECT_NAME_LENGTH + 1];
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
char Theme[MAX_PROJECT_NAME_LENGTH + 1];
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
char Title[MAX_TITLE_LENGTH + 1];
char URLIndex[MAX_BASE_URL_LENGTH + 1 + MAX_RELATIVE_PAGE_LOCATION_LENGTH + 1];
char URLPlayer[MAX_BASE_URL_LENGTH + 1 + MAX_RELATIVE_PAGE_LOCATION_LENGTH + 1 + MAX_PLAYER_URL_PREFIX_LENGTH + MAX_BASE_FILENAME_LENGTH + 1];
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
char VideoID[16];
} buffers;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
enum
{
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
// Contents and Player Pages Mandatory
TAG_INCLUDES,
// Contents Page Mandatory
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
TAG_INDEX,
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
// Player Page Mandatory
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
TAG_MENUS,
TAG_PLAYER,
TAG_SCRIPT,
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
// Player Page Optional
TAG_CUSTOM0,
TAG_CUSTOM1,
TAG_CUSTOM2,
TAG_CUSTOM3,
TAG_CUSTOM4,
TAG_CUSTOM5,
TAG_CUSTOM6,
TAG_CUSTOM7,
TAG_CUSTOM8,
TAG_CUSTOM9,
TAG_CUSTOM10,
TAG_CUSTOM11,
TAG_CUSTOM12,
TAG_CUSTOM13,
TAG_CUSTOM14,
TAG_CUSTOM15,
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
TAG_TITLE,
TAG_VIDEO_ID,
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
// Anywhere Optional
TAG_PROJECT,
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
TAG_PROJECT_ID,
TAG_THEME,
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
TAG_URL,
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
} template_tags;
typedef struct
{
int Code; // template_tags
char *Tag;
} tag;
tag Tags[] = {
{ TAG_INCLUDES, "__CINERA_INCLUDES__" },
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
{ TAG_INDEX, "__CINERA_INDEX__" },
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{ TAG_MENUS, "__CINERA_MENUS__" },
{ TAG_PLAYER, "__CINERA_PLAYER__" },
{ TAG_SCRIPT, "__CINERA_SCRIPT__" },
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
{ TAG_CUSTOM0, "__CINERA_CUSTOM0__" },
{ TAG_CUSTOM1, "__CINERA_CUSTOM1__" },
{ TAG_CUSTOM2, "__CINERA_CUSTOM2__" },
{ TAG_CUSTOM3, "__CINERA_CUSTOM3__" },
{ TAG_CUSTOM4, "__CINERA_CUSTOM4__" },
{ TAG_CUSTOM5, "__CINERA_CUSTOM5__" },
{ TAG_CUSTOM6, "__CINERA_CUSTOM6__" },
{ TAG_CUSTOM7, "__CINERA_CUSTOM7__" },
{ TAG_CUSTOM8, "__CINERA_CUSTOM8__" },
{ TAG_CUSTOM9, "__CINERA_CUSTOM9__" },
{ TAG_CUSTOM10, "__CINERA_CUSTOM10__" },
{ TAG_CUSTOM11, "__CINERA_CUSTOM11__" },
{ TAG_CUSTOM12, "__CINERA_CUSTOM12__" },
{ TAG_CUSTOM13, "__CINERA_CUSTOM13__" },
{ TAG_CUSTOM14, "__CINERA_CUSTOM14__" },
{ TAG_CUSTOM15, "__CINERA_CUSTOM15__" },
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{ TAG_TITLE, "__CINERA_TITLE__" },
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
{ TAG_VIDEO_ID, "__CINERA_VIDEO_ID__" },
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
{ TAG_PROJECT, "__CINERA_PROJECT__" },
{ TAG_PROJECT_ID, "__CINERA_PROJECT_ID__" },
{ TAG_THEME, "__CINERA_THEME__" },
{ TAG_URL, "__CINERA_URL__" },
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
};
typedef struct
{
int Offset;
int TagCode;
} tag_offset;
typedef struct
{
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
char Filename[256];
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
tag_offset Tag[16];
int Validity; // NOTE(matt): Bitmask describing which page the template is valid for, i.e. contents and / or player page
int TagCount;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
} template_metadata;
typedef struct
{
template_metadata Metadata;
buffer Buffer;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
} template;
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
// TODO(matt): Consider putting the ref_info and quote_info into linked lists on the heap, just to avoid all the hardcoded sizes
typedef struct
{
char Date[32];
char Text[512];
} quote_info;
hmml_to_html.c: Sanitise the refs menu [#15] Also update hmmlib.h for the new marker parameter
2017-03-19 01:23:44 +00:00
typedef struct
{
hmml_to_html.c: Consolidate references [#16]
2017-03-30 02:57:04 +00:00
char Timecode[8];
int Identifier;
} identifier;
hmml_to_html.c: Fix reference bugs * Comma separation of > 2 ref identifiers at the same offset * Fix multiple refs all at the same (possibly not -1) offset * Reference combinations, use flags to ensure we are using a valid combination We also tried to handle quote speakers other than the host, but appeared to hit a bug in hmmlib.h in which the quote.author got set to "quote" for the second (and subsequent) quote node in a set of annotations
2017-07-29 23:01:39 +00:00
#define REF_MAX_IDENTIFIER 64
hmml_to_html.c: The beginnings of config [#25] May in all likelihood back this stuff out
2017-05-13 15:38:10 +00:00
hmml_to_html.c: Consolidate references [#16]
2017-03-30 02:57:04 +00:00
typedef struct
{
hmml_to_html.c: Organise CSS [#22]
2017-04-13 00:21:04 +00:00
char RefTitle[620];
char ID[512];
char URL[512];
char Source[256];
hmml_to_html.c: The beginnings of config [#25] May in all likelihood back this stuff out
2017-05-13 15:38:10 +00:00
identifier Identifier[REF_MAX_IDENTIFIER];
hmml_to_html.c: Consolidate references [#16]
2017-03-30 02:57:04 +00:00
int IdentifierCount;
hmml_to_html.c: Sanitise the refs menu [#15] Also update hmmlib.h for the new marker parameter
2017-03-19 01:23:44 +00:00
} ref_info;
hmml_to_html.c: Introduce BuildQuote() [#20] Also move some structural styling out to style.css
2017-04-23 02:47:42 +00:00
typedef struct
{
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
char Marker[32];
char WrittenText[32];
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
} category_info;
hmml_to_html.c: Introduce BuildQuote() [#20] Also move some structural styling out to style.css
2017-04-23 02:47:42 +00:00
hmml_to_html.c: Add keywords and sort topic dots
2017-08-19 21:41:51 +00:00
typedef struct
{
category_info Category[64];
int Count;
} categories;
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
// TODO(matt): Parse this stuff out of a config file
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
typedef struct
{
char *Username;
char *CreditedName;
char *HomepageURL;
char *SupportIcon;
char *SupportURL;
} credential_info;
credential_info Credentials[] =
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
{ "a_waterman", "Andrew Waterman", "https://www.linkedin.com/in/andrew-waterman-76805788", "", ""},
{ "y_lee", "Yunsup Lee", "https://www.linkedin.com/in/yunsup-lee-385b692b/", "", ""},
cinera.c: Add credentials for Handmade Hero
2017-12-03 00:47:27 +00:00
{ "AndrewJDR", "Andrew Johnson", "", "", ""},
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
{ "AsafGartner", "Asaf Gartner", "", "", ""},
cinera.c: Add credentials and -v flag README.md: Add dependency on curl
2017-11-18 00:27:33 +00:00
{ "BretHudson", "Bret Hudson", "http://www.brethudson.com/", "cinera_sprite_patreon.png", "https://www.patreon.com/indieFunction"},
{ "ChronalDragon", "Andrew Chronister", "http://chronal.net/", "", ""},
{ "Kelimion", "Jeroen van Rijn", "https://handmade.network/home", "", ""},
cinera.c: Add credentials for Handmade Hero
2017-12-03 00:47:27 +00:00
{ "Mannilie", "Emmanuel Vaccaro", "http://emmanuelvaccaro.com/", "", ""},
cinera.c: HTTPS for Miblo's HomepageURL
2018-02-04 21:52:32 +00:00
{ "Miblo", "Matt Mascarenhas", "https://miblodelcarpio.co.uk/", "cinera_sprite_sendowl.png", "https://miblodelcarpio.co.uk/cinera#pledge"},
cinera.c: Update Credentials array
2017-12-17 20:44:00 +00:00
{ "Mr4thDimention", "Allen Webster", "http://www.4coder.net/", "", ""},
cinera.c: Add Pseudonym73 credentials
2018-04-02 20:52:45 +00:00
{ "Pseudonym73", "Andrew Bromage", "https://twitter.com/deguerre", "", ""},
cinera.c: Update Credentials array
2017-12-17 20:44:00 +00:00
{ "Quel_Solaar", "Eskil Steenberg", "http://quelsolaar.com/", "", ""},
cinera.c: Add credentials for Handmade Hero
2017-12-03 00:47:27 +00:00
{ "ZedZull", "Jay Waggle", "", "", ""},
cinera.c: Update Credentials array
2017-12-17 20:44:00 +00:00
{ "abnercoimbre", "Abner Coimbre", "https://handmade.network/m/abnercoimbre", "", ""},
cinera.c: Add credentials and -v flag README.md: Add dependency on curl
2017-11-18 00:27:33 +00:00
{ "brianwill", "Brian Will", "http://brianwill.net/blog/", "", ""},
cinera.c: Add cbloom credential for Handmade Hero
2017-12-03 00:55:01 +00:00
{ "cbloom", "Charles Bloom", "http://cbloomrants.blogspot.co.uk/", "", ""},
cinera: SendOwl
2017-12-10 17:29:00 +00:00
{ "cmuratori", "Casey Muratori", "https://handmadehero.org", "cinera_sprite_sendowl.png", "https://handmadehero.org/patreon.html"},
cinera.c: Add csnover credential
2017-12-03 18:25:20 +00:00
{ "csnover", "Colin Snover", "https://zetafleet.com/", "", ""},
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{ "debiatan", "Miguel Lechón", "http://blog.debiatan.net/", "", ""},
cinera.c: Add credentials for Handmade Hero
2017-12-03 00:47:27 +00:00
{ "dspecht", "Dustin Specht", "", "", ""},
{ "effect0r", "Cory Henderlite", "", "", ""},
{ "ffsjs", "ffsjs", "", "", ""},
cinera.c: Add credentials and -v flag README.md: Add dependency on curl
2017-11-18 00:27:33 +00:00
{ "fierydrake", "Mike Tunnicliffe", "", "", ""},
{ "garlandobloom", "Matthew VanDevander", "https://lowtideproductions.com/", "cinera_sprite_patreon.png", "https://www.patreon.com/mv"},
cinera.c: Add credentials for Handmade Hero
2017-12-03 00:47:27 +00:00
{ "ikerms", "Iker Murga", "", "", ""},
{ "insofaras", "Alex Baines", "https://abaines.me.uk/", "", ""},
{ "jacebennett", "Jace Bennett", "", "", ""},
cinera.c: Add credentials and -v flag README.md: Add dependency on curl
2017-11-18 00:27:33 +00:00
{ "jon", "Jonathan Blow", "http://the-witness.net/news/", "", ""},
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
{ "jpike", "Jacob Pike", "", "", ""},
cinera.c: Add credentials for Handmade Hero
2017-12-03 00:47:27 +00:00
{ "martincohen", "Martin Cohen", "http://blog.coh.io/", "", ""},
cinera.c: Add credentials and -v flag README.md: Add dependency on curl
2017-11-18 00:27:33 +00:00
{ "miotatsu", "Mio Iwakura", "http://riscy.tv/", "cinera_sprite_patreon.png", "https://patreon.com/miotatsu"},
{ "nothings", "Sean Barrett", "https://nothings.org/", "", ""},
cinera.c: Add info for Per and Bitwise
2018-03-23 15:33:37 +00:00
{ "pervognsen", "Per Vognsen", "https://github.com/pervognsen/bitwise/", "", ""},
cinera.c: Add credentials and -v flag README.md: Add dependency on curl
2017-11-18 00:27:33 +00:00
{ "philipbuuck", "Philip Buuck", "http://philipbuuck.com/", "", ""},
cinera.c: Add powerc9000 credential
2017-12-03 18:14:19 +00:00
{ "powerc9000", "Clay Murray", "http://claymurray.website/", "", ""},
cinera.c: Add credentials and -v flag README.md: Add dependency on curl
2017-11-18 00:27:33 +00:00
{ "rygorous", "Fabian Giesen", "https://fgiesen.wordpress.com/", "", ""},
cinera.c: Add credentials for Handmade Hero
2017-12-03 00:47:27 +00:00
{ "schme", "Kasper Sauramo", "", "", ""},
cinera.c: Add credentials and -v flag README.md: Add dependency on curl
2017-11-18 00:27:33 +00:00
{ "sssmcgrath", "Shawn McGrath", "http://www.dyadgame.com/", "", ""},
{ "thehappiecat", "Anne", "https://www.youtube.com/c/TheHappieCat", "cinera_sprite_patreon.png", "https://www.patreon.com/thehappiecat"},
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
{ "theinternetftw", "Ben Craddock", "", "", ""},
cinera.c: Add credentials for Handmade Hero
2017-12-03 00:47:27 +00:00
{ "wheatdog", "Tim Liou", "http://stringbulbs.com/", "", ""},
cinera.c: Add credentials and -v flag README.md: Add dependency on curl
2017-11-18 00:27:33 +00:00
{ "williamchyr", "William Chyr", "http://williamchyr.com/", "", ""},
{ "wonchun", "Won Chun", "https://twitter.com/won3d", "", ""},
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
};
typedef struct
{
char *Medium;
char *Icon;
char *WrittenName;
} category_medium;
category_medium CategoryMedium[] =
{
// medium icon written name
cinera: Add :multimedia and :hat hmdshow_2016_03 uses :multimedia Various riscy and hero annotations may use :hat
2017-11-28 23:02:00 +00:00
{ "admin", "&#128505;", "Administrivia"},
cinera.c: Add cbloom credential for Handmade Hero
2017-12-03 00:55:01 +00:00
{ "afk", "&#8230;" , "Away from Keyboard"},
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{ "authored", "&#128490;", "Chat Comment"}, // TODO(matt): Conditionally handle Chat vs Guest Comments
{ "blackboard", "&#128396;", "Blackboard"},
cinera.c: Add :drawing medium hmmlib: -std=gnu99
2018-06-03 14:22:06 +00:00
{ "drawing", "&#127912;", "Drawing"},
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{ "experience", "&#127863;", "Experience"},
cinera: Add :multimedia and :hat hmdshow_2016_03 uses :multimedia Various riscy and hero annotations may use :hat
2017-11-28 23:02:00 +00:00
{ "hat", "&#127913;", "Hat"},
{ "multimedia", "&#127916;", "Media Clip"},
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{ "owl", "&#129417;", "Owl of Shame"},
{ "programming", "&#128430;", "Programming"}, // TODO(matt): Potentially make this configurable per project
{ "rant", "&#128162;", "Rant"},
{ "research", "&#128214;", "Research"},
{ "run", "&#127939;", "In-Game"}, // TODO(matt): Potentially make this configurable per project
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{ "speech", "&#128489;", "Speech"},
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{ "trivia", "&#127922;", "Trivia"},
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
};
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
enum
{
NS_CALENDRICAL,
NS_LINEAR,
NS_SEASONAL,
} numbering_schemes;
typedef struct
{
char *ProjectID;
char *FullName;
char *Unit; // e.g. Day, Episode, Session
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
int NumberingScheme; // numbering_schemes
char *Medium;
char *AltURLPrefix; // NOTE(matt): This currently just straight up replaces the ProjectID in the player pages' output directories
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
} project_info;
project_info ProjectInfo[] =
{
cinera.c: Add info for Per and Bitwise
2018-03-23 15:33:37 +00:00
{ "bitwise", "Bitwise", "Day", NS_LINEAR, "programming", "" },
cinera.c: Add coad and reader ProjectInfo
2018-06-07 17:55:40 +00:00
{ "book", "Book Club", "Day", NS_LINEAR, "research", "" },
{ "coad", "Computer Organization and Design", "", NS_LINEAR, "research", "" },
{ "reader", "RISC-V Reader", "", NS_LINEAR, "research", "" },
{ "riscy", "RISCY BUSINESS", "Day", NS_LINEAR, "programming", "" },
{ "risc", "RISCellaneous", "", NS_CALENDRICAL, "speech", "" },
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
{ "chat", "Handmade Chat", "Day", NS_LINEAR, "speech", "" },
{ "code", "Handmade Hero", "Day", NS_LINEAR, "programming", "day" },
{ "intro-to-c", "Intro to C on Windows", "Day", NS_LINEAR, "programming", "day" },
{ "misc", "Handmade Miscellany", "", NS_LINEAR, "admin", "" },
{ "ray", "Handmade Ray", "Day", NS_LINEAR, "programming", "" },
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
{ "hmdshow", "HandmadeDev Show", "", NS_SEASONAL, "speech", "ep" },
{ "lecture", "Abner Talks", "", NS_SEASONAL, "speech", "" },
{ "stream", "Abner Programs", "", NS_SEASONAL, "programming", "" },
{ "special", "Abner Show Special", "", NS_SEASONAL, "programming", "" },
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
{ "obbg", "Open Block Building Game", "Episode", NS_LINEAR, "programming", "" },
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
{ "sysadmin", "SysAdmin", "Session", NS_LINEAR, "admin", "" },
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
};
hmml_to_html.c: Category styling Also upgrade hmml.a for lower-cased markers
2017-03-25 02:07:55 +00:00
#define ArrayCount(A) sizeof(A)/sizeof(*(A))
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
void
Clear(char *String, int Size)
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
for(int i = 0; i < Size; ++i)
{
String[i] = 0;
}
hmml_to_html.c: Function lofting and ref style PPiC 055
2017-03-16 00:56:58 +00:00
}
hmml_to_html.c: Partially implement refs [#15] It is missing the onRefChanged() function PPiC 051
2017-03-10 14:19:25 +00:00
int
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
StringLength(char *String)
hmml_to_html.c: Partially implement refs [#15] It is missing the onRefChanged() function PPiC 051
2017-03-10 14:19:25 +00:00
{
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
int i = 0;
while(String[i])
hmml_to_html.c: Partially implement refs [#15] It is missing the onRefChanged() function PPiC 051
2017-03-10 14:19:25 +00:00
{
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
++i;
hmml_to_html.c: Partially implement refs [#15] It is missing the onRefChanged() function PPiC 051
2017-03-10 14:19:25 +00:00
}
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
return i;
hmml_to_html.c: Partially implement refs [#15] It is missing the onRefChanged() function PPiC 051
2017-03-10 14:19:25 +00:00
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
#define CopyString(Dest, DestSize, Format, ...) CopyString_(__LINE__, (Dest), (DestSize), (Format), ##__VA_ARGS__)
__attribute__ ((format (printf, 4, 5)))
int
CopyString_(int LineNumber, char Dest[], int DestSize, char *Format, ...)
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
int Length = 0;
va_list Args;
va_start(Args, Format);
Length = vsnprintf(Dest, DestSize, Format, Args);
if(Length >= DestSize)
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
printf("CopyString() call on line %d has been passed a buffer too small (%d bytes) to contain null-terminated %d(+1)-character string\n", LineNumber, DestSize, Length);
__asm__("int3");
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
va_end(Args);
return Length;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
#define CopyStringNoFormat(Dest, DestSize, String) CopyStringNoFormat_(__LINE__, Dest, DestSize, String)
hmml_to_html.c: Correct integration [#25]
2017-06-13 22:13:03 +00:00
int
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat_(int LineNumber, char *Dest, int DestSize, char *String)
hmml_to_html.c: Make strings HTML safe Basically just rewriting < and > and others as &lt; and &gt; etc.
2017-06-07 23:47:47 +00:00
{
hmml_to_html.c: Correct integration [#25]
2017-06-13 22:13:03 +00:00
int Length = 0;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char *Start = String;
hmml_to_html.c: Make strings HTML safe Basically just rewriting < and > and others as &lt; and &gt; etc.
2017-06-07 23:47:47 +00:00
while(*String)
{
*Dest++ = *String++;
hmml_to_html.c: Correct integration [#25]
2017-06-13 22:13:03 +00:00
++Length;
hmml_to_html.c: Make strings HTML safe Basically just rewriting < and > and others as &lt; and &gt; etc.
2017-06-07 23:47:47 +00:00
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
if(Length >= DestSize)
{
printf("CopyStringNoFormat() call on line %d has been passed a buffer too small (%d bytes) to contain null-terminated %d(+1)-character string:\n"
"%s\n", LineNumber, DestSize, Length, Start);
__asm__("int3");
}
hmml_to_html.c: Fix integration [#25]
2017-06-15 22:10:36 +00:00
*Dest = '\0';
hmml_to_html.c: Correct integration [#25]
2017-06-13 22:13:03 +00:00
return Length;
hmml_to_html.c: Make strings HTML safe Basically just rewriting < and > and others as &lt; and &gt; etc.
2017-06-07 23:47:47 +00:00
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
#define ClearCopyStringNoFormat(Dest, DestSize, String) ClearCopyStringNoFormat_(__LINE__, Dest, DestSize, String)
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
int
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
ClearCopyStringNoFormat_(int LineNumber, char *Dest, int DestSize, char *String)
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
Clear(Dest, DestSize);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
int Length = 0;
char *Start = String;
while(*String)
{
*Dest++ = *String++;
++Length;
}
if(Length >= DestSize)
{
printf("ClearCopyStringNoFormat() call on line %d has been passed a buffer too small (%d bytes) to contain null-terminated %d(+1)-character string:\n"
"%s\n", LineNumber, DestSize, Length, Start);
__asm__("int3");
}
*Dest = '\0';
return Length;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
// TODO(matt): Maybe do a version of this that takes a string as a Terminator
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
#define CopyStringNoFormatT(Dest, DestSize, String, Terminator) CopyStringNoFormatT_(__LINE__, Dest, DestSize, String, Terminator)
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
int
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormatT_(int LineNumber, char *Dest, int DestSize, char *String, char Terminator)
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{
int Length = 0;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char *Start = String;
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
while(*String != Terminator)
{
*Dest++ = *String++;
++Length;
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
if(Length >= DestSize)
{
printf("CopyStringNoFormatT() call on line %d has been passed a buffer too small (%d bytes) to contain %c-terminated %d(+1)-character string:\n"
"%.*s\n", LineNumber, DestSize, Terminator == 0 ? '0' : Terminator, Length, Length, Start);
__asm__("int3");
}
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
*Dest = '\0';
return Length;
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
#define CopyStringToBuffer(Dest, Format, ...) CopyStringToBuffer_(__LINE__, Dest, Format, ##__VA_ARGS__)
__attribute__ ((format (printf, 3, 4)))
hmml_to_html.c: Function lofting and ref style PPiC 055
2017-03-16 00:56:58 +00:00
void
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBuffer_(int LineNumber, buffer *Dest, char *Format, ...)
hmml_to_html.c: Function lofting and ref style PPiC 055
2017-03-16 00:56:58 +00:00
{
hmml_to_html.c: Coloured authors
2017-03-23 00:34:59 +00:00
va_list Args;
va_start(Args, Format);
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
int Length = vsnprintf(Dest->Ptr, Dest->Size - (Dest->Ptr - Dest->Location), Format, Args);
hmml_to_html.c: Coloured authors
2017-03-23 00:34:59 +00:00
va_end(Args);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
if(Length + (Dest->Ptr - Dest->Location) >= Dest->Size)
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
fprintf(stderr, "CopyStringToBuffer(%s) call on line %d cannot accommodate null-terminated %d(+1)-character string:\n"
"%s\n", Dest->ID, LineNumber, Length, Format);
__asm__("int3");
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
}
hmml_to_html.c: Coloured authors
2017-03-23 00:34:59 +00:00
Dest->Ptr += Length;
hmml_to_html.c: Function lofting and ref style PPiC 055
2017-03-16 00:56:58 +00:00
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
#define CopyStringToBufferNoFormat(Dest, String) CopyStringToBufferNoFormat_(__LINE__, Dest, String)
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
void
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBufferNoFormat_(int LineNumber, buffer *Dest, char *String)
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char *Start = String;
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
while(*String)
{
*Dest->Ptr++ = *String++;
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
if(Dest->Ptr - Dest->Location >= Dest->Size)
{
fprintf(stderr, "CopyStringToBufferNoFormat(%s) call on line %d cannot accommodate %d-character string:\n"
"%s\n", Dest->ID, LineNumber, StringLength(Start), Start);
__asm__("int3");
}
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
*Dest->Ptr = '\0';
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
#define CopyStringToBufferHTMLSafe(Dest, String) CopyStringToBufferHTMLSafe_(__LINE__, Dest, String)
hmml_to_html.c: Make strings HTML safe Basically just rewriting < and > and others as &lt; and &gt; etc.
2017-06-07 23:47:47 +00:00
void
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBufferHTMLSafe_(int LineNumber, buffer *Dest, char *String)
hmml_to_html.c: Make strings HTML safe Basically just rewriting < and > and others as &lt; and &gt; etc.
2017-06-07 23:47:47 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char *Start = String;
int Length = StringLength(String);
hmml_to_html.c: Make strings HTML safe Basically just rewriting < and > and others as &lt; and &gt; etc.
2017-06-07 23:47:47 +00:00
while(*String)
{
switch(*String)
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
case '<': *Dest->Ptr++ = '&'; *Dest->Ptr++ = 'l'; *Dest->Ptr++ = 't'; *Dest->Ptr++ = ';'; Length += 3; break;
case '>': *Dest->Ptr++ = '&'; *Dest->Ptr++ = 'g'; *Dest->Ptr++ = 't'; *Dest->Ptr++ = ';'; Length += 3; break;
case '&': *Dest->Ptr++ = '&'; *Dest->Ptr++ = 'a'; *Dest->Ptr++ = 'm'; *Dest->Ptr++ = 'p'; *Dest->Ptr++ = ';'; Length += 4; break;
case '\"': *Dest->Ptr++ = '&'; *Dest->Ptr++ = 'q'; *Dest->Ptr++ = 'u'; *Dest->Ptr++ = 'o'; *Dest->Ptr++ = 't'; *Dest->Ptr++ = ';'; Length += 5; break;
case '\'': *Dest->Ptr++ = '&'; *Dest->Ptr++ = '#'; *Dest->Ptr++ = '3'; *Dest->Ptr++ = '9'; *Dest->Ptr++ = ';'; Length += 4; break;
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
default: *Dest->Ptr++ = *String; break;
}
++String;
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
if(Dest->Ptr - Dest->Location >= Dest->Size)
{
fprintf(stderr, "CopyStringToBufferHTMLSafe(%s) call on line %d cannot accommodate %d(+1)-character HTML-sanitised string:\n"
"%s\n", Dest->ID, LineNumber, Length, Start);
__asm__("int3");
}
*Dest->Ptr = '\0';
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
#define CopyStringToBufferHTMLSafeBreakingOnSlash(Dest, String) CopyStringToBufferHTMLSafeBreakingOnSlash_(__LINE__, Dest, String)
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
void
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBufferHTMLSafeBreakingOnSlash_(int LineNumber, buffer *Dest, char *String)
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char *Start = String;
int Length = StringLength(String);
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
while(*String)
{
switch(*String)
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
case '<': *Dest->Ptr++ = '&'; *Dest->Ptr++ = 'l'; *Dest->Ptr++ = 't'; *Dest->Ptr++ = ';'; Length += 3; break;
case '>': *Dest->Ptr++ = '&'; *Dest->Ptr++ = 'g'; *Dest->Ptr++ = 't'; *Dest->Ptr++ = ';'; Length += 3; break;
case '&': *Dest->Ptr++ = '&'; *Dest->Ptr++ = 'a'; *Dest->Ptr++ = 'm'; *Dest->Ptr++ = 'p'; *Dest->Ptr++ = ';'; Length += 4; break;
case '\'': *Dest->Ptr++ = '&'; *Dest->Ptr++ = '#'; *Dest->Ptr++ = '3'; *Dest->Ptr++ = '9'; *Dest->Ptr++ = ';'; Length += 4; break;
case '\"': *Dest->Ptr++ = '&'; *Dest->Ptr++ = 'q'; *Dest->Ptr++ = 'u'; *Dest->Ptr++ = 'o'; *Dest->Ptr++ = 't'; *Dest->Ptr++ = ';'; Length += 5; break;
case '/': *Dest->Ptr++ = '/'; *Dest->Ptr++ = '&'; *Dest->Ptr++ = '#'; *Dest->Ptr++ = '8'; *Dest->Ptr++ = '2'; *Dest->Ptr++ = '0'; *Dest->Ptr++ = '3'; *Dest->Ptr++ = ';'; Length += 7; break;
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
default: *Dest->Ptr++ = *String; break;
}
++String;
hmml_to_html.c: Make strings HTML safe Basically just rewriting < and > and others as &lt; and &gt; etc.
2017-06-07 23:47:47 +00:00
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
if(Dest->Ptr - Dest->Location >= Dest->Size)
{
fprintf(stderr, "CopyStringToBufferHTMLSafeBreakingOnSlash_(%s) call on line %d cannot accommodate %d(+1)-character HTML-sanitised string:\n"
"%s\n", Dest->ID, LineNumber, Length, Start);
__asm__("int3");
}
hmml_to_html.c: Make strings HTML safe Basically just rewriting < and > and others as &lt; and &gt; etc.
2017-06-07 23:47:47 +00:00
}
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
#define CopyBuffer(Dest, Src) CopyBuffer_(__LINE__, Dest, Src)
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
void
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
CopyBuffer_(int LineNumber, buffer *Dest, buffer *Src)
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
Src->Ptr = Src->Location;
while(*Src->Ptr)
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
*Dest->Ptr++ = *Src->Ptr++;
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
if(Dest->Ptr - Dest->Location >= Dest->Size)
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
fprintf(stderr, "CopyBuffer(%s) call on line %d cannot accommodate %d(+1)-character %s\n", Dest->ID, LineNumber, StringLength(Src->Location), Src->ID);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
__asm__("int3");
}
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
*Dest->Ptr = '\0';
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
}
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
#define CopyBufferSized(Dest, Src, Size) CopyBufferSized_(__LINE__, Dest, Src, Size)
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
void
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
CopyBufferSized_(int LineNumber, buffer *Dest, buffer *Src, int Size)
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
{
Src->Ptr = Src->Location;
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
while(Src->Ptr - Src->Location < Size)
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
{
*Dest->Ptr++ = *Src->Ptr++;
}
if(Dest->Ptr - Dest->Location >= Dest->Size)
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
fprintf(stderr, "CopyBufferNoNull(%s) call on line %d cannot accommodate %d(+1)-character %s\n", Dest->ID, LineNumber, StringLength(Src->Location), Src->ID);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
__asm__("int3");
}
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
}
hmml_to_html.c: Category styling [#3] Also squash some bugs and perform clean-up
2017-03-17 01:45:16 +00:00
int
hmml_to_html.c: Correct integration [#25]
2017-06-13 22:13:03 +00:00
StringsDiffer(char *A, char *B) // NOTE(matt): Two null-terminated strings
hmml_to_html.c: Category styling [#3] Also squash some bugs and perform clean-up
2017-03-17 01:45:16 +00:00
{
hmml_to_html.c: Mock-up reference.html Also adapt onRefChanged() to support multiple sourceMenus
2017-03-21 02:38:18 +00:00
while(*A && *B && *A == *B)
hmml_to_html.c: Category styling [#3] Also squash some bugs and perform clean-up
2017-03-17 01:45:16 +00:00
{
++A, ++B;
}
return *A - *B;
}
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
int
StringsDifferCaseInsensitive(char *A, char *B) // NOTE(matt): Two null-terminated strings
{
while(*A && *B &&
((*A >= 'A' && *A <= 'Z') ? *A + ('a' - 'A') : *A) ==
((*B >= 'A' && *B <= 'Z') ? *B + ('a' - 'A') : *B))
{
++A, ++B;
}
return *A - *B;
}
hmml_to_html.c: Fix BuildReference() order [#16] Remove dependency on string.h Correctly free everything on every return from main()
2017-04-23 00:30:37 +00:00
bool
hmml_to_html.c: Correct integration [#25]
2017-06-13 22:13:03 +00:00
StringsDifferT(char *A, // NOTE(matt): Null-terminated string
char *B, // NOTE(matt): Not null-terminated string (e.g. one mid-buffer)
hmml_to_html.c: Integrate keeping comments [#25] It straight up replaces <!-- CINERA_* --> comments with our content, while preserving other comments
2017-06-16 07:55:59 +00:00
char Terminator // NOTE(matt): Caller definable terminator. Pass 0 to only match on the extent of A
hmml_to_html.c: Correct integration [#25]
2017-06-13 22:13:03 +00:00
)
hmml_to_html.c: Fix BuildReference() order [#16] Remove dependency on string.h Correctly free everything on every return from main()
2017-04-23 00:30:37 +00:00
{
cinera_player_pre.js: Use YouTube API's timer This lets users of Firefox 59+ get sub-millisecond accurate performance: https://developer.mozilla.org/en-US/docs/Web/API/Performance/now
2018-05-15 19:45:03 +00:00
// TODO(matt): Make sure this can't crash upon reaching the end of B's buffer
hmml_to_html.c: Correct integration [#25]
2017-06-13 22:13:03 +00:00
int ALength = StringLength(A);
hmml_to_html.c: Fix BuildReference() order [#16] Remove dependency on string.h Correctly free everything on every return from main()
2017-04-23 00:30:37 +00:00
int i = 0;
hmml_to_html.c: Correct integration [#25]
2017-06-13 22:13:03 +00:00
while(i < ALength && A[i] && A[i] == B[i])
hmml_to_html.c: Fix BuildReference() order [#16] Remove dependency on string.h Correctly free everything on every return from main()
2017-04-23 00:30:37 +00:00
{
++i;
}
hmml_to_html.c: Correct integration [#25]
2017-06-13 22:13:03 +00:00
if((!Terminator && !A[i] && ALength == i) ||
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
(!A[i] && ALength == i && (B[i] == Terminator)))
hmml_to_html.c: Fix BuildReference() order [#16] Remove dependency on string.h Correctly free everything on every return from main()
2017-04-23 00:30:37 +00:00
{
return FALSE;
}
else
{
return TRUE;
}
}
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
int
MakeDir(char *Path)
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
// TODO(matt): Correctly check for permissions
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
int i = StringLength(Path);
int Ancestors = 0;
while(mkdir(Path, 00755) == -1)
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
if(errno == EACCES)
{
return RC_ERROR_DIRECTORY;
}
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
while(Path[i] != '/' && i > 0)
{
--i;
}
++Ancestors;
Path[i] = '\0';
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
if(i == 0) { return RC_ERROR_DIRECTORY; }
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
}
while(Ancestors > 0)
{
while(Path[i] != '\0')
{
++i;
}
Path[i] = '/';
--Ancestors;
if((mkdir(Path, 00755)) == -1)
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_ERROR_DIRECTORY;
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
}
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_SUCCESS;
}
void
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogUsage(buffer *Buffer)
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
#if DEBUG
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
char LogPath[256];
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
CopyString(LogPath, "%s/%s", Config.CacheDir, "buffers.log");
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
FILE *LogFile;
if(!(LogFile = fopen(LogPath, "a+")))
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
MakeDir(Config.CacheDir);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
if(!(LogFile = fopen(LogPath, "a+")))
{
perror("LogUsage");
return;
}
}
fprintf(LogFile, "%s,%ld,%d\n",
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
Buffer->ID,
Buffer->Ptr - Buffer->Location,
Buffer->Size);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
fclose(LogFile);
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
#endif
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
__attribute__ ((format (printf, 2, 3)))
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
void
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogError(int LogLevel, char *Format, ...)
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
if(Config.LogLevel >= LogLevel)
{
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
char LogPath[256];
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(LogPath, sizeof(LogPath), "%s/%s", Config.CacheDir, "errors.log");
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
FILE *LogFile;
if(!(LogFile = fopen(LogPath, "a+")))
{
MakeDir(Config.CacheDir);
if(!(LogFile = fopen(LogPath, "a+")))
{
perror("LogUsage");
return;
}
}
va_list Args;
va_start(Args, Format);
vfprintf(LogFile, Format, Args);
va_end(Args);
// TODO(matt): Include the LogLevel "string" and the current wall time
fprintf(LogFile, "\n");
fclose(LogFile);
}
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
}
void
FreeBuffer(buffer *Buffer)
{
free(Buffer->Location);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
Buffer->Location = 0;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
#if DEBUG_MEM
FILE *MemLog = fopen("/home/matt/cinera_mem", "a+");
fprintf(MemLog, " Freed %s\n", Buffer->ID);
fclose(MemLog);
printf(" Freed %s\n", Buffer->ID);
#endif
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
#if 0
#define ClaimBuffer(MemoryArena, Buffer, ID, Size) if(__ClaimBuffer(MemoryArena, Buffer, ID, Size))\
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
{\
fprintf(stderr, "%s:%d: MemoryArena cannot contain %s of size %d\n", __FILE__, __LINE__, ID, Size);\
hmml_free(&HMML);\
FreeBuffer(MemoryArena);\
return 1;\
};
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
#endif
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
int
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
ClaimBuffer(buffer *Buffer, char *ID, int Size)
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
if(MemoryArena.Ptr - MemoryArena.Location + Size > MemoryArena.Size)
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_ARENA_FULL;
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
Buffer->Location = (char *)MemoryArena.Ptr;
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
Buffer->Size = Size;
Buffer->ID = ID;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
MemoryArena.Ptr += Buffer->Size;
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
*Buffer->Location = '\0';
Buffer->Ptr = Buffer->Location;
#if DEBUG
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
float PercentageUsed = (float)(MemoryArena.Ptr - MemoryArena.Location) / MemoryArena.Size * 100;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
printf(" ClaimBuffer(%s): %d\n"
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
" Total ClaimedMemory: %ld (%.2f%%, leaving %ld free)\n\n", Buffer->ID, Buffer->Size, MemoryArena.Ptr - MemoryArena.Location, PercentageUsed, MemoryArena.Size - (MemoryArena.Ptr - MemoryArena.Location));
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
#endif
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_SUCCESS;
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
}
void
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
DeclaimBuffer(buffer *Buffer)
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
{
*Buffer->Location = '\0';
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
MemoryArena.Ptr -= Buffer->Size;
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
float PercentageUsed = (float)(Buffer->Ptr - Buffer->Location) / Buffer->Size * 100;
#if DEBUG
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
printf("DeclaimBuffer(%s)\n"
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
" Used: %ld / %d (%.2f%%)\n"
"\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
" Total ClaimedMemory: %ld\n\n",
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
Buffer->ID,
Buffer->Ptr - Buffer->Location,
Buffer->Size,
PercentageUsed,
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
MemoryArena.Ptr - MemoryArena.Location);
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
#endif
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogUsage(Buffer);
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
if(PercentageUsed >= 95.0f)
{
// TODO(matt): Implement either dynamically growing buffers, or phoning home to matt@handmadedev.org
LogError(LOG_ERROR, "%s used %.2f%% of its allotted memory\n", Buffer->ID, PercentageUsed);
fprintf(stderr, "\e[1;31mWarning\e[0m: %s used %.2f%% of its allotted memory\n", Buffer->ID, PercentageUsed);
}
else if(PercentageUsed >= 80.0f)
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
{
// TODO(matt): Implement either dynamically growing buffers, or phoning home to matt@handmadedev.org
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogError(LOG_ERROR, "%s used %.2f%% of its allotted memory\n", Buffer->ID, PercentageUsed);
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
fprintf(stderr, "\e[0;33mWarning\e[0m: %s used %.2f%% of its allotted memory\n", Buffer->ID, PercentageUsed);
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
}
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
Buffer->Size = 0;
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
}
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
void
RewindBuffer(buffer *Buffer)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
#if DEBUG
float PercentageUsed = (float)(Buffer->Ptr - Buffer->Location) / Buffer->Size * 100;
printf("Rewinding %s\n"
" Used: %ld / %d (%.2f%%)\n\n",
Buffer->ID,
Buffer->Ptr - Buffer->Location,
Buffer->Size,
PercentageUsed);
#endif
Buffer->Ptr = Buffer->Location;
}
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
enum
{
TEMPLATE_INDEX,
TEMPLATE_PLAYER,
TEMPLATE_BESPOKE
} templates;
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
char *
GetDirectoryPath(char *Filepath)
{
char *Ptr = Filepath + StringLength(Filepath) - 1;
while(Ptr > Filepath && *Ptr != '/')
{
--Ptr;
}
if(Ptr == Filepath)
{
*Ptr++ = '.';
}
*Ptr = '\0';
return Filepath;
}
char *
GetBaseFilename(char *Filepath,
char *Extension // Including the "."
// Pass 0 to retain the whole file path, only without its parent directories
)
{
char *BaseFilename = Filepath + StringLength(Filepath) - 1;
while(BaseFilename > Filepath && *BaseFilename != '/')
{
--BaseFilename;
}
if(*BaseFilename == '/')
{
++BaseFilename;
}
BaseFilename[StringLength(BaseFilename) - StringLength(Extension)] = '\0';
return BaseFilename;
}
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
void
ConstructTemplatePath(template *Template, int TemplateType)
{
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
// NOTE(matt): Bespoke template paths are set relative to:
// in Project Edition: ProjectDir
// in Single Edition: Parent directory of .hmml file
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
if(Template->Metadata.Filename[0] != '/')
{
char Temp[256];
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(Temp, sizeof(Temp), "%s", Template->Metadata.Filename);
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
char *Ptr = Template->Metadata.Filename;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char *End = Template->Metadata.Filename + sizeof(Template->Metadata.Filename);
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
if(TemplateType == TEMPLATE_BESPOKE)
{
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
if(Config.Edition == EDITION_SINGLE)
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
Ptr += CopyString(Ptr, End - Ptr, "%s/", GetDirectoryPath(Config.SingleHMMLFilePath));
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
}
else
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
Ptr += CopyString(Ptr, End - Ptr, "%s/", Config.ProjectDir);
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
}
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
}
else
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
Ptr += CopyString(Ptr, End - Ptr, "%s/", Config.TemplatesDir);
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(Ptr, End - Ptr, "%s", Temp);
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
}
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
int
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
InitTemplate(template **Template)
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
if(MemoryArena.Ptr - MemoryArena.Location + sizeof(template) > MemoryArena.Size)
{
return RC_ARENA_FULL;
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
*Template = (template *)MemoryArena.Ptr;
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
Clear((*Template)->Metadata.Filename, 256); // NOTE(matt): template_metadata specifies Filename[256]
(*Template)->Metadata.Validity = 0;
(*Template)->Metadata.TagCount = 0;
for(int i = 0; i < 16; ++i) // NOTE(matt): template_metadata specifies Tag[16]
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
(*Template)->Metadata.Tag[i].Offset = 0;
(*Template)->Metadata.Tag[i].TagCode = 0;
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
}
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
MemoryArena.Ptr += sizeof(template);
return RC_SUCCESS;
}
int
ClaimTemplate(template **Template, char *Location, int TemplateType)
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString((*Template)->Metadata.Filename, sizeof((*Template)->Metadata.Filename), "%s", Location);
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
ConstructTemplatePath((*Template), TemplateType);
if(TemplateType == TEMPLATE_BESPOKE)
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
fprintf(stderr, "\e[0;35mPacking\e[0m template: %s\n", (*Template)->Metadata.Filename);
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
FILE *File;
if(!(File = fopen((*Template)->Metadata.Filename, "r")))
{
LogError(LOG_ERROR, "Unable to open template %s: %s", (*Template)->Metadata.Filename, strerror(errno));
fprintf(stderr, "Unable to open template %s: %s\n", (*Template)->Metadata.Filename, strerror(errno));
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
Clear((*Template)->Metadata.Filename, 256); // NOTE(matt): template_metadata specifies Filename[256]
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
return RC_ERROR_FILE;
}
fseek(File, 0, SEEK_END);
(*Template)->Buffer.Size = ftell(File);
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
if(MemoryArena.Ptr - MemoryArena.Location + (*Template)->Buffer.Size > MemoryArena.Size)
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
Clear((*Template)->Metadata.Filename, 256); // NOTE(matt): template_metadata specifies Filename[256]
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_ARENA_FULL;
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
(*Template)->Buffer.Location = MemoryArena.Ptr;
(*Template)->Buffer.Ptr = (*Template)->Buffer.Location;
(*Template)->Buffer.ID = (*Template)->Metadata.Filename;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
fseek(File, 0, SEEK_SET);
fread((*Template)->Buffer.Location, (*Template)->Buffer.Size, 1, File);
fclose(File);
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
MemoryArena.Ptr += (*Template)->Buffer.Size;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
#if DEBUG
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
printf(" ClaimTemplate(%s): %d\n"
" Total ClaimedMemory: %ld\n\n", (*Template)->Metadata.Filename, (*Template)->Buffer.Size, MemoryArena.Ptr - MemoryArena.Location);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
#endif
return RC_SUCCESS;
}
int
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
DeclaimTemplate(template *Template)
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
Clear(Template->Metadata.Filename, 256);
Template->Metadata.Validity = 0;
for(int i = 0; i < Template->Metadata.TagCount; ++i)
{
Template->Metadata.Tag[i].Offset = 0;
Template->Metadata.Tag[i].TagCode = 0;
}
Template->Metadata.TagCount = 0;
MemoryArena.Ptr -= (*Template).Buffer.Size;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
#if DEBUG
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
printf("DeclaimTemplate(%s)\n"
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
" Total ClaimedMemory: %ld\n\n",
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
(*Template).Metadata.Filename,
MemoryArena.Ptr - MemoryArena.Location);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
#endif
return RC_SUCCESS;
}
hmml_to_html.c: Log buffer usage Also remove the evidently unused Colour buffer
2017-08-20 21:23:15 +00:00
int
TimecodeToSeconds(char *Timecode)
{
int HMS[3] = { 0, 0, 0 }; // 0 == Seconds; 1 == Minutes; 2 == Hours
int Colons = 0;
while(*Timecode)
{
//if((*Timecode < '0' || *Timecode > '9') && *Timecode != ':') { return FALSE; }
if(*Timecode == ':')
{
++Colons;
//if(Colons > 2) { return FALSE; }
for(int i = 0; i < Colons; ++i)
{
HMS[Colons - i] = HMS[Colons - (i + 1)];
}
HMS[0] = 0;
}
else
{
HMS[0] = HMS[0] * 10 + *Timecode - '0';
}
++Timecode;
}
//if(HMS[0] > 59 || HMS[1] > 59 || Timecode[-1] == ':') { return FALSE; }
return HMS[2] * 60 * 60 + HMS[1] * 60 + HMS[0];
}
hmml_to_html.c: Switch to hsl colours [#23] These colours should be visible on both dark and light backgrounds
2017-04-13 23:46:21 +00:00
typedef struct
{
hmml_to_html.c: Handle all ref combinations [#16]
2017-04-21 01:25:40 +00:00
unsigned int Hue:16;
unsigned int Saturation:8;
unsigned int Lightness:8;
hmml_to_html.c: Switch to hsl colours [#23] These colours should be visible on both dark and light backgrounds
2017-04-13 23:46:21 +00:00
} hsl_colour;
hsl_colour
hmml_to_html.c: Coloured authors [#3]
2017-03-18 02:04:13 +00:00
CharToColour(char Char)
{
hmml_to_html.c: Switch to hsl colours [#23] These colours should be visible on both dark and light backgrounds
2017-04-13 23:46:21 +00:00
hsl_colour Colour;
hmml_to_html.c: Coloured authors [#3]
2017-03-18 02:04:13 +00:00
if(Char >= 'a' && Char <= 'z')
{
hmml_to_html.c: Introduce BuildReference() [#16] Also increase saturation of generated colours
2017-04-19 01:10:45 +00:00
Colour.Hue = (((float)Char - 'a') / ('z' - 'a') * 360);
Colour.Saturation = (((float)Char - 'a') / ('z' - 'a') * 26 + 74);
hmml_to_html.c: Coloured authors [#3]
2017-03-18 02:04:13 +00:00
}
else if(Char >= 'A' && Char <= 'Z')
{
hmml_to_html.c: Introduce BuildReference() [#16] Also increase saturation of generated colours
2017-04-19 01:10:45 +00:00
Colour.Hue = (((float)Char - 'A') / ('Z' - 'A') * 360);
Colour.Saturation = (((float)Char - 'A') / ('Z' - 'A') * 26 + 74);
hmml_to_html.c: Coloured authors [#3]
2017-03-18 02:04:13 +00:00
}
else if(Char >= '0' && Char <= '9')
{
hmml_to_html.c: Introduce BuildReference() [#16] Also increase saturation of generated colours
2017-04-19 01:10:45 +00:00
Colour.Hue = (((float)Char - '0') / ('9' - '0') * 360);
Colour.Saturation = (((float)Char - '0') / ('9' - '0') * 26 + 74);
hmml_to_html.c: Coloured authors [#3]
2017-03-18 02:04:13 +00:00
}
else
{
hmml_to_html.c: Switch to hsl colours [#23] These colours should be visible on both dark and light backgrounds
2017-04-13 23:46:21 +00:00
Colour.Hue = 180;
Colour.Saturation = 50;
hmml_to_html.c: Coloured authors [#3]
2017-03-18 02:04:13 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Switch to hsl colours [#23] These colours should be visible on both dark and light backgrounds
2017-04-13 23:46:21 +00:00
return Colour;
hmml_to_html.c: Coloured authors [#3]
2017-03-18 02:04:13 +00:00
}
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
void
hmml_to_html.c: Correct colour lightness [#3]
2017-06-09 22:04:07 +00:00
StringToColourHash(hsl_colour *Colour, char *String)
hmml_to_html.c: Coloured authors [#3]
2017-03-18 02:04:13 +00:00
{
hmml_to_html.c: Correct colour lightness [#3]
2017-06-09 22:04:07 +00:00
Colour->Hue = 0;
Colour->Saturation = 0;
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
Colour->Lightness = 74;
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Coloured authors [#3]
2017-03-18 02:04:13 +00:00
int i;
for(i = 0; String[i]; ++i)
{
hmml_to_html.c: Correct colour lightness [#3]
2017-06-09 22:04:07 +00:00
Colour->Hue += CharToColour(String[i]).Hue;
Colour->Saturation += CharToColour(String[i]).Saturation;
hmml_to_html.c: Coloured authors [#3]
2017-03-18 02:04:13 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Correct colour lightness [#3]
2017-06-09 22:04:07 +00:00
Colour->Hue = Colour->Hue % 360;
Colour->Saturation = Colour->Saturation % 26 + 74;
hmml_to_html.c: Coloured authors [#3]
2017-03-18 02:04:13 +00:00
}
hmml_to_html.c: Category styling Also upgrade hmml.a for lower-cased markers
2017-03-25 02:07:55 +00:00
char *
SanitisePunctuation(char *String)
{
char *Ptr = String;
while(*Ptr)
{
if(*Ptr == ' ')
{
*Ptr = '_';
}
if((*Ptr < '0' || *Ptr > '9') &&
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
(*Ptr < 'a' || *Ptr > 'z') &&
(*Ptr < 'A' || *Ptr > 'Z'))
hmml_to_html.c: Category styling Also upgrade hmml.a for lower-cased markers
2017-03-25 02:07:55 +00:00
{
*Ptr = '-';
}
++Ptr;
}
return String;
}
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
enum
{
INCLUDE_CSS,
INCLUDE_Images,
INCLUDE_JS,
} include_types;
enum
{
PAGE_PLAYER = 1 << 0,
PAGE_INDEX = 1 << 1
} pages;
void
ConstructURLPrefix(buffer *URLPrefix, int IncludeType, int PageType)
{
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
RewindBuffer(URLPrefix);
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
if(StringsDiffer(Config.RootURL, ""))
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBuffer(URLPrefix, "%s/", Config.RootURL);
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
}
else
{
if(Config.Edition == EDITION_PROJECT)
{
if(PageType == PAGE_PLAYER)
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBuffer(URLPrefix, "../");
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBuffer(URLPrefix, "../");
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
}
}
switch(IncludeType)
{
case INCLUDE_CSS:
if(StringsDiffer(Config.CSSDir, ""))
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBuffer(URLPrefix, "%s/", Config.CSSDir);
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
}
break;
case INCLUDE_Images:
if(StringsDiffer(Config.ImagesDir, ""))
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBuffer(URLPrefix, "%s/", Config.ImagesDir);
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
}
break;
case INCLUDE_JS:
if(StringsDiffer(Config.JSDir, ""))
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBuffer(URLPrefix, "%s/", Config.JSDir);
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
}
break;
}
}
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
typedef struct
{
char Abbreviation[32];
hsl_colour Colour;
credential_info *Credential;
bool Seen;
} speaker;
typedef struct
{
speaker Speaker[16];
int Count;
} speakers;
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
enum
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
{
hmml_to_html.c: Add keywords and sort topic dots
2017-08-19 21:41:51 +00:00
CreditsError_NoHost,
CreditsError_NoAnnotator,
CreditsError_NoCredentials
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
} credits_errors;
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
int
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
SearchCredentials(buffer *CreditsMenu, bool *HasCreditsMenu, char *Person, char *Role, speakers *Speakers)
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{
bool Found = FALSE;
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
for(int CredentialIndex = 0; CredentialIndex < ArrayCount(Credentials); ++CredentialIndex)
{
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
if(!StringsDiffer(Person, Credentials[CredentialIndex].Username))
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
{
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
if(Speakers)
{
Speakers->Speaker[Speakers->Count].Credential = &Credentials[CredentialIndex];
++Speakers->Count;
}
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
Found = TRUE;
if(*HasCreditsMenu == FALSE)
{
CopyStringToBuffer(CreditsMenu,
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
" <div class=\"menu credits\">\n"
" <span>Credits</span>\n"
" <div class=\"credits_container\">\n");
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
*HasCreditsMenu = TRUE;
}
CopyStringToBuffer(CreditsMenu,
" <span class=\"credit\">\n");
if(*Credentials[CredentialIndex].HomepageURL)
{
CopyStringToBuffer(CreditsMenu,
" <a class=\"person\" href=\"%s\" target=\"_blank\">\n"
" <div class=\"role\">%s</div>\n"
" <div class=\"name\">%s</div>\n"
" </a>\n",
Credentials[CredentialIndex].HomepageURL,
Role,
Credentials[CredentialIndex].CreditedName);
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
}
else
{
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
CopyStringToBuffer(CreditsMenu,
" <div class=\"person\">\n"
" <div class=\"role\">%s</div>\n"
" <div class=\"name\">%s</div>\n"
" </div>\n",
Role,
Credentials[CredentialIndex].CreditedName);
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
if(*Credentials[CredentialIndex].SupportIcon && *Credentials[CredentialIndex].SupportURL)
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
{
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
buffer URLPrefix;
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
ClaimBuffer(&URLPrefix, "URLPrefix", 1024);
cinera: Fix bug in image URL prefix construction
2017-12-18 00:15:03 +00:00
ConstructURLPrefix(&URLPrefix, INCLUDE_Images, PAGE_PLAYER);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
CopyStringToBuffer(CreditsMenu,
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
" <a class=\"support\" href=\"%s\" target=\"_blank\"><div class=\"support_icon\" data-sprite=\"%s%s\"></div></a>\n",
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
Credentials[CredentialIndex].SupportURL,
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
URLPrefix.Location,
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
Credentials[CredentialIndex].SupportIcon);
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
DeclaimBuffer(&URLPrefix);
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
CopyStringToBuffer(CreditsMenu,
" </span>\n");
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
}
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
}
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
return Found ? RC_SUCCESS : CreditsError_NoCredentials;
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
void
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
ClearNullTerminatedString(char *String)
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
{
while(*String)
{
*String++ = '\0';
}
}
void
InitialString(char *Dest, char *Src)
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
ClearNullTerminatedString(Dest);
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
*Dest++ = *Src++;
while(*Src++)
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
if(*Src == ' ')
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
{
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
++Src;
if(*Src)
{
*Dest++ = *Src;
}
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
}
}
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
}
void
GetFirstSubstring(char *Dest, char *Src)
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
ClearNullTerminatedString(Dest);
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
while(*Src && *Src != ' ')
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
*Dest++ = *Src++;
}
}
void
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
InitialAndGetFinalString(char *Dest, int DestSize, char *Src)
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
ClearNullTerminatedString(Dest);
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
int SrcLength = StringLength(Src);
char *SrcPtr = Src + SrcLength - 1;
while(SrcPtr > Src && *SrcPtr != ' ')
{
--SrcPtr;
}
if(*SrcPtr == ' ' && SrcPtr - Src < SrcLength - 1)
{
++SrcPtr;
}
if(Src < SrcPtr)
{
*Dest++ = *Src++;
*Dest++ = '.';
*Dest++ = ' ';
while(Src < SrcPtr - 1)
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
if(*Src == ' ')
{
++Src;
if(*Src)
{
*Dest++ = *Src;
*Dest++ = '.';
*Dest++ = ' ';
}
}
++Src;
}
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(Dest, DestSize, "%s", SrcPtr);
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
}
bool
AbbreviationsClash(speakers *Speakers)
{
for(int i = 0; i < Speakers->Count; ++i)
{
for(int j = i + 1; j < Speakers->Count; ++j)
{
if(!StringsDiffer(Speakers->Speaker[i].Abbreviation, Speakers->Speaker[j].Abbreviation))
{
return TRUE;
}
}
}
return FALSE;
}
void
SortAndAbbreviateSpeakers(speakers *Speakers)
{
for(int i = 0; i < Speakers->Count; ++i)
{
for(int j = i + 1; j < Speakers->Count; ++j)
{
if(StringsDiffer(Speakers->Speaker[i].Credential->Username, Speakers->Speaker[j].Credential->Username) > 0)
{
credential_info *Temp = Speakers->Speaker[j].Credential;
Speakers->Speaker[j].Credential = Speakers->Speaker[i].Credential;
Speakers->Speaker[i].Credential = Temp;
break;
}
}
}
for(int i = 0; i < Speakers->Count; ++i)
{
StringToColourHash(&Speakers->Speaker[i].Colour, Speakers->Speaker[i].Credential->Username);
InitialString(Speakers->Speaker[i].Abbreviation, Speakers->Speaker[i].Credential->CreditedName);
}
int Attempt = 0;
while(AbbreviationsClash(Speakers))
{
for(int i = 0; i < Speakers->Count; ++i)
{
switch(Attempt)
{
case 0: GetFirstSubstring(Speakers->Speaker[i].Abbreviation, Speakers->Speaker[i].Credential->CreditedName); break;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
case 1: InitialAndGetFinalString(Speakers->Speaker[i].Abbreviation, sizeof(Speakers->Speaker[i].Abbreviation), Speakers->Speaker[i].Credential->CreditedName); break;
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
case 2: ClearCopyStringNoFormat(Speakers->Speaker[i].Abbreviation, sizeof(Speakers->Speaker[i].Abbreviation), Speakers->Speaker[i].Credential->Username); break;
}
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
}
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
++Attempt;
}
}
int
BuildCredits(buffer *CreditsMenu, bool *HasCreditsMenu, HMML_VideoMetaData *Metadata, speakers *Speakers)
// TODO(matt): Make this take the Credentials, once we are parsing them from a config
{
if(SearchCredentials(CreditsMenu, HasCreditsMenu, Metadata->member, "Host", Speakers) == CreditsError_NoCredentials)
{
printf("No credentials for member %s. Please contact matt@handmadedev.org with their:\n"
" Full name\n"
" Homepage URL (optional)\n"
" Financial support info, e.g. Patreon URL (optional)\n", Metadata->member);
return CreditsError_NoCredentials;
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
if(Metadata->co_host_count > 0)
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
for(int i = 0; i < Metadata->co_host_count; ++i)
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
if(SearchCredentials(CreditsMenu, HasCreditsMenu, Metadata->co_hosts[i], "Co-host", Speakers) == CreditsError_NoCredentials)
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
{
cinera.c: Validate timecode chronology Also correctly skip .hmml files for credentials-related reasons
2018-02-05 23:57:17 +00:00
printf("No credentials for co-host %s. Please contact matt@handmadedev.org with their:\n"
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
" Full name\n"
" Homepage URL (optional)\n"
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
" Financial support info, e.g. Patreon URL (optional)\n", Metadata->co_hosts[i]);
cinera.c: Validate timecode chronology Also correctly skip .hmml files for credentials-related reasons
2018-02-05 23:57:17 +00:00
return CreditsError_NoCredentials;
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
}
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
}
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
if(Metadata->guest_count > 0)
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
for(int i = 0; i < Metadata->guest_count; ++i)
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
if(SearchCredentials(CreditsMenu, HasCreditsMenu, Metadata->guests[i], "Guest", Speakers) == CreditsError_NoCredentials)
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
{
cinera.c: Validate timecode chronology Also correctly skip .hmml files for credentials-related reasons
2018-02-05 23:57:17 +00:00
printf("No credentials for guest %s. Please contact matt@handmadedev.org with their:\n"
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
" Full name\n"
" Homepage URL (optional)\n"
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
" Financial support info, e.g. Patreon URL (optional)\n", Metadata->guests[i]);
cinera.c: Validate timecode chronology Also correctly skip .hmml files for credentials-related reasons
2018-02-05 23:57:17 +00:00
return CreditsError_NoCredentials;
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
}
}
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
if(Speakers->Count > 1)
{
SortAndAbbreviateSpeakers(Speakers);
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
if(Metadata->annotator_count > 0)
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
for(int i = 0; i < Metadata->annotator_count; ++i)
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
{
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
if(SearchCredentials(CreditsMenu, HasCreditsMenu, Metadata->annotators[i], "Annotator", 0) == CreditsError_NoCredentials)
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{
cinera.c: Validate timecode chronology Also correctly skip .hmml files for credentials-related reasons
2018-02-05 23:57:17 +00:00
printf("No credentials for annotator %s. Please contact matt@handmadedev.org with their:\n"
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
" Full name\n"
" Homepage URL (optional)\n"
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
" Financial support info, e.g. Patreon URL (optional)\n", Metadata->annotators[i]);
cinera.c: Validate timecode chronology Also correctly skip .hmml files for credentials-related reasons
2018-02-05 23:57:17 +00:00
return CreditsError_NoCredentials;
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
}
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
}
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
}
else
{
if(*HasCreditsMenu == TRUE)
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
{
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
CopyStringToBuffer(CreditsMenu,
" </div>\n"
" </div>\n");
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
}
cinera.c: Validate timecode chronology Also correctly skip .hmml files for credentials-related reasons
2018-02-05 23:57:17 +00:00
fprintf(stderr, "Missing \"annotator\" in the [video] node\n");
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
return CreditsError_NoAnnotator;
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
}
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
if(*HasCreditsMenu == TRUE)
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
{
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
CopyStringToBuffer(CreditsMenu,
" </div>\n"
" </div>\n");
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera.c: Validate timecode chronology Also correctly skip .hmml files for credentials-related reasons
2018-02-05 23:57:17 +00:00
return RC_SUCCESS;
hmml_to_html.c: Credits menu [#4]
2017-05-25 20:28:52 +00:00
}
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
enum
{
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
REF_SITE = 1 << 0,
REF_PAGE = 1 << 1,
REF_URL = 1 << 2,
REF_TITLE = 1 << 3,
REF_ARTICLE = 1 << 4,
REF_AUTHOR = 1 << 5,
REF_EDITOR = 1 << 6,
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
REF_PUBLISHER = 1 << 7,
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
REF_ISBN = 1 << 8,
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
} reference_fields;
hmml_to_html.c: Handle all ref combinations [#16]
2017-04-21 01:25:40 +00:00
int
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
BuildReference(ref_info *ReferencesArray, int RefIdentifier, int UniqueRefs, HMML_Reference *Ref, HMML_Annotation *Anno)
hmml_to_html.c: Introduce BuildReference() [#16] Also increase saturation of generated colours
2017-04-19 01:10:45 +00:00
{
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
if(Ref->isbn)
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(ReferencesArray[UniqueRefs].ID, sizeof(ReferencesArray[UniqueRefs].ID), "%s", Ref->isbn);
if(!Ref->url) { CopyString(ReferencesArray[UniqueRefs].URL, sizeof(ReferencesArray[UniqueRefs].URL), "https://isbndb.com/book/%s", Ref->isbn); }
else { CopyStringNoFormat(ReferencesArray[UniqueRefs].URL, sizeof(ReferencesArray[UniqueRefs].URL), Ref->url); }
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
}
else if(Ref->url)
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(ReferencesArray[UniqueRefs].ID, sizeof(ReferencesArray[UniqueRefs].ID), Ref->url);
CopyStringNoFormat(ReferencesArray[UniqueRefs].URL, sizeof(ReferencesArray[UniqueRefs].URL), Ref->url);
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
}
else { return RC_INVALID_REFERENCE; }
hmml_to_html.c: Fix reference bugs * Comma separation of > 2 ref identifiers at the same offset * Fix multiple refs all at the same (possibly not -1) offset * Reference combinations, use flags to ensure we are using a valid combination We also tried to handle quote speakers other than the host, but appeared to hit a bug in hmmlib.h in which the quote.author got set to "quote" for the second (and subsequent) quote node in a set of annotations
2017-07-29 23:01:39 +00:00
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
int Mask = 0;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
if(Ref->site) { Mask |= REF_SITE; }
if(Ref->page) { Mask |= REF_PAGE; }
if(Ref->title) { Mask |= REF_TITLE; }
if(Ref->article) { Mask |= REF_ARTICLE; }
if(Ref->author) { Mask |= REF_AUTHOR; }
if(Ref->editor) { Mask |= REF_EDITOR; }
if(Ref->publisher) { Mask |= REF_PUBLISHER; }
hmml_to_html.c: Fix reference bugs * Comma separation of > 2 ref identifiers at the same offset * Fix multiple refs all at the same (possibly not -1) offset * Reference combinations, use flags to ensure we are using a valid combination We also tried to handle quote speakers other than the host, but appeared to hit a bug in hmmlib.h in which the quote.author got set to "quote" for the second (and subsequent) quote node in a set of annotations
2017-07-29 23:01:39 +00:00
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
// TODO(matt): Consider handling the various combinations more flexibly, unless we defer this stuff until we have the
// reference store, in which we could optionally customise the display of each reference entry
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
switch(Mask)
hmml_to_html.c: Handle all ref combinations [#16]
2017-04-21 01:25:40 +00:00
{
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
case (REF_TITLE | REF_AUTHOR | REF_PUBLISHER):
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(ReferencesArray[UniqueRefs].Source, sizeof(ReferencesArray[UniqueRefs].Source), "%s (%s)", Ref->author, Ref->publisher);
CopyStringNoFormat(ReferencesArray[UniqueRefs].RefTitle, sizeof(ReferencesArray[UniqueRefs].RefTitle), Ref->title);
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
} break;
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
case (REF_AUTHOR | REF_SITE | REF_PAGE):
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(ReferencesArray[UniqueRefs].Source, sizeof(ReferencesArray[UniqueRefs].Source), Ref->site);
CopyString(ReferencesArray[UniqueRefs].RefTitle, sizeof(ReferencesArray[UniqueRefs].RefTitle), "%s: \"%s\"", Ref->author, Ref->page);
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
} break;
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
case (REF_PAGE | REF_TITLE):
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(ReferencesArray[UniqueRefs].Source, sizeof(ReferencesArray[UniqueRefs].Source), Ref->title);
CopyStringNoFormat(ReferencesArray[UniqueRefs].RefTitle, sizeof(ReferencesArray[UniqueRefs].RefTitle), Ref->page);
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
} break;
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
case (REF_SITE | REF_PAGE):
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(ReferencesArray[UniqueRefs].Source, sizeof(ReferencesArray[UniqueRefs].Source), Ref->site);
CopyStringNoFormat(ReferencesArray[UniqueRefs].RefTitle, sizeof(ReferencesArray[UniqueRefs].RefTitle), Ref->page);
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
} break;
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
case (REF_SITE | REF_TITLE):
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(ReferencesArray[UniqueRefs].Source, sizeof(ReferencesArray[UniqueRefs].Source), Ref->site);
CopyStringNoFormat(ReferencesArray[UniqueRefs].RefTitle, sizeof(ReferencesArray[UniqueRefs].RefTitle), Ref->title);
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
} break;
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
case (REF_TITLE | REF_AUTHOR):
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(ReferencesArray[UniqueRefs].Source, sizeof(ReferencesArray[UniqueRefs].Source), Ref->author);
CopyStringNoFormat(ReferencesArray[UniqueRefs].RefTitle, sizeof(ReferencesArray[UniqueRefs].RefTitle), Ref->title);
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
} break;
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
case (REF_ARTICLE | REF_AUTHOR):
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(ReferencesArray[UniqueRefs].Source, sizeof(ReferencesArray[UniqueRefs].Source), Ref->author);
CopyStringNoFormat(ReferencesArray[UniqueRefs].RefTitle, sizeof(ReferencesArray[UniqueRefs].RefTitle), Ref->article);
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
} break;
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
case (REF_TITLE | REF_PUBLISHER):
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(ReferencesArray[UniqueRefs].Source, sizeof(ReferencesArray[UniqueRefs].Source), Ref->publisher);
CopyStringNoFormat(ReferencesArray[UniqueRefs].RefTitle, sizeof(ReferencesArray[UniqueRefs].RefTitle), Ref->title);
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
} break;
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
case REF_TITLE:
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(ReferencesArray[UniqueRefs].RefTitle, sizeof(ReferencesArray[UniqueRefs].RefTitle), Ref->title);
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
} break;
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
case REF_SITE:
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(ReferencesArray[UniqueRefs].RefTitle, sizeof(ReferencesArray[UniqueRefs].RefTitle), Ref->site);
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
} break;
default: return RC_INVALID_REFERENCE; break;
hmml_to_html.c: Handle all ref combinations [#16]
2017-04-21 01:25:40 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(ReferencesArray[UniqueRefs].Identifier[ReferencesArray[UniqueRefs].IdentifierCount].Timecode, sizeof(ReferencesArray[UniqueRefs].Identifier[ReferencesArray[UniqueRefs].IdentifierCount].Timecode), "%s", Anno->time);
hmml_to_html.c: Introduce BuildReference() [#16] Also increase saturation of generated colours
2017-04-19 01:10:45 +00:00
ReferencesArray[UniqueRefs].Identifier[ReferencesArray[UniqueRefs].IdentifierCount].Identifier = RefIdentifier;
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
return RC_SUCCESS;
hmml_to_html.c: Introduce BuildReference() [#16] Also increase saturation of generated colours
2017-04-19 01:10:45 +00:00
}
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
void
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
InsertCategory(categories *GlobalTopics, categories *LocalTopics, categories *GlobalMedia, categories *LocalMedia, char *Marker)
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
{
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
bool IsMedium = FALSE;
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Add keywords and sort topic dots
2017-08-19 21:41:51 +00:00
int CategoryMediumIndex;
for(CategoryMediumIndex = 0; CategoryMediumIndex < ArrayCount(CategoryMedium); ++CategoryMediumIndex)
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
{
hmml_to_html.c: Add keywords and sort topic dots
2017-08-19 21:41:51 +00:00
if(!StringsDiffer(CategoryMedium[CategoryMediumIndex].Medium, Marker))
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
{
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
IsMedium = TRUE;
break;
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
}
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
if(IsMedium)
{
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
int MediumIndex;
for(MediumIndex = 0; MediumIndex < LocalMedia->Count; ++MediumIndex)
hmml_to_html.c: Sort filter [#21] This works, but fails to take into account the "written text" of media
2017-05-22 21:37:00 +00:00
{
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if(!StringsDiffer(CategoryMedium[CategoryMediumIndex].Medium, LocalMedia->Category[MediumIndex].Marker))
hmml_to_html.c: Sort filter [#21] This works, but fails to take into account the "written text" of media
2017-05-22 21:37:00 +00:00
{
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
return;
hmml_to_html.c: Sort filter [#21] This works, but fails to take into account the "written text" of media
2017-05-22 21:37:00 +00:00
}
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if((StringsDiffer(CategoryMedium[CategoryMediumIndex].WrittenName, LocalMedia->Category[MediumIndex].WrittenText)) < 0)
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
{
hmml_to_html.c: Add keywords and sort topic dots
2017-08-19 21:41:51 +00:00
int CategoryCount;
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
for(CategoryCount = LocalMedia->Count; CategoryCount > MediumIndex; --CategoryCount)
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(LocalMedia->Category[CategoryCount].Marker, sizeof(LocalMedia->Category[CategoryCount].Marker), "%s", LocalMedia->Category[CategoryCount-1].Marker);
CopyString(LocalMedia->Category[CategoryCount].WrittenText, sizeof(LocalMedia->Category[CategoryCount].WrittenText), "%s", LocalMedia->Category[CategoryCount-1].WrittenText);
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(LocalMedia->Category[CategoryCount].Marker, sizeof(LocalMedia->Category[CategoryCount].Marker), "%s", CategoryMedium[CategoryMediumIndex].Medium);
CopyString(LocalMedia->Category[CategoryCount].WrittenText, sizeof(LocalMedia->Category[CategoryCount].WrittenText), "%s", CategoryMedium[CategoryMediumIndex].WrittenName);
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
break;
}
hmml_to_html.c: Sort filter [#21] This works, but fails to take into account the "written text" of media
2017-05-22 21:37:00 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if(MediumIndex == LocalMedia->Count)
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(LocalMedia->Category[MediumIndex].Marker, sizeof(LocalMedia->Category[MediumIndex].Marker), "%s", CategoryMedium[CategoryMediumIndex].Medium);
CopyString(LocalMedia->Category[MediumIndex].WrittenText, sizeof(LocalMedia->Category[MediumIndex].WrittenText), "%s", CategoryMedium[CategoryMediumIndex].WrittenName);
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
++LocalMedia->Count;
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
for(MediumIndex = 0; MediumIndex < GlobalMedia->Count; ++MediumIndex)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if(!StringsDiffer(CategoryMedium[CategoryMediumIndex].Medium, GlobalMedia->Category[MediumIndex].Marker))
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
return;
}
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if((StringsDiffer(CategoryMedium[CategoryMediumIndex].WrittenName, GlobalMedia->Category[MediumIndex].WrittenText)) < 0)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
int CategoryCount;
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
for(CategoryCount = GlobalMedia->Count; CategoryCount > MediumIndex; --CategoryCount)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(GlobalMedia->Category[CategoryCount].Marker, sizeof(GlobalMedia->Category[CategoryCount].Marker), "%s", GlobalMedia->Category[CategoryCount-1].Marker);
CopyString(GlobalMedia->Category[CategoryCount].WrittenText, sizeof(GlobalMedia->Category[CategoryCount].WrittenText), "%s", GlobalMedia->Category[CategoryCount-1].WrittenText);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(GlobalMedia->Category[CategoryCount].Marker, sizeof(GlobalMedia->Category[CategoryCount].Marker), "%s", CategoryMedium[CategoryMediumIndex].Medium);
CopyString(GlobalMedia->Category[CategoryCount].WrittenText, sizeof(GlobalMedia->Category[CategoryCount].WrittenText), "%s", CategoryMedium[CategoryMediumIndex].WrittenName);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
break;
}
}
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if(MediumIndex == GlobalMedia->Count)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(GlobalMedia->Category[MediumIndex].Marker, sizeof(GlobalMedia->Category[MediumIndex].Marker), "%s", CategoryMedium[CategoryMediumIndex].Medium);
CopyString(GlobalMedia->Category[MediumIndex].WrittenText, sizeof(GlobalMedia->Category[MediumIndex].WrittenText), "%s", CategoryMedium[CategoryMediumIndex].WrittenName);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
++GlobalMedia->Count;
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
}
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
else
{
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
int TopicIndex;
for(TopicIndex = 0; TopicIndex < LocalTopics->Count; ++TopicIndex)
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
{
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if(!StringsDiffer(Marker, LocalTopics->Category[TopicIndex].Marker))
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
{
return;
}
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if((StringsDiffer(Marker, LocalTopics->Category[TopicIndex].Marker)) < 0)
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
{
hmml_to_html.c: Add keywords and sort topic dots
2017-08-19 21:41:51 +00:00
int CategoryCount;
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
for(CategoryCount = LocalTopics->Count; CategoryCount > TopicIndex; --CategoryCount)
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(LocalTopics->Category[CategoryCount].Marker, sizeof(LocalTopics->Category[CategoryCount].Marker), "%s", LocalTopics->Category[CategoryCount-1].Marker);
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(LocalTopics->Category[CategoryCount].Marker, sizeof(LocalTopics->Category[CategoryCount].Marker), "%s", Marker);
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
break;
}
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if(TopicIndex == LocalTopics->Count)
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(LocalTopics->Category[TopicIndex].Marker, sizeof(LocalTopics->Category[TopicIndex].Marker), "%s", Marker);
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
++LocalTopics->Count;
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
for(TopicIndex = 0; TopicIndex < GlobalTopics->Count; ++TopicIndex)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if(!StringsDiffer(Marker, GlobalTopics->Category[TopicIndex].Marker))
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
return;
}
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
// NOTE(matt): This successfully sorts "nullTopic" at the end, but maybe figure out a more general way to force the
// order of stuff, perhaps blocks of dudes that should sort to the start / end
if(((StringsDiffer(Marker, GlobalTopics->Category[TopicIndex].Marker)) < 0 || !StringsDiffer(GlobalTopics->Category[TopicIndex].Marker, "nullTopic")))
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if(StringsDiffer(Marker, "nullTopic")) // NOTE(matt): This test (with the above || condition) forces nullTopic never to be inserted, only appended
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
int CategoryCount;
for(CategoryCount = GlobalTopics->Count; CategoryCount > TopicIndex; --CategoryCount)
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(GlobalTopics->Category[CategoryCount].Marker, sizeof(GlobalTopics->Category[CategoryCount].Marker), "%s", GlobalTopics->Category[CategoryCount-1].Marker);
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(GlobalTopics->Category[CategoryCount].Marker, sizeof(GlobalTopics->Category[CategoryCount].Marker), "%s", Marker);
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
break;
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
}
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if(TopicIndex == GlobalTopics->Count)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(GlobalTopics->Category[TopicIndex].Marker, sizeof(GlobalTopics->Category[TopicIndex].Marker), "%s", Marker);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
++GlobalTopics->Count;
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
}
}
hmml_to_html.c: Introduce BuildCatgories() Also update reference.html with :research as a CategoryMedium
2017-03-25 03:10:15 +00:00
void
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
BuildCategories(buffer *AnnotationClass, buffer *CategoryIcons, categories *LocalTopics, categories *LocalMedia, int *MarkerIndex, char *DefaultMedium)
hmml_to_html.c: Introduce BuildCatgories() Also update reference.html with :research as a CategoryMedium
2017-03-25 03:10:15 +00:00
{
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
bool CategoriesSpan = FALSE;
if(!(LocalTopics->Count == 1 && !StringsDiffer(LocalTopics->Category[0].Marker, "nullTopic")
&& LocalMedia->Count == 1 && !StringsDiffer(LocalMedia->Category[0].Marker, DefaultMedium)))
{
CategoriesSpan = TRUE;
CopyStringToBuffer(CategoryIcons, "<span class=\"cineraCategories\">");
}
if(LocalTopics->Count == 1 && !StringsDiffer(LocalTopics->Category[0].Marker, "nullTopic"))
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char SanitisedMarker[StringLength(LocalTopics->Category[0].Marker) + 1];
CopyString(SanitisedMarker, sizeof(SanitisedMarker), "%s", LocalTopics->Category[0].Marker);
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
SanitisePunctuation(SanitisedMarker);
CopyStringToBuffer(AnnotationClass, " cat_%s", SanitisedMarker);
}
else
hmml_to_html.c: Introduce BuildCatgories() Also update reference.html with :research as a CategoryMedium
2017-03-25 03:10:15 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
for(int i = 0; i < LocalTopics->Count; ++i)
hmml_to_html.c: Introduce BuildCatgories() Also update reference.html with :research as a CategoryMedium
2017-03-25 03:10:15 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char SanitisedMarker[StringLength(LocalTopics->Category[i].Marker) + 1];
CopyString(SanitisedMarker, sizeof(SanitisedMarker), "%s", LocalTopics->Category[i].Marker);
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
SanitisePunctuation(SanitisedMarker);
CopyStringToBuffer(CategoryIcons, "<div title=\"%s\" class=\"category %s\"></div>",
LocalTopics->Category[i].Marker,
SanitisedMarker);
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Add keywords and sort topic dots
2017-08-19 21:41:51 +00:00
CopyStringToBuffer(AnnotationClass, " cat_%s",
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
SanitisedMarker);
hmml_to_html.c: Deduplicate topics and add tooltip Also fix bug in filter menu navigation, in which the lastFocusedElement was not getting set after toggling a category via the keyboard
2017-06-11 22:49:04 +00:00
}
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if(LocalMedia->Count == 1 && !StringsDiffer(LocalMedia->Category[0].Marker, DefaultMedium))
hmml_to_html.c: Deduplicate topics and add tooltip Also fix bug in filter menu navigation, in which the lastFocusedElement was not getting set after toggling a category via the keyboard
2017-06-11 22:49:04 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char SanitisedMarker[StringLength(LocalMedia->Category[0].Marker) + 1];
CopyString(SanitisedMarker, sizeof(SanitisedMarker), "%s", LocalMedia->Category[0].Marker);
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
SanitisePunctuation(SanitisedMarker);
CopyStringToBuffer(AnnotationClass, " %s", SanitisedMarker);
}
else
{
for(int i = 0; i < LocalMedia->Count; ++i)
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char SanitisedMarker[StringLength(LocalMedia->Category[i].Marker) + 1];
CopyString(SanitisedMarker, sizeof(SanitisedMarker), "%s", LocalMedia->Category[i].Marker);
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
SanitisePunctuation(SanitisedMarker);
if(!StringsDiffer(LocalMedia->Category[i].Marker, "afk")) // TODO(matt): Initially hidden config
{
CopyStringToBuffer(AnnotationClass, " off_%s skip", SanitisedMarker); // TODO(matt): Bulletproof this?
}
else
{
for(int j = 0; j < ArrayCount(CategoryMedium); ++j)
{
if(!StringsDiffer(LocalMedia->Category[i].Marker, CategoryMedium[j].Medium))
{
CopyStringToBuffer(CategoryIcons, "<div title=\"%s\" class=\"categoryMedium %s\">%s</div>",
LocalMedia->Category[i].WrittenText,
LocalMedia->Category[i].Marker,
CategoryMedium[j].Icon);
CopyStringToBuffer(AnnotationClass, " %s", SanitisedMarker);
}
}
}
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
}
hmml_to_html.c: Deduplicate topics and add tooltip Also fix bug in filter menu navigation, in which the lastFocusedElement was not getting set after toggling a category via the keyboard
2017-06-11 22:49:04 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if(CategoriesSpan)
{
CopyStringToBuffer(CategoryIcons, "</span>");
}
hmml_to_html.c: Add keywords and sort topic dots
2017-08-19 21:41:51 +00:00
CopyStringToBuffer(AnnotationClass, "\"");
hmml_to_html.c: Introduce BuildCatgories() Also update reference.html with :research as a CategoryMedium
2017-03-25 03:10:15 +00:00
}
hmml_to_html.c: Introduce BuildQuote() [#20] Also move some structural styling out to style.css
2017-04-23 02:47:42 +00:00
int
StringToInt(char *String)
{
int Result = 0;
while(*String)
{
Result = Result * 10 + (*String - '0');
++String;
}
return Result;
}
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
size_t
CurlIntoBuffer(char *InPtr, size_t CharLength, size_t Chars, char **OutputPtr)
{
int Length = CharLength * Chars;
int i;
for(i = 0; InPtr[i] && i < Length; ++i)
{
*((*OutputPtr)++) = InPtr[i];
}
**OutputPtr = '\0';
return Length;
};
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
void
CurlQuotes(buffer *QuoteStaging, char *QuotesURL)
{
cinera.css: Marker and categories style cinera_player_pre.js: Episode keyboard navigation. Also swap out A for K, and D for J cinera_player_pre.js: Handle the case in onRefChanged() in which the filter_container or filterState is not present cinera.c: Refetch quotes when processing a set of annotations >60 mins after the last fetch Flags: -w Force quote cache rebuild
2018-02-28 01:04:06 +00:00
fprintf(stderr, "\e[0;35mFetching\e[0m quotes: %s\n", QuotesURL);
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
CURL *curl = curl_easy_init();
if(curl) {
cinera_player_pre.js: Reenable YT interaction Essentially, the previous change prevented the marker progress code from firing if the user only interacts with the YouTube player directly. cinera.c: Try to curl the quotes in, rather than straight up deleting them, if(ShouldFetchQuotes)
2018-02-28 20:18:11 +00:00
CURLcode CurlReturnCode;
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &QuoteStaging->Ptr);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlIntoBuffer);
curl_easy_setopt(curl, CURLOPT_URL, QuotesURL);
cinera_player_pre.js: Reenable YT interaction Essentially, the previous change prevented the marker progress code from firing if the user only interacts with the YouTube player directly. cinera.c: Try to curl the quotes in, rather than straight up deleting them, if(ShouldFetchQuotes)
2018-02-28 20:18:11 +00:00
if((CurlReturnCode = curl_easy_perform(curl)))
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
{
cinera_player_pre.js: Reenable YT interaction Essentially, the previous change prevented the marker progress code from firing if the user only interacts with the YouTube player directly. cinera.c: Try to curl the quotes in, rather than straight up deleting them, if(ShouldFetchQuotes)
2018-02-28 20:18:11 +00:00
fprintf(stderr, "%s\n", curl_easy_strerror(CurlReturnCode));
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
}
curl_easy_cleanup(curl);
}
}
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
int
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
SearchQuotes(buffer *QuoteStaging, int CacheSize, quote_info *Info, int ID)
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
QuoteStaging->Ptr = QuoteStaging->Location;
while(QuoteStaging->Ptr - QuoteStaging->Location < CacheSize)
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char InID[8] = { 0 };
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
char InTime[16] = { 0 };
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
QuoteStaging->Ptr += CopyStringNoFormatT(InID, sizeof(InID), QuoteStaging->Ptr, ',') + 1; // Skip past the ','
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
if(StringToInt(InID) == ID)
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
QuoteStaging->Ptr += CopyStringNoFormatT(InTime, sizeof(InTime), QuoteStaging->Ptr, ',') + 1; // Skip past the ','
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
long int Time = StringToInt(InTime);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char DayString[3] = { 0 };
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
strftime(DayString, 3, "%d", gmtime(&Time));
int Day = StringToInt(DayString);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char DaySuffix[3]; if(DayString[1] == '1' && Day != 11) { CopyString(DaySuffix, sizeof(DaySuffix), "st"); }
else if(DayString[1] == '2' && Day != 12) { CopyString(DaySuffix, sizeof(DaySuffix), "nd"); }
else if(DayString[1] == '3' && Day != 13) { CopyString(DaySuffix, sizeof(DaySuffix), "rd"); }
else { CopyString(DaySuffix, sizeof(DaySuffix), "th"); }
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
char MonthYear[32];
strftime(MonthYear, 32, "%B, %Y", gmtime(&Time));
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(Info->Date, sizeof(Info->Date), "%d%s %s", Day, DaySuffix, MonthYear);
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormatT(Info->Text, sizeof(Info->Text), QuoteStaging->Ptr, '\n');
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
FreeBuffer(QuoteStaging);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_FOUND;
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
}
else
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
while(*QuoteStaging->Ptr != '\n')
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
++QuoteStaging->Ptr;
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
++QuoteStaging->Ptr;
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
}
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_UNFOUND;
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
}
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
int
cinera.css: Marker and categories style cinera_player_pre.js: Episode keyboard navigation. Also swap out A for K, and D for J cinera_player_pre.js: Handle the case in onRefChanged() in which the filter_container or filterState is not present cinera.c: Refetch quotes when processing a set of annotations >60 mins after the last fetch Flags: -w Force quote cache rebuild
2018-02-28 01:04:06 +00:00
BuildQuote(quote_info *Info, char *Speaker, int ID, bool ShouldFetchQuotes)
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
{
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
char QuoteCacheDir[256];
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(QuoteCacheDir, sizeof(QuoteCacheDir), "%s/quotes", Config.CacheDir);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
char QuoteCachePath[256];
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(QuoteCachePath, sizeof(QuoteCachePath), "%s/%s", QuoteCacheDir, Speaker);
cinera.css: Marker and categories style cinera_player_pre.js: Episode keyboard navigation. Also swap out A for K, and D for J cinera_player_pre.js: Handle the case in onRefChanged() in which the filter_container or filterState is not present cinera.c: Refetch quotes when processing a set of annotations >60 mins after the last fetch Flags: -w Force quote cache rebuild
2018-02-28 01:04:06 +00:00
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
FILE *QuoteCache;
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
char QuotesURL[256];
cinera_player_pre.js: Reenable YT interaction Essentially, the previous change prevented the marker progress code from firing if the user only interacts with the YouTube player directly. cinera.c: Try to curl the quotes in, rather than straight up deleting them, if(ShouldFetchQuotes)
2018-02-28 20:18:11 +00:00
// TODO(matt): Make the URL configurable and also handle the case in which the .raw isn't available
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(QuotesURL, sizeof(QuotesURL), "https://dev.abaines.me.uk/quotes/%s.raw", Speaker);
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
bool CacheAvailable = FALSE;
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
if(!(QuoteCache = fopen(QuoteCachePath, "a+")))
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
if(MakeDir(QuoteCacheDir) == RC_SUCCESS)
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
{
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
CacheAvailable = TRUE;
cinera.css: Marker and categories style cinera_player_pre.js: Episode keyboard navigation. Also swap out A for K, and D for J cinera_player_pre.js: Handle the case in onRefChanged() in which the filter_container or filterState is not present cinera.c: Refetch quotes when processing a set of annotations >60 mins after the last fetch Flags: -w Force quote cache rebuild
2018-02-28 01:04:06 +00:00
}
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
if(!(QuoteCache = fopen(QuoteCachePath, "a+")))
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
fprintf(stderr, "Unable to open quote cache %s: %s\n", QuoteCachePath, strerror(errno));
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
}
else
{
CacheAvailable = TRUE;
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
}
}
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
else
{
CacheAvailable = TRUE;
}
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
buffer QuoteStaging;
QuoteStaging.ID = "QuoteStaging";
QuoteStaging.Size = Kilobytes(256);
if(!(QuoteStaging.Location = malloc(QuoteStaging.Size)))
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
fclose(QuoteCache);
return RC_ERROR_MEMORY;
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
#if DEBUG_MEM
FILE *MemLog = fopen("/home/matt/cinera_mem", "a+");
fprintf(MemLog, " Allocated QuoteStaging (%d)\n", QuoteStaging.Size);
fclose(MemLog);
printf(" Allocated QuoteStaging (%d)\n", QuoteStaging.Size);
#endif
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
QuoteStaging.Ptr = QuoteStaging.Location;
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
if(CacheAvailable)
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
{
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
fseek(QuoteCache, 0, SEEK_END);
int FileSize = ftell(QuoteCache);
fseek(QuoteCache, 0, SEEK_SET);
fread(QuoteStaging.Location, FileSize, 1, QuoteCache);
fclose(QuoteCache);
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
cinera_player_pre.js: Reenable YT interaction Essentially, the previous change prevented the marker progress code from firing if the user only interacts with the YouTube player directly. cinera.c: Try to curl the quotes in, rather than straight up deleting them, if(ShouldFetchQuotes)
2018-02-28 20:18:11 +00:00
if(ShouldFetchQuotes || SearchQuotes(&QuoteStaging, FileSize, Info, ID) == RC_UNFOUND)
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
{
CurlQuotes(&QuoteStaging, QuotesURL);
if(!(QuoteCache = fopen(QuoteCachePath, "w")))
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
{
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
perror(QuoteCachePath);
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
}
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
fwrite(QuoteStaging.Location, QuoteStaging.Ptr - QuoteStaging.Location, 1, QuoteCache);
fclose(QuoteCache);
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
int CacheSize = QuoteStaging.Ptr - QuoteStaging.Location;
QuoteStaging.Ptr = QuoteStaging.Location;
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
if(SearchQuotes(&QuoteStaging, CacheSize, Info, ID) == RC_UNFOUND)
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
{
FreeBuffer(&QuoteStaging);
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
return RC_UNFOUND;
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
}
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
}
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
}
else
{
CurlQuotes(&QuoteStaging, QuotesURL);
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
int CacheSize = QuoteStaging.Ptr - QuoteStaging.Location;
QuoteStaging.Ptr = QuoteStaging.Location;
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
if(SearchQuotes(&QuoteStaging, CacheSize, Info, ID) == RC_UNFOUND)
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
{
FreeBuffer(&QuoteStaging);
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
return RC_UNFOUND;
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
}
}
hmml_to_html.c: Fix quoting
2017-08-11 22:41:52 +00:00
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
return RC_SUCCESS;
hmml_to_html.c: Cache the quotes Also link to insofaras' quote site
2017-08-10 01:05:41 +00:00
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
int
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
GenerateTopicColours(char *Topic)
hmml_to_html.c: Generate topics.css [#22]
2017-03-31 00:56:50 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char SanitisedTopic[StringLength(Topic) + 1];
CopyString(SanitisedTopic, sizeof(SanitisedTopic), "%s", Topic);
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
SanitisePunctuation(SanitisedTopic);
hmml_to_html.c: Generate topics.css [#22]
2017-03-31 00:56:50 +00:00
for(int i = 0; i < ArrayCount(CategoryMedium); ++i)
{
hmml_to_html.c: Complete credits [#4] Support multiple co-hosts, guests and annotators
2017-08-18 22:46:58 +00:00
if(!StringsDiffer(Topic, CategoryMedium[i].Medium))
hmml_to_html.c: Generate topics.css [#22]
2017-03-31 00:56:50 +00:00
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_NOOP;
hmml_to_html.c: Generate topics.css [#22]
2017-03-31 00:56:50 +00:00
}
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
file_buffer Topics;
Topics.Buffer.ID = "Topics";
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
if(StringsDiffer(Config.CSSDir, ""))
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(Topics.Path, sizeof(Topics.Path), "%s/%s/cinera_topics.css", Config.RootDir, Config.CSSDir);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
}
else
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(Topics.Path, sizeof(Topics.Path), "%s/cinera_topics.css", Config.RootDir);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
cinera.c: Call MakeDir() in GenerateTopicColours()
2017-12-24 01:57:11 +00:00
char *Ptr = Topics.Path + StringLength(Topics.Path) - 1;
while(*Ptr != '/')
{
--Ptr;
}
*Ptr = '\0';
DIR *CSSDirHandle; // TODO(matt): open()
if(!(CSSDirHandle = opendir(Topics.Path)))
{
if(MakeDir(Topics.Path) == RC_ERROR_DIRECTORY)
{
LogError(LOG_ERROR, "Unable to create directory %s: %s", Topics.Path, strerror(errno));
fprintf(stderr, "Unable to create directory %s: %s\n", Topics.Path, strerror(errno));
return RC_ERROR_DIRECTORY;
};
}
closedir(CSSDirHandle);
*Ptr = '/';
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
if((Topics.Handle = fopen(Topics.Path, "a+")))
hmml_to_html.c: Generate topics.css [#22]
2017-03-31 00:56:50 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
fseek(Topics.Handle, 0, SEEK_END);
Topics.FileSize = ftell(Topics.Handle);
Topics.Buffer.Size = Topics.FileSize;
fseek(Topics.Handle, 0, SEEK_SET);
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
if(!(Topics.Buffer.Location = malloc(Topics.Buffer.Size)))
hmml_to_html.c: Generate topics.css [#22]
2017-03-31 00:56:50 +00:00
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_ERROR_MEMORY;
hmml_to_html.c: Generate topics.css [#22]
2017-03-31 00:56:50 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
#if DEBUG_MEM
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
FILE *MemLog = fopen("/home/matt/cinera_mem", "a+");
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
fprintf(MemLog, " Allocated Topics (%d)\n", Topics.Buffer.Size);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
fclose(MemLog);
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
printf(" Allocated Topics (%d)\n", Topics.Buffer.Size);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
#endif
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
Topics.Buffer.Ptr = Topics.Buffer.Location;
fread(Topics.Buffer.Location, Topics.Buffer.Size, 1, Topics.Handle);
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
while(Topics.Buffer.Ptr - Topics.Buffer.Location < Topics.Buffer.Size)
hmml_to_html.c: Generate topics.css [#22]
2017-03-31 00:56:50 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
Topics.Buffer.Ptr += StringLength(".category.");
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if(!StringsDifferT(SanitisedTopic, Topics.Buffer.Ptr, ' '))
hmml_to_html.c: Generate topics.css [#22]
2017-03-31 00:56:50 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
FreeBuffer(&Topics.Buffer);
fclose(Topics.Handle);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_NOOP;
hmml_to_html.c: Generate topics.css [#22]
2017-03-31 00:56:50 +00:00
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
while(Topics.Buffer.Ptr - Topics.Buffer.Location < Topics.Buffer.Size && *Topics.Buffer.Ptr != '\n')
hmml_to_html.c: Generate topics.css [#22]
2017-03-31 00:56:50 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
++Topics.Buffer.Ptr;
hmml_to_html.c: Generate topics.css [#22]
2017-03-31 00:56:50 +00:00
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
++Topics.Buffer.Ptr;
hmml_to_html.c: Generate topics.css [#22]
2017-03-31 00:56:50 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if(!StringsDiffer(Topic, "nullTopic"))
{
fprintf(Topics.Handle, ".category.%s { border: 1px solid transparent; background: transparent; }\n",
SanitisedTopic);
}
else
{
hsl_colour Colour;
StringToColourHash(&Colour, Topic);
fprintf(Topics.Handle, ".category.%s { border: 1px solid hsl(%d, %d%%, %d%%); background: hsl(%d, %d%%, %d%%); }\n",
SanitisedTopic, Colour.Hue, Colour.Saturation, Colour.Lightness, Colour.Hue, Colour.Saturation, Colour.Lightness);
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
fclose(Topics.Handle);
FreeBuffer(&Topics.Buffer);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_SUCCESS;
hmml_to_html.c: Generate topics.css [#22]
2017-03-31 00:56:50 +00:00
}
else
{
cinera.c: Call MakeDir() in GenerateTopicColours()
2017-12-24 01:57:11 +00:00
// NOTE(matt): Maybe it shouldn't be possible to hit this case now that we MakeDir the actually dir...
perror(Topics.Path);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_ERROR_FILE;
hmml_to_html.c: Generate topics.css [#22]
2017-03-31 00:56:50 +00:00
}
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
void
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
PrintUsage(char *BinaryLocation, config *DefaultConfig)
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
fprintf(stderr,
"Usage: %s [option(s)] filename(s)\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
"\n"
"Options:\n"
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
" Paths: \e[1;30m(advisedly universal, but may be set per-(sub)project as required)\e[0m\n"
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
" -r <root directory>\n"
" Override default root directory (\"%s\")\n"
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
" -R <root URL>\n"
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
" Override default root URL (\"%s\")\n"
cinera.c: Call MakeDir() in GenerateTopicColours()
2017-12-24 01:57:11 +00:00
" \e[1;31mIMPORTANT\e[0m: -r and -R must correspond to the same location\n"
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
" \e[1;30mUNSUPPORTED: If you move files from RootDir, the RootURL should\n"
" correspond to the resulting location\e[0m\n"
"\n"
" -c <CSS directory path>\n"
" Override default CSS directory (\"%s\"), relative to root\n"
" -i <images directory path>\n"
" Override default images directory (\"%s\"), relative to root\n"
" -j <JS directory path>\n"
" Override default JS directory (\"%s\"), relative to root\n"
"\n"
" Project Settings:\n"
" -p <project ID>\n"
" Set the project ID, equal to the \"project\" field in the HMML files\n"
" NOTE: Setting the project ID triggers PROJECT EDITION\n"
" -m <default medium>\n"
" Override default default medium (\"%s\")\n"
" \e[1;30mKnown project defaults:\n",
BinaryLocation,
DefaultConfig->RootDir,
DefaultConfig->RootURL,
DefaultConfig->CSSDir,
DefaultConfig->ImagesDir,
DefaultConfig->JSDir,
DefaultConfig->DefaultMedium);
for(int ProjectIndex = 0; ProjectIndex < ArrayCount(ProjectInfo); ++ProjectIndex)
{
fprintf(stderr, " %s:",
ProjectInfo[ProjectIndex].ProjectID);
// NOTE(matt): This kind of thing really needs to loop over the dudes once to find the longest one
for(int i = 11; i > StringLength(ProjectInfo[ProjectIndex].ProjectID); i -= 4)
{
fprintf(stderr, "\t");
}
fprintf(stderr, "%s\n",
ProjectInfo[ProjectIndex].Medium);
}
fprintf(stderr,
"\e[0m -s <style>\n"
" Set the style / theme, corresponding to a cinera__*.css file\n"
" This is equal to the \"project\" field in the HMML files by default\n"
" -q\n"
" Quit after syncing with annotation files in project input directory\n"
" \e[1;30mUNSUPPORTED: This is likely to be removed in the future\e[0m\n"
"\n"
" Project Input Paths\n"
" -d <annotations directory>\n"
" Override default annotations directory (\"%s\")\n"
" -t <templates directory>\n"
" Override default templates directory (\"%s\")\n"
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
"\n"
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
" -x <index template location>\n"
" Set index template file path, either absolute or relative to\n"
" template directory, and enable integration\n"
" -y <player template location>\n"
" Set player template file path, either absolute or relative\n"
" to template directory, and enable integration\n"
"\n"
" Project Output Paths\n"
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
" -b <base output directory>\n"
" Override project's default base output directory (\"%s\")\n"
" -B <base URL>\n"
" Override default base URL (\"%s\")\n"
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
" NOTE: This must be set, if -n or -a are to be used\n"
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
"\n"
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
" -n <index location>\n"
" Override default index location (\"%s\"), relative to base\n"
" -a <player location>\n"
" Override default player location (\"%s\"), relative to base\n"
" NOTE: The PlayerURLPrefix is currently hardcoded in cinera.c but\n"
" will be configurable in the full configuration system\n"
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
"\n"
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
" Single Edition Output Path\n"
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
" -o <output location>\n"
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
" Override default output player location (\"%s\")\n"
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
"\n"
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
" -e\n"
" Display (examine) index file and exit\n"
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
" -f\n"
" Force integration with an incomplete template\n"
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
" -g\n"
" Ignore video privacy status\n"
" NOTE: For use with projects whose videos are known to all be public,\n"
" to save us having to check their privacy status\n"
cinera.css: Marker and categories style cinera_player_pre.js: Episode keyboard navigation. Also swap out A for K, and D for J cinera_player_pre.js: Handle the case in onRefChanged() in which the filter_container or filterState is not present cinera.c: Refetch quotes when processing a set of annotations >60 mins after the last fetch Flags: -w Force quote cache rebuild
2018-02-28 01:04:06 +00:00
" -w\n"
" Force quote cache rebuild \e[1;30m(memory aid: \"wget\")\e[0m\n"
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
"\n"
" -l <n>\n"
" Override default log level (%d), where n is from 0 (terse) to 7 (verbose)\n"
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
" -u <seconds>\n"
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
" Override default update interval (%d)\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
//" -c config location\n"
cinera.c: Add credentials and -v flag README.md: Add dependency on curl
2017-11-18 00:27:33 +00:00
" -v\n"
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
" Display version and exit\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
" -h\n"
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
" Display this help\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
"\n"
"Template:\n"
cinera.css: Marker and categories style cinera_player_pre.js: Episode keyboard navigation. Also swap out A for K, and D for J cinera_player_pre.js: Handle the case in onRefChanged() in which the filter_container or filterState is not present cinera.c: Refetch quotes when processing a set of annotations >60 mins after the last fetch Flags: -w Force quote cache rebuild
2018-02-28 01:04:06 +00:00
" A complete Index Template shall contain exactly one each of the following tags:\n"
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
" <!-- __CINERA_INCLUDES__ -->\n"
" to put inside your own <head></head>\n"
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
" <!-- __CINERA_INDEX__ -->\n"
"\n"
cinera.css: Marker and categories style cinera_player_pre.js: Episode keyboard navigation. Also swap out A for K, and D for J cinera_player_pre.js: Handle the case in onRefChanged() in which the filter_container or filterState is not present cinera.c: Refetch quotes when processing a set of annotations >60 mins after the last fetch Flags: -w Force quote cache rebuild
2018-02-28 01:04:06 +00:00
" A complete Player Template shall contain exactly one each of the following tags:\n"
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
" <!-- __CINERA_INCLUDES__ -->\n"
" to put inside your own <head></head>\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
" <!-- __CINERA_MENUS__ -->\n"
" <!-- __CINERA_PLAYER__ -->\n"
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
" <!-- __CINERA_SCRIPT__ -->\n"
" must come after <!-- __CINERA_MENUS__ --> and <!-- __CINERA_PLAYER__ -->\n"
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
"\n"
cinera.css: Marker and categories style cinera_player_pre.js: Episode keyboard navigation. Also swap out A for K, and D for J cinera_player_pre.js: Handle the case in onRefChanged() in which the filter_container or filterState is not present cinera.c: Refetch quotes when processing a set of annotations >60 mins after the last fetch Flags: -w Force quote cache rebuild
2018-02-28 01:04:06 +00:00
" Optional tags available for use in your Player Template:\n"
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
" <!-- __CINERA_TITLE__ -->\n"
" <!-- __CINERA_VIDEO_ID__ -->\n"
"\n"
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
" Other available tags:\n"
" <!-- __CINERA_PROJECT__ -->\n"
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
" <!-- __CINERA_PROJECT_ID__ -->\n"
" <!-- __CINERA_THEME__ -->\n"
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
" <!-- __CINERA_URL__ -->\n"
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
" Only really usable if BaseURL is set \e[1;30m(-B)\e[0m\n"
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
" <!-- __CINERA_CUSTOM0__ -->\n"
" <!-- __CINERA_CUSTOM1__ -->\n"
" <!-- __CINERA_CUSTOM2__ -->\n"
" ⋮\n"
" <!-- __CINERA_CUSTOM15__ -->\n"
" Freeform buffers for small snippets of localised information, e.g. a\n"
" single <a> element or perhaps a <!-- comment -->\n"
" They correspond to the custom0 to custom15 attributes in the [video]\n"
" node in your .hmml files\n"
" 0 to 11 may hold up to 255 characters\n"
" 12 to 15 may hold up to 1023 characters\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
"\n"
"HMML Specification:\n"
" https://git.handmade.network/Annotation-Pushers/Annotation-System/wikis/hmmlspec\n",
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
DefaultConfig->ProjectDir,
DefaultConfig->TemplatesDir,
DefaultConfig->BaseDir,
DefaultConfig->BaseURL,
DefaultConfig->IndexLocation,
DefaultConfig->PlayerLocation,
DefaultConfig->OutLocation,
DefaultConfig->LogLevel,
DefaultConfig->UpdateInterval);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
void
DepartComment(buffer *Template)
hmml_to_html.c: The beginnings of config [#25] May in all likelihood back this stuff out
2017-05-13 15:38:10 +00:00
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
while(Template->Ptr - Template->Location < Template->Size)
{
if(!StringsDifferT("-->", Template->Ptr, 0))
{
Template->Ptr += StringLength("-->");
break;
}
++Template->Ptr;
}
}
hmml_to_html.c: The beginnings of config [#25] May in all likelihood back this stuff out
2017-05-13 15:38:10 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
int
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
ValidateTemplate(template **Template, char *Location, int TemplateType)
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
// TODO(matt): Record line numbers and contextual information:
// <? ?>
// <!-- -->
// < >
// <script </script>
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
#if 1
int Return = ClaimTemplate(Template, Location, TemplateType);
switch(Return)
{
case RC_ARENA_FULL:
case RC_ERROR_FILE:
return Return;
case RC_SUCCESS:
break;
}
#endif
buffer Errors;
if(ClaimBuffer(&Errors, "Errors", Kilobytes(1)) == RC_ARENA_FULL) { DeclaimTemplate(*Template); return RC_ARENA_FULL; };
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
bool HaveErrors = FALSE;
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
bool FoundIncludes = FALSE;
bool FoundMenus = FALSE;
bool FoundPlayer = FALSE;
bool FoundScript = FALSE;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
bool FoundIndex = FALSE;
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
char *Previous = (*Template)->Buffer.Location;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
while((*Template)->Buffer.Ptr - (*Template)->Buffer.Location < (*Template)->Buffer.Size)
hmml_to_html.c: The beginnings of config [#25] May in all likelihood back this stuff out
2017-05-13 15:38:10 +00:00
{
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
NextTagSearch:
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
if(*(*Template)->Buffer.Ptr == '!' && ((*Template)->Buffer.Ptr > (*Template)->Buffer.Location && !StringsDifferT("<!--", &(*Template)->Buffer.Ptr[-1], 0)))
hmml_to_html.c: The beginnings of config [#25] May in all likelihood back this stuff out
2017-05-13 15:38:10 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
char *CommentStart = &(*Template)->Buffer.Ptr[-1];
while((*Template)->Buffer.Ptr - (*Template)->Buffer.Location < (*Template)->Buffer.Size && StringsDifferT("-->", (*Template)->Buffer.Ptr, 0))
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
for(int i = 0; i < ArrayCount(Tags); ++i)
hmml_to_html.c: The beginnings of config [#25] May in all likelihood back this stuff out
2017-05-13 15:38:10 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
if(!(StringsDifferT(Tags[i].Tag, (*Template)->Buffer.Ptr, 0)))
hmml_to_html.c: The beginnings of config [#25] May in all likelihood back this stuff out
2017-05-13 15:38:10 +00:00
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
// TODO(matt): Pack up this data for BuffersToHTML() to use
/*
* Potential ways to compress these cases
*
* bool Found[TAG_COUNT]
* -Asaf
*
* int* flags[] = { [TAG_INCLUDES] = &FoundIncludes, [TAG_MENUS] = &FoundMenus } flags[Tags[i].Code] = true;
* -insofaras
*
*/
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
int ThisTagCode = Tags[i].Code;
char *ThisTagName = Tags[i].Tag;
switch(ThisTagCode)
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
case TAG_INDEX:
FoundIndex = TRUE;
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
goto RecordTag;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
case TAG_INCLUDES:
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(!(Config.Mode & MODE_FORCEINTEGRATION) && FoundIncludes == TRUE)
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
CopyStringToBuffer(&Errors, "Template contains more than one <!-- %s --> tag\n", ThisTagName);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
HaveErrors = TRUE;
}
FoundIncludes = TRUE;
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
goto RecordTag;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
case TAG_MENUS:
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(!(Config.Mode & MODE_FORCEINTEGRATION) && FoundMenus == TRUE)
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
CopyStringToBuffer(&Errors, "Template contains more than one <!-- %s --> tag\n", Tags[i].Tag);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
HaveErrors = TRUE;
}
FoundMenus = TRUE;
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
goto RecordTag;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
case TAG_PLAYER:
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(!(Config.Mode & MODE_FORCEINTEGRATION) && FoundPlayer == TRUE)
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
CopyStringToBuffer(&Errors, "Template contains more than one <!-- %s --> tag\n", Tags[i].Tag);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
HaveErrors = TRUE;
}
FoundPlayer = TRUE;
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
goto RecordTag;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
case TAG_SCRIPT:
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(!(Config.Mode & MODE_FORCEINTEGRATION) && (FoundMenus == FALSE || FoundPlayer == FALSE))
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
CopyStringToBuffer(&Errors, "<!-- %s --> must come after <!-- __CINERA_MENUS__ --> and <!-- __CINERA_PLAYER__ -->\n", Tags[i].Tag);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
HaveErrors = TRUE;
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(!(Config.Mode & MODE_FORCEINTEGRATION) && FoundScript == TRUE)
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
CopyStringToBuffer(&Errors, "Template contains more than one <!-- %s --> tag\n", Tags[i].Tag);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
HaveErrors = TRUE;
}
FoundScript = TRUE;
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
goto RecordTag;
default: // NOTE(matt): All freely usable tags should hit this case
RecordTag:
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
(*Template)->Metadata.Tag[(*Template)->Metadata.TagCount].Offset = CommentStart - Previous;
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
(*Template)->Metadata.Tag[(*Template)->Metadata.TagCount].TagCode = ThisTagCode;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
(*Template)->Metadata.TagCount++;
DepartComment(&(*Template)->Buffer);
Previous = (*Template)->Buffer.Ptr;
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
goto NextTagSearch;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
};
hmml_to_html.c: The beginnings of config [#25] May in all likelihood back this stuff out
2017-05-13 15:38:10 +00:00
}
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
++(*Template)->Buffer.Ptr;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
}
else
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
++(*Template)->Buffer.Ptr;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
if(FoundIndex)
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
(*Template)->Metadata.Validity |= PAGE_INDEX;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(!HaveErrors && FoundIncludes && FoundMenus && FoundPlayer && FoundScript)
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
(*Template)->Metadata.Validity |= PAGE_PLAYER;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(!(Config.Mode & MODE_FORCEINTEGRATION))
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
if(TemplateType == TEMPLATE_INDEX && !((*Template)->Metadata.Validity & PAGE_INDEX))
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
CopyStringToBuffer(&Errors, "Index template %s must include one <!-- __CINERA_INDEX__ --> tag\n", (*Template)->Metadata.Filename);
fprintf(stderr, "%s", Errors.Location);
DeclaimBuffer(&Errors);
DeclaimTemplate(*Template);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_INVALID_TEMPLATE;
}
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
else if((TemplateType == TEMPLATE_PLAYER || TemplateType == TEMPLATE_BESPOKE) && !((*Template)->Metadata.Validity & PAGE_PLAYER))
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
if(!FoundIncludes){ CopyStringToBuffer(&Errors, "Player template %s must include one <!-- __CINERA_INCLUDES__ --> tag\n", (*Template)->Metadata.Filename); };
if(!FoundMenus){ CopyStringToBuffer(&Errors, "Player template %s must include one <!-- __CINERA_MENUS__ --> tag\n", (*Template)->Metadata.Filename); };
if(!FoundPlayer){ CopyStringToBuffer(&Errors, "Player template %s must include one <!-- __CINERA_PLAYER__ --> tag\n", (*Template)->Metadata.Filename); };
if(!FoundScript){ CopyStringToBuffer(&Errors, "Player template %s must include one <!-- __CINERA_SCRIPT__ --> tag\n", (*Template)->Metadata.Filename); };
fprintf(stderr, "%s", Errors.Location);
DeclaimBuffer(&Errors);
DeclaimTemplate(*Template);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_INVALID_TEMPLATE;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
}
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
DeclaimBuffer(&Errors);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_SUCCESS;
}
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
void
ConstructIndexURL(buffer *IndexURL)
{
RewindBuffer(IndexURL);
if(StringsDiffer(Config.BaseURL, ""))
{
CopyStringToBuffer(IndexURL, "%s/", Config.BaseURL);
if(StringsDiffer(Config.IndexLocation, ""))
{
CopyStringToBuffer(IndexURL, "%s/", Config.IndexLocation);
}
}
}
void
ConstructPlayerURL(buffer *PlayerURL, char *BaseFilename)
{
RewindBuffer(PlayerURL);
if(StringsDiffer(Config.BaseURL, ""))
{
CopyStringToBuffer(PlayerURL, "%s/", Config.BaseURL);
if(StringsDiffer(Config.PlayerLocation, ""))
{
CopyStringToBuffer(PlayerURL, "%s/", Config.PlayerLocation);
}
}
if(StringsDiffer(BaseFilename, ""))
{
if(StringsDiffer(Config.PlayerURLPrefix, ""))
{
char *Ptr = BaseFilename + StringLength(Config.ProjectID);
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
CopyStringToBuffer(PlayerURL, "%s%s/", Config.PlayerURLPrefix, Ptr);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
}
else
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
CopyStringToBuffer(PlayerURL, "%s/", BaseFilename);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
}
}
}
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
bool
MediumExists(char *Medium)
{
for(int i = 0; i < ArrayCount(CategoryMedium); ++i)
{
if(!StringsDiffer(Medium, CategoryMedium[i].Medium))
{
return TRUE;
}
}
fprintf(stderr, "Specified default medium \"%s\" not available. Valid media are:\n", Medium);
for(int i = 0; i < ArrayCount(CategoryMedium); ++i)
{
fprintf(stderr, " %s\n", CategoryMedium[i].Medium);
}
fprintf(stderr, "To have \"%s\" added to the list, contact matt@handmadedev.org\n", Medium);
return FALSE;
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
int
ReadFileIntoBuffer(file_buffer *File, int BufferPadding)
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
if(!(File->Handle = fopen(File->Path, "r"))) // TODO(matt): Fuller error handling
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
return RC_ERROR_FILE;
}
fseek(File->Handle, 0, SEEK_END);
File->FileSize = ftell(File->Handle);
File->Buffer.Size = File->FileSize + 1 + BufferPadding; // NOTE(matt): +1 to accommodate a NULL terminator
fseek(File->Handle, 0, SEEK_SET);
// TODO(matt): Consider using the MemoryArena? Maybe have separate ReadFileIntoMemory() and ReadFileIntoArena()
if(!(File->Buffer.Location = malloc(File->Buffer.Size)))
{
fclose(File->Handle);
return RC_ERROR_MEMORY;
}
File->Buffer.Ptr = File->Buffer.Location;
fread(File->Buffer.Location, File->FileSize, 1, File->Handle);
File->Buffer.Location[File->FileSize] = '\0';
fclose(File->Handle);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
File->Buffer.ID = File->Path;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
return RC_SUCCESS;
}
// NOTE(matt): Currently unused
int
WriteBufferToFile(file_buffer *File, buffer *Buffer, int BytesToWrite, bool KeepFileHandleOpen)
{
if(!(File->Handle = fopen(File->Path, "w")))
{
return RC_ERROR_FILE;
}
fwrite(Buffer->Location, BytesToWrite, 1, File->Handle);
if(!KeepFileHandleOpen)
{
fclose(File->Handle);
}
return RC_SUCCESS;
}
typedef struct
{
char *BaseFilename;
char *Title;
} neighbour;
typedef struct
{
neighbour Prev;
neighbour Next;
} neighbours;
int
ExamineIndex(index *Index)
{
int IndexMetadataFileReadCode = ReadFileIntoBuffer(&Index->Metadata, 0);
switch(IndexMetadataFileReadCode)
{
case RC_ERROR_MEMORY:
return RC_ERROR_MEMORY;
case RC_ERROR_FILE:
fprintf(stderr, "Unable to open index file %s: %s\n", Index->Metadata.Path, strerror(errno));
return RC_ERROR_FILE;
case RC_SUCCESS:
break;
}
Index->Header = *(index_header *)Index->Metadata.Buffer.Ptr;
// TODO(matt): Check that we're the current version, and maybe print out stuff accordingly? Or do we just straight up
// enforce that examining an index requires upgrading to the current version?
printf("Current:\n"
"\tDBVersion: %d\n"
"\tAppVersion: %d.%d.%d\n"
"\tHMMLVersion: %d.%d.%d\n"
"\n"
"Initial:\n"
"\tDBVersion: %d\n"
"\tAppVersion: %d.%d.%d\n"
"\tHMMLVersion: %d.%d.%d\n"
"\n"
"Project ID: %s\n"
"Project Full Name: %s\n"
"\n"
"Base URL: %s\n"
"Relative Index Page Location: %s\n"
"Relative Player Page Location: %s\n"
"Player Page URL Prefix: %s\n"
"\n"
"Entries: %d\n",
Index->Header.CurrentDBVersion,
Index->Header.CurrentAppVersion.Major, Index->Header.CurrentAppVersion.Minor, Index->Header.CurrentAppVersion.Patch,
Index->Header.CurrentHMMLVersion.Major, Index->Header.CurrentHMMLVersion.Minor, Index->Header.CurrentHMMLVersion.Patch,
Index->Header.InitialDBVersion,
Index->Header.InitialAppVersion.Major, Index->Header.InitialAppVersion.Minor, Index->Header.InitialAppVersion.Patch,
Index->Header.InitialHMMLVersion.Major, Index->Header.InitialHMMLVersion.Minor, Index->Header.InitialHMMLVersion.Patch,
Index->Header.ProjectID,
Index->Header.ProjectName,
Index->Header.BaseURL,
StringsDiffer(Index->Header.IndexLocation, "") ? Index->Header.IndexLocation : "(same as Base URL)",
StringsDiffer(Index->Header.PlayerLocation, "") ? Index->Header.PlayerLocation : "(directly descended from Base URL)",
StringsDiffer(Index->Header.PlayerURLPrefix, "") ? Index->Header.PlayerURLPrefix : "(no special prefix, the player page URLs equal their entry's base filename)",
Index->Header.EntryCount);
Index->Metadata.Buffer.Ptr += sizeof(index_header);
for(int EntryIndex = 0; EntryIndex < Index->Header.EntryCount; ++EntryIndex)
{
Index->Entry = *(index_metadata *)Index->Metadata.Buffer.Ptr;
printf(" %3d\t%s%sSize: %4d\t%d\t%d\t%d\t%d\n"
"\t %s\n",
EntryIndex + 1, Index->Entry.BaseFilename,
StringLength(Index->Entry.BaseFilename) > 8 ? "\t" : "\t\t", // NOTE(matt): Janktasm
Index->Entry.Size,
Index->Entry.LinkOffsets.PrevStart,
Index->Entry.LinkOffsets.PrevEnd,
Index->Entry.LinkOffsets.NextStart,
Index->Entry.LinkOffsets.NextEnd,
Index->Entry.Title);
Index->Metadata.Buffer.Ptr += sizeof(index_metadata);
}
FreeBuffer(&Index->Metadata.Buffer);
return RC_SUCCESS;
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
enum
{
C_SEEK_FORWARDS,
C_SEEK_BACKWARDS
} seek_directions;
enum
{
C_SEEK_START, // First character of string
C_SEEK_BEFORE, // Character before first character
C_SEEK_END, // Last character of string
C_SEEK_AFTER // Character after last character
} seek_positions;
int
SeekBufferForString(buffer *Buffer, char *String,
int Direction, /* seek_directions */
int Position /* seek_positions */)
{
// TODO(matt): Optimise? Some means of analysing the String to increment
// the pointer in bigger strides
// Perhaps count up runs of consecutive chars and seek for the char with
// the longest run, in strides of that run-length
char *InitialLocation = Buffer->Ptr;
if(Direction == C_SEEK_FORWARDS)
{
while(Buffer->Ptr - Buffer->Location < Buffer->Size - StringLength(String)
&& StringsDifferT(String, Buffer->Ptr, 0))
{
++Buffer->Ptr;
}
}
else
{
while(Buffer->Ptr > Buffer->Location
&& StringsDifferT(String, Buffer->Ptr, 0))
{
--Buffer->Ptr;
}
}
if(StringsDifferT(String, Buffer->Ptr, 0))
{
Buffer->Ptr = InitialLocation;
return RC_UNFOUND;
}
switch(Position)
{
case C_SEEK_START:
break;
case C_SEEK_BEFORE:
if(Buffer->Ptr > Buffer->Location)
{
--Buffer->Ptr;
break;
}
else
{
return RC_ERROR_SEEK; // Ptr remains at string start
}
case C_SEEK_END:
Buffer->Ptr += StringLength(String) - 1;
break;
case C_SEEK_AFTER:
if(Buffer->Size >= Buffer->Ptr - Buffer->Location + StringLength(String))
{
Buffer->Ptr += StringLength(String);
break;
}
else
{
return RC_ERROR_SEEK; // Ptr remains at string start
// NOTE(matt): Should it, however, be left at the end of the string?
}
}
return RC_SUCCESS;
}
cinera.c: Validate timecode chronology Also correctly skip .hmml files for credentials-related reasons
2018-02-05 23:57:17 +00:00
#define HMMLCleanup() \
DeclaimBuffer(&CreditsMenu); \
DeclaimBuffer(&FilterMedia); \
DeclaimBuffer(&FilterTopics); \
DeclaimBuffer(&FilterMenu); \
DeclaimBuffer(&ReferenceMenu); \
DeclaimBuffer(&QuoteMenu); \
hmml_free(&HMML);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
void
ClearTerminalRow(int Length)
{
fprintf(stderr, "\r");
for(int i = 0; i < Length; ++i)
{
fprintf(stderr, " ");
}
fprintf(stderr, "\r");
}
bool
VideoIsPrivate(char *VideoID)
{
// NOTE(matt): Currently only supports YouTube
char Message[128];
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(Message, sizeof(Message), "\e[0;35mChecking\e[0m privacy status of: https://youtube.com/watch?v=%s", VideoID);
fprintf(stderr, "%s", Message);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
int MessageLength = StringLength(Message);
buffer VideoAPIResponse;
ClaimBuffer(&VideoAPIResponse, "VideoAPIResponse", Kilobytes(1));
CURL *curl = curl_easy_init();
if(curl) {
LastPrivacyCheck = time(0);
#define APIKey "AIzaSyAdV2U8ivPk8PHMaPMId0gynksw_gdzr9k"
char URL[1024] = {0};
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(URL, sizeof(URL), "https://www.googleapis.com/youtube/v3/videos?key=%s&part=status&id=%s", APIKey, VideoID);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
CURLcode CurlReturnCode;
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &VideoAPIResponse.Ptr);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlIntoBuffer);
curl_easy_setopt(curl, CURLOPT_URL, URL);
if((CurlReturnCode = curl_easy_perform(curl)))
{
fprintf(stderr, "%s\n", curl_easy_strerror(CurlReturnCode));
}
curl_easy_cleanup(curl);
VideoAPIResponse.Ptr = VideoAPIResponse.Location;
SeekBufferForString(&VideoAPIResponse, "{", C_SEEK_FORWARDS, C_SEEK_AFTER);
SeekBufferForString(&VideoAPIResponse, "\"totalResults\": ", C_SEEK_FORWARDS, C_SEEK_AFTER);
if(*VideoAPIResponse.Ptr == '0')
{
DeclaimBuffer(&VideoAPIResponse);
// printf("Private video: https://youtube.com/watch?v=%s\n", VideoID);
ClearTerminalRow(MessageLength);
return TRUE;
}
SeekBufferForString(&VideoAPIResponse, "{", C_SEEK_FORWARDS, C_SEEK_AFTER);
SeekBufferForString(&VideoAPIResponse, "\"privacyStatus\": \"", C_SEEK_FORWARDS, C_SEEK_AFTER);
char Status[16];
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormatT(Status, sizeof(Status), VideoAPIResponse.Ptr, '\"');
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(!StringsDiffer(Status, "public"))
{
DeclaimBuffer(&VideoAPIResponse);
ClearTerminalRow(MessageLength);
return FALSE;
}
}
DeclaimBuffer(&VideoAPIResponse);
// printf("Unlisted video: https://youtube.com/watch?v=%s\n", VideoID);
ClearTerminalRow(MessageLength);
return TRUE;
}
typedef struct
{
index_metadata Prev, This, Next;
bool PrevIsFirst, NextIsFinal;
short int PrevIndex, ThisIndex, NextIndex;
} neighbourhood;
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
int
LinearSearchForSpeaker(speakers Speakers, char *Username)
{
for(int i = 0; i < Speakers.Count; ++i)
{
if(!StringsDifferCaseInsensitive(Speakers.Speaker[i].Credential->Username, Username))
{
return i;
}
}
return -1;
}
bool
IsCategorisedAFK(HMML_Annotation Anno)
{
for(int i = 0; i < Anno.marker_count; ++i)
{
if(!StringsDiffer(Anno.markers[i].marker, "afk"))
{
return TRUE;
}
}
return FALSE;
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
int
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
HMMLToBuffers(buffers *CollationBuffers, template **BespokeTemplate, char *Filename, neighbourhood *N)
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
RewindBuffer(&CollationBuffers->IncludesPlayer);
RewindBuffer(&CollationBuffers->Menus);
RewindBuffer(&CollationBuffers->Player);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
RewindBuffer(&CollationBuffers->ScriptPlayer);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
RewindBuffer(&CollationBuffers->IncludesIndex);
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
RewindBuffer(&CollationBuffers->Search);
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
*CollationBuffers->Custom0 = '\0';
*CollationBuffers->Custom1 = '\0';
*CollationBuffers->Custom2 = '\0';
*CollationBuffers->Custom3 = '\0';
*CollationBuffers->Custom4 = '\0';
*CollationBuffers->Custom5 = '\0';
*CollationBuffers->Custom6 = '\0';
*CollationBuffers->Custom7 = '\0';
*CollationBuffers->Custom8 = '\0';
*CollationBuffers->Custom9 = '\0';
*CollationBuffers->Custom10 = '\0';
*CollationBuffers->Custom11 = '\0';
*CollationBuffers->Custom12 = '\0';
*CollationBuffers->Custom13 = '\0';
*CollationBuffers->Custom14 = '\0';
*CollationBuffers->Custom15 = '\0';
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
*CollationBuffers->Title = '\0';
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
char Filepath[256];
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(Config.Edition == EDITION_PROJECT)
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(Filepath, sizeof(Filepath), "%s/%s", Config.ProjectDir, Filename);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
else
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(Filepath, sizeof(Filepath), "%s", Filename);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
FILE *InFile;
if(!(InFile = fopen(Filepath, "r")))
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogError(LOG_ERROR, "Unable to open (annotations file) %s: %s", Filename, strerror(errno));
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
fprintf(stderr, "Unable to open (annotations file) %s: %s\n", Filename, strerror(errno));
return RC_ERROR_FILE;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
HMML_Output HMML = hmml_parse_file(InFile);
fclose(InFile);
if(HMML.well_formed)
{
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
bool HaveErrors = FALSE;
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
char *BaseFilename = GetBaseFilename(Filename, ".hmml");
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(StringLength(BaseFilename) > MAX_BASE_FILENAME_LENGTH)
{
fprintf(stderr, "\e[1;31mBase filename \"%s\" is too long (%d/%d characters)\e[0m\n", BaseFilename, StringLength(BaseFilename), MAX_BASE_FILENAME_LENGTH);
HaveErrors = TRUE;
}
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
if(!HMML.metadata.title)
{
fprintf(stderr, "Please set the title attribute in the [video] node of your .hmml file\n");
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
HaveErrors = TRUE;
}
else if(StringLength(HMML.metadata.title) > MAX_TITLE_LENGTH)
{
fprintf(stderr, "\e[1;31mVideo title \"%s\" is too long (%d/%d characters)\e[0m\n", HMML.metadata.title, StringLength(HMML.metadata.title), MAX_TITLE_LENGTH);
HaveErrors = TRUE;
}
else
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(CollationBuffers->Title, sizeof(CollationBuffers->Title), "%s", HMML.metadata.title);
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
}
if(!HMML.metadata.member)
{
fprintf(stderr, "Please set the member attribute in the [video] node of your .hmml file\n");
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
HaveErrors = TRUE;
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
}
cinera.c: Correctly set theme
2018-06-13 15:05:21 +00:00
if(!StringsDiffer(CollationBuffers->Theme, ""))
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
{
cinera.c: Correctly set theme
2018-06-13 15:05:21 +00:00
if(HMML.metadata.project)
{
CopyStringNoFormat(CollationBuffers->Theme, sizeof(CollationBuffers->Theme), HMML.metadata.project);
}
else
{
fprintf(stderr, "Unable to determine which theme to apply to the HTML\n"
"Please set at least one of:\n"
"\t1. project attribute in the [video] node of your .hmml file\n"
"\t2. ProjectID on the command line with -p\n"
"\t3. Style on the command line with -s\n"
);
HaveErrors = TRUE;
}
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
}
if(!HMML.metadata.id)
{
fprintf(stderr, "Please set the id attribute in the [video] node of your .hmml file\n");
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
HaveErrors = TRUE;
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(CollationBuffers->VideoID, sizeof(CollationBuffers->VideoID), "%s", HMML.metadata.id);
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
buffer URLPlayer;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
ClaimBuffer(&URLPlayer, "URLPlayer", MAX_BASE_URL_LENGTH + 1 + MAX_RELATIVE_PAGE_LOCATION_LENGTH + 1 + MAX_PLAYER_URL_PREFIX_LENGTH + MAX_BASE_FILENAME_LENGTH);
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
ConstructPlayerURL(&URLPlayer, BaseFilename);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(CollationBuffers->URLPlayer, sizeof(CollationBuffers->URLPlayer), "%s", URLPlayer.Location);
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
DeclaimBuffer(&URLPlayer);
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
if(HMML.metadata.project && (!StringsDiffer(CollationBuffers->ProjectID, "") || !StringsDiffer(CollationBuffers->ProjectName, "")))
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
{
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
for(int ProjectIndex = 0; ProjectIndex < ArrayCount(ProjectInfo); ++ProjectIndex)
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
{
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
if(!StringsDiffer(ProjectInfo[ProjectIndex].ProjectID,
HMML.metadata.project))
{
cinera.c: Fix CollationBuffers->ProjectID test
2018-06-12 19:32:56 +00:00
CopyStringNoFormat(CollationBuffers->ProjectID, sizeof(CollationBuffers->ProjectID), HMML.metadata.project);
CopyStringNoFormat(CollationBuffers->ProjectName, sizeof(CollationBuffers->ProjectName), ProjectInfo[ProjectIndex].FullName);
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
break;
}
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
}
}
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
char *DefaultMedium = Config.DefaultMedium;
if(HMML.metadata.medium)
{
if(MediumExists(HMML.metadata.medium))
{
DefaultMedium = HMML.metadata.medium;
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
else { HaveErrors = TRUE; }
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
}
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
// TODO(matt): Consider simply making these as buffers and claiming the necessary amount for them
// The nice thing about doing it this way, though, is that it encourages bespoke template use, which should
// usually be the more convenient way for people to write greater amounts of localised information
for(int CustomIndex = 0; CustomIndex < HMML_CUSTOM_ATTR_COUNT; ++CustomIndex)
{
if(HMML.metadata.custom[CustomIndex])
{
int LengthOfString = StringLength(HMML.metadata.custom[CustomIndex]);
if(LengthOfString > (CustomIndex < 12 ? MAX_CUSTOM_SNIPPET_SHORT_LENGTH : MAX_CUSTOM_SNIPPET_LONG_LENGTH))
{
fprintf(stderr, "\e[1;31mCustom string %d \"\e[0m%s\e[1;31m\" is too long (%d/%d characters)\e[0m\n", CustomIndex, HMML.metadata.custom[CustomIndex], LengthOfString, CustomIndex < 12 ? MAX_CUSTOM_SNIPPET_SHORT_LENGTH : MAX_CUSTOM_SNIPPET_LONG_LENGTH);
if(LengthOfString < MAX_CUSTOM_SNIPPET_LONG_LENGTH)
{
fprintf(stderr, "Consider using custom12 to custom15, which can hold %d characters\n", MAX_CUSTOM_SNIPPET_LONG_LENGTH);
}
else
{
fprintf(stderr, "Consider using a bespoke template for longer amounts of localised information\n");
}
HaveErrors = TRUE;
}
else
{
switch(CustomIndex)
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
case 0: CopyStringNoFormat(CollationBuffers->Custom0, sizeof(CollationBuffers->Custom0), HMML.metadata.custom[CustomIndex]); break;
case 1: CopyStringNoFormat(CollationBuffers->Custom1, sizeof(CollationBuffers->Custom1), HMML.metadata.custom[CustomIndex]); break;
case 2: CopyStringNoFormat(CollationBuffers->Custom2, sizeof(CollationBuffers->Custom2), HMML.metadata.custom[CustomIndex]); break;
case 3: CopyStringNoFormat(CollationBuffers->Custom3, sizeof(CollationBuffers->Custom3), HMML.metadata.custom[CustomIndex]); break;
case 4: CopyStringNoFormat(CollationBuffers->Custom4, sizeof(CollationBuffers->Custom4), HMML.metadata.custom[CustomIndex]); break;
case 5: CopyStringNoFormat(CollationBuffers->Custom5, sizeof(CollationBuffers->Custom5), HMML.metadata.custom[CustomIndex]); break;
case 6: CopyStringNoFormat(CollationBuffers->Custom6, sizeof(CollationBuffers->Custom6), HMML.metadata.custom[CustomIndex]); break;
case 7: CopyStringNoFormat(CollationBuffers->Custom7, sizeof(CollationBuffers->Custom7), HMML.metadata.custom[CustomIndex]); break;
case 8: CopyStringNoFormat(CollationBuffers->Custom8, sizeof(CollationBuffers->Custom8), HMML.metadata.custom[CustomIndex]); break;
case 9: CopyStringNoFormat(CollationBuffers->Custom9, sizeof(CollationBuffers->Custom9), HMML.metadata.custom[CustomIndex]); break;
case 10: CopyStringNoFormat(CollationBuffers->Custom10, sizeof(CollationBuffers->Custom10), HMML.metadata.custom[CustomIndex]); break;
case 11: CopyStringNoFormat(CollationBuffers->Custom11, sizeof(CollationBuffers->Custom11), HMML.metadata.custom[CustomIndex]); break;
case 12: CopyStringNoFormat(CollationBuffers->Custom12, sizeof(CollationBuffers->Custom12), HMML.metadata.custom[CustomIndex]); break;
case 13: CopyStringNoFormat(CollationBuffers->Custom13, sizeof(CollationBuffers->Custom13), HMML.metadata.custom[CustomIndex]); break;
case 14: CopyStringNoFormat(CollationBuffers->Custom14, sizeof(CollationBuffers->Custom14), HMML.metadata.custom[CustomIndex]); break;
case 15: CopyStringNoFormat(CollationBuffers->Custom15, sizeof(CollationBuffers->Custom15), HMML.metadata.custom[CustomIndex]); break;
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
}
}
}
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(!HaveErrors)
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
{
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(HMML.metadata.template)
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
{
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
switch(ValidateTemplate(BespokeTemplate, HMML.metadata.template, TEMPLATE_BESPOKE))
{
case RC_ARENA_FULL:
case RC_INVALID_TEMPLATE: // Invalid template
case RC_ERROR_FILE: // Could not load template
case RC_ERROR_MEMORY: // Could not allocate memory for template
HaveErrors = TRUE;
case RC_SUCCESS:
break;
}
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
}
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(HaveErrors)
{
fprintf(stderr, "\e[1;31mSkipping\e[0m %s", BaseFilename);
if(HMML.metadata.title) { fprintf(stderr, " - %s", HMML.metadata.title); }
fprintf(stderr, "\n");
hmml_free(&HMML);
return RC_ERROR_HMML;
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(N)
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
N->This.LinkOffsets.PrevStart = 0;
N->This.LinkOffsets.PrevEnd = 0;
N->This.LinkOffsets.NextStart = 0;
N->This.LinkOffsets.NextEnd = 0;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
#if DEBUG
printf(
"================================================================================\n"
"%s\n"
"================================================================================\n",
Filename);
#endif
// NOTE(matt): Tree structure of "global" buffer dependencies
// Master
// IncludesPlayer
// Menus
// QuoteMenu
// ReferenceMenu
// FilterMenu
// FilterTopics
// FilterMedia
// CreditsMenu
// Player
// Script
buffer QuoteMenu;
buffer ReferenceMenu;
buffer FilterMenu;
buffer FilterTopics;
buffer FilterMedia;
buffer CreditsMenu;
buffer Annotation;
buffer AnnotationHeader;
buffer AnnotationClass;
buffer AnnotationData;
buffer Text;
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
buffer CategoryIcons;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
if(ClaimBuffer(&QuoteMenu, "QuoteMenu", Kilobytes(32)) == RC_ARENA_FULL) { hmml_free(&HMML); return RC_ARENA_FULL; };
if(ClaimBuffer(&ReferenceMenu, "ReferenceMenu", Kilobytes(32)) == RC_ARENA_FULL) { hmml_free(&HMML); return RC_ARENA_FULL; };
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
if(ClaimBuffer(&FilterMenu, "FilterMenu", Kilobytes(16)) == RC_ARENA_FULL) { hmml_free(&HMML); return RC_ARENA_FULL; };
if(ClaimBuffer(&FilterTopics, "FilterTopics", Kilobytes(8)) == RC_ARENA_FULL) { hmml_free(&HMML); return RC_ARENA_FULL; };
if(ClaimBuffer(&FilterMedia, "FilterMedia", Kilobytes(8)) == RC_ARENA_FULL) { hmml_free(&HMML); return RC_ARENA_FULL; };
if(ClaimBuffer(&CreditsMenu, "CreditsMenu", Kilobytes(8)) == RC_ARENA_FULL) { hmml_free(&HMML); return RC_ARENA_FULL; };
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
ref_info ReferencesArray[200] = { };
categories Topics = { };
categories Media = { };
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
bool HasQuoteMenu = FALSE;
bool HasReferenceMenu = FALSE;
bool HasFilterMenu = FALSE;
bool HasCreditsMenu = FALSE;
int QuoteIdentifier = 0x3b1;
int RefIdentifier = 1;
int UniqueRefs = 0;
CopyStringToBuffer(&CollationBuffers->Menus,
cinera.c: Correct template buffers The template buffers no longer contain indentation spaces at the start or a \n at the end. This removes any weirdness from template composition Also remove the cleanup code added in 0.5.22
2018-01-08 22:59:36 +00:00
"<div class=\"cineraMenus %s\">\n"
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
" <span class=\"episode_name\">", StringsDiffer(Config.Theme, "") ? Config.Theme : HMML.metadata.project);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBufferHTMLSafe(&CollationBuffers->Menus, HMML.metadata.title);
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
CopyStringToBuffer(&CollationBuffers->Menus, "</span>\n");
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&CollationBuffers->Player,
cinera.c: Correct template buffers The template buffers no longer contain indentation spaces at the start or a \n at the end. This removes any weirdness from template composition Also remove the cleanup code added in 0.5.22
2018-01-08 22:59:36 +00:00
"<div class=\"cineraPlayerContainer\">\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
" <div class=\"video_container\" data-videoId=\"%s\"></div>\n"
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
" <div class=\"markers_container %s\">\n", HMML.metadata.id, StringsDiffer(Config.Theme, "") ? Config.Theme : HMML.metadata.project);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(N)
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
N->This.LinkOffsets.PrevStart = (CollationBuffers->Player.Ptr - CollationBuffers->Player.Location);
if(N->Prev.Size || N->Next.Size)
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(N->Prev.Size)
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
// TODO(matt): Once we have a more rigorous notion of "Day Numbers", perhaps also use them here
buffer PreviousPlayerURL;
ClaimBuffer(&PreviousPlayerURL, "PreviousPlayerURL", MAX_BASE_URL_LENGTH + 1 + MAX_RELATIVE_PAGE_LOCATION_LENGTH + 1 + MAX_PLAYER_URL_PREFIX_LENGTH + MAX_BASE_FILENAME_LENGTH);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
ConstructPlayerURL(&PreviousPlayerURL, N->Prev.BaseFilename);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
CopyStringToBuffer(&CollationBuffers->Player,
" <a class=\"episodeMarker prev\" href=\"%s\"><div>&#9195;</div><div>Previous: '%s'</div><div>&#9195;</div></a>\n",
PreviousPlayerURL.Location,
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
N->Prev.Title);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
DeclaimBuffer(&PreviousPlayerURL);
}
else
{
CopyStringToBuffer(&CollationBuffers->Player,
" <div class=\"episodeMarker first\"><div>&#8226;</div><div>Welcome to <cite>%s</cite></div><div>&#8226;</div></div>\n", CollationBuffers->ProjectName);
}
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
N->This.LinkOffsets.PrevEnd = (CollationBuffers->Player.Ptr - CollationBuffers->Player.Location - N->This.LinkOffsets.PrevStart);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
}
CopyStringToBuffer(&CollationBuffers->Player,
" <div class=\"markers\">\n");
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
speakers Speakers = { };
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
switch(BuildCredits(&CreditsMenu, &HasCreditsMenu, &HMML.metadata, &Speakers))
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
cinera.c: Validate timecode chronology Also correctly skip .hmml files for credentials-related reasons
2018-02-05 23:57:17 +00:00
case CreditsError_NoHost:
case CreditsError_NoAnnotator:
case CreditsError_NoCredentials:
fprintf(stderr, "\e[1;31mSkipping\e[0m %s - %s\n", BaseFilename, HMML.metadata.title);
HMMLCleanup();
return RC_ERROR_HMML;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
bool PrivateVideo = FALSE;
if(Config.Edition != EDITION_SINGLE && N->This.Size == 0 && !(Config.Mode & MODE_NOPRIVACY))
{
if(VideoIsPrivate(HMML.metadata.id))
{
// TODO(matt): Actually generate these guys, just putting them in a secret location
N->This.LinkOffsets.PrevStart = 0;
N->This.LinkOffsets.PrevEnd = 0;
PrivateVideo = TRUE;
HMMLCleanup();
return RC_PRIVATE_VIDEO;
}
}
if(Config.Edition != EDITION_SINGLE && !PrivateVideo)
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBuffer(&CollationBuffers->Search, "name: \"");
if(StringsDiffer(Config.PlayerURLPrefix, ""))
{
char *Ptr = BaseFilename + StringLength(Config.ProjectID);
CopyStringToBuffer(&CollationBuffers->Search, "%s%s", Config.PlayerURLPrefix, Ptr);
}
else
{
CopyStringToBuffer(&CollationBuffers->Search, "%s", BaseFilename);
}
CopyStringToBuffer(&CollationBuffers->Search, "\"\n"
"title: \"");
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
CopyStringToBufferNoFormat(&CollationBuffers->Search, HMML.metadata.title);
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
CopyStringToBuffer(&CollationBuffers->Search, "\"\n"
"markers:\n");
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
#if DEBUG
printf("\n\n --- Entering Annotations Loop ---\n\n\n\n");
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
#endif
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Validate timecode chronology Also correctly skip .hmml files for credentials-related reasons
2018-02-05 23:57:17 +00:00
int PreviousTimecode = 0;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
for(int AnnotationIndex = 0; AnnotationIndex < HMML.annotation_count; ++AnnotationIndex)
{
#if DEBUG
printf("%d\n", AnnotationIndex);
#endif
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
HMML_Annotation *Anno = HMML.annotations + AnnotationIndex;
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Validate timecode chronology Also correctly skip .hmml files for credentials-related reasons
2018-02-05 23:57:17 +00:00
if(TimecodeToSeconds(Anno->time) < PreviousTimecode)
{
fprintf(stderr, "%s:%d: Timecode %s is chronologically before previous timecode\n"
"\e[1;31mSkipping\e[0m %s - %s\n",
Filename, Anno->line, Anno->time,
BaseFilename, HMML.metadata.title);
HMMLCleanup();
return RC_ERROR_HMML;
}
PreviousTimecode = TimecodeToSeconds(Anno->time);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
categories LocalTopics = { };
categories LocalMedia = { };
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
bool HasQuote = FALSE;
bool HasReference = FALSE;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
quote_info QuoteInfo = { };
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
// NOTE(matt): Tree structure of "annotation local" buffer dependencies
// Annotation
// AnnotationHeader
// AnnotationClass
// AnnotationData
// Text
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
// CategoryIcons
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
cinera.c: Validate timecode chronology Also correctly skip .hmml files for credentials-related reasons
2018-02-05 23:57:17 +00:00
// TODO(matt): Shouldn't all of these guys DeclaimBuffer() before returning?
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
if(ClaimBuffer(&Annotation, "Annotation", Kilobytes(8)) == RC_ARENA_FULL) { hmml_free(&HMML); return RC_ARENA_FULL; };
if(ClaimBuffer(&AnnotationHeader, "AnnotationHeader", 512) == RC_ARENA_FULL) { hmml_free(&HMML); return RC_ARENA_FULL; };
if(ClaimBuffer(&AnnotationClass, "AnnotationClass", 256) == RC_ARENA_FULL) { hmml_free(&HMML); return RC_ARENA_FULL; };
if(ClaimBuffer(&AnnotationData, "AnnotationData", 512) == RC_ARENA_FULL) { hmml_free(&HMML); return RC_ARENA_FULL; };
if(ClaimBuffer(&Text, "Text", Kilobytes(4)) == RC_ARENA_FULL) { hmml_free(&HMML); return RC_ARENA_FULL; };
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
if(ClaimBuffer(&CategoryIcons, "CategoryIcons", Kilobytes(1)) == RC_ARENA_FULL) { hmml_free(&HMML); return RC_ARENA_FULL; };
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&AnnotationHeader,
" <div data-timestamp=\"%d\"",
TimecodeToSeconds(Anno->time));
CopyStringToBuffer(&AnnotationClass,
" class=\"marker");
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
if((Anno->author || Speakers.Count > 1) && !IsCategorisedAFK(*Anno))
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
int SpeakerIndex;
if(Anno->author && (SpeakerIndex = LinearSearchForSpeaker(Speakers, Anno->author)) == -1)
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
{
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
if(!HasFilterMenu)
{
HasFilterMenu = TRUE;
}
InsertCategory(&Topics, &LocalTopics, &Media, &LocalMedia, "authored");
hsl_colour AuthorColour;
StringToColourHash(&AuthorColour, Anno->author);
// TODO(matt): That EDITION_NETWORK site database API-polling stuff
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&Text,
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
"<span class=\"author\" data-hue=\"%d\" data-saturation=\"%d%%\">%s</span> ",
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
AuthorColour.Hue, AuthorColour.Saturation,
Anno->author);
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
}
else
{
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
if(!Anno->author)
{
SpeakerIndex = LinearSearchForSpeaker(Speakers, HMML.metadata.member);
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&Text,
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
"<span class=\"author\" data-hue=\"%d\" data-saturation=\"%d%%\">%s</span>: ",
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
Speakers.Speaker[SpeakerIndex].Colour.Hue,
Speakers.Speaker[SpeakerIndex].Colour.Saturation,
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
Speakers.Speaker[SpeakerIndex].Seen == FALSE ? Speakers.Speaker[SpeakerIndex].Credential->CreditedName : Speakers.Speaker[SpeakerIndex].Abbreviation);
Speakers.Speaker[SpeakerIndex].Seen = TRUE;
}
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
char *InPtr = Anno->text;
int MarkerIndex = 0, RefIndex = 0;
while(*InPtr || RefIndex < Anno->reference_count)
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(MarkerIndex < Anno->marker_count &&
InPtr - Anno->text == Anno->markers[MarkerIndex].offset)
hmml_to_html.c: The beginnings of config [#25] May in all likelihood back this stuff out
2017-05-13 15:38:10 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
char *Readable = Anno->markers[MarkerIndex].parameter
? Anno->markers[MarkerIndex].parameter
: Anno->markers[MarkerIndex].marker;
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
switch(Anno->markers[MarkerIndex].type)
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
case HMML_MEMBER:
case HMML_PROJECT:
{
// TODO(matt): That EDITION_NETWORK site database API-polling stuff
hsl_colour Colour;
StringToColourHash(&Colour, Anno->markers[MarkerIndex].marker);
CopyStringToBuffer(&Text,
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
"<span class=\"%s\" data-hue=\"%d\" data-saturation=\"%d%%\">%.*s</span>",
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
Anno->markers[MarkerIndex].type == HMML_MEMBER ? "member" : "project",
Colour.Hue, Colour.Saturation,
cinera.c: Preserve the case of the markers' text
2018-04-07 05:30:28 +00:00
StringLength(Readable), InPtr);
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
} break;
case HMML_CATEGORY:
hmml_to_html.c: The beginnings of config [#25] May in all likelihood back this stuff out
2017-05-13 15:38:10 +00:00
{
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
switch(GenerateTopicColours(Anno->markers[MarkerIndex].marker))
{
case RC_SUCCESS:
case RC_NOOP:
break;
case RC_ERROR_FILE:
case RC_ERROR_MEMORY:
hmml_free(&HMML);
return RC_ERROR_FATAL;
};
if(!HasFilterMenu)
{
HasFilterMenu = TRUE;
}
InsertCategory(&Topics, &LocalTopics, &Media, &LocalMedia, Anno->markers[MarkerIndex].marker);
cinera.c: Preserve the case of the markers' text
2018-04-07 05:30:28 +00:00
CopyStringToBuffer(&Text, "%.*s", StringLength(Readable), InPtr);
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
} break;
case HMML_MARKER_COUNT: break;
hmml_to_html.c: The beginnings of config [#25] May in all likelihood back this stuff out
2017-05-13 15:38:10 +00:00
}
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
InPtr += StringLength(Readable);
++MarkerIndex;
hmml_to_html.c: The beginnings of config [#25] May in all likelihood back this stuff out
2017-05-13 15:38:10 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
while(RefIndex < Anno->reference_count &&
InPtr - Anno->text == Anno->references[RefIndex].offset)
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
HMML_Reference *CurrentRef = Anno->references + RefIndex;
if(!HasReferenceMenu)
{
CopyStringToBuffer(&ReferenceMenu,
" <div class=\"menu references\">\n"
" <span>References &#9660;</span>\n"
" <div class=\"refs references_container\">\n");
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
if(BuildReference(ReferencesArray, RefIdentifier, UniqueRefs, CurrentRef, Anno) == RC_INVALID_REFERENCE)
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogError(LOG_ERROR, "Reference combination processing failed: %s:%d", Filename, Anno->line);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
fprintf(stderr, "%s:%d: Cannot process new combination of reference info\n"
"\n"
"Either tweak your annotation, or contact matt@handmadedev.org\n"
"mentioning the ref node you want to write and how you want it to\n"
"appear in the references menu\n", Filename, Anno->line);
hmml_free(&HMML);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_INVALID_REFERENCE;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
++ReferencesArray[RefIdentifier - 1].IdentifierCount;
++UniqueRefs;
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
HasReferenceMenu = TRUE;
}
else
hmml_to_html.c: Validate template up front
2017-08-08 19:26:54 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
for(int i = 0; i < UniqueRefs; ++i)
hmml_to_html.c: Validate template up front
2017-08-08 19:26:54 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(ReferencesArray[i].IdentifierCount == REF_MAX_IDENTIFIER)
hmml_to_html.c: Validate template up front
2017-08-08 19:26:54 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogError(LOG_EMERGENCY, "REF_MAX_IDENTIFIER (%d) reached. Contact matt@handmadedev.org", REF_MAX_IDENTIFIER);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
fprintf(stderr, "%s:%d: Too many timecodes associated with one reference (increase REF_MAX_IDENTIFIER)\n", Filename, Anno->line);
hmml_free(&HMML);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_ERROR_MAX_REFS;
hmml_to_html.c: Validate template up front
2017-08-08 19:26:54 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(CurrentRef->isbn)
hmml_to_html.c: Validate template up front
2017-08-08 19:26:54 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(!StringsDiffer(CurrentRef->isbn, ReferencesArray[i].ID))
hmml_to_html.c: Validate template up front
2017-08-08 19:26:54 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(ReferencesArray[i].Identifier[ReferencesArray[i].IdentifierCount].Timecode, sizeof(ReferencesArray[i].Identifier[ReferencesArray[i].IdentifierCount].Timecode), "%s", Anno->time);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
ReferencesArray[i].Identifier[ReferencesArray[i].IdentifierCount].Identifier = RefIdentifier;
++ReferencesArray[i].IdentifierCount;
goto AppendedIdentifier;
hmml_to_html.c: Validate template up front
2017-08-08 19:26:54 +00:00
}
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
else if(CurrentRef->url)
hmml_to_html.c: Validate template up front
2017-08-08 19:26:54 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(!StringsDiffer(CurrentRef->url, ReferencesArray[i].ID))
hmml_to_html.c: Validate template up front
2017-08-08 19:26:54 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(ReferencesArray[i].Identifier[ReferencesArray[i].IdentifierCount].Timecode, sizeof(ReferencesArray[i].Identifier[ReferencesArray[i].IdentifierCount].Timecode), "%s", Anno->time);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
ReferencesArray[i].Identifier[ReferencesArray[i].IdentifierCount].Identifier = RefIdentifier;
++ReferencesArray[i].IdentifierCount;
goto AppendedIdentifier;
hmml_to_html.c: Validate template up front
2017-08-08 19:26:54 +00:00
}
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
else
hmml_to_html.c: Validate template up front
2017-08-08 19:26:54 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogError(LOG_ERROR, "Reference missing ISBN or URL: %s:%d", Filename, Anno->line);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
fprintf(stderr, "%s:%d: Reference must have an ISBN or URL\n", Filename, Anno->line);
hmml_free(&HMML);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_INVALID_REFERENCE;
hmml_to_html.c: Validate template up front
2017-08-08 19:26:54 +00:00
}
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
cinera.c: Add new reference combination
2018-04-05 21:25:23 +00:00
if(BuildReference(ReferencesArray, RefIdentifier, UniqueRefs, CurrentRef, Anno) == RC_INVALID_REFERENCE)
hmml_to_html.c: Validate template up front
2017-08-08 19:26:54 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogError(LOG_ERROR, "Reference combination processing failed: %s:%d", Filename, Anno->line);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
fprintf(stderr, "%s:%d: Cannot process new combination of reference info\n"
"\n"
"Either tweak your annotation, or contact matt@handmadedev.org\n"
"mentioning the ref node you want to write and how you want it to\n"
"appear in the references menu\n", Filename, Anno->line);
hmml_free(&HMML);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_INVALID_REFERENCE;
hmml_to_html.c: Validate template up front
2017-08-08 19:26:54 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
++ReferencesArray[UniqueRefs].IdentifierCount;
++UniqueRefs;
hmml_to_html.c: Validate template up front
2017-08-08 19:26:54 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
AppendedIdentifier:
if(!HasReference)
hmml_to_html.c: Category styling Also upgrade hmml.a for lower-cased markers
2017-03-25 02:07:55 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(CurrentRef->isbn)
hmml_to_html.c: Category styling Also upgrade hmml.a for lower-cased markers
2017-03-25 02:07:55 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&AnnotationData, " data-ref=\"%s", CurrentRef->isbn);
hmml_to_html.c: Category styling Also upgrade hmml.a for lower-cased markers
2017-03-25 02:07:55 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
else if(CurrentRef->url)
hmml_to_html.c: Quote and Ref Menus [#16 #20] PPiC 063
2017-03-29 03:38:12 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&AnnotationData, " data-ref=\"%s", CurrentRef->url);
hmml_to_html.c: Quote and Ref Menus [#16 #20] PPiC 063
2017-03-29 03:38:12 +00:00
}
hmml_to_html.c: Consolidate references [#16]
2017-03-30 02:57:04 +00:00
else
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogError(LOG_ERROR, "Reference missing ISBN or URL: %s:%d", Filename, Anno->line);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
fprintf(stderr, "%s:%d: Reference must have an ISBN or URL\n", Filename, Anno->line);
hmml_free(&HMML);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_INVALID_REFERENCE;
hmml_to_html.c: Consolidate references [#16]
2017-03-30 02:57:04 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
HasReference = TRUE;
}
else
{
if(CurrentRef->isbn)
hmml_to_html.c: Quote and Ref Menus [#16 #20] PPiC 063
2017-03-29 03:38:12 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&AnnotationData, ",%s", CurrentRef->isbn);
hmml_to_html.c: Quote and Ref Menus [#16 #20] PPiC 063
2017-03-29 03:38:12 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
else if(CurrentRef->url)
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&AnnotationData, ",%s", CurrentRef->url);
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
}
else
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogError(LOG_ERROR, "Reference missing ISBN or URL: %s:%d", Filename, Anno->line);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
fprintf(stderr, "%s:%d: Reference must have an ISBN or URL", Filename, Anno->line);
hmml_free(&HMML);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_INVALID_REFERENCE;
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBuffer(&Text, "<sup>%s%d</sup>",
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
Anno->references[RefIndex].offset == Anno->references[RefIndex-1].offset ? "," : "",
RefIdentifier);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
++RefIndex;
++RefIdentifier;
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(*InPtr)
{
switch(*InPtr)
hmml_to_html.c: Category styling Also upgrade hmml.a for lower-cased markers
2017-03-25 02:07:55 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
case '<':
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
CopyStringToBuffer(&Text, "&lt;");
break;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
case '>':
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
CopyStringToBuffer(&Text, "&gt;");
break;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
case '&':
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
CopyStringToBuffer(&Text, "&amp;");
break;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
case '\"':
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
CopyStringToBuffer(&Text, "&quot;");
break;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
case '\'':
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
CopyStringToBuffer(&Text, "&#39;");
break;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
default:
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
*Text.Ptr++ = *InPtr;
hmml_to_html.c: Add keywords and sort topic dots
2017-08-19 21:41:51 +00:00
*Text.Ptr = '\0';
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
break;
hmml_to_html.c: Category styling Also upgrade hmml.a for lower-cased markers
2017-03-25 02:07:55 +00:00
}
cinera.c: Distinguish speakers from chat comments It treats co-hosts and guests differently from chat commenters, styling and categorising annotations for them such that their contributions don't come under the "Chat comment" medium Also do some essentially cosmetic code compression of the marker cases and other things cinera_player_pre.js: Make the credits menu initially focus the host's person if they have no support, rather than the first credited person who has support
2018-04-04 22:39:38 +00:00
++InPtr;
hmml_to_html.c: Category styling Also upgrade hmml.a for lower-cased markers
2017-03-25 02:07:55 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(Anno->is_quote)
{
if(!HasQuoteMenu)
hmml_to_html.c: Quote and Ref Menus [#16 #20] PPiC 063
2017-03-29 03:38:12 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&QuoteMenu,
" <div class=\"menu quotes\">\n"
" <span>Quotes &#9660;</span>\n"
" <div class=\"refs quotes_container\">\n");
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
HasQuoteMenu = TRUE;
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(!HasReference)
{
CopyStringToBuffer(&AnnotationData, " data-ref=\"&#%d;", QuoteIdentifier);
}
else
{
CopyStringToBuffer(&AnnotationData, ",&#%d;", QuoteIdentifier);
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
HasQuote = TRUE;
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
char *Speaker = Anno->quote.author ? Anno->quote.author : HMML.metadata.stream_username ? HMML.metadata.stream_username : HMML.metadata.member;
cinera.css: Marker and categories style cinera_player_pre.js: Episode keyboard navigation. Also swap out A for K, and D for J cinera_player_pre.js: Handle the case in onRefChanged() in which the filter_container or filterState is not present cinera.c: Refetch quotes when processing a set of annotations >60 mins after the last fetch Flags: -w Force quote cache rebuild
2018-02-28 01:04:06 +00:00
bool ShouldFetchQuotes = FALSE;
if(Config.Mode & MODE_NOCACHE || (Config.Edition != EDITION_SINGLE && time(0) - LastQuoteFetch > 60*60))
{
ShouldFetchQuotes = TRUE;
LastQuoteFetch = time(0);
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(BuildQuote(&QuoteInfo,
Speaker,
cinera.css: Marker and categories style cinera_player_pre.js: Episode keyboard navigation. Also swap out A for K, and D for J cinera_player_pre.js: Handle the case in onRefChanged() in which the filter_container or filterState is not present cinera.c: Refetch quotes when processing a set of annotations >60 mins after the last fetch Flags: -w Force quote cache rebuild
2018-02-28 01:04:06 +00:00
Anno->quote.id, ShouldFetchQuotes) == RC_UNFOUND)
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogError(LOG_ERROR, "Quote #%s %d not found: %s:%d", Speaker, Anno->quote.id, Filename, Anno->line);
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
Filename[StringLength(Filename) - StringLength(".hmml")] = '\0';
fprintf(stderr, "Quote #%s %d not found\n"
"\e[1;31mSkipping\e[0m %s - %s\n",
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
Speaker,
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
Anno->quote.id,
BaseFilename, HMML.metadata.title);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
hmml_free(&HMML);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_ERROR_QUOTE;
hmml_to_html.c: Quote and Ref Menus [#16 #20] PPiC 063
2017-03-29 03:38:12 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&QuoteMenu,
" <a target=\"_blank\" class=\"ref\" href=\"https://dev.abaines.me.uk/quotes/%s/%d\">\n"
" <span data-id=\"&#%d;\">\n"
" <span class=\"ref_content\">\n"
" <div class=\"source\">Quote %d</div>\n"
" <div class=\"ref_title\">",
Speaker,
Anno->quote.id,
QuoteIdentifier,
Anno->quote.id);
CopyStringToBufferHTMLSafe(&QuoteMenu, QuoteInfo.Text);
CopyStringToBuffer(&QuoteMenu, "</div>\n"
" <div class=\"quote_byline\">&mdash;%s, %s</div>\n"
" </span>\n"
" <div class=\"ref_indices\">\n"
" <span data-timestamp=\"%d\" class=\"timecode\"><span class=\"ref_index\">[&#%d;]</span><span class=\"time\">%s</span></span>\n"
" </div>\n"
" </span>\n"
" </a>\n",
Speaker,
QuoteInfo.Date,
TimecodeToSeconds(Anno->time),
QuoteIdentifier,
Anno->time);
if(!Anno->text[0])
hmml_to_html.c: Category styling Also upgrade hmml.a for lower-cased markers
2017-03-25 02:07:55 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&Text, "&#8220;");
CopyStringToBufferHTMLSafe(&Text, QuoteInfo.Text);
CopyStringToBuffer(&Text, "&#8221;");
hmml_to_html.c: Sort filter [#21] This works, but fails to take into account the "written text" of media
2017-05-22 21:37:00 +00:00
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBuffer(&Text, "<sup>&#%d;</sup>", QuoteIdentifier);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
++QuoteIdentifier;
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
if(Config.Edition != EDITION_SINGLE && !PrivateVideo)
{
CopyStringToBuffer(&CollationBuffers->Search, "\"%d\": \"", TimecodeToSeconds(Anno->time));
if(Anno->is_quote && !Anno->text[0])
{
CopyStringToBuffer(&CollationBuffers->Search, "\u201C");
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
CopyStringToBufferNoFormat(&CollationBuffers->Search, QuoteInfo.Text);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBuffer(&CollationBuffers->Search, "\u201D");
}
else
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
CopyStringToBufferNoFormat(&CollationBuffers->Search, Anno->text);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
}
CopyStringToBuffer(&CollationBuffers->Search, "\"\n");
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
while(MarkerIndex < Anno->marker_count)
{
cinera.c: Fix 0.5.20 more correctly The actual bug was that MarkerIndex wasn't being incremented for HMML_CATEGORY markers mid-annotation... (HMML_MEMBER and HMML_PROJECT were fine.)
2018-01-06 00:00:05 +00:00
switch(GenerateTopicColours(Anno->markers[MarkerIndex].marker))
hmml_to_html.c: Sort filter [#21] This works, but fails to take into account the "written text" of media
2017-05-22 21:37:00 +00:00
{
cinera.c: Fix 0.5.20 more correctly The actual bug was that MarkerIndex wasn't being incremented for HMML_CATEGORY markers mid-annotation... (HMML_MEMBER and HMML_PROJECT were fine.)
2018-01-06 00:00:05 +00:00
case RC_SUCCESS:
case RC_NOOP:
break;
case RC_ERROR_FILE:
case RC_ERROR_MEMORY:
hmml_free(&HMML);
return RC_ERROR_FATAL;
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
}
cinera.c: Fix 0.5.20 more correctly The actual bug was that MarkerIndex wasn't being incremented for HMML_CATEGORY markers mid-annotation... (HMML_MEMBER and HMML_PROJECT were fine.)
2018-01-06 00:00:05 +00:00
if(!HasFilterMenu)
{
HasFilterMenu = TRUE;
hmml_to_html.c: Category styling Also upgrade hmml.a for lower-cased markers
2017-03-25 02:07:55 +00:00
}
cinera.c: Fix 0.5.20 more correctly The actual bug was that MarkerIndex wasn't being incremented for HMML_CATEGORY markers mid-annotation... (HMML_MEMBER and HMML_PROJECT were fine.)
2018-01-06 00:00:05 +00:00
InsertCategory(&Topics, &LocalTopics, &Media, &LocalMedia, Anno->markers[MarkerIndex].marker);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
++MarkerIndex;
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if(LocalTopics.Count == 0)
{
switch(GenerateTopicColours("nullTopic"))
{
case RC_SUCCESS:
case RC_NOOP:
break;
case RC_ERROR_FILE:
case RC_ERROR_MEMORY:
hmml_free(&HMML);
return RC_ERROR_FATAL;
};
InsertCategory(&Topics, &LocalTopics, &Media, &LocalMedia, "nullTopic");
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(LocalMedia.Count == 0)
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
InsertCategory(&Topics, &LocalTopics, &Media, &LocalMedia, DefaultMedium);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
BuildCategories(&AnnotationClass, &CategoryIcons, &LocalTopics, &LocalMedia, &MarkerIndex, DefaultMedium);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyBuffer(&AnnotationHeader, &AnnotationClass);
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(HasQuote || HasReference)
{
CopyStringToBuffer(&AnnotationData, "\"");
CopyBuffer(&AnnotationHeader, &AnnotationData);
}
CopyStringToBuffer(&AnnotationHeader, ">\n");
CopyBuffer(&Annotation, &AnnotationHeader);
CopyStringToBuffer(&Annotation,
cinera: More namespacing and style tweak
2017-12-10 17:05:46 +00:00
" <div class=\"cineraContent\"><span class=\"timecode\">%s</span>",
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
Anno->time);
CopyBuffer(&Annotation, &Text);
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(LocalTopics.Count > 0)
{
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
CopyBuffer(&Annotation, &CategoryIcons);
hmml_to_html.c: Begin single-pass rewrite
2017-03-22 02:18:31 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&Annotation, "</div>\n"
" <div class=\"progress faded\">\n"
cinera: More namespacing and style tweak
2017-12-10 17:05:46 +00:00
" <div class=\"cineraContent\"><span class=\"timecode\">%s</span>",
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
Anno->time);
CopyBuffer(&Annotation, &Text);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
if(LocalTopics.Count > 0)
{
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
CopyBuffer(&Annotation, &CategoryIcons);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&Annotation, "</div>\n"
" </div>\n"
" <div class=\"progress main\">\n"
cinera: More namespacing and style tweak
2017-12-10 17:05:46 +00:00
" <div class=\"cineraContent\"><span class=\"timecode\">%s</span>",
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
Anno->time);
CopyBuffer(&Annotation, &Text);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
if(LocalTopics.Count > 0)
{
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
CopyBuffer(&Annotation, &CategoryIcons);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&Annotation, "</div>\n"
" </div>\n"
" </div>\n");
CopyBuffer(&CollationBuffers->Player, &Annotation);
// NOTE(matt): Tree structure of "annotation local" buffer dependencies
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
// CategoryIcons
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
// Text
// AnnotationData
// AnnotationClass
// AnnotationHeader
// Annotation
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
DeclaimBuffer(&CategoryIcons);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
DeclaimBuffer(&Text);
DeclaimBuffer(&AnnotationData);
DeclaimBuffer(&AnnotationClass);
DeclaimBuffer(&AnnotationHeader);
DeclaimBuffer(&Annotation);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
cinera.c: Only build search if != Single Edition
2018-01-05 20:03:02 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(Config.Edition != EDITION_SINGLE && !PrivateVideo)
cinera.c: Only build search if != Single Edition
2018-01-05 20:03:02 +00:00
{
CopyStringToBuffer(&CollationBuffers->Search, "---\n");
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
N->This.Size = CollationBuffers->Search.Ptr - CollationBuffers->Search.Location;
cinera.c: Only build search if != Single Edition
2018-01-05 20:03:02 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
#if DEBUG
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
printf("\n\n --- End of Annotations Loop ---\n\n\n\n");
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
#endif
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(HasQuoteMenu)
{
CopyStringToBuffer(&QuoteMenu,
" </div>\n"
" </div>\n");
CopyBuffer(&CollationBuffers->Menus, &QuoteMenu);
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(HasReferenceMenu)
{
for(int i = 0; i < UniqueRefs; ++i)
hmml_to_html.c: Quote and Ref Menus [#16 #20] PPiC 063
2017-03-29 03:38:12 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&ReferenceMenu,
" <a data-id=\"%s\" href=\"%s\" target=\"_blank\" class=\"ref\">\n"
" <span class=\"ref_content\">\n",
ReferencesArray[i].ID,
ReferencesArray[i].URL);
if(*ReferencesArray[i].Source)
hmml_to_html.c: Consolidate references [#16]
2017-03-30 02:57:04 +00:00
{
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
CopyStringToBuffer(&ReferenceMenu,
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
" <div class=\"source\">");
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
CopyStringToBufferHTMLSafeBreakingOnSlash(&ReferenceMenu, ReferencesArray[i].Source);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&ReferenceMenu, "</div>\n"
" <div class=\"ref_title\">");
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
CopyStringToBufferHTMLSafeBreakingOnSlash(&ReferenceMenu, ReferencesArray[i].RefTitle);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&ReferenceMenu, "</div>\n");
}
else
{
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
CopyStringToBuffer(&ReferenceMenu,
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
" <div class=\"ref_title\">");
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
CopyStringToBufferHTMLSafeBreakingOnSlash(&ReferenceMenu, ReferencesArray[i].RefTitle);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&ReferenceMenu, "</div>\n");
}
CopyStringToBuffer(&ReferenceMenu,
" </span>\n");
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
for(int j = 0; j < ReferencesArray[i].IdentifierCount;)
{
CopyStringToBuffer(&ReferenceMenu,
" <div class=\"ref_indices\">\n ");
for(int k = 0; k < 3 && j < ReferencesArray[i].IdentifierCount; ++k, ++j)
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
{
CopyStringToBuffer(&ReferenceMenu,
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
"<span data-timestamp=\"%d\" class=\"timecode\"><span class=\"ref_index\">[%d]</span><span class=\"time\">%s</span></span>",
TimecodeToSeconds(ReferencesArray[i].Identifier[j].Timecode),
ReferencesArray[i].Identifier[j].Identifier,
ReferencesArray[i].Identifier[j].Timecode);
hmml_to_html.c: Command-line args [#25]
2017-06-25 18:05:58 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&ReferenceMenu, "\n"
" </div>\n");
hmml_to_html.c: Consolidate references [#16]
2017-03-30 02:57:04 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Quote and Ref Menus [#16 #20] PPiC 063
2017-03-29 03:38:12 +00:00
CopyStringToBuffer(&ReferenceMenu,
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
" </a>\n");
}
CopyStringToBuffer(&ReferenceMenu,
" </div>\n"
" </div>\n");
CopyBuffer(&CollationBuffers->Menus, &ReferenceMenu);
}
if(HasFilterMenu)
{
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
buffer URLPrefix;
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
ClaimBuffer(&URLPrefix, "URLPrefix", 1024);
cinera: Fix bug in image URL prefix construction
2017-12-18 00:15:03 +00:00
ConstructURLPrefix(&URLPrefix, INCLUDE_Images, PAGE_PLAYER);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
CopyStringToBuffer(&FilterMenu,
" <div class=\"menu filter\">\n"
" <span><img src=\"%scinera_icon_filter.png\"></span>\n"
" <div class=\"filter_container\">\n"
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
" <div class=\"filter_mode exclusive\">Filter mode: </div>\n"
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
" <div class=\"filters\">\n",
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
URLPrefix.Location);
DeclaimBuffer(&URLPrefix);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(Topics.Count > 0)
{
CopyStringToBuffer(&FilterMenu,
" <div class=\"filter_topics\">\n"
" <div class=\"filter_title\">Topics</div>\n");
for(int i = 0; i < Topics.Count; ++i)
hmml_to_html.c: Simplify InsertCategory() Basically just relive it of taking HasTopic and HasCategory
2017-08-19 22:35:07 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char SanitisedMarker[StringLength(Topics.Category[i].Marker) + 1];
CopyString(SanitisedMarker, sizeof(SanitisedMarker), "%s", Topics.Category[i].Marker);
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
SanitisePunctuation(SanitisedMarker);
bool NullTopic = !StringsDiffer(Topics.Category[i].Marker, "nullTopic");
hmml_to_html.c: Simplify InsertCategory() Basically just relive it of taking HasTopic and HasCategory
2017-08-19 22:35:07 +00:00
CopyStringToBuffer(&FilterTopics,
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
" <div %sclass=\"filter_content %s\">\n"
cinera.c: Namespace .text to .cineraText
2017-12-29 16:00:44 +00:00
" <span class=\"icon category %s\"></span><span class=\"cineraText\">%s</span>\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
" </div>\n",
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
NullTopic ? "title=\"Annotations that don't fit into the above topic(s) may be filtered using this pseudo-topic\" " : "",
SanitisedMarker,
SanitisedMarker,
NullTopic ? "(null topic)" : Topics.Category[i].Marker);
hmml_to_html.c: Simplify InsertCategory() Basically just relive it of taking HasTopic and HasCategory
2017-08-19 22:35:07 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&FilterTopics,
" </div>\n");
CopyBuffer(&FilterMenu, &FilterTopics);
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(Media.Count > 0)
{
CopyStringToBuffer(&FilterMedia,
" <div class=\"filter_media\">\n"
" <div class=\"filter_title\">Media</div>\n");
for(int i = 0; i < Media.Count; ++i)
hmml_to_html.c: Simplify InsertCategory() Basically just relive it of taking HasTopic and HasCategory
2017-08-19 22:35:07 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char SanitisedMarker[StringLength(Media.Category[i].Marker) + 1];
CopyString(SanitisedMarker, sizeof(SanitisedMarker), "%s", Media.Category[i].Marker);
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
SanitisePunctuation(SanitisedMarker);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
int j;
for(j = 0; j < ArrayCount(CategoryMedium); ++j)
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(!StringsDiffer(Media.Category[i].Marker, CategoryMedium[j].Medium))
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
break;
hmml_to_html.c: Sort the filter media [#21]
2017-05-24 21:56:36 +00:00
}
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
if(!StringsDiffer(Media.Category[i].Marker, "afk")) // TODO(matt): Initially hidden config
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
// When we do this for real, we'll probably need to loop
// over the configured media to see who should be hidden
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
{
CopyStringToBuffer(&FilterMedia,
" <div class=\"filter_content %s off\">\n"
cinera.c: Namespace .text to .cineraText
2017-12-29 16:00:44 +00:00
" <span class=\"icon\">%s</span><span class=\"cineraText\">%s</span>\n"
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
" </div>\n",
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
SanitisedMarker,
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
CategoryMedium[j].Icon,
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
CategoryMedium[j].WrittenName);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
}
else
{
CopyStringToBuffer(&FilterMedia,
" <div class=\"filter_content %s\">\n"
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
" <span class=\"icon\">%s</span><span class=\"cineraText\">%s%s</span>\n"
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
" </div>\n",
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
SanitisedMarker,
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
CategoryMedium[j].Icon,
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
CategoryMedium[j].WrittenName,
!StringsDiffer(Media.Category[i].Marker, DefaultMedium) ? "</span><span class=\"cineraDefaultMediumIndicator\" title=\"Default medium\n"
"Annotations lacking a media icon are in this medium\">&#128969;" : "");
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
}
hmml_to_html.c: Generate the Filter [#21]
2017-05-21 06:35:16 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&FilterMedia,
" </div>\n");
CopyBuffer(&FilterMenu, &FilterMedia);
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&FilterMenu,
" </div>\n"
" </div>\n"
" </div>\n");
hmml_to_html.c: Simplify InsertCategory() Basically just relive it of taking HasTopic and HasCategory
2017-08-19 22:35:07 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyBuffer(&CollationBuffers->Menus, &FilterMenu);
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera: Fix theatre and add GUI clickable for it
2018-01-17 20:15:00 +00:00
CopyStringToBuffer(&CollationBuffers->Menus,
" <div class=\"menu views\">\n"
" <div class=\"view\" data-id=\"theatre\" title=\"Theatre mode\">&#127917;</div>\n"
" <div class=\"views_container\">\n"
" <div class=\"view\" data-id=\"super\" title=\"SUPERtheatre mode\">&#127967;</div>\n"
" </div>\n"
cinera: Share link (to current annotation)
2018-05-22 21:43:59 +00:00
" </div>\n"
" <div class=\"menu link\">\n"
" <span>&#128279;</span>\n"
" <div class=\"link_container\">\n"
" <div id=\"cineraLinkMode\">Link to current annotation</div>\n"
" <textarea title=\"Click to copy to clipboard\" id=\"cineraLink\" readonly spellcheck=\"false\"></textarea>\n"
" </div>\n"
" </div>\n");
cinera: Fix theatre and add GUI clickable for it
2018-01-17 20:15:00 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(HasCreditsMenu)
{
CopyBuffer(&CollationBuffers->Menus, &CreditsMenu);
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera: Theatre Mode This also changes the hardcoded, unintegrated output to wrap cineraMenus and cineraPlayerContainer in a <div>, as newly reflected in the example template_player.html
2018-01-15 21:52:24 +00:00
// TODO(matt): Maybe figure out a more succinct way to code this Help text
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&CollationBuffers->Menus,
" <div class=\"help\">\n"
" <span>?</span>\n"
" <div class=\"help_container\">\n"
" <span class=\"help_key\">?</span><h1>Keyboard Navigation</h1>\n"
"\n"
" <h2>Global Keys</h2>\n"
cinera.css: Marker and categories style cinera_player_pre.js: Episode keyboard navigation. Also swap out A for K, and D for J cinera_player_pre.js: Handle the case in onRefChanged() in which the filter_container or filterState is not present cinera.c: Refetch quotes when processing a set of annotations >60 mins after the last fetch Flags: -w Force quote cache rebuild
2018-02-28 01:04:06 +00:00
" <span class=\"help_key\">[</span>, <span class=\"help_key\">&lt;</span> / <span class=\"help_key\">]</span>, <span class=\"help_key\">&gt;</span> <span class=\"help_text\">Jump to previous / next episode</span><br>\n"
" <span class=\"help_key\">W</span>, <span class=\"help_key\">K</span>, <span class=\"help_key\">P</span> / <span class=\"help_key\">S</span>, <span class=\"help_key\">J</span>, <span class=\"help_key\">N</span> <span class=\"help_text\">Jump to previous / next marker</span><br>\n"
cinera: Theatre Mode This also changes the hardcoded, unintegrated output to wrap cineraMenus and cineraPlayerContainer in a <div>, as newly reflected in the example template_player.html
2018-01-15 21:52:24 +00:00
" <span class=\"help_key\">t</span> / <span class=\"help_key\">T</span> <span class=\"help_text\">Toggle theatre / SUPERtheatre mode</span><br>\n"
);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(HasFilterMenu)
{
CopyStringToBuffer(&CollationBuffers->Menus,
cinera: Share link (to current annotation)
2018-05-22 21:43:59 +00:00
" <span class=\"help_key\">V</span> <span class=\"help_text\">Revert filter to original state</span> <span class=\"help_key\">Y</span> <span class=\"help_text\">Select link (requires manual Ctrl-c)</span>\n");
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
else
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <span class=\"help_key unavailable\">z</span> <span class=\"help_text unavailable\">Toggle filter mode</span> <span class=\"help_key unavailable\">V</span> <span class=\"help_text unavailable\">Revert filter to original state</span>\n");
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&CollationBuffers->Menus,
"\n"
" <h2>Menu toggling</h2>\n");
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(HasQuoteMenu)
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <span class=\"help_key\">q</span> <span class=\"help_text\">Quotes</span>\n");
}
else
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <span class=\"help_key unavailable\">q</span> <span class=\"help_text unavailable\">Quotes</span>\n");
}
if(HasReferenceMenu)
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <span class=\"help_key\">r</span> <span class=\"help_text\">References</span>\n");
}
else
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <span class=\"help_key unavailable\">r</span> <span class=\"help_text unavailable\">References</span>\n");
}
if(HasFilterMenu)
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <span class=\"help_key\">f</span> <span class=\"help_text\">Filter</span>\n");
}
else
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <span class=\"help_key unavailable\">f</span> <span class=\"help_text unavailable\">Filter</span>\n");
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera: Share link (to current annotation)
2018-05-22 21:43:59 +00:00
CopyStringToBuffer(&CollationBuffers->Menus,
" <span class=\"help_key\">y</span> <span class=\"help_text\">Link</span>\n");
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(HasCreditsMenu)
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <span class=\"help_key\">c</span> <span class=\"help_text\">Credits</span>\n");
}
else
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <span class=\"help_key unavailable\">c</span> <span class=\"help_text unavailable\">Credits</span>\n");
}
CopyStringToBuffer(&CollationBuffers->Menus,
"\n"
cinera.css: Marker and categories style cinera_player_pre.js: Episode keyboard navigation. Also swap out A for K, and D for J cinera_player_pre.js: Handle the case in onRefChanged() in which the filter_container or filterState is not present cinera.c: Refetch quotes when processing a set of annotations >60 mins after the last fetch Flags: -w Force quote cache rebuild
2018-02-28 01:04:06 +00:00
" <h2>In-Menu Movement</h2>\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
" <div class=\"help_paragraph\">\n"
" <div class=\"key_block\">\n"
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
" <div>\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
" <span class=\"help_key\">a</span>\n"
" </div>\n"
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
" <div>\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
" <span class=\"help_key\">w</span><br>\n"
" <span class=\"help_key\">s</span>\n"
" </div>\n"
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
" <div>\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
" <span class=\"help_key\">d</span>\n"
" </div>\n"
" </div>\n"
" <div class=\"key_block\">\n"
" <span class=\"help_key\">h</span>\n"
" <span class=\"help_key\">j</span>\n"
" <span class=\"help_key\">k</span>\n"
" <span class=\"help_key\">l</span>\n"
" </div>\n"
" <div class=\"key_block\">\n"
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
" <div>\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
" <span class=\"help_key\">←</span>\n"
" </div>\n"
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
" <div>\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
" <span class=\"help_key\">↑</span><br>\n"
" <span class=\"help_key\">↓</span>\n"
" </div>\n"
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
" <div>\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
" <span class=\"help_key\">→</span>\n"
" </div>\n"
" </div>\n"
" </div>\n"
" <br>\n");
if(HasQuoteMenu)
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <h2>Quotes ");
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
if(HasReferenceMenu)
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&CollationBuffers->Menus, "and References Menus</h2>\n");
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
}
else
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&CollationBuffers->Menus, "<span class=\"unavailable\">and References</span> Menus</h2>\n");
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
else
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <h2><span class=\"unavailable\">Quotes");
if(HasReferenceMenu)
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&CollationBuffers->Menus, " and</span> References Menus</h2>\n");
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
}
else
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&CollationBuffers->Menus, " and References Menus</span></h2>\n");
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
if(HasQuoteMenu || HasReferenceMenu)
{
CopyStringToBuffer(&CollationBuffers->Menus,
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
" <span class=\"help_key word\">Enter</span> <span class=\"help_text\">Jump to timecode</span><br>\n");
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
else
{
CopyStringToBuffer(&CollationBuffers->Menus,
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
" <span class=\"help_key word unavailable\">Enter</span> <span class=\"help_text unavailable\">Jump to timecode</span><br>\n");
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
CopyStringToBuffer(&CollationBuffers->Menus, "\n");
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(HasQuoteMenu)
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <h2>Quotes");
if(HasReferenceMenu)
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&CollationBuffers->Menus, ", References ");
if(HasCreditsMenu)
{
CopyStringToBuffer(&CollationBuffers->Menus, "and Credits Menus</h2>");
}
else
{
CopyStringToBuffer(&CollationBuffers->Menus, "<span class=\"unavailable\">and Credits</span> Menus</h2>");
}
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
}
else
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&CollationBuffers->Menus, "<span class=\"unavailable\">, References ");
if(HasCreditsMenu)
{
CopyStringToBuffer(&CollationBuffers->Menus, "</span>and Credits Menus</h2>");
}
else
{
CopyStringToBuffer(&CollationBuffers->Menus, "and Credits</span> Menus</h2>");
}
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
else
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <h2><span class=\"unavailable\">Quotes");
if(HasReferenceMenu)
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&CollationBuffers->Menus, ", </span>References ");
if(HasCreditsMenu)
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&CollationBuffers->Menus, "and Credits Menus</h2>");
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
}
else
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&CollationBuffers->Menus, "<span class=\"unavailable\">and Credits</span> Menus</h2>");
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
}
}
else
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&CollationBuffers->Menus, ", References ");
if(HasCreditsMenu)
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
{
cinera: Theatre Mode This also changes the hardcoded, unintegrated output to wrap cineraMenus and cineraPlayerContainer in a <div>, as newly reflected in the example template_player.html
2018-01-15 21:52:24 +00:00
CopyStringToBuffer(&CollationBuffers->Menus, "and</span> Credits Menus</h2>");
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
}
else
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&CollationBuffers->Menus, "and Credits Menus</h2></span>");
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
}
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
CopyStringToBuffer(&CollationBuffers->Menus, "\n");
if(HasQuoteMenu || HasReferenceMenu || HasCreditsMenu)
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <span class=\"help_key\">o</span> <span class=\"help_text\">Open URL (in new tab)</span>\n");
}
else
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <span class=\"help_key unavailable\">o</span> <span class=\"help_text unavailable\">Open URL (in new tab)</span>\n");
}
CopyStringToBuffer(&CollationBuffers->Menus,
"\n");
if(HasFilterMenu)
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <h2>Filter Menu</h2>\n"
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
" <span class=\"help_key\">x</span>, <span class=\"help_key word\">Space</span> <span class=\"help_text\">Toggle category and focus next</span><br>\n"
" <span class=\"help_key\">X</span>, <span class=\"help_key word modifier\">Shift</span><span class=\"help_key word\">Space</span> <span class=\"help_text\">Toggle category and focus previous</span><br>\n"
cinera: Share link (to current annotation)
2018-05-22 21:43:59 +00:00
" <span class=\"help_key\">v</span> <span class=\"help_text\">Invert topics / media as per focus</span>\n"
"\n"
" <h2>Filter and Link Menus</h2>\n"
" <span class=\"help_key\">z</span> <span class=\"help_text\">Toggle filter / linking mode</span>\n");
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
else
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <h2><span class=\"unavailable\">Filter Menu</span></h2>\n"
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
" <span class=\"help_key unavailable\">x</span>, <span class=\"help_key word unavailable\">Space</span> <span class=\"help_text unavailable\">Toggle category and focus next</span><br>\n"
" <span class=\"help_key unavailable\">X</span>, <span class=\"help_key word modifier unavailable\">Shift</span><span class=\"help_key word unavailable\">Space</span> <span class=\"help_text unavailable\">Toggle category and focus previous</span><br>\n"
cinera: Share link (to current annotation)
2018-05-22 21:43:59 +00:00
" <span class=\"help_key unavailable\">v</span> <span class=\"help_text unavailable\">Invert topics / media as per focus</span>\n"
"\n"
" <h2><span class=\"unavailable\">Filter</span> and Link Menus</h2>\n"
" <span class=\"help_key\">z</span> <span class=\"help_text\">Toggle <span class=\"unavailable\">filter /</span> linking mode</span>\n");
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
CopyStringToBuffer(&CollationBuffers->Menus, "\n");
if(HasCreditsMenu)
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <h2>Credits Menu</h2>\n"
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
" <span class=\"help_key word\">Enter</span> <span class=\"help_text\">Open URL (in new tab)</span><br>\n");
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
else
{
CopyStringToBuffer(&CollationBuffers->Menus,
" <h2><span class=\"unavailable\">Credits Menu</span></h2>\n"
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
" <span class=\"help_key word unavailable\">Enter</span> <span class=\"help_text unavailable\">Open URL (in new tab)</span><br>\n");
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
CopyStringToBuffer(&CollationBuffers->Menus,
" </div>\n"
" </div>\n"
" </div>");
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
CopyStringToBuffer(&CollationBuffers->Player,
" </div>\n");
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(N)
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
N->This.LinkOffsets.NextStart = (CollationBuffers->Player.Ptr - CollationBuffers->Player.Location - (N->This.LinkOffsets.PrevStart + N->This.LinkOffsets.PrevEnd));
if(N->Prev.Size || N->Next.Size)
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(N->Next.Size > 0)
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
// TODO(matt): Once we have a more rigorous notion of "Day Numbers", perhaps also use them here
buffer NextPlayerURL;
ClaimBuffer(&NextPlayerURL, "NextPlayerURL", MAX_BASE_URL_LENGTH + 1 + MAX_RELATIVE_PAGE_LOCATION_LENGTH + 1 + MAX_PLAYER_URL_PREFIX_LENGTH + MAX_BASE_FILENAME_LENGTH);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
ConstructPlayerURL(&NextPlayerURL, N->Next.BaseFilename);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
CopyStringToBuffer(&CollationBuffers->Player,
" <a class=\"episodeMarker next\" href=\"%s\"><div>&#9196;</div><div>Next: '%s'</div><div>&#9196;</div></a>\n",
NextPlayerURL.Location,
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
N->Next.Title);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
DeclaimBuffer(&NextPlayerURL);
}
else
{
CopyStringToBuffer(&CollationBuffers->Player,
" <div class=\"episodeMarker last\"><div>&#8226;</div><div>You have arrived at the (current) end of <cite>%s</cite></div><div>&#8226;</div></div>\n", CollationBuffers->ProjectName);
}
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
N->This.LinkOffsets.NextEnd = (CollationBuffers->Player.Ptr - CollationBuffers->Player.Location - (N->This.LinkOffsets.PrevStart + N->This.LinkOffsets.PrevEnd + N->This.LinkOffsets.NextStart));
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&CollationBuffers->Player,
" </div>\n"
" </div>");
// TODO(matt): Maybe do something about indentation levels
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
buffer URLIndex;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
ClaimBuffer(&URLIndex, "URLIndex", MAX_BASE_URL_LENGTH + 1 + MAX_RELATIVE_PAGE_LOCATION_LENGTH + 1);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
ConstructIndexURL(&URLIndex);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(CollationBuffers->URLIndex, sizeof(CollationBuffers->URLIndex), "%s", URLIndex.Location);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
DeclaimBuffer(&URLIndex);
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
buffer URLPrefix;
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
ClaimBuffer(&URLPrefix, "URLPrefix", 1024);
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
ConstructURLPrefix(&URLPrefix, INCLUDE_CSS, PAGE_INDEX);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
CopyStringToBuffer(&CollationBuffers->IncludesIndex,
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
"<meta charset=\"UTF-8\">\n"
" <meta name=\"generator\" content=\"Cinera %d.%d.%d\">\n"
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
"\n"
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
" <link rel=\"stylesheet\" type=\"text/css\" href=\"%scinera.css\">\n"
" <link rel=\"stylesheet\" type=\"text/css\" href=\"%scinera__%s.css\">\n"
" <link rel=\"stylesheet\" type=\"text/css\" href=\"%scinera_topics.css\">\n",
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
CINERA_APP_VERSION.Major,
CINERA_APP_VERSION.Minor,
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CINERA_APP_VERSION.Patch,
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
URLPrefix.Location,
URLPrefix.Location, StringsDiffer(Config.Theme, "") ? Config.Theme : HMML.metadata.project,
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
URLPrefix.Location);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBuffer(&CollationBuffers->IncludesPlayer,
"<meta charset=\"UTF-8\">\n"
" <meta name=\"generator\" content=\"Cinera %d.%d.%d\">\n",
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
CINERA_APP_VERSION.Major,
CINERA_APP_VERSION.Minor,
CINERA_APP_VERSION.Patch);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(Topics.Count || Media.Count)
{
CopyStringToBuffer(&CollationBuffers->IncludesPlayer,
" <meta name=\"keywords\" content=\"");
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(Topics.Count > 0)
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
for(int i = 0; i < Topics.Count; ++i)
{
cinera: Tweak filter Introduce nullTopic, visually represent the media in annotations and default to "exclusive" mode
2018-01-15 00:03:11 +00:00
if(StringsDiffer(Topics.Category[i].Marker, "nullTopic"))
{
CopyStringToBuffer(&CollationBuffers->IncludesPlayer, "%s, ", Topics.Category[i].Marker);
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(Media.Count > 0)
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
{
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
for(int i = 0; i < Media.Count; ++i)
{
CopyStringToBuffer(&CollationBuffers->IncludesPlayer, "%s, ", Media.Category[i].WrittenText);
}
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CollationBuffers->IncludesPlayer.Ptr -= 2;
cinera.c: Fail earlier on unknown project HTML-santitise episode title and project name from templates. This won't always be correct, but I reckon the common case will require it.
2018-05-25 19:05:06 +00:00
CopyStringToBuffer(&CollationBuffers->IncludesPlayer, "\">\n");
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
ConstructURLPrefix(&URLPrefix, INCLUDE_CSS, PAGE_PLAYER);
CopyStringToBuffer(&CollationBuffers->IncludesPlayer,
"\n"
" <link rel=\"stylesheet\" type=\"text/css\" href=\"%scinera.css\">\n"
" <link rel=\"stylesheet\" type=\"text/css\" href=\"%scinera__%s.css\">\n"
" <link rel=\"stylesheet\" type=\"text/css\" href=\"%scinera_topics.css\">\n",
URLPrefix.Location,
URLPrefix.Location, StringsDiffer(Config.Theme, "") ? Config.Theme : HMML.metadata.project,
URLPrefix.Location);
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
ConstructURLPrefix(&URLPrefix, INCLUDE_JS, PAGE_PLAYER);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
CopyStringToBuffer(&CollationBuffers->IncludesPlayer,
cinera.c: Correct template buffers The template buffers no longer contain indentation spaces at the start or a \n at the end. This removes any weirdness from template composition Also remove the cleanup code added in 0.5.22
2018-01-08 22:59:36 +00:00
" <script type=\"text/javascript\" src=\"%scinera_player_pre.js\"></script>",
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
URLPrefix.Location);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
CopyStringToBuffer(&CollationBuffers->ScriptPlayer,
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
"<script type=\"text/javascript\" src=\"%scinera_player_post.js\"></script>",
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
URLPrefix.Location);
DeclaimBuffer(&URLPrefix);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
// NOTE(matt): Tree structure of "global" buffer dependencies
// CreditsMenu
// FilterMedia
// FilterTopics
// FilterMenu
// ReferenceMenu
// QuoteMenu
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
DeclaimBuffer(&CreditsMenu);
DeclaimBuffer(&FilterMedia);
DeclaimBuffer(&FilterTopics);
DeclaimBuffer(&FilterMenu);
DeclaimBuffer(&ReferenceMenu);
DeclaimBuffer(&QuoteMenu);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
else
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogError(LOG_ERROR, "%s:%d: %s", Filename, HMML.error.line, HMML.error.message);
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
fprintf(stderr, "\e[1;31mSkipping\e[0m %s:%d: %s\n", Filename, HMML.error.line, HMML.error.message);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
hmml_free(&HMML);
return RC_ERROR_HMML;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
hmml_free(&HMML);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_SUCCESS;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
int
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
BuffersToHTML(buffers *CollationBuffers, template *Template, char *OutputPath, int PageType, unsigned int *PlayerOffset)
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
#if DEBUG
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
printf("\n\n --- Buffer Collation ---\n"
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
" %s\n\n\n", OutputPath ? OutputPath : Config.OutLocation);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
#endif
#if DEBUG_MEM
FILE *MemLog = fopen("/home/matt/cinera_mem", "a+");
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
fprintf(MemLog, "\nEntered BuffersToHTML(%s)\n", OutputPath ? OutputPath : Config.OutLocation);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
fclose(MemLog);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
#endif
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
if(StringsDiffer(Template->Metadata.Filename, ""))
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
if((StringsDiffer(Template->Metadata.Filename, ""))
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
&& ((Template->Metadata.Validity & PageType) || Config.Mode & MODE_FORCEINTEGRATION))
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
buffer Output;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
Output.Size = Template->Buffer.Size + (Kilobytes(512));
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
Output.ID = "Output";
if(!(Output.Location = malloc(Output.Size)))
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogError(LOG_ERROR, "BuffersToHTML(): %s",
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
strerror(errno));
return RC_ERROR_MEMORY;
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
#if DEBUG_MEM
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
MemLog = fopen("/home/matt/cinera_mem", "a+");
fprintf(MemLog, " Allocated Output (%d)\n", Output.Size);
fclose(MemLog);
printf(" Allocated Output (%d)\n", Output.Size);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
#endif
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
Output.Ptr = Output.Location;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
bool NeedPlayerOffset = PlayerOffset ? TRUE : FALSE;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
Template->Buffer.Ptr = Template->Buffer.Location;
for(int i = 0; i < Template->Metadata.TagCount; ++i)
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
int j = 0;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
while(Template->Metadata.Tag[i].Offset > j)
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
*Output.Ptr++ = *Template->Buffer.Ptr++;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
++j;
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
// TODO(matt): Make this whole template stuff context-aware, so it can determine whether or not to HTML-encode
// or sanitise punctuation for CSS-safety
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
switch(Template->Metadata.Tag[i].TagCode)
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
case TAG_PROJECT_ID:
if(CollationBuffers->ProjectID[0] == '\0')
{
cinera.c: Fix CollationBuffers->ProjectID test
2018-06-12 19:32:56 +00:00
fprintf(stderr, "Template contains a <!-- __CINERA_PROJECT_ID__ --> tag\n"
"Skipping just this tag, because no project ID is set\n");
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
}
else
{
cinera.c: Fix CollationBuffers->ProjectID test
2018-06-12 19:32:56 +00:00
CopyStringToBufferNoFormat(&Output, CollationBuffers->ProjectID); // NOTE(matt): Not HTML-safe
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
}
break;
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
case TAG_PROJECT:
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
if(CollationBuffers->ProjectName[0] == '\0')
{
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
fprintf(stderr, "Template contains a <!-- __CINERA_PROJECT__ --> tag\n"
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
"Skipping just this tag, because we do not know the project's full name\n");
}
else
{
cinera.c: Fail earlier on unknown project HTML-santitise episode title and project name from templates. This won't always be correct, but I reckon the common case will require it.
2018-05-25 19:05:06 +00:00
CopyStringToBufferHTMLSafe(&Output, CollationBuffers->ProjectName);
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
}
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
break;
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
case TAG_THEME:
CopyStringToBufferNoFormat(&Output, CollationBuffers->Theme); // NOTE(matt): Not HTML-safe
break;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
case TAG_TITLE:
cinera.c: Fail earlier on unknown project HTML-santitise episode title and project name from templates. This won't always be correct, but I reckon the common case will require it.
2018-05-25 19:05:06 +00:00
CopyStringToBufferHTMLSafe(&Output, CollationBuffers->Title);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
break;
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
case TAG_URL:
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(PageType == PAGE_PLAYER)
{
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
CopyStringToBufferNoFormat(&Output, CollationBuffers->URLPlayer);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
}
else
{
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
CopyStringToBufferNoFormat(&Output, CollationBuffers->URLIndex);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
}
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
break;
case TAG_VIDEO_ID:
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
CopyStringToBufferNoFormat(&Output, CollationBuffers->VideoID);
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
break;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
case TAG_INDEX:
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
if(Config.Edition == EDITION_SINGLE)
{
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
fprintf(stderr, "Template contains a <!-- __CINERA_INDEX__ --> tag\n"
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
"Skipping just this tag, because an index cannot be generated for inclusion in a\n"
"bespoke template in Single Edition\n");
}
else
{
CopyBuffer(&Output, &CollationBuffers->Index);
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
break;
case TAG_INCLUDES:
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(PageType == PAGE_PLAYER)
{
CopyBuffer(&Output, &CollationBuffers->IncludesPlayer);
}
else
{
CopyBuffer(&Output, &CollationBuffers->IncludesIndex);
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
break;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
case TAG_MENUS:
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
CopyBuffer(&Output, &CollationBuffers->Menus);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
break;
case TAG_PLAYER:
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(NeedPlayerOffset) { *PlayerOffset += (Output.Ptr - Output.Location); NeedPlayerOffset = !NeedPlayerOffset; }
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
CopyBuffer(&Output, &CollationBuffers->Player);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
break;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
case TAG_SCRIPT:
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
CopyBuffer(&Output, &CollationBuffers->ScriptPlayer);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
break;
cinera.c: Add <!-- __CINERA_CUSTOMn__--> tags Also compress the template code cinera_player_pre.js: Fix bug in which onRefChanged() tried to call player.jumpToNextMarker(); before the player was ready. This could happen if its first marker's timecode is 0:00 and medium is :afk Enable Theatre mode to work in containers styled with max-width or max-height
2018-02-23 23:36:42 +00:00
case TAG_CUSTOM0: CopyStringToBufferNoFormat(&Output, CollationBuffers->Custom0); break;
case TAG_CUSTOM1: CopyStringToBufferNoFormat(&Output, CollationBuffers->Custom1); break;
case TAG_CUSTOM2: CopyStringToBufferNoFormat(&Output, CollationBuffers->Custom2); break;
case TAG_CUSTOM3: CopyStringToBufferNoFormat(&Output, CollationBuffers->Custom3); break;
case TAG_CUSTOM4: CopyStringToBufferNoFormat(&Output, CollationBuffers->Custom4); break;
case TAG_CUSTOM5: CopyStringToBufferNoFormat(&Output, CollationBuffers->Custom5); break;
case TAG_CUSTOM6: CopyStringToBufferNoFormat(&Output, CollationBuffers->Custom6); break;
case TAG_CUSTOM7: CopyStringToBufferNoFormat(&Output, CollationBuffers->Custom7); break;
case TAG_CUSTOM8: CopyStringToBufferNoFormat(&Output, CollationBuffers->Custom8); break;
case TAG_CUSTOM9: CopyStringToBufferNoFormat(&Output, CollationBuffers->Custom9); break;
case TAG_CUSTOM10: CopyStringToBufferNoFormat(&Output, CollationBuffers->Custom10); break;
case TAG_CUSTOM11: CopyStringToBufferNoFormat(&Output, CollationBuffers->Custom11); break;
case TAG_CUSTOM12: CopyStringToBufferNoFormat(&Output, CollationBuffers->Custom12); break;
case TAG_CUSTOM13: CopyStringToBufferNoFormat(&Output, CollationBuffers->Custom13); break;
case TAG_CUSTOM14: CopyStringToBufferNoFormat(&Output, CollationBuffers->Custom14); break;
case TAG_CUSTOM15: CopyStringToBufferNoFormat(&Output, CollationBuffers->Custom15); break;
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
DepartComment(&Template->Buffer);
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
while(Template->Buffer.Ptr - Template->Buffer.Location < Template->Buffer.Size)
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
*Output.Ptr++ = *Template->Buffer.Ptr++;
hmml_to_html.c: Generate keyboard navigation [#24] With thanks to @insofaras for the onblur functionality
2017-06-03 01:32:18 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
FILE *OutFile;
if(!(OutFile = fopen(Config.Edition == EDITION_PROJECT ? OutputPath : Config.OutIntegratedLocation, "w")))
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogError(LOG_ERROR, "Unable to open output file %s: %s", Config.Edition == EDITION_PROJECT ? OutputPath : Config.OutIntegratedLocation, strerror(errno));
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
free(Output.Location);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
#if DEBUG_MEM
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
MemLog = fopen("/home/matt/cinera_mem", "a+");
fprintf(MemLog, " Freed Output\n");
fclose(MemLog);
printf(" Freed Output\n");
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
#endif
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_ERROR_FILE;
}
fwrite(Output.Location, Output.Ptr - Output.Location, 1, OutFile);
fclose(OutFile);
free(Output.Location);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
#if DEBUG_MEM
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
MemLog = fopen("/home/matt/cinera_mem", "a+");
fprintf(MemLog, " Freed Output\n");
fclose(MemLog);
printf(" Freed Output\n");
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
#endif
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_SUCCESS;
}
else
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_INVALID_TEMPLATE;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
}
else
{
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
buffer Master;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
if(ClaimBuffer(&Master, "Master", Kilobytes(512)) == RC_ARENA_FULL) { return RC_ARENA_FULL; };
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&Master,
"<html>\n"
cinera.c: Correct template buffers The template buffers no longer contain indentation spaces at the start or a \n at the end. This removes any weirdness from template composition Also remove the cleanup code added in 0.5.22
2018-01-08 22:59:36 +00:00
" <head>\n"
" ");
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
CopyBuffer(&Master, PageType == PAGE_PLAYER ? &CollationBuffers->IncludesPlayer : &CollationBuffers->IncludesIndex);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
CopyStringToBuffer(&Master, "\n");
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&Master,
" </head>\n"
cinera.c: Correct template buffers The template buffers no longer contain indentation spaces at the start or a \n at the end. This removes any weirdness from template composition Also remove the cleanup code added in 0.5.22
2018-01-08 22:59:36 +00:00
" <body>\n"
" ");
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
if(PageType == PAGE_PLAYER)
{
cinera: Fix theatre and add GUI clickable for it
2018-01-17 20:15:00 +00:00
CopyStringToBuffer(&Master, "<div>\n"
cinera: Theatre Mode This also changes the hardcoded, unintegrated output to wrap cineraMenus and cineraPlayerContainer in a <div>, as newly reflected in the example template_player.html
2018-01-15 21:52:24 +00:00
" ");
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
CopyBuffer(&Master, &CollationBuffers->Menus);
cinera.c: Correct template buffers The template buffers no longer contain indentation spaces at the start or a \n at the end. This removes any weirdness from template composition Also remove the cleanup code added in 0.5.22
2018-01-08 22:59:36 +00:00
CopyStringToBuffer(&Master, "\n"
cinera: Theatre Mode This also changes the hardcoded, unintegrated output to wrap cineraMenus and cineraPlayerContainer in a <div>, as newly reflected in the example template_player.html
2018-01-15 21:52:24 +00:00
" ");
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(PlayerOffset) { *PlayerOffset += Master.Ptr - Master.Location; }
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
CopyBuffer(&Master, &CollationBuffers->Player);
cinera.c: Correct template buffers The template buffers no longer contain indentation spaces at the start or a \n at the end. This removes any weirdness from template composition Also remove the cleanup code added in 0.5.22
2018-01-08 22:59:36 +00:00
CopyStringToBuffer(&Master, "\n"
cinera: Theatre Mode This also changes the hardcoded, unintegrated output to wrap cineraMenus and cineraPlayerContainer in a <div>, as newly reflected in the example template_player.html
2018-01-15 21:52:24 +00:00
" ");
CopyStringToBuffer(&Master, "</div>\n"
cinera.c: Correct template buffers The template buffers no longer contain indentation spaces at the start or a \n at the end. This removes any weirdness from template composition Also remove the cleanup code added in 0.5.22
2018-01-08 22:59:36 +00:00
" ");
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
CopyBuffer(&Master, &CollationBuffers->ScriptPlayer);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
CopyStringToBuffer(&Master, "\n");
}
else
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
CopyBuffer(&Master, &CollationBuffers->Index);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
CopyStringToBuffer(&Master,
" </body>\n"
"</html>\n");
FILE *OutFile;
if(!(OutFile = fopen(Config.Edition == EDITION_PROJECT ? OutputPath : Config.OutLocation, "w")))
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogError(LOG_ERROR, "Unable to open output file %s: %s", Config.Edition == EDITION_PROJECT ? OutputPath : Config.OutLocation, strerror(errno));
DeclaimBuffer(&Master);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_ERROR_FILE;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
fwrite(Master.Location, Master.Ptr - Master.Location, 1, OutFile);
fclose(OutFile);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
DeclaimBuffer(&Master);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_SUCCESS;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
int
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
BinarySearchForMetadataEntry(index *Index, index_metadata **Entry, char *SearchTerm)
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
{
int Lower = 0;
index_metadata *LowerEntry = (index_metadata*)(Index->Metadata.Buffer.Ptr + sizeof(index_metadata) * Lower);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(StringsDiffer(SearchTerm, LowerEntry->BaseFilename) < 0 ) { return -1; }
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
int Upper = Index->Header.EntryCount - 1;
int Pivot = Upper - ((Upper - Lower) >> 1);
index_metadata *UpperEntry;
index_metadata *PivotEntry;
do {
LowerEntry = (index_metadata*)(Index->Metadata.Buffer.Ptr + sizeof(index_metadata) * Lower);
PivotEntry = (index_metadata*)(Index->Metadata.Buffer.Ptr + sizeof(index_metadata) * Pivot);
UpperEntry = (index_metadata*)(Index->Metadata.Buffer.Ptr + sizeof(index_metadata) * Upper);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(!StringsDiffer(SearchTerm, LowerEntry->BaseFilename)) { *Entry = LowerEntry; return Lower; }
if(!StringsDiffer(SearchTerm, PivotEntry->BaseFilename)) { *Entry = PivotEntry; return Pivot; }
if(!StringsDiffer(SearchTerm, UpperEntry->BaseFilename)) { *Entry = UpperEntry; return Upper; }
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
if((StringsDiffer(SearchTerm, PivotEntry->BaseFilename) < 0)) { Upper = Pivot; }
else { Lower = Pivot; }
Pivot = Upper - ((Upper - Lower) >> 1);
} while(Upper > Pivot);
return Upper;
}
int
AccumulateIndexEntryInsertionOffset(index *Index, int EntryIndex)
{
int Result = 0;
index_metadata *AccEntry = { 0 };
if(EntryIndex < Index->Header.EntryCount >> 1)
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
//printf("\u200B"); // NOTE(matt): Don't ask...
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
for(; EntryIndex > 0; --EntryIndex)
{
AccEntry = (index_metadata*)(Index->Metadata.Buffer.Location + sizeof(index_header) + sizeof(index_metadata) * (EntryIndex - 1));
Result += AccEntry->Size;
}
Result += StringLength("---\n");
}
else
{
for(; EntryIndex < Index->Header.EntryCount; ++EntryIndex)
{
AccEntry = (index_metadata*)(Index->Metadata.Buffer.Location + sizeof(index_header) + sizeof(index_metadata) * EntryIndex);
Result += AccEntry->Size;
}
Result = Index->File.FileSize - Result;
}
return Result;
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
void
ClearEntry(index_metadata *Entry)
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
Entry->LinkOffsets.PrevStart = 0;
Entry->LinkOffsets.NextStart = 0;
Entry->LinkOffsets.PrevEnd = 0;
Entry->LinkOffsets.NextEnd = 0;
Entry->Size = 0;
Clear(Entry->BaseFilename, sizeof(Entry->BaseFilename));
Clear(Entry->Title, sizeof(Entry->Title));
}
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
enum
{
EDIT_DELETION,
EDIT_ADDITION,
EDIT_REINSERTION
} index_edits;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
void
GetNeighbourhood(index *Index, neighbourhood *N, int IndexEditType, bool *ThisIsPrev)
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
index_metadata Entry = { };
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
int EntryIndex;
int IncomingIndex = N->ThisIndex;
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(IndexEditType == EDIT_DELETION)
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
bool FoundThis = FALSE;
for(EntryIndex = IncomingIndex + 1; EntryIndex < Index->Header.EntryCount; ++EntryIndex)
{
Entry = *(index_metadata *)(Index->Metadata.Buffer.Location + sizeof(index_header) + sizeof(index_metadata) * EntryIndex);
if(Entry.Size > 0)
{
FoundThis = TRUE;
break;
}
}
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(!FoundThis)
{
for(EntryIndex = IncomingIndex - 1; EntryIndex >= 0; --EntryIndex)
{
Entry = *(index_metadata *)(Index->Metadata.Buffer.Location + sizeof(index_header) + sizeof(index_metadata) * EntryIndex);
if(Entry.Size > 0)
{
FoundThis = TRUE;
*ThisIsPrev = TRUE;
break;
}
}
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(FoundThis)
{
N->ThisIndex = EntryIndex;
N->This.Size = Entry.Size;
N->This.LinkOffsets.PrevStart = Entry.LinkOffsets.PrevStart;
N->This.LinkOffsets.PrevEnd = Entry.LinkOffsets.PrevEnd;
N->This.LinkOffsets.NextStart = Entry.LinkOffsets.NextStart;
N->This.LinkOffsets.NextEnd = Entry.LinkOffsets.NextEnd;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(N->This.BaseFilename, sizeof(N->This.BaseFilename), "%s", Entry.BaseFilename);
CopyString(N->This.Title, sizeof(N->This.Title), "%s", Entry.Title);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
}
else
{
return; // NOTE(matt): We were evidently the last public entry, until now
}
}
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
N->PrevIsFirst = TRUE;
N->NextIsFinal = TRUE;
if(IndexEditType == EDIT_DELETION && *ThisIsPrev == FALSE)
{
EntryIndex = IncomingIndex - 1;
}
else
{
EntryIndex = N->ThisIndex - 1;
}
bool FoundPrev = FALSE;
for(; EntryIndex >= 0; --EntryIndex)
{
Entry = *(index_metadata*)(Index->Metadata.Buffer.Location + sizeof(index_header) + sizeof(index_metadata) * EntryIndex);
if(Entry.Size > 0)
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(!FoundPrev)
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
N->PrevIndex = EntryIndex;
N->Prev.Size = Entry.Size;
N->Prev.LinkOffsets.PrevStart = Entry.LinkOffsets.PrevStart;
N->Prev.LinkOffsets.PrevEnd = Entry.LinkOffsets.PrevEnd;
N->Prev.LinkOffsets.NextStart = Entry.LinkOffsets.NextStart;
N->Prev.LinkOffsets.NextEnd = Entry.LinkOffsets.NextEnd;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(N->Prev.BaseFilename, sizeof(N->Prev.BaseFilename), "%s", Entry.BaseFilename);
CopyString(N->Prev.Title, sizeof(N->Prev.Title), "%s", Entry.Title);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
FoundPrev = TRUE;
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
else
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
N->PrevIsFirst = FALSE;
break;
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
}
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
}
switch(IndexEditType)
{
case EDIT_DELETION:
if(*ThisIsPrev == TRUE) { EntryIndex = Index->Header.EntryCount; break; } // NOTE(matt): No need to enter the loop, else fallthrough
case EDIT_REINSERTION:
EntryIndex = N->ThisIndex + 1;
break;
case EDIT_ADDITION:
EntryIndex = N->ThisIndex;
break;
}
bool FoundNext = FALSE;
for(; EntryIndex < Index->Header.EntryCount;
++EntryIndex)
{
Entry = *(index_metadata*)(Index->Metadata.Buffer.Location + sizeof(index_header) + sizeof(index_metadata) * EntryIndex);
if(Entry.Size > 0)
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(!FoundNext)
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
N->NextIndex = EntryIndex;
N->Next.Size = Entry.Size;
N->Next.LinkOffsets.PrevStart = Entry.LinkOffsets.PrevStart;
N->Next.LinkOffsets.PrevEnd = Entry.LinkOffsets.PrevEnd;
N->Next.LinkOffsets.NextStart = Entry.LinkOffsets.NextStart;
N->Next.LinkOffsets.NextEnd = Entry.LinkOffsets.NextEnd;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(N->Next.BaseFilename, sizeof(N->Next.BaseFilename), "%s", Entry.BaseFilename);
CopyString(N->Next.Title, sizeof(N->Next.Title), "%s", Entry.Title);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
FoundNext = TRUE;
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
}
else
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
N->NextIsFinal = FALSE;
break;
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
}
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
}
switch(IndexEditType)
{
case EDIT_REINSERTION:
break;
case EDIT_DELETION:
if(*ThisIsPrev == FALSE) { --N->ThisIndex; }
if(FoundNext) { --N->NextIndex; }
break;
case EDIT_ADDITION:
if(FoundNext) { ++N->NextIndex; }
break;
}
}
int
InsertIntoIndex(index *Index, neighbourhood *N, buffers *CollationBuffers, template **BespokeTemplate, char *BaseFilename, bool RecheckingPrivacy)
{
int IndexEntryInsertionStart = -1;
int IndexEntryInsertionEnd = -1;
Index->Header.EntryCount = 0;
ClearEntry(&Index->Entry);
bool Reinserting = FALSE;
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
index_metadata *Entry = { 0 };
if(Index->Metadata.FileSize > 0 && Index->File.FileSize > 0)
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
{
// TODO(matt): Index validation?
// Maybe at least if(!StringsDiffer(..., "name: \"");
// and check that we won't crash through the end of the file when skipping to the next entry
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
Index->Header = *(index_header *)Index->Metadata.Buffer.Location;
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
Index->Header.CurrentDBVersion = CINERA_DB_VERSION;
Index->Header.CurrentAppVersion = CINERA_APP_VERSION;
Index->Header.CurrentHMMLVersion.Major = hmml_version.Major;
Index->Header.CurrentHMMLVersion.Minor = hmml_version.Minor;
Index->Header.CurrentHMMLVersion.Patch = hmml_version.Patch;
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
*(index_header *)Index->Metadata.Buffer.Location = Index->Header;
Index->Metadata.Buffer.Ptr = Index->Metadata.Buffer.Location + sizeof(Index->Header);
Index->File.Buffer.Ptr = Index->File.Buffer.Location + StringLength("---\n");
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
N->ThisIndex = BinarySearchForMetadataEntry(Index, &Entry, BaseFilename);
if(Entry)
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
// Reinsert
Reinserting = TRUE;
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
N->This.Size = Entry->Size;
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
N->This.LinkOffsets.PrevStart = Entry->LinkOffsets.PrevStart;
N->This.LinkOffsets.PrevEnd = Entry->LinkOffsets.PrevEnd;
N->This.LinkOffsets.NextStart = Entry->LinkOffsets.NextStart;
N->This.LinkOffsets.NextEnd = Entry->LinkOffsets.NextEnd;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
IndexEntryInsertionStart = AccumulateIndexEntryInsertionOffset(Index, N->ThisIndex);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
IndexEntryInsertionEnd = IndexEntryInsertionStart + Entry->Size;
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
}
else
{
if(N->ThisIndex == -1) { ++N->ThisIndex; } // NOTE(matt): BinarySearchForMetadataEntry returns -1 if search term precedes the set
Entry = (index_metadata*)(Index->Metadata.Buffer.Location + sizeof(index_header) + sizeof(index_metadata) * N->ThisIndex);
if(StringsDiffer(BaseFilename, Entry->BaseFilename) < 0)
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
// Insert
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
IndexEntryInsertionStart = AccumulateIndexEntryInsertionOffset(Index, N->ThisIndex);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
else
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
// Append
++N->ThisIndex;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
GetNeighbourhood(Index, N, Reinserting ? EDIT_REINSERTION : EDIT_ADDITION, 0);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
else
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
// NOTE(matt): Initialising new index_header
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
Index->Header.InitialDBVersion = Index->Header.CurrentDBVersion = CINERA_DB_VERSION;
Index->Header.InitialAppVersion = Index->Header.CurrentAppVersion = CINERA_APP_VERSION;
Index->Header.InitialHMMLVersion.Major = Index->Header.CurrentHMMLVersion.Major = hmml_version.Major;
Index->Header.InitialHMMLVersion.Minor = Index->Header.CurrentHMMLVersion.Minor = hmml_version.Minor;
Index->Header.InitialHMMLVersion.Patch = Index->Header.CurrentHMMLVersion.Patch = hmml_version.Patch;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(Index->Header.ProjectID, sizeof(Index->Header.ProjectID), Config.ProjectID);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
for(int ProjectIndex = 0; ProjectIndex < ArrayCount(ProjectInfo); ++ProjectIndex)
{
if(!StringsDiffer(ProjectInfo[ProjectIndex].ProjectID, Config.ProjectID))
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(Index->Header.ProjectName, sizeof(Index->Header.ProjectName), ProjectInfo[ProjectIndex].FullName);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
break;
}
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(Index->Header.BaseURL, sizeof(Index->Header.BaseURL), Config.BaseURL);
CopyStringNoFormat(Index->Header.IndexLocation, sizeof(Index->Header.IndexLocation), Config.IndexLocation);
CopyStringNoFormat(Index->Header.PlayerLocation, sizeof(Index->Header.PlayerLocation), Config.PlayerLocation);
CopyStringNoFormat(Index->Header.PlayerURLPrefix, sizeof(Index->Header.PlayerURLPrefix), Config.PlayerURLPrefix);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
DIR *OutputDirectoryHandle;
if(!(OutputDirectoryHandle = opendir(Config.BaseDir)))
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
if(MakeDir(Config.BaseDir) == RC_ERROR_DIRECTORY)
{
LogError(LOG_ERROR, "Unable to create directory %s: %s", Config.BaseDir, strerror(errno));
fprintf(stderr, "Unable to create directory %s: %s\n", Config.BaseDir, strerror(errno));
return RC_ERROR_DIRECTORY;
};
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
closedir(OutputDirectoryHandle);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char InputFile[StringLength(BaseFilename) + StringLength(".hmml") + 1];
CopyString(InputFile, sizeof(InputFile), "%s.hmml", BaseFilename);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
bool VideoIsPrivate = FALSE;
switch(HMMLToBuffers(CollationBuffers, BespokeTemplate, InputFile, N))
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
// TODO(matt): Actually sort out the fatality of these cases
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
case RC_ERROR_FILE:
case RC_ERROR_FATAL:
return RC_ERROR_FATAL;
case RC_ERROR_HMML:
case RC_ERROR_MAX_REFS:
case RC_ERROR_QUOTE:
case RC_INVALID_REFERENCE:
return RC_ERROR_HMML;
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
case RC_PRIVATE_VIDEO:
VideoIsPrivate = TRUE;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
case RC_SUCCESS:
break;
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
ClearCopyStringNoFormat(N->This.BaseFilename, sizeof(N->This.BaseFilename), BaseFilename);
if(N->This.Size > 0) { ClearCopyStringNoFormat(N->This.Title, sizeof(N->This.Title), CollationBuffers->Title); }
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(Reinserting)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
// Reinsert
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
if(!VideoIsPrivate)
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
if(!(Index->File.Handle = fopen(Index->File.Path, "w"))) { return RC_ERROR_FILE; }
fwrite(Index->File.Buffer.Location, IndexEntryInsertionStart, 1, Index->File.Handle);
fwrite(CollationBuffers->Search.Location, N->This.Size, 1, Index->File.Handle);
fwrite(Index->File.Buffer.Location + IndexEntryInsertionEnd, Index->File.FileSize - IndexEntryInsertionEnd, 1, Index->File.Handle);
fclose(Index->File.Handle);
if(N->This.Size == IndexEntryInsertionEnd - IndexEntryInsertionStart)
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
Index->File.Buffer.Ptr = Index->File.Buffer.Location + IndexEntryInsertionStart;
CopyBufferSized(&Index->File.Buffer, &CollationBuffers->Search, N->This.Size);
}
else
{
FreeBuffer(&Index->File.Buffer);
ReadFileIntoBuffer(&Index->File, 0);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
}
LogError(LOG_NOTICE, "Reinserted %s - %s", BaseFilename, CollationBuffers->Title);
fprintf(stderr, "\e[1;33mReinserted\e[0m %s - %s\n", BaseFilename, CollationBuffers->Title);
}
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
else if(!RecheckingPrivacy)
{
LogError(LOG_NOTICE, "Privately Reinserted %s", BaseFilename);
fprintf(stderr, "\e[0;34mPrivately Reinserted\e[0m %s\n", BaseFilename);
}
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
}
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
else
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
++Index->Header.EntryCount;
if(!(Index->Metadata.Handle = fopen(Index->Metadata.Path, "w"))) { return RC_ERROR_FILE; }
fwrite(&Index->Header, sizeof(index_header), 1, Index->Metadata.Handle);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
if(!(Index->File.Handle = fopen(Index->File.Path, "w"))) { return RC_ERROR_FILE; }
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
if(IndexEntryInsertionStart >= 0)
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
// Insert new
fwrite(Index->Metadata.Buffer.Location + sizeof(index_header), sizeof(index_metadata) * N->ThisIndex, 1, Index->Metadata.Handle);
fwrite(&N->This, sizeof(index_metadata), 1, Index->Metadata.Handle);
fwrite(Index->Metadata.Buffer.Location + sizeof(index_header) + sizeof(index_metadata) * N->ThisIndex,
Index->Metadata.FileSize - sizeof(index_header) - sizeof(index_metadata) * N->ThisIndex,
1, Index->Metadata.Handle);
fwrite(Index->File.Buffer.Location, IndexEntryInsertionStart, 1, Index->File.Handle);
fwrite(CollationBuffers->Search.Location, N->This.Size, 1, Index->File.Handle);
fwrite(Index->File.Buffer.Location + IndexEntryInsertionStart, Index->File.FileSize - IndexEntryInsertionStart, 1, Index->File.Handle);
if(!VideoIsPrivate)
{
LogError(LOG_NOTICE, "Inserted %s - %s", BaseFilename, CollationBuffers->Title);
fprintf(stderr, "\e[1;32mInserted\e[0m %s - %s\n", BaseFilename, CollationBuffers->Title);
}
else if(!RecheckingPrivacy)
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
{
LogError(LOG_NOTICE, "Privately Inserted %s", BaseFilename);
fprintf(stderr, "\e[0;34mPrivately Inserted\e[0m %s\n", BaseFilename);
}
}
else
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
// Append new
if(Index->Metadata.FileSize > 0)
{
fwrite(Index->Metadata.Buffer.Location + sizeof(index_header), Index->Metadata.FileSize - sizeof(index_header), 1, Index->Metadata.Handle);
fwrite(Index->File.Buffer.Location, Index->File.FileSize, 1, Index->File.Handle);
}
else
{
fprintf(Index->File.Handle, "---\n");
}
fwrite(&N->This, sizeof(index_metadata), 1, Index->Metadata.Handle);
fwrite(CollationBuffers->Search.Location, N->This.Size, 1, Index->File.Handle);
if(!VideoIsPrivate)
{
LogError(LOG_NOTICE, "Appended %s - %s", BaseFilename, CollationBuffers->Title);
fprintf(stderr, "\e[1;32mAppended\e[0m %s - %s\n", BaseFilename, CollationBuffers->Title);
}
else if(!RecheckingPrivacy)
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
{
LogError(LOG_NOTICE, "Privately Appended %s", BaseFilename);
fprintf(stderr, "\e[0;34mPrivately Appended\e[0m %s\n", BaseFilename);
}
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
fclose(Index->Metadata.Handle);
FreeBuffer(&Index->Metadata.Buffer);
ReadFileIntoBuffer(&Index->Metadata, 0);
fclose(Index->File.Handle);
FreeBuffer(&Index->File.Buffer);
ReadFileIntoBuffer(&Index->File, 0);
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
// TODO(matt): Remove VideoIsPrivate in favour of generating a player page in a random location
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
return VideoIsPrivate ? RC_PRIVATE_VIDEO : RC_SUCCESS;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
void
ConstructDirectoryPath(buffer *DirectoryPath, int PageType, char *PageLocation, char *BaseFilename)
{
RewindBuffer(DirectoryPath);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBuffer(DirectoryPath, "%s", Config.BaseDir);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
switch(PageType)
{
case PAGE_INDEX:
if(StringsDiffer(PageLocation, ""))
{
CopyStringToBuffer(DirectoryPath, "/%s", PageLocation);
}
break;
case PAGE_PLAYER:
if(StringsDiffer(PageLocation, ""))
{
CopyStringToBuffer(DirectoryPath, "/%s", PageLocation);
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(BaseFilename)
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(StringsDiffer(Config.PlayerURLPrefix, ""))
{
char *Ptr = BaseFilename + StringLength(Config.ProjectID);
CopyStringToBuffer(DirectoryPath, "/%s%s", Config.PlayerURLPrefix, Ptr);
}
else
{
CopyStringToBuffer(DirectoryPath, "/%s", BaseFilename);
}
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
}
break;
}
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
enum
{
LINK_INCLUDE,
LINK_EXCLUDE
} link_types;
enum
{
LINK_PREV,
LINK_NEXT
} link_directions;
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
int
InsertNeighbourLink(file_buffer *FromFile, index_metadata *From, index_metadata *To, int LinkDirection, char *ProjectName, bool FromHasOneNeighbour)
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
if(ReadFileIntoBuffer(FromFile, 0) == RC_SUCCESS)
{
if(!(FromFile->Handle = fopen(FromFile->Path, "w"))) { FreeBuffer(&FromFile->Buffer); return RC_ERROR_FILE; };
buffer Link;
ClaimBuffer(&Link, "Link", 4096);
buffer ToPlayerURL;
if(To)
{
ClaimBuffer(&ToPlayerURL, "ToPlayerURL", MAX_BASE_URL_LENGTH + 1 + MAX_RELATIVE_PAGE_LOCATION_LENGTH + 1 + MAX_PLAYER_URL_PREFIX_LENGTH + MAX_BASE_FILENAME_LENGTH);
ConstructPlayerURL(&ToPlayerURL, To->BaseFilename);
}
switch(LinkDirection)
{
case LINK_PREV:
{
int NewPrevEnd = 0;
int NewNextEnd = 0;
fwrite(FromFile->Buffer.Location, From->LinkOffsets.PrevStart, 1, FromFile->Handle);
if(To)
{
CopyStringToBuffer(&Link,
" <a class=\"episodeMarker prev\" href=\"%s\"><div>&#9195;</div><div>Previous: '%s'</div><div>&#9195;</div></a>\n",
ToPlayerURL.Location,
To->Title);
}
else
{
CopyStringToBuffer(&Link,
" <div class=\"episodeMarker first\"><div>&#8226;</div><div>Welcome to <cite>%s</cite></div><div>&#8226;</div></div>\n", ProjectName);
}
NewPrevEnd = Link.Ptr - Link.Location;
fwrite(Link.Location, (Link.Ptr - Link.Location), 1, FromFile->Handle);
if(FromHasOneNeighbour)
{
fwrite(FromFile->Buffer.Location + From->LinkOffsets.PrevStart + From->LinkOffsets.PrevEnd, From->LinkOffsets.NextStart, 1, FromFile->Handle);
RewindBuffer(&Link);
CopyStringToBuffer(&Link,
" <div class=\"episodeMarker last\"><div>&#8226;</div><div>You have arrived at the (current) end of <cite>%s</cite></div><div>&#8226;</div></div>\n", ProjectName);
NewNextEnd = Link.Ptr - Link.Location;
fwrite(Link.Location, NewNextEnd, 1, FromFile->Handle);
fwrite(FromFile->Buffer.Location + From->LinkOffsets.PrevStart + From->LinkOffsets.PrevEnd + From->LinkOffsets.NextStart + From->LinkOffsets.NextEnd,
FromFile->FileSize - (From->LinkOffsets.PrevStart + From->LinkOffsets.PrevEnd + From->LinkOffsets.NextStart + From->LinkOffsets.NextEnd),
1,
FromFile->Handle);
}
else
{
fwrite(FromFile->Buffer.Location + From->LinkOffsets.PrevStart + From->LinkOffsets.PrevEnd,
FromFile->FileSize - (From->LinkOffsets.PrevStart + From->LinkOffsets.PrevEnd),
1,
FromFile->Handle);
}
From->LinkOffsets.PrevEnd = NewPrevEnd;
if(FromHasOneNeighbour) { From->LinkOffsets.NextEnd = NewNextEnd; }
} break;
case LINK_NEXT:
{
int NewPrevEnd = 0;
int NewNextEnd = 0;
if(FromHasOneNeighbour)
{
fwrite(FromFile->Buffer.Location, From->LinkOffsets.PrevStart, 1, FromFile->Handle);
CopyStringToBuffer(&Link,
" <div class=\"episodeMarker first\"><div>&#8226;</div><div>Welcome to <cite>%s</cite></div><div>&#8226;</div></div>\n", ProjectName);
NewPrevEnd = Link.Ptr - Link.Location;
fwrite(Link.Location, NewPrevEnd, 1, FromFile->Handle);
RewindBuffer(&Link);
fwrite(FromFile->Buffer.Location + From->LinkOffsets.PrevStart + From->LinkOffsets.PrevEnd,
From->LinkOffsets.NextStart, 1, FromFile->Handle);
}
else
{
fwrite(FromFile->Buffer.Location, From->LinkOffsets.PrevStart + From->LinkOffsets.PrevEnd + From->LinkOffsets.NextStart, 1, FromFile->Handle);
}
if(To)
{
CopyStringToBuffer(&Link,
" <a class=\"episodeMarker next\" href=\"%s\"><div>&#9196;</div><div>Next: '%s'</div><div>&#9196;</div></a>\n",
ToPlayerURL.Location,
To->Title);
}
else
{
CopyStringToBuffer(&Link,
" <div class=\"episodeMarker last\"><div>&#8226;</div><div>You have arrived at the (current) end of <cite>%s</cite></div><div>&#8226;</div></div>\n", ProjectName);
}
NewNextEnd = Link.Ptr - Link.Location;
fwrite(Link.Location, (Link.Ptr - Link.Location), 1, FromFile->Handle);
fwrite(FromFile->Buffer.Location + From->LinkOffsets.PrevStart + From->LinkOffsets.PrevEnd + From->LinkOffsets.NextStart + From->LinkOffsets.NextEnd,
FromFile->FileSize - (From->LinkOffsets.PrevStart + From->LinkOffsets.PrevEnd + From->LinkOffsets.NextStart + From->LinkOffsets.NextEnd),
1,
FromFile->Handle);
if(FromHasOneNeighbour) { From->LinkOffsets.PrevEnd = NewPrevEnd; }
From->LinkOffsets.NextEnd = NewNextEnd;
} break;
}
if(To) { DeclaimBuffer(&ToPlayerURL); }
DeclaimBuffer(&Link);
fclose(FromFile->Handle);
FreeBuffer(&FromFile->Buffer);
return RC_SUCCESS;
}
else
{
return RC_ERROR_FILE;
}
}
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
int
DeleteNeighbourLinks(file_buffer *File, index_metadata *Metadata)
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
if(ReadFileIntoBuffer(File, 0) == RC_SUCCESS)
{
if(!(File->Handle = fopen(File->Path, "w"))) { FreeBuffer(&File->Buffer); return RC_ERROR_FILE; };
fwrite(File->Buffer.Location, Metadata->LinkOffsets.PrevStart, 1, File->Handle);
fwrite(File->Buffer.Location + Metadata->LinkOffsets.PrevStart + Metadata->LinkOffsets.PrevEnd, Metadata->LinkOffsets.NextStart, 1, File->Handle);
fwrite(File->Buffer.Location + Metadata->LinkOffsets.PrevStart + Metadata->LinkOffsets.PrevEnd + Metadata->LinkOffsets.NextStart + Metadata->LinkOffsets.NextEnd,
File->FileSize - (Metadata->LinkOffsets.PrevStart + Metadata->LinkOffsets.PrevEnd + Metadata->LinkOffsets.NextStart + Metadata->LinkOffsets.NextEnd),
1,
File->Handle);
fclose(File->Handle);
Metadata->LinkOffsets.PrevEnd = 0;
Metadata->LinkOffsets.NextEnd = 0;
FreeBuffer(&File->Buffer);
return RC_SUCCESS;
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
else { return RC_ERROR_FILE; }
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
}
cinera.c: Reference and player tweaks Different ISBN database, and slightly more flexible BuildReference() Permit line-breaking on '/' in the references menu cinera.css and cinera_player*.js: More subtle "click here to regain focus" - for @insofaras Persist theatre mode - for @insofaras Resume in-progress video at previous timecode - for @AsafGartner
2018-04-17 23:05:14 +00:00
int
LinkNeighbours(index *Index, neighbourhood *N, char *BaseFilename, int LinkType)
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(N->PrevIndex == -1 && N->NextIndex == -1)
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
buffer LonePlayerPagePath;
ClaimBuffer(&LonePlayerPagePath, "LonePlayerPagePath", MAX_BASE_URL_LENGTH + 1 + MAX_RELATIVE_PAGE_LOCATION_LENGTH + 1 + MAX_PLAYER_URL_PREFIX_LENGTH + MAX_BASE_FILENAME_LENGTH + 1 + 10);
ConstructDirectoryPath(&LonePlayerPagePath, PAGE_PLAYER, Config.PlayerLocation, N->This.BaseFilename);
CopyStringToBuffer(&LonePlayerPagePath, "/index.html");
file_buffer LonePlayerPage;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(LonePlayerPage.Path, sizeof(LonePlayerPage.Path), LonePlayerPagePath.Location);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
DeleteNeighbourLinks(&LonePlayerPage, &N->This);
DeclaimBuffer(&LonePlayerPagePath);
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
else
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(N->PrevIndex >= 0)
{
buffer PreviousPlayerPagePath;
ClaimBuffer(&PreviousPlayerPagePath, "PreviousPlayerPagePath", MAX_BASE_URL_LENGTH + 1 + MAX_RELATIVE_PAGE_LOCATION_LENGTH + 1 + MAX_PLAYER_URL_PREFIX_LENGTH + MAX_BASE_FILENAME_LENGTH + 1 + 10);
ConstructDirectoryPath(&PreviousPlayerPagePath, PAGE_PLAYER, Config.PlayerLocation, N->Prev.BaseFilename);
CopyStringToBuffer(&PreviousPlayerPagePath, "/index.html");
file_buffer PreviousPlayerPage;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(PreviousPlayerPage.Path, sizeof(PreviousPlayerPage.Path), PreviousPlayerPagePath.Location);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
switch(LinkType)
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
case LINK_EXCLUDE:
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
buffer ThisPlayerPagePath;
ClaimBuffer(&ThisPlayerPagePath, "ThisPlayerPagePath", MAX_BASE_URL_LENGTH + 1 + MAX_RELATIVE_PAGE_LOCATION_LENGTH + 1 + MAX_PLAYER_URL_PREFIX_LENGTH + MAX_BASE_FILENAME_LENGTH + 1 + 10);
ConstructDirectoryPath(&ThisPlayerPagePath, PAGE_PLAYER, Config.PlayerLocation, N->This.BaseFilename);
CopyStringToBuffer(&ThisPlayerPagePath, "/index.html");
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
file_buffer ThisPlayerPage;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(ThisPlayerPage.Path, sizeof(ThisPlayerPage.Path), ThisPlayerPagePath.Location);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
InsertNeighbourLink(&ThisPlayerPage, &N->This, &N->Prev, LINK_PREV, Index->Header.ProjectName, N->NextIndex == -1 ? TRUE : FALSE);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
DeclaimBuffer(&ThisPlayerPagePath);
}
case LINK_INCLUDE:
{
InsertNeighbourLink(&PreviousPlayerPage, &N->Prev, &N->This, LINK_NEXT, Index->Header.ProjectName, N->PrevIsFirst);
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
*(index_metadata *)(Index->Metadata.Buffer.Location + sizeof(index_header) + sizeof(index_metadata) * N->PrevIndex) = N->Prev;
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
}
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
DeclaimBuffer(&PreviousPlayerPagePath);
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(N->NextIndex >= 0)
{
buffer NextPlayerPagePath;
ClaimBuffer(&NextPlayerPagePath, "NextPlayerPagePath", MAX_BASE_URL_LENGTH + 1 + MAX_RELATIVE_PAGE_LOCATION_LENGTH + 1 + MAX_PLAYER_URL_PREFIX_LENGTH + MAX_BASE_FILENAME_LENGTH + 1 + 10);
ConstructDirectoryPath(&NextPlayerPagePath, PAGE_PLAYER, Config.PlayerLocation, N->Next.BaseFilename);
CopyStringToBuffer(&NextPlayerPagePath, "/index.html");
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
file_buffer NextPlayerPage;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(NextPlayerPage.Path, sizeof(NextPlayerPage.Path), NextPlayerPagePath.Location);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
switch(LinkType)
{
case LINK_EXCLUDE:
{
buffer ThisPlayerPagePath;
ClaimBuffer(&ThisPlayerPagePath, "ThisPlayerPagePath", MAX_BASE_URL_LENGTH + 1 + MAX_RELATIVE_PAGE_LOCATION_LENGTH + 1 + MAX_PLAYER_URL_PREFIX_LENGTH + MAX_BASE_FILENAME_LENGTH + 1 + 10);
ConstructDirectoryPath(&ThisPlayerPagePath, PAGE_PLAYER, Config.PlayerLocation, N->This.BaseFilename);
CopyStringToBuffer(&ThisPlayerPagePath, "/index.html");
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
file_buffer ThisPlayerPage;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(ThisPlayerPage.Path, sizeof(ThisPlayerPage.Path), ThisPlayerPagePath.Location);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
InsertNeighbourLink(&ThisPlayerPage, &N->This, &N->Next, LINK_NEXT, Index->Header.ProjectName, N->PrevIndex == -1 ? TRUE : FALSE);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
DeclaimBuffer(&ThisPlayerPagePath);
}
case LINK_INCLUDE:
{
InsertNeighbourLink(&NextPlayerPage, &N->Next, &N->This, LINK_PREV, Index->Header.ProjectName, N->NextIsFinal);
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
*(index_metadata *)(Index->Metadata.Buffer.Location + sizeof(index_header) + sizeof(index_metadata) * N->NextIndex) = N->Next;
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
}
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
DeclaimBuffer(&NextPlayerPagePath);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
}
return RC_SUCCESS;
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
void
DeleteIndexPageFromFilesystem() // NOTE(matt): Do we need to handle relocating, like the PlayerPage function?
{
buffer IndexDirectory;
ClaimBuffer(&IndexDirectory, "IndexDirectory", 1024);
ConstructDirectoryPath(&IndexDirectory, PAGE_INDEX, Config.IndexLocation, "");
char IndexPagePath[1024];
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(IndexPagePath, sizeof(IndexPagePath), "%s/index.html", IndexDirectory.Location);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
remove(IndexPagePath);
remove(IndexDirectory.Location);
DeclaimBuffer(&IndexDirectory);
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
int
DeletePlayerPageFromFilesystem(char *BaseFilename, char *PlayerLocation, bool Relocating)
{
// NOTE(matt): Once we have the notion of an output filename format, we'll need to use that here
buffer OutputDirectoryPath;
ClaimBuffer(&OutputDirectoryPath, "OutputDirectoryPath", 1024);
ConstructDirectoryPath(&OutputDirectoryPath, PAGE_PLAYER, PlayerLocation, BaseFilename);
DIR *PlayerDir;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if((PlayerDir = opendir(OutputDirectoryPath.Location))) // There is a directory for the Player, which there probably should be if not for manual intervention
{
char PlayerPagePath[256];
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(PlayerPagePath, sizeof(PlayerPagePath), "%s/index.html", OutputDirectoryPath.Location);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
FILE *PlayerPage;
if((PlayerPage = fopen(PlayerPagePath, "r")))
{
fclose(PlayerPage);
remove(PlayerPagePath);
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
closedir(PlayerDir);
if((remove(OutputDirectoryPath.Location) == -1))
{
LogError(LOG_NOTICE, "Mostly deleted %s. Unable to remove directory %s: %s", BaseFilename, OutputDirectoryPath.Location, strerror(errno));
fprintf(stderr, "\e[1;30mMostly deleted\e[0m %s. \e[1;31mUnable to remove directory\e[0m %s: %s", BaseFilename, OutputDirectoryPath.Location, strerror(errno));
}
else
{
if(!Relocating)
{
LogError(LOG_INFORMATIONAL, "Deleted %s", BaseFilename);
fprintf(stderr, "\e[1;30mDeleted\e[0m %s\n", BaseFilename);
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
DeclaimBuffer(&OutputDirectoryPath);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
return RC_SUCCESS;
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
int
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
DeleteFromIndex(index *Index, neighbourhood *N, char *BaseFilename)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
// TODO(matt): LogError()
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
Index->Header = *(index_header *)Index->Metadata.Buffer.Location;
Index->Metadata.Buffer.Ptr = Index->Metadata.Buffer.Location + sizeof(Index->Header);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
index_metadata *Entry = { 0 };
int EntryIndex = BinarySearchForMetadataEntry(Index, &Entry, BaseFilename);
if(Entry)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
int DeleteFileFrom = AccumulateIndexEntryInsertionOffset(Index, EntryIndex);
int DeleteFileTo = DeleteFileFrom + Entry->Size;
bool ThisIsPrev = FALSE;
N->ThisIndex = EntryIndex;
GetNeighbourhood(Index, N, EDIT_DELETION, &ThisIsPrev);
--Index->Header.EntryCount;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(Index->Header.EntryCount == 0)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
DeleteIndexPageFromFilesystem();
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
remove(Index->Metadata.Path);
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
Index->Metadata.FileSize = 0;
FreeBuffer(&Index->Metadata.Buffer);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
remove(Index->File.Path);
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
Index->File.FileSize = 0;
FreeBuffer(&Index->File.Buffer);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
else
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(!(Index->Metadata.Handle = fopen(Index->Metadata.Path, "w"))) { FreeBuffer(&Index->Metadata.Buffer); return RC_ERROR_FILE; }
if(!(Index->File.Handle = fopen(Index->File.Path, "w"))) { FreeBuffer(&Index->File.Buffer); return RC_ERROR_FILE; }
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
fwrite(&Index->Header, sizeof(Index->Header), 1, Index->Metadata.Handle);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
fwrite(Index->Metadata.Buffer.Location + sizeof(index_header), sizeof(index_metadata) * EntryIndex, 1, Index->Metadata.Handle);
fwrite(Index->Metadata.Buffer.Location + sizeof(index_header) + sizeof(index_metadata) * (EntryIndex + 1),
Index->Metadata.FileSize - sizeof(index_header) - sizeof(index_metadata) * (EntryIndex + 1),
1, Index->Metadata.Handle);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
fclose(Index->Metadata.Handle);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
FreeBuffer(&Index->Metadata.Buffer);
ReadFileIntoBuffer(&Index->Metadata, 0);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
fwrite(Index->File.Buffer.Location, DeleteFileFrom, 1, Index->File.Handle);
fwrite(Index->File.Buffer.Location + DeleteFileTo, Index->File.FileSize - DeleteFileTo, 1, Index->File.Handle);
fclose(Index->File.Handle);
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
FreeBuffer(&Index->File.Buffer);
ReadFileIntoBuffer(&Index->File, 0);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
return Entry ? RC_SUCCESS : RC_NOOP;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
int
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
IndexToBuffer(index *Index, buffers *CollationBuffers) // NOTE(matt): This guy malloc's CollationBuffers->Index
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
if(Index->Metadata.FileSize > 0)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
Index->Header = *(index_header*)Index->Metadata.Buffer.Location;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
int ProjectIndex;
for(ProjectIndex = 0; ProjectIndex < ArrayCount(ProjectInfo); ++ProjectIndex)
{
if(!StringsDiffer(ProjectInfo[ProjectIndex].ProjectID, Config.ProjectID))
{
break;
}
}
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
char *Theme = StringsDiffer(Config.Theme, "") ? Config.Theme : Config.ProjectID;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
int Allowance = StringLength(Theme) * 2 + StringLength(Config.ProjectID) + StringLength(Config.BaseURL) + StringLength(Config.PlayerLocation);
char queryContainer[656 + Allowance]; // NOTE(matt): Update the size if changing the string
CopyString(queryContainer, sizeof(queryContainer),
cinera.c: Namespacing
2017-12-10 00:17:19 +00:00
"<div class=\"cineraQueryContainer %s\">\n"
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
" <label for=\"query\">Query:</label>\n"
" <div class=\"inputContainer\">\n"
" <input type=\"text\" id=\"query\" autofocus=\"\">\n"
" <div class=\"spinner\">\n"
" Downloading data...\n"
" </div>\n"
" </div>\n"
" </div>\n"
cinera.c: Namespacing
2017-12-10 00:17:19 +00:00
" <div id=\"cineraResultsSummary\">Found: 0 episodes, 0 markers, 0h 0m 0s total.</div>\n"
" <div id=\"cineraResults\"></div>\n"
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
"\n"
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
" <div id=\"cineraIndex\" class=\"%s\" data-project=\"%s\" data-baseURL=\"%s\" data-playerLocation=\"%s\">\n"
cinera: Handle sorting state separately from UI Also add user-select: none
2018-01-21 19:30:54 +00:00
" <div id=\"cineraIndexSort\">Sort: Old to New &#9206;</div>\n"
cinera: Sortable index
2018-01-21 18:59:09 +00:00
" <div id=\"cineraIndexEntries\">\n",
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
Theme,
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
Theme,
Config.ProjectID,
Config.BaseURL,
Config.PlayerLocation);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
buffer URLPrefix;
ClaimBuffer(&URLPrefix, "URLPrefix", 1024);
ConstructURLPrefix(&URLPrefix, INCLUDE_JS, PAGE_INDEX);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
char Script[107 + StringLength(URLPrefix.Location)]; // NOTE(matt): Update the size if changing the string
CopyString(Script, sizeof(Script),
cinera: Sortable index
2018-01-21 18:59:09 +00:00
" </div>\n"
" </div>\n"
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
" <script type=\"text/javascript\" src=\"%scinera_search.js\"></script>\n",
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
URLPrefix.Location);
DeclaimBuffer(&URLPrefix);
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
buffer PlayerURL;
ClaimBuffer(&PlayerURL, "PlayerURL", MAX_BASE_URL_LENGTH + 1 + MAX_RELATIVE_PAGE_LOCATION_LENGTH + 1 + MAX_PLAYER_URL_PREFIX_LENGTH + MAX_BASE_FILENAME_LENGTH);
ConstructPlayerURL(&PlayerURL, "");
char *ProjectUnit = 0;
if(StringsDiffer(ProjectInfo[ProjectIndex].Unit, ""))
{
ProjectUnit = ProjectInfo[ProjectIndex].Unit;
}
char Number[16];
index_metadata *This;
cinera.c: Fix fix from 0.5.49
2018-05-14 14:55:49 +00:00
char Text[(ProjectUnit ? StringLength(ProjectUnit) : 0) + sizeof(Number) + sizeof(This->Title) + 3];
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
int EntryLength = StringLength(PlayerURL.Location) + sizeof(Text) + 82;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
CollationBuffers->Index.Size = StringLength(queryContainer) + (Index->Header.EntryCount * EntryLength) + StringLength(Script);
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
if(!(CollationBuffers->Index.Location = malloc(CollationBuffers->Index.Size))) { return RC_ERROR_MEMORY; }
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
CollationBuffers->Index.ID = "Index";
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
CollationBuffers->Index.Ptr = CollationBuffers->Index.Location;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBuffer(&CollationBuffers->Index, "%s", queryContainer);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
int ProjectIDLength = StringLength(Config.ProjectID);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
bool IndexRequired = FALSE;
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
Index->Metadata.Buffer.Ptr = Index->Metadata.Buffer.Location + sizeof(Index->Header);
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
for(int EntryIndex = 0; EntryIndex < Index->Header.EntryCount; ++EntryIndex, Index->Metadata.Buffer.Ptr += sizeof(index_metadata))
{
This = (index_metadata *)Index->Metadata.Buffer.Ptr;
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(This->Size > 0)
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
IndexRequired = TRUE;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(Number, sizeof(Number), "%s", This->BaseFilename + ProjectIDLength);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(ProjectInfo[ProjectIndex].NumberingScheme == NS_LINEAR)
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
for(int i = 0; Number[i]; ++i)
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(Number[i] == '_')
{
Number[i] = '.';
}
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
}
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
ConstructPlayerURL(&PlayerURL, This->BaseFilename);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(ProjectUnit)
{
CopyStringToBuffer(&CollationBuffers->Index,
" <div>\n"
" <a href=\"%s\">", PlayerURL.Location);
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(Text, sizeof(Text), "%s %s: %s",
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
ProjectUnit, // TODO(matt): Do we need to special-case the various numbering schemes?
Number,
This->Title);
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
CopyStringToBufferHTMLSafe(&CollationBuffers->Index, Text);
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
CopyStringToBuffer(&CollationBuffers->Index,
"</a>\n"
" </div>\n");
}
else
{
CopyStringToBuffer(&CollationBuffers->Index,
" <div>\n"
" <a href=\"%s\">", PlayerURL.Location);
CopyStringToBufferHTMLSafe(&CollationBuffers->Index, This->Title);
CopyStringToBuffer(&CollationBuffers->Index,
"</a>\n"
" </div>\n");
}
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
}
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
}
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
DeclaimBuffer(&PlayerURL);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringToBuffer(&CollationBuffers->Index, "%s", Script);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(!IndexRequired) { return RC_NOOP; }
else { return RC_SUCCESS; }
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
}
else
{
return RC_ERROR_FILE;
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
char *
StripTrailingSlash(char *String) // NOTE(matt): For absolute paths
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
int Length = StringLength(String);
while(Length > 0 && String[Length - 1] == '/')
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
{
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
String[Length - 1] = '\0';
--Length;
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
}
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
return String;
}
char *
StripSurroundingSlashes(char *String) // NOTE(matt): For relative paths
{
int Length = StringLength(String);
if(Length > 0)
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
{
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
while((String[0]) == '/')
{
++String;
--Length;
}
while(String[Length - 1] == '/')
{
String[Length - 1] = '\0';
--Length;
}
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
}
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
return String;
}
int
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
GeneratePlayerPage(index *Index, neighbourhood *N, buffers *CollationBuffers, template *PlayerTemplate, char *BaseFilename)
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
{
buffer OutputDirectoryPath;
ClaimBuffer(&OutputDirectoryPath, "OutputDirectoryPath", 1024);
ConstructDirectoryPath(&OutputDirectoryPath, PAGE_PLAYER, Config.PlayerLocation, BaseFilename);
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
DIR *OutputDirectoryHandle;
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
if(!(OutputDirectoryHandle = opendir(OutputDirectoryPath.Location))) // TODO(matt): open()
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
if(MakeDir(OutputDirectoryPath.Location) == RC_ERROR_DIRECTORY)
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
LogError(LOG_ERROR, "Unable to create directory %s: %s", OutputDirectoryPath.Location, strerror(errno));
fprintf(stderr, "Unable to create directory %s: %s\n", OutputDirectoryPath.Location, strerror(errno));
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
return RC_ERROR_DIRECTORY;
};
}
closedir(OutputDirectoryHandle);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
char PlayerPagePath[1024];
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(PlayerPagePath, sizeof(PlayerPagePath), "%s/index.html", OutputDirectoryPath.Location);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
DeclaimBuffer(&OutputDirectoryPath);
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
bool IndexInTemplate = FALSE;
for(int TagIndex = 0; TagIndex < PlayerTemplate->Metadata.TagCount; ++TagIndex)
{
if(PlayerTemplate->Metadata.Tag[TagIndex].TagCode == TAG_INDEX)
{
IndexInTemplate = TRUE;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
IndexToBuffer(Index, CollationBuffers);
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
break;
}
}
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
BuffersToHTML(CollationBuffers, PlayerTemplate, PlayerPagePath, PAGE_PLAYER, &N->This.LinkOffsets.PrevStart);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
*(index_metadata *)(Index->Metadata.Buffer.Location + sizeof(index_header) + sizeof(index_metadata) * N->ThisIndex) = N->This;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
Index->Metadata.Handle = fopen(Index->Metadata.Path, "w");
fwrite(Index->Metadata.Buffer.Location, Index->Metadata.Buffer.Size, 1, Index->Metadata.Handle);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
fclose(Index->Metadata.Handle);
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
if(IndexInTemplate)
{
FreeBuffer(&CollationBuffers->Index);
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
return RC_SUCCESS;
}
int
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
GenerateIndexPage(index *Index, buffers *CollationBuffers, template *IndexTemplate)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
buffer OutputDirectoryPath;
ClaimBuffer(&OutputDirectoryPath, "OutputDirectoryPath", 1024);
ConstructDirectoryPath(&OutputDirectoryPath, PAGE_INDEX, Config.IndexLocation, 0);
DIR *OutputDirectoryHandle;
if(!(OutputDirectoryHandle = opendir(OutputDirectoryPath.Location))) // TODO(matt): open()
{
if(MakeDir(OutputDirectoryPath.Location) == RC_ERROR_DIRECTORY)
{
LogError(LOG_ERROR, "Unable to create directory %s: %s", OutputDirectoryPath.Location, strerror(errno));
fprintf(stderr, "Unable to create directory %s: %s\n", OutputDirectoryPath.Location, strerror(errno));
return RC_ERROR_DIRECTORY;
};
}
closedir(OutputDirectoryHandle);
char IndexPagePath[1024];
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(IndexPagePath, sizeof(IndexPagePath), "%s/index.html", OutputDirectoryPath.Location);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
DeclaimBuffer(&OutputDirectoryPath);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
switch(IndexToBuffer(Index, CollationBuffers))
{
case RC_SUCCESS:
{
BuffersToHTML(CollationBuffers, IndexTemplate, IndexPagePath, PAGE_INDEX, 0);
break;
}
case RC_NOOP:
{
DeleteIndexPageFromFilesystem();
break;
}
}
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
FreeBuffer(&CollationBuffers->Index);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
return RC_SUCCESS;
}
int
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
DeleteEntry(index *Index, neighbourhood *Neighbourhood, char *BaseFilename)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(DeleteFromIndex(Index, Neighbourhood, BaseFilename) == RC_SUCCESS)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(Neighbourhood->This.Size > 0)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
LinkNeighbours(Index, Neighbourhood, BaseFilename, LINK_EXCLUDE);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
DeletePlayerPageFromFilesystem(BaseFilename, Config.PlayerLocation, FALSE);
return RC_SUCCESS;
}
return RC_NOOP;
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
int
InsertEntry(index *Index, neighbourhood *Neighbourhood, buffers *CollationBuffers, template *PlayerTemplate, template *BespokeTemplate, char *BaseFilename, bool RecheckingPrivacy)
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
if(InsertIntoIndex(Index, Neighbourhood, CollationBuffers, &BespokeTemplate, BaseFilename, RecheckingPrivacy) == RC_SUCCESS)
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
LinkNeighbours(Index, Neighbourhood, BaseFilename, LINK_INCLUDE);
if(StringsDiffer(BespokeTemplate->Metadata.Filename, ""))
{
GeneratePlayerPage(Index, Neighbourhood, CollationBuffers, BespokeTemplate, BaseFilename);
DeclaimTemplate(BespokeTemplate);
}
else
{
GeneratePlayerPage(Index, Neighbourhood, CollationBuffers, PlayerTemplate, BaseFilename);
}
return RC_SUCCESS;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
return RC_NOOP;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
int
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
RecheckPrivacy(index *Index, buffers *CollationBuffers, template *IndexTemplate, template *PlayerTemplate, template *BespokeTemplate)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
if(Index->Metadata.FileSize > 0)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
Index->Header = *(index_header*)Index->Metadata.Buffer.Location;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
index_metadata Entry = { };
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
int PrivateEntryIndex = 0;
index_metadata PrivateEntries[Index->Header.EntryCount];
bool Inserted = FALSE;
for(int IndexEntry = 0; IndexEntry < Index->Header.EntryCount; ++IndexEntry)
{
Entry = *(index_metadata *)(Index->Metadata.Buffer.Location + sizeof(index_header) + sizeof(index_metadata) * IndexEntry);
if(Entry.Size == 0)
{
PrivateEntries[PrivateEntryIndex] = Entry;
++PrivateEntryIndex;
}
}
for(int i = 0; i < PrivateEntryIndex; ++i)
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
neighbourhood Neighbourhood = { };
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
Neighbourhood.PrevIndex = -1;
Neighbourhood.ThisIndex = -1;
Neighbourhood.NextIndex = -1;
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
Inserted = (InsertEntry(Index, &Neighbourhood, CollationBuffers, PlayerTemplate, BespokeTemplate, PrivateEntries[i].BaseFilename, TRUE) == RC_SUCCESS);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
}
if(Inserted)
{
GenerateIndexPage(Index, CollationBuffers, IndexTemplate);
}
LastPrivacyCheck = time(0);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
return RC_SUCCESS;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
int
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
MonitorDirectory(index *Index, buffers *CollationBuffers, template *IndexTemplate, template *PlayerTemplate, template *BespokeTemplate, int inotifyInstance, int WatchDescriptor)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
#if DEBUG_MEM
FILE *MemLog = fopen("/home/matt/cinera_mem", "a+");
fprintf(MemLog, "\nCalled MonitorDirectory()\n");
fclose(MemLog);
#endif
buffer Events;
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(ClaimBuffer(&Events, "inotify Events", Kilobytes(4)) == RC_ARENA_FULL) { return RC_ARENA_FULL; };
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
struct inotify_event *Event;
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
int BytesRead = read(inotifyInstance, Events.Location, Events.Size); // TODO(matt): Handle error EINVAL
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(inotifyInstance < 0) { perror("MonitorDirectory()"); }
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
struct inotify_event *FinalFileEvents[1024];
int FinalFileEventsCount = 0;
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
// TODO(matt): Test this with longer update intervals, and combinations of events...
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
for(Events.Ptr = Events.Location;
Events.Ptr < Events.Location + BytesRead && Events.Ptr - Events.Location < Events.Size;
Events.Ptr += sizeof(struct inotify_event) + Event->len)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
Event = (struct inotify_event *)Events.Ptr;
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
char *Ptr = Event->name;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
Ptr += (StringLength(Event->name) - StringLength(".hmml"));
if(!(StringsDiffer(Ptr, ".hmml")))
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
*Ptr = '\0';
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
bool FoundEvent = FALSE;
int FinalFileEventsIndex;
for(FinalFileEventsIndex = 0; FinalFileEventsIndex < FinalFileEventsCount; ++FinalFileEventsIndex)
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
if(!StringsDiffer(FinalFileEvents[FinalFileEventsIndex]->name, Event->name))
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
FinalFileEvents[FinalFileEventsIndex] = Event;
FoundEvent = TRUE;
cinera.c: Binary search the .metadata Also optimise out superfluous searches, and relieve IndexToBuffer() of the need to string-search the .index Rewrite the table of contents page after deleting an entry This commit also retains profiling, as a reminder to me how I used it, and the old linear search code. The timing blocks and the old code may be deleted in a future commit
2018-03-06 20:40:12 +00:00
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
}
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
if(!FoundEvent) { FinalFileEvents[FinalFileEventsIndex] = Event; ++FinalFileEventsCount; }
}
}
bool Deleted = FALSE;
bool Inserted = FALSE;
for(int FinalFileEventsIndex = 0; FinalFileEventsIndex < FinalFileEventsCount; ++FinalFileEventsIndex)
{
neighbourhood Neighbourhood = { };
Neighbourhood.PrevIndex = -1;
Neighbourhood.ThisIndex = -1;
Neighbourhood.NextIndex = -1;
// TODO(matt): Maybe handle IN_ALL_EVENTS
if(FinalFileEvents[FinalFileEventsIndex]->mask & IN_DELETE || FinalFileEvents[FinalFileEventsIndex]->mask & IN_MOVED_FROM)
{
cinera.c: Generate index if any files changed Previously it could fail to generate an index if the processing of the final file set "Inserted" or "Deleted" to FALSE, even if a prior file had set it to TRUE
2018-06-04 22:53:28 +00:00
Deleted |= (DeleteEntry(Index, &Neighbourhood, FinalFileEvents[FinalFileEventsIndex]->name) == RC_SUCCESS);
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
}
else
{
cinera.c: Generate index if any files changed Previously it could fail to generate an index if the processing of the final file set "Inserted" or "Deleted" to FALSE, even if a prior file had set it to TRUE
2018-06-04 22:53:28 +00:00
Inserted |= (InsertEntry(Index, &Neighbourhood, CollationBuffers, PlayerTemplate, BespokeTemplate, FinalFileEvents[FinalFileEventsIndex]->name, 0) == RC_SUCCESS);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
}
}
hmml_to_html.c: Add keywords and sort topic dots
2017-08-19 21:41:51 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(Deleted || Inserted)
{
GenerateIndexPage(Index, CollationBuffers, IndexTemplate);
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
DeclaimBuffer(&Events);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
return RC_SUCCESS;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
int
RemoveDirectory(char *Path)
{
if((remove(Path) == -1))
{
LogError(LOG_NOTICE, "Unable to remove directory %s: %s", Path, strerror(errno));
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
fprintf(stderr, "\e[1;30mUnable to remove directory\e[0m %s: %s\n", Path, strerror(errno));
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
return RC_ERROR_DIRECTORY;
}
else
{
LogError(LOG_INFORMATIONAL, "Deleted %s", Path);
//fprintf(stderr, "\e[1;30mDeleted\e[0m %s\n", Path);
return RC_SUCCESS;
}
}
int
RemoveDirectoryRecursively(char *Path)
{
if(RemoveDirectory(Path) == RC_ERROR_DIRECTORY) { return RC_ERROR_DIRECTORY; }
char *Ptr = Path + StringLength(Path) - 1;
while(Ptr > Path)
{
if(*Ptr == '/')
{
*Ptr = '\0';
if(RemoveDirectory(Path) == RC_ERROR_DIRECTORY) { return RC_ERROR_DIRECTORY; }
}
--Ptr;
}
return RC_SUCCESS;
}
int
UpgradeDB(index *Index)
{
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
// DBVersion 1
typedef struct { unsigned int DBVersion; version AppVersion; version HMMLVersion; unsigned int EntryCount; } index_header1;
typedef struct { int Size; char BaseFilename[32]; } index_metadata1;
typedef struct { file_buffer File; file_buffer Metadata; index_header1 Header; index_metadata1 Entry; } index1;
//
// DBVersion 2
typedef struct { unsigned int DBVersion; version AppVersion; version HMMLVersion; unsigned int EntryCount; char IndexLocation[32]; char PlayerLocation[32]; } index_header2;
typedef struct { int Size; char BaseFilename[32]; } index_metadata2;
typedef struct { file_buffer File; file_buffer Metadata; index_header2 Header; index_metadata2 Entry; } index2;
//
// NOTE(matt): For each new DB version, we must declare and initialise one instance of each preceding version, only cast the
// incoming Index to the type of the OriginalDBVersion, and move into the final case all operations on that incoming Index
bool OnlyHeaderChanged = TRUE;
int OriginalHeaderSize = 0;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
index1 Index1 = { };
index2 Index2 = { };
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
int OriginalDBVersion = Index->Header.CurrentDBVersion;
switch(OriginalDBVersion)
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
{
case 1:
{
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
OriginalHeaderSize = sizeof(index_header1);
Index1.Header = *(index_header1 *)Index->Metadata.Buffer.Ptr;
Index2.Header.DBVersion = CINERA_DB_VERSION;
Index2.Header.AppVersion = CINERA_APP_VERSION;
Index2.Header.HMMLVersion.Major = hmml_version.Major;
Index2.Header.HMMLVersion.Minor = hmml_version.Minor;
Index2.Header.HMMLVersion.Patch = hmml_version.Patch;
Index2.Header.EntryCount = Index1.Header.EntryCount;
Clear(Index2.Header.IndexLocation, sizeof(Index2.Header.IndexLocation));
Clear(Index2.Header.PlayerLocation, sizeof(Index2.Header.PlayerLocation));
}
case 2:
{
if(OriginalDBVersion == 2)
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
{
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
OriginalHeaderSize = sizeof(index_header2);
Index2.Header = *(index_header2 *)Index->Metadata.Buffer.Ptr;
}
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
Index->Header.InitialDBVersion = Index2.Header.DBVersion;
Index->Header.InitialAppVersion = Index2.Header.AppVersion;
Index->Header.InitialHMMLVersion.Major = Index2.Header.HMMLVersion.Major;
Index->Header.InitialHMMLVersion.Minor = Index2.Header.HMMLVersion.Minor;
Index->Header.InitialHMMLVersion.Patch = Index2.Header.HMMLVersion.Patch;
Index->Header.CurrentDBVersion = CINERA_DB_VERSION;
Index->Header.CurrentAppVersion = CINERA_APP_VERSION;
Index->Header.CurrentHMMLVersion.Major = hmml_version.Major;
Index->Header.CurrentHMMLVersion.Minor = hmml_version.Minor;
Index->Header.CurrentHMMLVersion.Patch = hmml_version.Patch;
Index->Header.EntryCount = Index2.Header.EntryCount;
ClearCopyStringNoFormat(Index->Header.ProjectID, sizeof(Index->Header.ProjectID), Config.ProjectID);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
Clear(Index->Header.ProjectName, sizeof(Index->Header.ProjectName));
for(int ProjectIndex = 0; ProjectIndex < ArrayCount(ProjectInfo); ++ProjectIndex)
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
{
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(!StringsDiffer(ProjectInfo[ProjectIndex].ProjectID, Config.ProjectID))
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(Index->Header.ProjectName, sizeof(Index->Header.ProjectName), "%s", ProjectInfo[ProjectIndex].FullName);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
break;
}
}
ClearCopyStringNoFormat(Index->Header.BaseURL, sizeof(Index->Header.BaseURL), Config.BaseURL);
ClearCopyStringNoFormat(Index->Header.IndexLocation, sizeof(Index->Header.IndexLocation), Index2.Header.IndexLocation);
ClearCopyStringNoFormat(Index->Header.PlayerLocation, sizeof(Index->Header.PlayerLocation), Index2.Header.PlayerLocation);
ClearCopyStringNoFormat(Index->Header.PlayerURLPrefix, sizeof(Index->Header.PlayerURLPrefix), Config.PlayerURLPrefix);
OnlyHeaderChanged = FALSE;
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
if(!(Index->Metadata.Handle = fopen(Index->Metadata.Path, "w"))) { FreeBuffer(&Index->Metadata.Buffer); return RC_ERROR_FILE; }
fwrite(&Index->Header, sizeof(Index->Header), 1, Index->Metadata.Handle);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
Index->Metadata.Buffer.Ptr = Index->Metadata.Buffer.Location + OriginalHeaderSize;
Index->File.Buffer.Ptr += StringLength("---\n");
for(int EntryIndex = 0; EntryIndex < Index->Header.EntryCount; ++EntryIndex)
{
// NOTE(matt): We can use either index_metadata1 or 2 here because they are the same
index_metadata2 This = *(index_metadata2 *)Index->Metadata.Buffer.Ptr;
Index->Entry.LinkOffsets.PrevStart = 0;
Index->Entry.LinkOffsets.NextStart = 0;
Index->Entry.LinkOffsets.PrevEnd = 0;
Index->Entry.LinkOffsets.NextEnd = 0;
Index->Entry.Size = This.Size;
ClearCopyStringNoFormat(Index->Entry.BaseFilename, sizeof(Index->Entry.BaseFilename), This.BaseFilename);
char *IndexEntryStart = Index->File.Buffer.Ptr;
SeekBufferForString(&Index->File.Buffer, "title: \"", C_SEEK_FORWARDS, C_SEEK_AFTER);
Clear(Index->Entry.Title, sizeof(Index->Entry.Title));
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormatT(Index->Entry.Title, sizeof(Index->Entry.Title), Index->File.Buffer.Ptr, '\n');
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
Index->Entry.Title[StringLength(Index->Entry.Title) - 1] = '\0';
fwrite(&Index->Entry, sizeof(Index->Entry), 1, Index->Metadata.Handle);
Index->Metadata.Buffer.Ptr += sizeof(This);
IndexEntryStart += This.Size;
Index->File.Buffer.Ptr = IndexEntryStart;
}
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
fclose(Index->Metadata.Handle);
FreeBuffer(&Index->Metadata.Buffer);
if(ReadFileIntoBuffer(&Index->Metadata, 0) == RC_ERROR_FILE)
{
return RC_ERROR_FILE;
}
}
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(OnlyHeaderChanged)
{
if(!(Index->Metadata.Handle = fopen(Index->Metadata.Path, "w"))) { FreeBuffer(&Index->Metadata.Buffer); return RC_ERROR_FILE; }
fwrite(&Index->Header, sizeof(Index->Header), 1, Index->Metadata.Handle);
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
fwrite(Index->Metadata.Buffer.Location + OriginalHeaderSize, Index->Metadata.FileSize - OriginalHeaderSize, 1, Index->Metadata.Handle);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
fclose(Index->Metadata.Handle);
FreeBuffer(&Index->Metadata.Buffer);
if(ReadFileIntoBuffer(&Index->Metadata, 0) == RC_ERROR_FILE)
{
return RC_ERROR_FILE;
}
}
fprintf(stderr, "\n\e[1;32mUpgraded Cinera DB from %d to %d!\e[0m\n\n", OriginalDBVersion, Index->Header.CurrentDBVersion);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
return RC_SUCCESS;
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
typedef struct
{
bool Present;
char ID[32];
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
} index_entry; // Metadata, unless we actually want to bolster this?
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
void
RemoveChildDirectories(buffer FullPath, char *ParentDirectory)
{
char *Ptr = FullPath.Location + StringLength(ParentDirectory);
RemoveDirectory(FullPath.Location);
while(FullPath.Ptr > Ptr)
{
if(*FullPath.Ptr == '/')
{
*FullPath.Ptr = '\0';
RemoveDirectory(FullPath.Location);
}
--FullPath.Ptr;
}
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
int
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
DeleteDeadIndexEntries(index *Index)
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
// TODO(matt): More rigorously figure out who we should delete
// Maybe compare the output directory and the input HMML names
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
Index->Header = *(index_header *)Index->Metadata.Buffer.Location;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(Index->Header.CurrentDBVersion < CINERA_DB_VERSION)
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
{
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(CINERA_DB_VERSION == 4)
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
{
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
fprintf(stderr, "\n\e[1;31mHandle conversion from CINERA_DB_VERSION %d to %d!\e[0m\n\n", Index->Header.CurrentDBVersion, CINERA_DB_VERSION);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
exit(RC_ERROR_FATAL);
}
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
if(UpgradeDB(Index) == RC_ERROR_FILE) { return RC_NOOP; }
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
}
else if(Index->Header.CurrentDBVersion > CINERA_DB_VERSION)
{
fprintf(stderr, "\e[1;31mUnsupported DB Version (%d). Please upgrade Cinera\e[0m\n", Index->Header.CurrentDBVersion);
exit(RC_ERROR_FATAL);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
bool NewPlayerLocation = FALSE;
bool NewIndexLocation = FALSE;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(StringsDiffer(Index->Header.PlayerLocation, Config.PlayerLocation))
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
buffer OldPlayerDirectory;
ClaimBuffer(&OldPlayerDirectory, "OldPlayerDirectory", 1024);
ConstructDirectoryPath(&OldPlayerDirectory, PAGE_PLAYER, Index->Header.PlayerLocation, 0);
buffer NewPlayerDirectory;
ClaimBuffer(&NewPlayerDirectory, "NewPlayerDirectory", 1024);
ConstructDirectoryPath(&NewPlayerDirectory, PAGE_PLAYER, Config.PlayerLocation, 0);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
printf("\e[1;33mRelocating Player Page%s from %s to %s\e[0m\n",
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
Index->Header.EntryCount > 1 ? "s" : "",
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
OldPlayerDirectory.Location,
NewPlayerDirectory.Location);
DeclaimBuffer(&NewPlayerDirectory);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
for(int EntryIndex = 0; EntryIndex < Index->Header.EntryCount; ++EntryIndex)
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
index_metadata This = *(index_metadata *)(Index->Metadata.Buffer.Location + sizeof(index_header) + sizeof(index_metadata) * EntryIndex);
ConstructDirectoryPath(&OldPlayerDirectory, PAGE_PLAYER, Index->Header.PlayerLocation, This.BaseFilename);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
DeletePlayerPageFromFilesystem(This.BaseFilename, Index->Header.PlayerLocation, TRUE);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
}
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
ConstructDirectoryPath(&OldPlayerDirectory, PAGE_PLAYER, Index->Header.PlayerLocation, 0);
if(StringLength(Index->Header.PlayerLocation) > 0)
{
RemoveChildDirectories(OldPlayerDirectory, Config.BaseDir);
}
DeclaimBuffer(&OldPlayerDirectory);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
ClearCopyStringNoFormat(Index->Header.PlayerLocation, sizeof(Index->Header.PlayerLocation), Config.PlayerLocation);
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
*(index_header *)Index->Metadata.Buffer.Location = Index->Header;
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
NewPlayerLocation = TRUE;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
}
if(StringsDiffer(Index->Header.IndexLocation, Config.IndexLocation))
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
buffer OldIndexDirectory;
ClaimBuffer(&OldIndexDirectory, "OldIndexDirectory", 1024);
ConstructDirectoryPath(&OldIndexDirectory, PAGE_INDEX, Index->Header.IndexLocation, 0);
buffer NewIndexDirectory;
ClaimBuffer(&NewIndexDirectory, "NewIndexDirectory", 1024);
ConstructDirectoryPath(&NewIndexDirectory, PAGE_INDEX, Config.IndexLocation, 0);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
printf("\e[1;33mRelocating Index Page from %s to %s\e[0m\n",
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
OldIndexDirectory.Location,
NewIndexDirectory.Location);
DeclaimBuffer(&NewIndexDirectory);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
char IndexPagePath[2048] = { 0 };
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(IndexPagePath, sizeof(IndexPagePath), "%s/index.html", OldIndexDirectory.Location);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
remove(IndexPagePath);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
if(StringLength(Index->Header.IndexLocation) > 0)
{
RemoveChildDirectories(OldIndexDirectory, Config.BaseDir);
}
DeclaimBuffer(&OldIndexDirectory);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
ClearCopyStringNoFormat(Index->Header.IndexLocation, sizeof(Index->Header.IndexLocation), Config.IndexLocation);
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
*(index_header *)Index->Metadata.Buffer.Location = Index->Header;
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
NewIndexLocation = TRUE;
}
if(NewPlayerLocation || NewIndexLocation)
{
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(!(Index->Metadata.Handle = fopen(Index->Metadata.Path, "w"))) { FreeBuffer(&Index->Metadata.Buffer); return RC_ERROR_FILE; }
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
fwrite(Index->Metadata.Buffer.Location, Index->Metadata.FileSize, 1, Index->Metadata.Handle);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
fclose(Index->Metadata.Handle);
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
index_entry Entries[Index->Header.EntryCount];
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
for(int EntryIndex = 0; EntryIndex < Index->Header.EntryCount; ++EntryIndex)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
index_metadata This = *(index_metadata *)(Index->Metadata.Buffer.Location + sizeof(index_header) + sizeof(index_metadata) * EntryIndex);
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyStringNoFormat(Entries[EntryIndex].ID, sizeof(Entries[EntryIndex].ID), This.BaseFilename);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
Entries[EntryIndex].Present = FALSE;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
DIR *ProjectDirHandle;
if(!(ProjectDirHandle = opendir(Config.ProjectDir)))
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
LogError(LOG_ERROR, "Unable to scan project directory %s: %s", Config.ProjectDir, strerror(errno));
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
fprintf(stderr, "Unable to scan project directory %s: %s\n", Config.ProjectDir, strerror(errno));
return RC_ERROR_DIRECTORY;
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
struct dirent *ProjectFiles;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
while((ProjectFiles = readdir(ProjectDirHandle)))
{
char *Ptr;
Ptr = ProjectFiles->d_name;
Ptr += (StringLength(ProjectFiles->d_name) - StringLength(".hmml"));
if(!(StringsDiffer(Ptr, ".hmml")))
{
*Ptr = '\0';
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
for(int i = 0; i < Index->Header.EntryCount; ++i)
hmml_to_html.c: Add keywords and sort topic dots
2017-08-19 21:41:51 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
if(!StringsDiffer(Entries[i].ID, ProjectFiles->d_name))
{
Entries[i].Present = TRUE;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
break;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
}
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
closedir(ProjectDirHandle);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
bool Deleted = FALSE;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
for(int i = 0; i < Index->Header.EntryCount; ++i)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
if(Entries[i].Present == FALSE)
{
Deleted = TRUE;
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
neighbourhood Neighbourhood = { };
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
Neighbourhood.PrevIndex = -1;
Neighbourhood.ThisIndex = -1;
Neighbourhood.NextIndex = -1;
DeleteEntry(Index, &Neighbourhood, Entries[i].ID);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
}
return Deleted ? RC_SUCCESS : RC_NOOP;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
hmml_to_html.c: Add keywords and sort topic dots
2017-08-19 21:41:51 +00:00
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
int
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
SyncIndexWithInput(index *Index, buffers *CollationBuffers, template *IndexTemplate, template *PlayerTemplate, template *BespokeTemplate)
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
{
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
bool Deleted = FALSE;
cinera.c: Generate index if any files changed Previously it could fail to generate an index if the processing of the final file set "Inserted" or "Deleted" to FALSE, even if a prior file had set it to TRUE
2018-06-04 22:53:28 +00:00
Deleted = (Index->Metadata.FileSize > 0 && Index->File.FileSize > 0 && DeleteDeadIndexEntries(Index) == RC_SUCCESS);
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
DIR *ProjectDirHandle;
if(!(ProjectDirHandle = opendir(Config.ProjectDir)))
{
LogError(LOG_ERROR, "Unable to scan project directory %s: %s", Config.ProjectDir, strerror(errno));
fprintf(stderr, "Unable to scan project directory %s: %s\n", Config.ProjectDir, strerror(errno));
return RC_ERROR_DIRECTORY;
}
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
struct dirent *ProjectFiles;
bool Inserted = FALSE;
while((ProjectFiles = readdir(ProjectDirHandle)))
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
char *Ptr = ProjectFiles->d_name;
Ptr += (StringLength(ProjectFiles->d_name) - StringLength(".hmml"));
if(!(StringsDiffer(Ptr, ".hmml")))
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
*Ptr = '\0';
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
neighbourhood Neighbourhood = { };
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
Neighbourhood.PrevIndex = -1;
Neighbourhood.NextIndex = -1;
cinera.c: Generate index if any files changed Previously it could fail to generate an index if the processing of the final file set "Inserted" or "Deleted" to FALSE, even if a prior file had set it to TRUE
2018-06-04 22:53:28 +00:00
Inserted |= (InsertEntry(Index, &Neighbourhood, CollationBuffers, PlayerTemplate, BespokeTemplate, ProjectFiles->d_name, 0) == RC_SUCCESS);
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
}
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
closedir(ProjectDirHandle);
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
if(Deleted || Inserted)
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
{
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
GenerateIndexPage(Index, CollationBuffers, IndexTemplate);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
}
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
return RC_SUCCESS;
}
cinera.c: Add credentials and -v flag README.md: Add dependency on curl
2017-11-18 00:27:33 +00:00
void
PrintVersions()
{
curl_version_info_data *CurlVersion = curl_version_info(CURLVERSION_NOW);
printf("Cinera: %d.%d.%d\n"
"Cinera DB: %d\n"
"hmmlib: %d.%d.%d\n"
"libcurl: %s\n",
CINERA_APP_VERSION.Major, CINERA_APP_VERSION.Minor, CINERA_APP_VERSION.Patch,
CINERA_DB_VERSION,
hmml_version.Major, hmml_version.Minor, hmml_version.Patch,
CurlVersion->version);
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
int
main(int ArgC, char **Args)
{
// TODO(matt): Read all defaults from the config
config DefaultConfig = {
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
.RootDir = ".",
.RootURL = "",
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
.CSSDir = "",
.ImagesDir = "",
.JSDir = "",
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
.TemplatesDir = ".",
.TemplateIndexLocation = "",
.TemplatePlayerLocation = "",
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
.BaseDir = ".",
.BaseURL = "",
.IndexLocation = "",
.PlayerLocation = "", // Should default to the ProjectID
.Edition = EDITION_SINGLE,
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
.LogLevel = LOG_EMERGENCY,
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
.DefaultMedium = "programming",
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
.Mode = 0,
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
.OutLocation = "out.html",
.OutIntegratedLocation = "out_integrated.html",
.ProjectDir = ".",
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
.ProjectID = "",
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
.Theme = "",
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
.UpdateInterval = 4,
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
.PlayerURLPrefix = ""
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
};
hmml_to_html.c: Add keywords and sort topic dots
2017-08-19 21:41:51 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(getenv("XDG_CACHE_HOME"))
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(DefaultConfig.CacheDir, sizeof(DefaultConfig.CacheDir), "%s/cinera", getenv("XDG_CACHE_HOME"));
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
else
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(DefaultConfig.CacheDir, sizeof(DefaultConfig.CacheDir), "%s/.cache/cinera", getenv("HOME"));
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
hmml_to_html.c: Add keywords and sort topic dots
2017-08-19 21:41:51 +00:00
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
Config = DefaultConfig;
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(ArgC < 2)
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
PrintUsage(Args[0], &DefaultConfig);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
return RC_RIP;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
char CommandLineArg;
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
while((CommandLineArg = getopt(ArgC, Args, "a:b:B:c:d:efghi:j:l:m:n:o:p:qr:R:s:t:u:vwx:y:")) != -1)
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
switch(CommandLineArg)
{
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
case 'a':
Config.PlayerLocation = StripSurroundingSlashes(optarg);
break;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
case 'b':
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
Config.BaseDir = StripTrailingSlash(optarg);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
break;
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
case 'B':
Config.BaseURL = StripTrailingSlash(optarg);
break;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
case 'c':
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
Config.CSSDir = StripSurroundingSlashes(optarg);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
break;
case 'd':
Config.ProjectDir = StripTrailingSlash(optarg);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
break;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
case 'e':
Config.Mode |= MODE_EXAMINE;
break;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
case 'f':
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
Config.Mode |= MODE_FORCEINTEGRATION;
break;
case 'g':
Config.Mode |= MODE_NOPRIVACY;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
break;
case 'i':
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
Config.ImagesDir = StripSurroundingSlashes(optarg);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
break;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
case 'j':
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
Config.JSDir = StripSurroundingSlashes(optarg);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
break;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
case 'l':
// TODO(matt): Make this actually take a string, rather than requiring the LogLevel number
Config.LogLevel = StringToInt(optarg);
break;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
case 'm':
Config.DefaultMedium = optarg;
break;
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
case 'n':
Config.IndexLocation = StripSurroundingSlashes(optarg);
break;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
case 'o':
Config.OutLocation = optarg;
Config.OutIntegratedLocation = optarg;
break;
case 'p':
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
Config.ProjectID = optarg;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
break;
cinera.c: Add -q flag This sets cinera to "oneshot mode" which makes a Project Edition instance quit after syncing from annotation files in project input directory
2017-12-18 14:31:05 +00:00
case 'q':
cinera.c: Support a combination of modes Specifically, with the addition of MODE_ONESHOT in v0.5.12 we must allow for the possibility of being in both that mode and MODE_INTEGRATE
2017-12-18 15:10:02 +00:00
Config.Mode |= MODE_ONESHOT;
cinera.c: Add -q flag This sets cinera to "oneshot mode" which makes a Project Edition instance quit after syncing from annotation files in project input directory
2017-12-18 14:31:05 +00:00
break;
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
case 'r':
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
Config.RootDir = StripTrailingSlash(optarg);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
break;
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
case 'R':
Config.RootURL = StripTrailingSlash(optarg);
break;
Add -s flag, project info and CINERA_PROJECT tag -s flag sets the style / theme Also some general code clean-up and repo organisation
2017-12-07 01:15:13 +00:00
case 's':
Config.Theme = optarg;
break;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
case 't':
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
Config.TemplatesDir = StripTrailingSlash(optarg);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
break;
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
case 'u':
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
Config.UpdateInterval = StringToInt(optarg);
break;
cinera.c: Add credentials and -v flag README.md: Add dependency on curl
2017-11-18 00:27:33 +00:00
case 'v':
PrintVersions();
return RC_SUCCESS;
cinera.css: Marker and categories style cinera_player_pre.js: Episode keyboard navigation. Also swap out A for K, and D for J cinera_player_pre.js: Handle the case in onRefChanged() in which the filter_container or filterState is not present cinera.c: Refetch quotes when processing a set of annotations >60 mins after the last fetch Flags: -w Force quote cache rebuild
2018-02-28 01:04:06 +00:00
case 'w':
Config.Mode |= MODE_NOCACHE;
break;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
case 'x':
Config.TemplateIndexLocation = optarg;
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
break;
case 'y':
Config.TemplatePlayerLocation = optarg;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
break;
case 'h':
default:
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
PrintUsage(Args[0], &DefaultConfig);
cinera.c: Add credentials and -v flag README.md: Add dependency on curl
2017-11-18 00:27:33 +00:00
return RC_SUCCESS;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(Config.Mode & MODE_EXAMINE)
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
index Index = { };
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
Index.Metadata.Buffer.ID = "IndexMetadata";
// TODO(matt): Allow optionally passing a .metadata file as an argument?
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(Index.Metadata.Path, sizeof(Index.Metadata.Path), "%s/%s.metadata", Config.BaseDir, Config.ProjectID);
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
ExamineIndex(&Index);
exit(RC_SUCCESS);
}
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
// NOTE(matt): Init MemoryArena (it is global)
MemoryArena.Size = Megabytes(4);
if(!(MemoryArena.Location = calloc(MemoryArena.Size, 1)))
{
LogError(LOG_EMERGENCY, "%s: %s", Args[0], strerror(errno));
return RC_RIP;
}
MemoryArena.Ptr = MemoryArena.Location;
#if DEBUG_MEM
FILE *MemLog = fopen("/home/matt/cinera_mem", "a+");
fprintf(MemLog, " Allocated MemoryArena (%d)\n", MemoryArena.Size);
fclose(MemLog);
printf(" Allocated MemoryArena (%d)\n", MemoryArena.Size);
#endif
#if DEBUG
printf("Allocated MemoryArena: %d\n\n", MemoryArena.Size);
#endif
// NOTE(matt): Tree structure of buffer dependencies
// IncludesPlayer
// Menus
// Player
// ScriptPlayer
//
// IncludesIndex
// Index
buffers CollationBuffers = {};
if(ClaimBuffer(&CollationBuffers.IncludesPlayer, "IncludesPlayer", Kilobytes(1)) == RC_ARENA_FULL) { goto RIP; };
if(ClaimBuffer(&CollationBuffers.Menus, "Menus", Kilobytes(32)) == RC_ARENA_FULL) { goto RIP; };
if(ClaimBuffer(&CollationBuffers.Player, "Player", Kilobytes(256)) == RC_ARENA_FULL) { goto RIP; };
if(ClaimBuffer(&CollationBuffers.ScriptPlayer, "ScriptPlayer", Kilobytes(8)) == RC_ARENA_FULL) { goto RIP; };
if(ClaimBuffer(&CollationBuffers.IncludesIndex, "IncludesIndex", Kilobytes(1)) == RC_ARENA_FULL) { goto RIP; };
if(ClaimBuffer(&CollationBuffers.Search, "Search", Kilobytes(32)) == RC_ARENA_FULL) { goto RIP; };
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
bool HaveConfigErrors = FALSE;
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
if(StringsDiffer(Config.ProjectID, ""))
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(StringLength(Config.ProjectID) > MAX_PROJECT_ID_LENGTH)
{
fprintf(stderr, "\e[1;31mProjectID \"%s\" is too long (%d/%d characters)\e[0m\n", Config.ProjectID, StringLength(Config.ProjectID), MAX_PROJECT_ID_LENGTH);
HaveConfigErrors = TRUE;
}
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
Config.Edition = EDITION_PROJECT;
cinera.c: Fail earlier on unknown project HTML-santitise episode title and project name from templates. This won't always be correct, but I reckon the common case will require it.
2018-05-25 19:05:06 +00:00
bool KnownProject = FALSE;
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
for(int ProjectInfoIndex = 0; ProjectInfoIndex < ArrayCount(ProjectInfo); ++ProjectInfoIndex)
{
if(!StringsDiffer(Config.ProjectID, ProjectInfo[ProjectInfoIndex].ProjectID))
{
cinera.c: Fail earlier on unknown project HTML-santitise episode title and project name from templates. This won't always be correct, but I reckon the common case will require it.
2018-05-25 19:05:06 +00:00
KnownProject = TRUE;
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
CopyStringNoFormat(CollationBuffers.ProjectID, sizeof(CollationBuffers.ProjectID), Config.ProjectID);
if(!StringsDiffer(Config.Theme, ""))
{
cinera.c: Correctly set theme
2018-06-13 15:05:21 +00:00
Config.Theme = Config.ProjectID;
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
}
cinera.c: Set CollationBuffers.Theme
2018-06-12 19:21:58 +00:00
CopyStringNoFormat(CollationBuffers.Theme, sizeof(CollationBuffers.Theme), Config.Theme);
cinera.c: Add PROJECT_ID and THEME template tags
2018-06-12 19:03:12 +00:00
if(StringsDiffer(ProjectInfo[ProjectInfoIndex].FullName, ""))
{
CopyStringNoFormat(CollationBuffers.ProjectName, sizeof(CollationBuffers.ProjectName), ProjectInfo[ProjectInfoIndex].FullName);
}
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
if(StringsDiffer(ProjectInfo[ProjectInfoIndex].Medium, ""))
{
Config.DefaultMedium = ProjectInfo[ProjectInfoIndex].Medium;
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
if(StringsDiffer(ProjectInfo[ProjectInfoIndex].AltURLPrefix, ""))
{
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(StringLength(ProjectInfo[ProjectInfoIndex].AltURLPrefix) > MAX_PLAYER_URL_PREFIX_LENGTH)
{
fprintf(stderr, "\e[1;31mPlayer URL Prefix \"%s\" is too long (%d/%d characters)\e[0m\n", ProjectInfo[ProjectInfoIndex].AltURLPrefix, StringLength(ProjectInfo[ProjectInfoIndex].AltURLPrefix), MAX_PLAYER_URL_PREFIX_LENGTH);
HaveConfigErrors = TRUE;
}
else
{
Config.PlayerURLPrefix = ProjectInfo[ProjectInfoIndex].AltURLPrefix;
}
}
if(StringLength(ProjectInfo[ProjectInfoIndex].FullName) > MAX_PROJECT_NAME_LENGTH)
{
fprintf(stderr, "\e[1;31mProject Name \"%s\" is too long (%d/%d characters)\e[0m\n", ProjectInfo[ProjectInfoIndex].FullName, StringLength(ProjectInfo[ProjectInfoIndex].FullName), MAX_PROJECT_NAME_LENGTH);
HaveConfigErrors = TRUE;
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
}
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Add support for alternative URL prefixes This is hardcoded for now, for ease of use, pending the config system Also add Medium to the ProjectInfo array, to save users having to set this with -m (which option remains available to them) Reorganise the CSS, Images and JS files back to their location in the same directory, since a default invocation of the program assumes they are in the same directory as the Root Directory, to hopefully alleviate some potential user frustration thanks to the requirement to set their locations (with -c, -i and -j) before any usable output is produced
2017-12-07 21:07:36 +00:00
break;
}
}
cinera.c: Fail earlier on unknown project HTML-santitise episode title and project name from templates. This won't always be correct, but I reckon the common case will require it.
2018-05-25 19:05:06 +00:00
if(!KnownProject)
{
fprintf(stderr, "\e[1;31mMissing Project Info for %s\e[0m \e[1;30m(-p)\e[0m\n", Config.ProjectID);
HaveConfigErrors = TRUE;
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(StringsDiffer(Config.BaseURL, "") && StringLength(Config.BaseURL) > MAX_BASE_URL_LENGTH)
{
fprintf(stderr, "\e[1;31mBase URL \"%s\" is too long (%d/%d characters)\e[0m\n", Config.BaseURL, StringLength(Config.BaseURL), MAX_BASE_URL_LENGTH);
HaveConfigErrors = TRUE;
}
if(StringsDiffer(Config.IndexLocation, "") && StringLength(Config.IndexLocation) > MAX_RELATIVE_PAGE_LOCATION_LENGTH)
{
fprintf(stderr, "\e[1;31mRelative Index Page Location \"%s\" is too long (%d/%d characters)\e[0m\n", Config.IndexLocation, StringLength(Config.IndexLocation), MAX_RELATIVE_PAGE_LOCATION_LENGTH);
HaveConfigErrors = TRUE;
}
if(StringsDiffer(Config.PlayerLocation, "") && StringLength(Config.PlayerLocation) > MAX_RELATIVE_PAGE_LOCATION_LENGTH)
{
fprintf(stderr, "\e[1;31mRelative Player Page Location \"%s\" is too long (%d/%d characters)\e[0m\n", Config.PlayerLocation, StringLength(Config.PlayerLocation), MAX_RELATIVE_PAGE_LOCATION_LENGTH);
HaveConfigErrors = TRUE;
}
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
if(!MediumExists(Config.DefaultMedium))
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
// TODO(matt): We'll want to stick around when we have multiple projects configured
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
HaveConfigErrors = TRUE;
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
if(HaveConfigErrors) { exit(RC_RIP); }
cinera.c: Add credentials and -v flag README.md: Add dependency on curl
2017-11-18 00:27:33 +00:00
// NOTE(matt): Templating
//
// Config will contain paths of multiple templates
// App is running all the time, and picking up changes to the config as we go
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
// If we find a new template, we first of all Init and Validate it
// In our case here, we just want to straight up Init our three possible templates
// and Validate the Index and Player templates if their locations are set
cinera.c: Add credentials and -v flag README.md: Add dependency on curl
2017-11-18 00:27:33 +00:00
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
template *IndexTemplate; InitTemplate(&IndexTemplate);
template *PlayerTemplate; InitTemplate(&PlayerTemplate);
template *BespokeTemplate; InitTemplate(&BespokeTemplate);
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
if(StringsDiffer(Config.TemplatePlayerLocation, ""))
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
switch(ValidateTemplate(&PlayerTemplate, Config.TemplatePlayerLocation, TEMPLATE_PLAYER))
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
case RC_INVALID_TEMPLATE: // Invalid template
case RC_ERROR_FILE: // Could not load template
case RC_ERROR_MEMORY: // Could not allocate memory for template
goto RIP;
case RC_SUCCESS:
break;
}
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
if(Config.Edition == EDITION_PROJECT && StringsDiffer(Config.TemplateIndexLocation, ""))
{
switch(ValidateTemplate(&IndexTemplate, Config.TemplateIndexLocation, TEMPLATE_INDEX))
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
case RC_INVALID_TEMPLATE: // Invalid template
case RC_ERROR_MEMORY: // Could not allocate memory for template
case RC_ERROR_FILE: // Could not load template
goto RIP;
case RC_SUCCESS:
break;
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
hmml_to_html.c: Fix Usage text [#25]
2017-06-25 18:22:54 +00:00
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
if(Config.Edition == EDITION_PROJECT)
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
#if DEBUG_MEM
FILE *MemLog = fopen("/home/matt/cinera_mem", "w+");
fprintf(MemLog, "Entered Project Edition\n");
fclose(MemLog);
#endif
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
// TODO(matt): Also log these startup messages?
cinera.c: Add credentials and -v flag README.md: Add dependency on curl
2017-11-18 00:27:33 +00:00
PrintVersions();
printf( "\n"
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
"Universal\n"
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
" Cache Directory: \e[1;30m(XDG_CACHE_HOME)\e[0m\t%s\n"
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
"\n"
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
" Root\n"
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
" Directory: \e[1;30m(-r)\e[0m\t\t\t%s\n"
" URL: \e[1;30m(-R)\e[0m\t\t\t%s\n"
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
" Paths relative to root\n"
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
" CSS: \e[1;30m(-c)\e[0m\t\t\t%s\n"
" Images: \e[1;30m(-i)\e[0m\t\t\t%s\n"
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
" JS: \e[1;30m(-j)\e[0m\t\t\t%s\n"
"\n"
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
"Project\n"
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
" ID: \e[1;30m(-p)\e[0m\t\t\t\t%s\n"
" Default Medium: \e[1;30m(-m)\e[0m\t\t%s\n"
" Style / Theme: \e[1;30m(-s)\e[0m\t\t\t%s\n"
"\n"
"Input Paths\n"
" Annotations Directory: \e[1;30m(-d)\e[0m\t\t%s\n"
" Templates Directory: \e[1;30m(-t)\e[0m\t\t%s\n"
" Index Template: \e[1;30m(-x)\e[0m\t\t%s\n"
" Player Template: \e[1;30m(-y)\e[0m\t\t%s\n"
"\n"
"Output Paths\n"
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
" Base\n"
" Directory: \e[1;30m(-b)\e[0m\t\t\t%s\n"
" URL: \e[1;30m(-B)\e[0m\t\t\t%s\n"
" Paths relative to base\n"
" Index Page: \e[1;30m(-n)\e[0m\t\t\t%s\n"
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
/* NOTE(matt): Here, I think, is where we'll split into sub-projects (...really?...) */
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
" Player Page(s): \e[1;30m(-a)\e[0m\t\t%s\n"
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
" Player Page Prefix: \e[1;30m(hardcoded)\e[0m\t%s\n"
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
"\n"
"Modes\n"
" Force template integration: \e[1;30m(-f)\e[0m\t%s\n"
" Ignore video privacy status: \e[1;30m(-g)\e[0m\t%s\n"
" Quit after sync: \e[1;30m(-q)\e[0m\t\t%s\n"
" Force quote cache rebuild: \e[1;30m(-w)\e[0m\t%s\n"
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
"\n",
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
Config.CacheDir,
Config.RootDir,
StringsDiffer(Config.RootURL, "") ? Config.RootURL : "[empty]",
StringsDiffer(Config.CSSDir, "") ? Config.CSSDir : "(same as root)",
StringsDiffer(Config.ImagesDir, "") ? Config.ImagesDir : "(same as root)",
StringsDiffer(Config.JSDir, "") ? Config.JSDir : "(same as root)",
Config.ProjectID,
Config.DefaultMedium,
cinera.c: Set CollationBuffers.Theme
2018-06-12 19:21:58 +00:00
Config.Theme,
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
Config.ProjectDir,
Config.TemplatesDir,
StringsDiffer(Config.TemplateIndexLocation, "") ? Config.TemplateIndexLocation : "[none set]",
StringsDiffer(Config.TemplatePlayerLocation, "") ? Config.TemplatePlayerLocation : "[none set]",
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
Config.BaseDir,
StringsDiffer(Config.BaseURL, "") ? Config.BaseURL : "[empty]",
StringsDiffer(Config.IndexLocation, "") ? Config.IndexLocation : "(same as base)",
StringsDiffer(Config.PlayerLocation, "") ? Config.PlayerLocation : "(directly descended from base)",
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
StringsDiffer(Config.PlayerURLPrefix, "") ? Config.PlayerURLPrefix : Config.ProjectID,
Config.Mode & MODE_FORCEINTEGRATION ? "on" : "off",
Config.Mode & MODE_NOPRIVACY ? "on" : "off",
Config.Mode & MODE_ONESHOT ? "on" : "off",
Config.Mode & MODE_NOCACHE ? "on" : "off");
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
cinera: Allow custom output paths Relative to the Base: -a sets the player location -n sets the index location Tweak flags, and add -B to set Base URL (necessary if setting -a or -n) New template tags: __CINERA_URL__ __CINERA_VIDEO_ID__ Bump DB version: 2 index_header now contains the Index and Player Locations
2017-12-12 23:24:10 +00:00
if((StringsDiffer(Config.IndexLocation, "") || StringsDiffer(Config.PlayerLocation, ""))
&& StringLength(Config.BaseURL) == 0)
{
printf("\e[1;33mPlease set a Project Base URL (-B) so we can output the Index / Player pages to\n"
"locations other than the defaults\e[0m\n");
return(RC_SUCCESS);
}
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
index Index = { };
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
Index.Metadata.Buffer.ID = "IndexMetadata";
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(Index.Metadata.Path, sizeof(Index.Metadata.Path), "%s/%s.metadata", Config.BaseDir, Config.ProjectID);
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
ReadFileIntoBuffer(&Index.Metadata, 0); // NOTE(matt): Could we actually catch errors (permissions?) here and bail?
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
Index.File.Buffer.ID = "IndexFile";
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(Index.File.Path, sizeof(Index.File.Path), "%s/%s.index", Config.BaseDir, Config.ProjectID);
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
ReadFileIntoBuffer(&Index.File, 0); // NOTE(matt): Could we actually catch errors (permissions?) here and bail?
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
printf("┌╼ Synchronising with Annotations Directory ╾┐\n");
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
SyncIndexWithInput(&Index, &CollationBuffers, IndexTemplate, PlayerTemplate, BespokeTemplate);
cinera.c: Support a combination of modes Specifically, with the addition of MODE_ONESHOT in v0.5.12 we must allow for the possibility of being in both that mode and MODE_INTEGRATE
2017-12-18 15:10:02 +00:00
if(Config.Mode & MODE_ONESHOT)
cinera.c: Add -q flag This sets cinera to "oneshot mode" which makes a Project Edition instance quit after syncing from annotation files in project input directory
2017-12-18 14:31:05 +00:00
{
goto RIP;
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
printf("\n┌╼ Monitoring Annotations Directory for \e[1;32mnew\e[0m, \e[1;33medited\e[0m and \e[1;30mdeleted\e[0m .hmml files ╾┐\n");
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
int inotifyInstance = inotify_init1(IN_NONBLOCK);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
// NOTE(matt): Do we want to also watch IN_DELETE_SELF events?
int WatchDescriptor = inotify_add_watch(inotifyInstance, Config.ProjectDir, IN_CLOSE_WRITE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO);
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
while(MonitorDirectory(&Index, &CollationBuffers, IndexTemplate, PlayerTemplate, BespokeTemplate, inotifyInstance, WatchDescriptor) != RC_ARENA_FULL)
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
{
cinera.css: Marker and categories style cinera_player_pre.js: Episode keyboard navigation. Also swap out A for K, and D for J cinera_player_pre.js: Handle the case in onRefChanged() in which the filter_container or filterState is not present cinera.c: Refetch quotes when processing a set of annotations >60 mins after the last fetch Flags: -w Force quote cache rebuild
2018-02-28 01:04:06 +00:00
// TODO(matt): Refetch the quotes and rebuild player pages if needed
//
// Every sixty mins, redownload the quotes and, I suppose, SyncIndexWithInput(). But here we still don't even know
// who the speaker is. To know, we'll probably have to store all quoted speakers in the project's .metadata. Maybe
// postpone this for now, but we will certainly need this to happen
//
// The most ideal solution is possibly that we store quote numbers in the Metadata->Entry, listen for and handle a
// REST PUT request from insobot when a quote changes (unless we're supposed to poll insobot for them?), and rebuild
// the player page(s) accordingly.
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
//
if(!(Config.Mode & MODE_NOPRIVACY) && time(0) - LastPrivacyCheck > 60 * 60 * 4)
{
RecheckPrivacy(&Index, &CollationBuffers, IndexTemplate, PlayerTemplate, BespokeTemplate);
}
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
sleep(Config.UpdateInterval);
hmml_to_html.c: Always On
2017-09-15 01:11:39 +00:00
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
}
else
{
if(optind == ArgC)
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
fprintf(stderr, "%s: requires at least one input .hmml file\n", Args[0]);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
PrintUsage(Args[0], &DefaultConfig);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
goto RIP;
hmml_to_html.c: Begin single-pass rewrite
2017-03-22 02:18:31 +00:00
}
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
NextFile:
cinera.c: Call MakeDir() in GenerateTopicColours()
2017-12-24 01:57:11 +00:00
// TODO(matt): Just change the default output location so all these guys won't overwrite each other
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
for(int FileIndex = optind; FileIndex < ArgC; ++FileIndex)
hmml_to_html.c: Begin single-pass rewrite
2017-03-22 02:18:31 +00:00
{
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
bool HasBespokeTemplate = FALSE;
char *Ptr = Args[FileIndex];
Ptr += (StringLength(Args[FileIndex]) - StringLength(".hmml"));
if(!(StringsDiffer(Ptr, ".hmml")))
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
{
cinera: Replace all inline CSS and JS We no longer prevent enforcement of strict server security policies (to be documented) Add bounds-checking to the Copy string functions, fixing buffer sizes Fix the marker skipping (e.g. :afk)
2018-04-22 20:57:31 +00:00
CopyString(Config.SingleHMMLFilePath, sizeof(Config.SingleHMMLFilePath), "%s", Args[FileIndex]);
cinera.c: Support private videos It merely checks the video's privacy status and, if not public, records its corresponding HMML base filename privately in the .metadata without generating a player page or a search / table of contents entry for it. Every four hours it will loop over the .metadata to recheck the privacy status of any privately recorded entries, and process newly public ones. Fix template validation to check that the script comes after both the player and menus (previously it only specified the player). Fix relocation code to try and remove only the child directories of the BaseDir, and no shallower (previously it would try and "recursively" remove directories all the way back to /, obviously not actually getting there because it would encounter a non-empty directory along the way). Add "Modes" to the startup printout. Flags: -g Ignore privacy status
2018-04-01 20:58:53 +00:00
switch(HMMLToBuffers(&CollationBuffers, &BespokeTemplate, Args[FileIndex], 0))
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
// TODO(matt): Actually sort out the fatality of these cases
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
case RC_ERROR_FILE:
case RC_ERROR_FATAL:
goto RIP;
case RC_ERROR_HMML:
case RC_ERROR_MAX_REFS:
case RC_ERROR_QUOTE:
case RC_INVALID_REFERENCE:
if(FileIndex < (ArgC - 1)) { goto NextFile; }
else { goto RIP; }
case RC_SUCCESS:
break;
};
HasBespokeTemplate = StringsDiffer(BespokeTemplate->Metadata.Filename, "");
switch(BuffersToHTML(&CollationBuffers,
HasBespokeTemplate ? BespokeTemplate : PlayerTemplate,
0,
cinera.c: Prev / Next Episode Links Also fix the inotify loop, augment the index (the .metadata files) to contain data useful for insobot, and futureproof UpgradeDB() Flags: * -e Examine Index Just pop an -e on the end of your usual list of flags * -u Update Interval (was -U)
2018-02-21 21:50:23 +00:00
PAGE_PLAYER, 0))
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
{
cinera.c: Remove spurious file I/O Don't \-escape anything in the index Document server's security header (recommended) requirements
2018-05-01 21:05:44 +00:00
// TODO(matt): Actually sort out the fatality of these cases
cinera.c: Bespoke template in Single Edition Also fail gracefully if supplied with an .hmml file containing an incomplete [video] node, or a template containing tags whose buffers cannot be populated
2018-01-04 20:55:51 +00:00
case RC_INVALID_TEMPLATE:
if(HasBespokeTemplate) { DeclaimTemplate(BespokeTemplate); }
if(FileIndex < (ArgC - 1)) { goto NextFile; }
case RC_ERROR_MEMORY:
case RC_ERROR_FILE:
case RC_ARENA_FULL:
goto RIP;
case RC_SUCCESS:
#if 0
fprintf(stdout, "\e[1;32mWritten\e[0m %s\n", HasBespokeTemplate ? Config.OutIntegratedLocation : Config.OutLocation);
#endif
if(HasBespokeTemplate) { DeclaimTemplate(BespokeTemplate); }
break;
};
}
hmml_to_html.c: Begin single-pass rewrite
2017-03-22 02:18:31 +00:00
}
}
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
if(StringsDiffer(PlayerTemplate->Metadata.Filename, ""))
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
{
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
DeclaimTemplate(PlayerTemplate);
cinera.c: Video-specific medium and template Remove environment variable CINERA_INTEGRATE because this is meaningless now that the default template locations are blank Flags -t Template Directory (was Player Template Location) -y Player Template Location Bug Fixes Correctly skip annotation sets that couldn't be processed for various reasons Fix crash caused by <!-- __CINERA_INDEX__ --> tag in a player template, because its buffer was being freed Fix 2048 bytes leak per processed set of annotations
2018-01-03 22:16:20 +00:00
}
if(Config.Edition == EDITION_PROJECT && StringsDiffer(IndexTemplate->Metadata.Filename, ""))
{
DeclaimTemplate(IndexTemplate);
hmml_to_html.c: Generate a full project
2017-08-29 20:35:28 +00:00
}
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
DeclaimBuffer(&CollationBuffers.Search);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
DeclaimBuffer(&CollationBuffers.IncludesIndex);
cinera.c: Search [#7] Also put the stuff in a new directory called cinera, that contains only the files needed to get going, with example template files.
2017-11-11 00:34:47 +00:00
DeclaimBuffer(&CollationBuffers.ScriptPlayer);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
DeclaimBuffer(&CollationBuffers.Player);
DeclaimBuffer(&CollationBuffers.Menus);
DeclaimBuffer(&CollationBuffers.IncludesPlayer);
hmml_to_html.c: Generate full project [#25] Full project currently includes a "Table of Contents" linking to pages for each set of annotations. It should successfully generate pages for all well-formed annotations, even if >= 1 are not well-formed.
2017-09-07 21:41:08 +00:00
RIP:
hmml_to_html.c: Prevent buffer overflow errors * REF_MAX_IDENTIFIER sanity (i.e. check that we're below the max before adding a new one) * Make ClaimBuffer() check that there's enough space left in the arena
2017-07-29 00:36:14 +00:00
free(MemoryArena.Location);
hmml_to_html.c: Full-featured always-on For the same input across either multiple runs or one long always-on run, we now produce the same output. This wasn't the case because our indexing did not take into account stuff processed in previous runs.
2017-10-18 21:07:29 +00:00
#if DEBUG_MEM
MemLog = fopen("/home/matt/cinera_mem", "a+");
fprintf(MemLog, " Freed MemoryArena\n");
fclose(MemLog);
printf(" Freed MemoryArena\n");
#endif
hmml_to_html.c: Partially implement refs [#15] It is missing the onRefChanged() function PPiC 051
2017-03-10 14:19:25 +00:00
}