video: video_file_store.py comparison

hack in path router - dirs kind of work; putting a video in the path doesn't

comparison

equal deleted inserted replaced

-:7cacfae58430
+:0aea9e55899b
 import hashlib
 import logging
 import os
 from dataclasses import dataclass
 from pathlib import Path
+import re
 from typing import Iterable, Iterator
 import pymongo.collection
 log = logging.getLogger('vfs')
 webDataPath: str
 label: str
 # perms, playlists, req by/when
+def numSort(docs: list):
+def pad(match):
+return match.group(0).zfill(10)
+docs.sort(key=lambda doc: re.sub(r"\d+", pad, doc['label']))
 @dataclass
 class VideoFileStore:
 fs: pymongo.collection.Collection
 def findInDir(self, subdir: str) -> Iterable[VideoFile]:
+log.warning(f'findInDir:  {subdir=}')
 webRelParent = '.' if subdir == '/' else subdir
-for doc in self.fs.find({
+docs = list(self.fs.find({
 'type': 'file',
 'webRelParent': webRelParent
-}, sort=[('label', 1)]):
+}))
+numSort(docs)
+for doc in docs:
 yield VideoFile(Path(doc['diskPath']), doc['webRelPath'],
 doc['webDataPath'], doc['label'])
 def findSubdirs(self, subdir: str) -> Iterable:
-for doc in self.fs.find({
+docs = list(self.fs.find({
 'type':
 'dir',
 'webRelParent':
 '.' if subdir == '/' else subdir
-}, sort=[('label', 1)]):
+}))
+numSort(docs)
+for doc in docs:
 yield {
 'label': doc['label'],
 'path': doc['webRelPath'],
 }

Mercurial > code > home > repos > video