Keywords visual and backend refactoring.

mt3 · Dec 4, 2011 · 25bdf0b · 25bdf0b
1 parent b761d92
commit 25bdf0b
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 16 deletions.
diff --git a/stallion/main.py b/stallion/main.py
@@ -58,6 +58,8 @@ def releases(dist_name):
     if not ret:
         ret = pypi.package_releases(dist_name.capitalize(), show_hidden)
 
+    print pypi.user_packages('hpk')
+
     ret.sort(key=lambda v: pkg_resources.parse_version(v), reverse=True)
 
     data["dist_name"] = dist_name

diff --git a/stallion/metadata.py b/stallion/metadata.py
@@ -60,7 +60,7 @@
     '1.2': HEADER_META_1_2,
 }
 
-METADATA_NAME = "PKG-INFO"
+METADATA_NAME = 'PKG-INFO'
 
 def parse_metadata(metadata):
     """ Parse the package PKG-INFO metadata. Currently supports versions 1.0 (PEP-0241),
@@ -74,7 +74,7 @@ def parse_metadata(metadata):
              is part of the metadata version specification
     """
     parsed_metadata = Parser().parsestr(metadata)
-    metadata_spec = set(HEADER_META[parsed_metadata["metadata-version"]])
+    metadata_spec = set(HEADER_META[parsed_metadata['metadata-version']])
     key_exist = set(map(string.lower, parsed_metadata.keys()))
     return (parsed_metadata, key_exist.intersection(metadata_spec))
 
@@ -118,8 +118,11 @@ def field_process(field_name, field_value):
 
     f_value = clean_lead_ws_description(field_value, field_name)
 
-    if f_value == "UNKNOWN":
-        f_value = None
+    if f_value == 'UNKNOWN':
+        return None
+
+    if field_name == 'keywords':
+        f_value = field_value.split(',' if ',' in field_value else ' ')
 
     return f_value
 
@@ -147,7 +150,7 @@ def metadata_to_dict(parsed_metadata, key_known):
     return mdict
 
 def run_test():
-    pkg = pkg_resources.get_distribution("jinja2")
+    pkg = pkg_resources.get_distribution('jinja2')
     parsed, key_known = parse_metadata(pkg.get_metadata(METADATA_NAME))
     ret = metadata_to_dict(parsed, key_known)
 

diff --git a/stallion/static/extra.css b/stallion/static/extra.css
@@ -1,3 +1,27 @@
-      body {
-        padding-top: 60px;
-      }
+body {
+	padding-top: 60px;
+}
+
+img.midicon { 
+	vertical-align: middle; 
+}
+
+.tag-lvl1 {
+	background: #10B240;
+	border: 1px solid #059430;
+	border-radius: 3px 3px 3px 3px;
+	color: #FFFFFF;
+	cursor: default;
+	display: inline-block;
+	margin: 2px;
+	vertical-align: middle;
+	border-style: solid;
+}
+
+.tag-lvl2 {
+	border-top: 1px solid #62EF88;
+	display: inline-block;
+	padding: 0 10px 2px 10px;
+	font-size: 12px
+}
+
diff --git a/stallion/templates/main.html b/stallion/templates/main.html
@@ -7,9 +7,6 @@
   <script type="text/javascript" src="{{ url_for('static', filename='bootstrap-buttons.js') }}"></script>
   <link rel="stylesheet" href="{{ url_for('static', filename='bootstrap.min.css') }}">
   <link href="{{ url_for('static', filename='extra.css') }}" rel="stylesheet">
-  <style type="text/css">
-	img.midicon { vertical-align: middle; }
-  </style>
   <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
   {% block js %}{% endblock %}
 </head>

diff --git a/stallion/templates/metadata10.html b/stallion/templates/metadata10.html
@@ -56,11 +56,21 @@
 <tr>
 	<td><strong>Keywords</strong></td>
 	<td>
-	{% if distinfo["keywords"] %}
-		{{ distinfo["keywords"] }}
-	{% else %}
-		<span class="label warning">No keywords specified</span>
-	{% endif %}
+		{% set keywords = distinfo["keywords"] %}
+		{% if not keywords %}
+			<span class="label warning">No keywords specified</span>
+		{% elif keywords is string %}
+			<span class="tag-lvl1">
+				<span class="tag-lvl2">{{ keywords }}</span>
+			</span>
+		{% else %}
+			{% for keyw in keywords %}
+			<span class="tag-lvl1">
+				<span class="tag-lvl2">{{ keyw|title }}</span>
+			</span>
+			{% endfor %}
+		{% endif %}
+
 	</td>
 </tr>
 
@@ -126,6 +136,8 @@
 		{% else %}
 			<span class="label warning">No classifiers specified</span>
 		{% endif %}
+
+		<br />
 	</td>
 </tr>