From c97518523b910ca7412f69de3803739affe2c583 Mon Sep 17 00:00:00 2001
From: EUcancER <root@euer.krebsco.de>
Date: Wed, 16 Nov 2011 18:35:13 +0100
Subject: //punani: tightnani-web is now able to handle fallback(super-)
 package manager

---
 punani/tightnani/tightnani-web.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'punani/tightnani/tightnani-web.py')

diff --git a/punani/tightnani/tightnani-web.py b/punani/tightnani/tightnani-web.py
index 52f5004f..4386bbae 100755
--- a/punani/tightnani/tightnani-web.py
+++ b/punani/tightnani/tightnani-web.py
@@ -18,7 +18,7 @@ pdb= json.load(open(PDB_FILE))
 class Index:
   def GET(self):
     ret = """Welcome to the Tightnani API<br/>
-Retrieve a package name for your distribution with: /ARCH/PKG"""
+Retrieve a package name for your distribution with: /PACKER/PKG"""
     return ret
 
 class Reload:
@@ -36,13 +36,18 @@ class ArchFinder:
     if not packer or not package: web.BadRequest()
     else:
       packer = pdb['packer-symlinks'].get(packer,packer) #try to resolve similar packers
+      super_packer = pdb['super-packer'].get(packer,'')
       ret = pdb.get(package,{}).get(packer,False)
+      ret = ret if ret else pdb.get(package,{}).get(super_packer,False)
+
       if not ret: web.NotFound()
       else: return ret
 
 
 
 if __name__ == "__main__":
+  import sys 
+  sys.argv.append("9111")
   app = web.application(urls,globals())
   app.internalerror = web.debugerror
   app.run()
-- 
cgit v1.2.3


From 4e8fa61ec02b6f05134e8b95239d1821a46de57c Mon Sep 17 00:00:00 2001
From: EUcancER <root@euer.krebsco.de>
Date: Wed, 16 Nov 2011 22:56:47 +0100
Subject: //tightnani-web:  add error message:

---
 punani/tightnani/tightnani-web.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'punani/tightnani/tightnani-web.py')

diff --git a/punani/tightnani/tightnani-web.py b/punani/tightnani/tightnani-web.py
index 4386bbae..4e6a64a4 100755
--- a/punani/tightnani/tightnani-web.py
+++ b/punani/tightnani/tightnani-web.py
@@ -12,8 +12,9 @@ urls = (
 
 
 PDB_FILE="tightnani_db"
-
-pdb= json.load(open(PDB_FILE))
+f = open(PDB_FILE)
+pdb= json.load(f)
+f.close()
 
 class Index:
   def GET(self):
@@ -23,7 +24,9 @@ Retrieve a package name for your distribution with: /PACKER/PKG"""
 
 class Reload:
   def GET(self):
-    pdb= json.load(open(PDB_FILE))
+    f = open(PDB_FILE)
+    pdb= json.load(f)
+    f.close()
     return "DB reloaded"
 
 
@@ -40,7 +43,9 @@ class ArchFinder:
       ret = pdb.get(package,{}).get(packer,False)
       ret = ret if ret else pdb.get(package,{}).get(super_packer,False)
 
-      if not ret: web.NotFound()
+      if not ret: 
+        web.NotFound()
+        return "not found. i'm so sorry :("
       else: return ret
 
 
-- 
cgit v1.2.3


From 3877e5d8221d42811d376ddb560552684d34f5cc Mon Sep 17 00:00:00 2001
From: EUcancER <root@euer.krebsco.de>
Date: Thu, 17 Nov 2011 11:16:48 +0100
Subject: //punani: rm old punani, tightnani->punani

---
 punani/tightnani/tightnani-web.py | 58 ---------------------------------------
 1 file changed, 58 deletions(-)
 delete mode 100755 punani/tightnani/tightnani-web.py

(limited to 'punani/tightnani/tightnani-web.py')

diff --git a/punani/tightnani/tightnani-web.py b/punani/tightnani/tightnani-web.py
deleted file mode 100755
index 4e6a64a4..00000000
--- a/punani/tightnani/tightnani-web.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/python
-
-import web
-import json
-
-urls = ( 
-  '/', 'Index',
-  '/dump','Dump',
-  '/reload','Reload',
-  '/(.+)/(.+)', 'ArchFinder',
-)
-
-
-PDB_FILE="tightnani_db"
-f = open(PDB_FILE)
-pdb= json.load(f)
-f.close()
-
-class Index:
-  def GET(self):
-    ret = """Welcome to the Tightnani API<br/>
-Retrieve a package name for your distribution with: /PACKER/PKG"""
-    return ret
-
-class Reload:
-  def GET(self):
-    f = open(PDB_FILE)
-    pdb= json.load(f)
-    f.close()
-    return "DB reloaded"
-
-
-class Dump:
-  def GET(self):
-    return json.dumps(pdb,sort_keys=True,indent=4)
-
-class ArchFinder:
-  def GET(self,packer,package):
-    if not packer or not package: web.BadRequest()
-    else:
-      packer = pdb['packer-symlinks'].get(packer,packer) #try to resolve similar packers
-      super_packer = pdb['super-packer'].get(packer,'')
-      ret = pdb.get(package,{}).get(packer,False)
-      ret = ret if ret else pdb.get(package,{}).get(super_packer,False)
-
-      if not ret: 
-        web.NotFound()
-        return "not found. i'm so sorry :("
-      else: return ret
-
-
-
-if __name__ == "__main__":
-  import sys 
-  sys.argv.append("9111")
-  app = web.application(urls,globals())
-  app.internalerror = web.debugerror
-  app.run()
-- 
cgit v1.2.3