From 908793d077cc5bb3e11b03a40945d3842874c751 Mon Sep 17 00:00:00 2001 From: Seth Ladygo Date: Wed, 19 Feb 2020 12:55:25 -0800 Subject: [PATCH] send_locally_feed.py: simplify csv dir logic --- procat2/management/commands/send_locally_feed.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/procat2/management/commands/send_locally_feed.py b/procat2/management/commands/send_locally_feed.py index 08a95c3..8bce843 100644 --- a/procat2/management/commands/send_locally_feed.py +++ b/procat2/management/commands/send_locally_feed.py @@ -2,6 +2,7 @@ import os import csv import tempfile from pathlib import Path +from os.path import basename, dirname, realpath, abspath from django.core.management.base import BaseCommand, CommandError from django.conf import settings @@ -31,18 +32,14 @@ class Command(BaseCommand): return UPC.objects.filter(material__in=materials).distinct('upc') - def csv_dir(self): - return os.path.join(settings.ASSET_DIR, 'locally') - - def csv_path(self, season, region): + csv_dir = os.path.join(settings.ASSET_DIR, 'locally') filename = f'Keen_{season}_{region}.csv'.replace(' ', '_') - #mkstemp(suffix=None, prefix=None, dir=None, text=False) - return os.path.join(self.csv_dir(), filename) + return os.path.join(csv_dir, filename) + - def write_csv(self, path, upcs, season): - Path(self.csv_dir()).mkdir(parents=True, exist_ok=True) + Path(dirname(path)).mkdir(parents=True, exist_ok=True) with open(path, 'w', newline='') as csvfile: writer = csv.writer(csvfile) #, delimiter=',', quotechar='|', quoting=csv.QUOTE_MINIMAL) writer.writerow(self.upc_headers())