Changeset 9163

Timestamp:

May 8, 2011, 7:45:17 PM (14 years ago)

Author:

rick

Message:

I guess the python documentation is right about this one :-)

"Lots of people want their programs to have “required options”. Think about it.
If it’s required, then it’s not optional! If there is a piece of information
that your program absolutely requires in order to run successfully, that’s what
positional arguments are for." - ​http://docs.python.org/library/optparse.html

Fixed.

File:

• src/django_gheat/gheat/management/commands/import_droidstumbler.py (modified) (3 diffs)

src/django_gheat/gheat/management/commands/import_droidstumbler.py

@@ -26 +26 @@
 
 from django.core.management import setup_environ
-from django.core.management.base import BaseCommand
+from django.core.management.base import BaseCommand, CommandError
 from optparse import OptionParser, make_option
 from gheat.models import *
+import csv
 import datetime
-import csv
+import os
+import sys
 
 def import_droidstumbler(location, meetrondje, gebruiker, email):
@@ -49 +51 @@
 
 class Command(BaseCommand):
+  args = '<csvfile>'
   option_list = BaseCommand.option_list + (
-    make_option('-f', '--location', dest='location', default='location'),
     make_option('-m', '--meetrondje', dest='meetrondje', default='rondje'),
     make_option('-g', '--gebruiker', dest='gebruiker', default='username'),
@@ -57 +59 @@
 
   def handle(self, *args, **options):
-    import_droidstumbler(options['location'],options['meetrondje'],options['gebruiker'],options['email'])
+    try:
+      (csv_file,) = args
+    except ValueError:
+      self.print_help(sys.argv[0],sys.argv[1])
+      raise CommandError("Not all arguments are provided")
+    if not os.path.isfile(csv_file):
+      raise CommandError("csv file '%s' does not exists" % csv_file)
+    import_droidstumbler(csv_file,options['meetrondje'],options['gebruiker'],options['email'])