.

scripts/commands/api/generate.ts

@@ -1,4 +1,5 @@
-import { Logger, Collection, Storage } from '@freearhey/core'
+import { Logger, Collection } from '@freearhey/core'
+import { Storage } from '@freearhey/storage-js'
 import { SITES_DIR, API_DIR } from '../../constants'
 import { GuideChannel } from '../../models'
 import { ChannelsParser } from '../../core'

scripts/commands/channels/edit.ts

@@ -1,4 +1,5 @@
-import { Storage, Collection, Logger, Dictionary } from '@freearhey/core'
+import { Collection, Logger, Dictionary } from '@freearhey/core'
+import { Storage } from '@freearhey/storage-js'
 import type { DataProcessorData } from '../../types/dataProcessor'
 import type { DataLoaderData } from '../../types/dataLoader'
 import { ChannelSearchableData } from '../../types/channel'

scripts/commands/channels/parse.ts

@@ -1,4 +1,5 @@
-import { Logger, File, Storage } from '@freearhey/core'
+import { Logger } from '@freearhey/core'
+import { Storage, File } from '@freearhey/storage-js'
 import { ChannelsParser } from '../../core'
 import { ChannelList } from '../../models'
 import { pathToFileURL } from 'node:url'

scripts/commands/epg/grab.ts

@@ -1,4 +1,5 @@
-import { Logger, Timer, Storage, Collection } from '@freearhey/core'
+import { Logger, Timer, Collection } from '@freearhey/core'
+import { Storage } from '@freearhey/storage-js'
 import { QueueCreator, Job, ChannelsParser } from '../../core'
 import { Option, program } from 'commander'
 import { SITES_DIR } from '../../constants'

scripts/commands/sites/init.ts

@@ -1,4 +1,5 @@
-import { Logger, Storage } from '@freearhey/core'
+import { Logger } from '@freearhey/core'
+import { Storage } from '@freearhey/storage-js'
 import { SITES_DIR } from '../../constants'
 import { pathToFileURL } from 'node:url'
 import { program } from 'commander'

scripts/commands/sites/update.ts

@@ -1,5 +1,6 @@
 import { IssueLoader, HTMLTable, ChannelsParser } from '../../core'
-import { Logger, Storage, Collection } from '@freearhey/core'
+import { Logger, Collection } from '@freearhey/core'
+import { Storage } from '@freearhey/storage-js'
 import { ChannelList, Issue, Site } from '../../models'
 import { SITES_DIR, ROOT_DIR } from '../../constants'
 import { Channel } from 'epg-grabber'

scripts/core/channelsParser.ts

@@ -1,5 +1,5 @@
-import { parseChannels } from 'epg-grabber'
-import { Storage } from '@freearhey/core'
+import { EPGGrabber } from 'epg-grabber'
+import { Storage } from '@freearhey/storage-js'
 import { ChannelList } from '../models'
 
 interface ChannelsParserProps {
@@ -15,7 +15,7 @@ export class ChannelsParser {
 
   async parse(filepath: string): Promise<ChannelList> {
     const content = await this.storage.load(filepath)
-    const parsed = parseChannels(content)
+    const parsed = EPGGrabber.parseChannelsXML(content)
 
     return new ChannelList({ channels: parsed })
   }

scripts/core/dataLoader.ts

@@ -1,6 +1,6 @@
 import type { DataLoaderProps, DataLoaderData } from '../types/dataLoader'
 import cliProgress, { MultiBar } from 'cli-progress'
-import { Storage } from '@freearhey/core'
+import { Storage } from '@freearhey/storage-js'
 import { ApiClient } from './apiClient'
 import numeral from 'numeral'
 

scripts/core/guideManager.ts

@@ -1,4 +1,5 @@
-import { Collection, Logger, Zip, Storage, StringTemplate } from '@freearhey/core'
+import { Collection, Logger, Zip, StringTemplate } from '@freearhey/core'
+import { Storage } from '@freearhey/storage-js'
 import epgGrabber from 'epg-grabber'
 import { OptionValues } from 'commander'
 import { Channel, Feed, Guide } from '../models'