Merge pull request #16 from CreatCodeBuild/dev

Dev

Author: CreatCodeBuild

.gitignore

@@ -1,6 +1,11 @@
 # common
 .idea/
 *.pyc
-public/
+example/
 .cache/
-__pycache__/
+__pycache__/
+
+# package
+build/
+dist/
+*.egg-info

README.md

@@ -1,25 +1,34 @@
 # Super Fast HTTP2 Framework for Progressive Web Application
 
-
-# Dependency
-Python3.5+  
-Future version might only support Python3.6+ since `curio` might only support 3.6+ in the future.
-```bash
-pip install h2
-pip install curio
+# Installation
+Clone this project to your local directory. In this directory, 
+```
+python setup.py
 ```
-I will make it available on pip once I have the first release.
+This will automatically install `hyper2web` to the associated Python as a site-package.
+
+I will make it available on PyPi once I have the first release.
+
+## Python Version
+Python3.5+
+
+## Dependency
+This project uses `h2` and `curio`.
 
-This project is at its very early stage. I still need to learn a lot about h2, curio, HTTP and Web.  
 [h2 Github](https://github.com/python-hyper/hyper-h2) [doc](https://python-hyper.org/h2/en/stable/)  
 [curio Github](https://github.com/dabeaz/curio) [doc](https://curio.readthedocs.io/en/latest/)
 
 # How to
-First clone this repo to your disk.
-
-Under this repo, create a dir `public` or whatever names, put your frontend code there.
-
-Then create an `app.py` or whatever names.
+Assuming you have a directory structure like
+```
+your project/
+--public/
+  --index.html
+  --index.js
+  ...
+--app.py
+```
+Your `app.py` looks like
 ```python
 from hyper2web import app
 

app.py

@@ -41,13 +41,18 @@ async def default_get(http, stream, parameters):
 		else:
 			self._router = router(None)
 
+		# will server this file on GET '/'
+		if default_file:
+			async def get_index(http, stream, para):
+				await http.send_file(stream, os.path.join(self.root, self.default_file))
+			self.get('/', get_index)
+
 	def up(self):
 		kernel = Kernel()
 		kernel.run(h2_server(address=("localhost", self.port),
 							 certfile="{}.crt.pem".format("localhost"),
 							 keyfile="{}.key".format("localhost"),
-							 app=self),
-				   shutdown=True)
+							 app=self))
 
 	def get(self, route: str, handler):
 		self._router.register('GET', route, handler)

hyper2web/app.py

@@ -30,42 +30,43 @@ def find_match(self, path: str):
 		# todo: now the problem is how to implement it
 		# todo: pattern matching should be independent from :method,
 		# todo: but the current implementation doesn't support it. Should improve it later.
-		print(self._routes.values())
 		for routes_of_this_method in self._routes.values():
-			print(routes_of_this_method)
 			for route in routes_of_this_method:
 				matched, parameters = self._match(route, path)
+				# this function returns the first match, not the best match
 				if matched:
 					return route, parameters
 		return None, None
 
 	@classmethod
 	def _match(cls, route, path):
-		# todo: it seems like that regular expression is not necessary
-		# note: Could it be simpler? Could regex help?
-		route = route.split('/')
-		path = path.split('/')
+		# '/something/xxx/' to 'something/xxx'. Get rid of '/' at the left and the right end of a string
+		route = route.lstrip('/').rstrip('/').split('/')
+		path = path.lstrip('/').rstrip('/').split('/')
+		print(route, path)
 		if len(route) != len(path):
 			return False, None
 		else:
 			# todo: implement it
 			parameters = {}
 			for r, p in zip(route, path):
+				if r == p == '':
+					return True, None
 				if r[0] == '{' and r[-1] == '}':
 					parameters[r[1:-1]] = p
 				elif r != p:
 					return False, None
+			print('out of for loop')
 			return True, parameters
 
 	# async
 	async def handle_route(self, http: HTTP, stream: Stream):
 		print('app.App.handle_route')
 
-		path = stream.headers[':path'].lstrip('/')
+		path = stream.headers[':path']
 		method = stream.headers[':method']
 
 		route, parameters = self.find_match(path)
-		print('app.App.handle_route', route)
 
 		# 如果没有任何匹配，就默认为静态文件读取
 		if route is None: