Merge pull request #17 from cs50/develop

v1.0.2

Author: Jelleas

compare50/__main__.py

@@ -271,8 +271,7 @@ def main():
             sys.exit(1)
 
 
-
-    with profiler(), _api._ProgressBar("Preparing") as _api.progress_bar:
+    with profiler(), _api._ProgressBar("Preparing", enabled=not args.debug) as _api.progress_bar:
         # Collect all submissions, archive submissions and distro files
         subs = submission_factory.get_all(args.submissions, preprocessor)
         _api.progress_bar.update(33)
@@ -287,7 +286,6 @@ def main():
         # Cross compare and rank all submissions, keep only top `n`
         _api.progress_bar.new(f"Scoring ({passes[0].__name__})")
         scores = _api.rank(subs, archive_subs, ignored_files, passes[0], n=args.n)
-
         # Get the matching spans, group them per submission
         groups = []
         pass_to_results = {}

compare50/_api.py

@@ -341,7 +341,8 @@ class _ProgressBar(metaclass=_Singleton):
     STOP_SIGNAL = None
     UPDATE_SIGNAL = 1
 
-    def __init__(self, message):
+    def __init__(self, message, enabled=True):
+        self.enabled = enabled
         self._message = message
         self._process = None
         self._percentage = 0
@@ -360,14 +361,18 @@ def remaining_percentage(self):
 
     def new(self, message):
         """Fill the current bar, and create a new bar with message."""
-        self._message = message
-        self.fill()
-        self._percentage = 0
-        self._message_queue.put((message, 100))
+        if self.enabled:
+            self._message = message
+            self.fill()
+            self._percentage = 0
+            self._message_queue.put((message, 100))
         return self
 
     def update(self, amount=1):
         """Update the progress bar with amount."""
+        if not self.enabled:
+            return
+
         self._update += amount
         if self._update < self._resolution:
             return
@@ -393,6 +398,9 @@ def _stop(self):
         self._process.join()
 
     def __enter__(self):
+        if not self.enabled:
+            return self
+
         def progress_runner(message, total, message_queue):
             format = '{l_bar}{bar}|[{elapsed} {remaining}s]'
             bar = tqdm.tqdm(total=total, bar_format=format)
@@ -422,7 +430,8 @@ def progress_runner(message, total, message_queue):
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
-        self._stop()
+        if self.enabled:
+            self._stop()
 
 
 #: Global progress bar used by compare50

compare50/_renderer/templates/index.html

@@ -60,7 +60,7 @@ <h4 class="align-text-bottom">compare50 results</h4>
         <script>
             function rowListenerFactory(row) {
                 return event => {
-                    window.location = `file://{{dest}}/match_${row.cells[0].textContent}.html`
+                    window.location.href = `match_${row.cells[0].textContent}.html`
                 }
             }
             for (let row of document.getElementById("results").rows) {

docs/source/index.rst

@@ -1,5 +1,5 @@
-compare50
-=========
+``compare50``
+=============
 
 .. toctree::
    :hidden:

setup.py

@@ -21,6 +21,6 @@
     packages=find_packages(exclude=["tests"]),
     scripts=["bin/compare50"],
     url="https://github.com/cs50/compare50",
-    version="1.0.1",
+    version="1.0.2",
     include_package_data=True,
 )