fz0x1/HPI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move over some my.photos stuff to mycfg

Browse source
This commit is contained in:
Dima Gerasimov 2020-03-12 21:45:47 +00:00
parent e23276266b
commit c3e1f2c4c0
1 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
my/photos/__init__.py
View file

@ -16,15 +16,14 @@ import magic # type: ignore
import PIL.Image # type: ignore import PIL.Image # type: ignore
from PIL.ExifTags import TAGS, GPSTAGS # type: ignore from PIL.ExifTags import TAGS, GPSTAGS # type: ignore
import logging
def get_logger():
return logging.getLogger('photo-provider')
PATHS = [ from ..common import LazyLogger
"***REMOVED***",
]
PHOTOS_URL = "***REMOVED***"
logger = LazyLogger('my.photos')
from mycfg import photos as config
# TODO could use other pathes I suppose? # TODO could use other pathes I suppose?
@ -42,14 +41,9 @@ CACHE_PATH = "***REMOVED***"
# TODO sokino -- wrong timestamp # TODO sokino -- wrong timestamp
_REGEXES = [re.compile(rs) for rs in [
r'***REMOVED***',
r'***REMOVED***',
# TODO eh, some photos from ***REMOVED*** -- which is clearly bad datetime! like a default setting
# TODO mm. maybe have expected datetime ranges for photos and discard everything else? some cameras looks like they god bad timestamps
]]
def ignore_path(p: str): def ignore_path(p: str):
# TODO use marker files instead?..
for reg in _REGEXES: for reg in _REGEXES:
if reg.search(p): if reg.search(p):
return True return True
@ -132,7 +126,7 @@ class Photo(NamedTuple):
@property @property
def _basename(self) -> str: def _basename(self) -> str:
for bp in PATHS: for bp in config.paths:
if self.path.startswith(bp): if self.path.startswith(bp):
return self.path[len(bp):] return self.path[len(bp):]
else: else:
@ -147,8 +141,6 @@ class Photo(NamedTuple):
return PHOTOS_URL + self._basename return PHOTOS_URL + self._basename
def _try_photo(photo: str, mtype: str, dgeo: Optional[LatLon]) -> Optional[Photo]: def _try_photo(photo: str, mtype: str, dgeo: Optional[LatLon]) -> Optional[Photo]:
logger = get_logger()
geo: Optional[LatLon] geo: Optional[LatLon]
dt: Optional[datetime] = None dt: Optional[datetime] = None
@ -217,17 +209,16 @@ def _try_photo(photo: str, mtype: str, dgeo: Optional[LatLon]) -> Optional[Photo
# if geo information is missing from photo, you can specify it manually in geo.json file # if geo information is missing from photo, you can specify it manually in geo.json file
def iter_photos() -> Iterator[Photo]: def iter_photos() -> Iterator[Photo]:
logger = get_logger()
geolocator = Nominatim() # TODO does it cache?? geolocator = Nominatim() # TODO does it cache??
mime = magic.Magic(mime=True) mime = magic.Magic(mime=True)
for pp in PATHS: for pp in config.paths:
assert os.path.lexists(pp) assert os.path.lexists(pp)
geos: List[LatLon] = [] # stack of geos so we could use the most specific one geos: List[LatLon] = [] # stack of geos so we could use the most specific one
# TODO could have this for all meta? e.g. time # TODO could have this for all meta? e.g. time
for d, _, files in itertools.chain.from_iterable((os.walk(pp, followlinks=True) for pp in PATHS)): # TODO just use fd-find? it's gonna be faster.. althrough not iterative?
for d, _, files in itertools.chain.from_iterable((os.walk(pp, followlinks=True) for pp in config.paths)):
logger.info(f"Processing {d}") logger.info(f"Processing {d}")
geof = join(d, 'geo.json') geof = join(d, 'geo.json')
@ -245,7 +236,7 @@ def iter_photos() -> Iterator[Photo]:
for f in sorted(files): for f in sorted(files):
photo = join(d, f) photo = join(d, f)
if ignore_path(photo): if config.ignored(photo):
logger.info(f"Ignoring {photo} due to regex") logger.info(f"Ignoring {photo} due to regex")
continue continue