Fix incorrect notbook_id returned by assignment list #24

ngshare_exchange/course_management.py

@@ -7,6 +7,7 @@
 import argparse
 from urllib.parse import quote
 
+
 # https://www.geeksforgeeks.org/print-colors-python-terminal/
 def prRed(skk, exit=True):
     print('\033[91m {}\033[00m'.format(skk))
@@ -83,7 +84,6 @@ def check_status_code(response):
 
 
 def check_message(response):
-
     response = response.json()
     if not response['success']:
         prRed(response['message'])
@@ -460,12 +460,10 @@ def parse_args(argv):
 
 
 def main(argv=None):
-
     argv = argv or sys.argv[1:]
     args = parse_args(argv)
     args.func(args)
 
 
 if __name__ == '__main__':
-
     sys.exit(main())

ngshare_exchange/exchange.py

@@ -21,7 +21,6 @@
 
 
 class Exchange(ABCExchange):
-
     username = (
         os.environ['JUPYTERHUB_USER']
         if 'JUPYTERHUB_USER' in os.environ
@@ -38,7 +37,6 @@ class Exchange(ABCExchange):
 
     @property
     def ngshare_url(self):
-
         if self._ngshare_url:
             return self._ngshare_url
         if 'PROXY_PUBLIC_SERVICE_HOST' in os.environ:
@@ -189,7 +187,7 @@ def decode_dir(self, src_dir, dest_dir, ignore=None, noclobber=False):
 
     def encode_dir(self, src_dir, ignore=None):
         encoded_files = []
-        for (subdir, dirs, files) in os.walk(src_dir):
+        for subdir, dirs, files in os.walk(src_dir):
             for file_name in files:
                 file_path = subdir + os.sep + file_name
                 data_bytes = open(file_path, 'rb').read()

ngshare_exchange/list.py

@@ -383,7 +383,7 @@ def nb_key(nb):
 
             info['notebooks'] = []
             for notebook in notebooks:
-                if self.cached:
+                if self.cached or info['status'] == 'fetched':
                     nb_info = {
                         'notebook_id': os.path.splitext(
                             os.path.split(notebook)[1]
@@ -392,11 +392,6 @@ def nb_key(nb):
                     }
                 elif self.inbound:
                     nb_info = {'notebook_id': notebook['notebook_id']}
-                elif info['status'] == 'fetched':
-                    nb_info = {
-                        'notebook_id': notebook,
-                        'path': os.path.abspath(notebook),
-                    }
                 else:
                     nb_info = {'notebook_id': notebook}
                 if info['status'] != 'submitted':

ngshare_exchange/release_assignment.py

@@ -10,7 +10,6 @@
 
 
 class ExchangeReleaseAssignment(Exchange, ABCExchangeReleaseAssignment):
-
     force = Bool(
         False, help='Force overwrite existing files in the exchange.'
     ).tag(config=True)
@@ -44,7 +43,6 @@ def init_src(self):
                 self.coursedir.assignment_id,
             )
             if os.path.isdir(source):
-
                 # Looks like the instructor forgot to assign
                 self.fail(
                     'Assignment found in "{}" but not "{}", run `nbgrader generate_assignment` first.'.format(

ngshare_exchange/tests/test_fetch_feedback.py

@@ -12,7 +12,6 @@
 
 
 class TestExchangeFetchFeedback(TestExchange):
-
     timestamp = 'some_timestamp'
 
     def _mock_bad_feedback(self):
@@ -70,7 +69,6 @@ def _new_fetch_feedback(
         assignment_id=TestExchange.assignment_id,
         student_id=TestExchange.student_id,
     ):
-
         retvalue = self._new_exchange_object(
             ExchangeFetchFeedback, course_id, assignment_id, student_id
         )
@@ -122,7 +120,6 @@ def test_no_course_id(self):
             assert issubclass(type(e), ExchangeError)
 
     def test_fetch(self):
-
         # set chache folder
 
         submission_name = '{}+{}+{}'.format(
@@ -150,7 +147,6 @@ def test_fetch(self):
                 assert actual_file.read() == reference_file.read()
 
     def test_fetch_path_includes_course(self):
-
         # set chache folder
 
         submission_name = '{}+{}+{}'.format(