#399

frontend/src/lib/postNewQueryState.ts

@@ -1,4 +1,5 @@
 import { resultRepairMode } from '@/lib/postImportRows'
+import { validatePostImportSessionId } from '@/lib/postImportStorage'
 
 import type {
     PostImportOrigin,
@@ -12,6 +13,7 @@ type QueryRowState = {
   thumbnail_base:          string
   original_created_from:   string
   original_created_before: string
+  video_ms:                string
   duration:                string
   tags:                    string
   parent_post_ids:         string
@@ -37,6 +39,7 @@ type EncodedRowState = {
   h?: string
   f?: string
   b?: string
+  x?: string
   d?: string
   g?: string
   p?: string
@@ -58,8 +61,8 @@ export type ParsedPostNewState = {
   shortcut:   boolean }
 
 export type SerialisedPostNewState = {
-  path: string
-  rows: PostImportRow[] }
+  path:     string
+  complete: boolean }
 
 const BASIC_KEYS = [
     'url',
@@ -67,6 +70,7 @@ const BASIC_KEYS = [
     'thumbnail_base',
     'original_created_from',
     'original_created_before',
+    'video_ms',
     'duration',
     'tags',
     'parent_post_ids'] as const
@@ -77,7 +81,7 @@ const STATE_KEYS = [
     'import_status',
     'created_post_id',
     'recoverable'] as const
-const SINGLE_ROW_KEYS = [...BASIC_KEYS, ...STATE_KEYS] as const
+const SINGLE_ROW_KEYS = [...BASIC_KEYS, ...STATE_KEYS, 'session_id'] as const
 const MAX_REGULAR_URL_LENGTH = 768
 const MAX_COMPRESSED_STATE_LENGTH = 767
 const COMPRESSED_STATE_PREFIX = 'z1.'
@@ -241,6 +245,7 @@ const baseRowState = (row: PostImportRow): QueryRowState => ({
     thumbnail_base: String (row.attributes.thumbnailBase ?? ''),
     original_created_from: String (row.attributes.originalCreatedFrom ?? ''),
     original_created_before: String (row.attributes.originalCreatedBefore ?? ''),
+    video_ms: String (row.attributes.videoMs ?? ''),
     duration: String (row.attributes.duration ?? ''),
     tags: String (row.attributes.tags ?? ''),
     parent_post_ids: String (row.attributes.parentPostIds ?? ''),
@@ -263,6 +268,7 @@ const buildRow = (
       thumbnailBase: manual.has ('thumbnailBase') ? 'manual' : 'automatic',
       originalCreatedFrom: manual.has ('originalCreatedFrom') ? 'manual' : 'automatic',
       originalCreatedBefore: manual.has ('originalCreatedBefore') ? 'manual' : 'automatic',
+      videoMs: 'automatic',
       duration: 'automatic',
       tags: manual.has ('tags') ? 'manual' : 'automatic',
       parentPostIds: manual.has ('parentPostIds') ? 'manual' : 'automatic' }
@@ -274,6 +280,7 @@ const buildRow = (
       thumbnailBase: state.thumbnail_base,
       originalCreatedFrom: state.original_created_from,
       originalCreatedBefore: state.original_created_before,
+      videoMs: state.video_ms,
       duration: state.duration,
       tags: state.tags,
       parentPostIds: state.parent_post_ids }
@@ -356,6 +363,7 @@ const parseEncodedRow = (
       ['h', 'thumbnail_base'],
       ['f', 'original_created_from'],
       ['b', 'original_created_before'],
+      ['x', 'video_ms'],
       ['d', 'duration'],
       ['g', 'tags'],
       ['p', 'parent_post_ids']] as const
@@ -382,6 +390,7 @@ const parseEncodedRow = (
       thumbnail_base: parsedStrings.thumbnail_base,
       original_created_from: parsedStrings.original_created_from,
       original_created_before: parsedStrings.original_created_before,
+      video_ms: parsedStrings.video_ms,
       duration: parsedStrings.duration,
       tags: parsedStrings.tags,
       parent_post_ids: parsedStrings.parent_post_ids,
@@ -399,7 +408,8 @@ const parseSingleRow = (params: URLSearchParams): ParsedPostNewState | null => {
   if (url == null || url === '')
     return null
 
-  const hasOnlyUrl = Array.from (params.keys ()).every (key => key === 'url')
+  const hasOnlyUrl = Array.from (params.keys ()).every (
+      key => key === 'url' || key === 'session_id')
   if (hasOnlyUrl)
     {
       const row = buildRow (1, {
@@ -408,6 +418,7 @@ const parseSingleRow = (params: URLSearchParams): ParsedPostNewState | null => {
 	  thumbnail_base: '',
 	  original_created_from: '',
 	  original_created_before: '',
+	  video_ms: '',
 	  duration: '',
 	  tags: '',
 	  parent_post_ids: '',
@@ -444,6 +455,7 @@ const parseSingleRow = (params: URLSearchParams): ParsedPostNewState | null => {
       thumbnail_base: params.get ('thumbnail_base') ?? '',
       original_created_from: params.get ('original_created_from') ?? '',
       original_created_before: params.get ('original_created_before') ?? '',
+      video_ms: params.get ('video_ms') ?? '',
       duration: params.get ('duration') ?? '',
       tags: params.get ('tags') ?? '',
       parent_post_ids: params.get ('parent_post_ids') ?? '',
@@ -546,6 +558,7 @@ const regularQuery = (rows: PostImportRow[]): URLSearchParams => {
       params.set ('thumbnail_base', String (row?.attributes.thumbnailBase ?? ''))
       params.set ('original_created_from', String (row?.attributes.originalCreatedFrom ?? ''))
       params.set ('original_created_before', String (row?.attributes.originalCreatedBefore ?? ''))
+      params.set ('video_ms', String (row?.attributes.videoMs ?? ''))
       params.set ('duration', String (row?.attributes.duration ?? ''))
       params.set ('tags', String (row?.attributes.tags ?? ''))
       params.set ('parent_post_ids', String (row?.attributes.parentPostIds ?? ''))
@@ -589,6 +602,8 @@ const encodeRowState = (
     encoded.f = base.original_created_from
   if (base.original_created_before !== '')
     encoded.b = base.original_created_before
+  if (base.video_ms !== '')
+    encoded.x = base.video_ms
   if (base.duration !== '')
     encoded.d = base.duration
   if (base.tags !== '')
@@ -626,6 +641,24 @@ export const hasPostNewReviewState = (search: string): boolean => {
 }
 
 
+export const parsePostNewSessionId = (search: string): string | null =>
+    validatePostImportSessionId (
+        new URLSearchParams (search).get ('session_id'))
+
+
+export const appendPostNewSessionId = (
+    path:       string,
+    sessionId:  string,
+): string => {
+  const validatedId = validatePostImportSessionId (sessionId)
+  if (validatedId == null)
+    return path
+
+  const separator = path.includes ('?') ? '&' : '?'
+  return `${ path }${ separator }session_id=${ validatedId }`
+}
+
+
 export const parsePostNewState = async (
     search: string,
 ): Promise<ParsedPostNewState | null> => {
@@ -661,7 +694,7 @@ const serialiseCompressedRows = async (
 	  if (payload.length <= MAX_COMPRESSED_STATE_LENGTH)
 	    return {
 		path: `/posts/new?state=${ state }`,
-		rows: nextRows }
+		complete: count === rows.length }
 	}
     }
   catch
@@ -680,7 +713,7 @@ export const serialisePostNewState = async (
   if (regularPath.length < MAX_REGULAR_URL_LENGTH)
     return {
 	path: regularPath,
-	rows }
+	complete: true }
 
   return await serialiseCompressedRows (rows)
 }