-
-
-
}})
-
{{ t6 }}{{ c6 }}{{ v6 }}
-
-
-
-
-
{{ t7 }}{{ c7 }}{{ v7 }}
-
-
-
-
-
{{ t8 }}{{ c8 }}{{ v8 }}
-
-
-
-
-
{{ t9 }}{{ c9 }}{{ v9 }}
-
-
-
-
-
{{ t10 }}{{ c10 }}{{ v10 }}
-
+
+ {% for player in team[5:] %}
-
{{ t11 }}{{ c11 }}{{ v11 }}
+
{{ player["name"] }}{{ player["captain"] }}
+ {% endfor %}
-
-
+ {% for player in team[0:5] %}
-
{{ t1 }}{{ c1 }}{{ v1 }}
-
-
-
-
-
{{ t2 }}{{ c2 }}{{ v2 }}
-
-
-
-
{{ t3 }}{{ c3 }}{{ v3 }}
-
-
-
-
-
{{ t4 }}{{ c4 }}{{ v4 }}
-
-
-
-
-
{{ t5 }}{{ c5 }}{{ v5 }}
+
{{ player["name"] }}{{ player["captain"] }}
+
+ {% endfor %}
diff --git a/app/fantasy_cricket/utils.py b/app/fantasy_cricket/utils.py
deleted file mode 100644
index 207bf642..00000000
--- a/app/fantasy_cricket/utils.py
+++ /dev/null
@@ -1,92 +0,0 @@
-"""
-Module which helps to get current match data
-Copyright (C) 2020 Royston E Tauro & Sammith S Bharadwaj & Shreyas Raviprasad
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
--
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see
.
-"""
-
-import json
-from pycricbuzz import Cricbuzz
-
-
-class Matches:
- """
- Class which gets and parses matches within 24 hours period
- """
-
- def __init__(self):
- """
- cricket: class of cricbuzz
- supported teams: supported teams by our module
- flags: flags json with links
- """
-
- self.cricket = Cricbuzz()
-
- self.supported_teams = [
- "India",
- "Australia",
- "New Zealand",
- "England",
- "Bangladesh",
- "South Africa",
- "West Indies",
- "Pakistan",
- "Afghanistan",
- "Sri Lanka",
- ]
- with open("app/fantasy_cricket/data/flags.json") as flag_file:
- self.flags = json.load(flag_file)
-
- def get_match(self):
- """
- Gets current matches dict
- """
- matches = []
- for match in self.cricket.matches():
-
- if (
- match["team1"]["name"] in self.supported_teams
- and match["team2"]["name"] in self.supported_teams
- #and match["mchstate"] == "preview"
- ):
- matches.append(
- (
- match["team1"],
- match["team2"],
- self.flags["countries"][match["team1"]["name"]],
- self.flags["countries"][match["team2"]["name"]],
- )
- )
- return matches
-
- def get_squad_file_match_type(self, teams):
- """
- Gets squad file based on teams
- """
-
- for match in self.cricket.matches():
-
- if (
- match["team1"]["name"] == teams[0]
- and match["team2"]["name"] == teams[1]
- ):
- match_det = (
- match["team1"]["squad_bench"] + match["team1"]["squad"],
- match["team2"]["squad_bench"] + match["team2"]["squad"],
- match["srs"] + match["mnum"],
- match["type"]
- )
- break
- return match_det
diff --git a/app/main.py b/app/main.py
old mode 100644
new mode 100755
index 35e7fb4d..43efaab8
--- a/app/main.py
+++ b/app/main.py
@@ -16,14 +16,14 @@
along with this program. If not, see
.
"""
-import os
+from typing import List
from fastapi.templating import Jinja2Templates
from fastapi.responses import HTMLResponse, RedirectResponse, FileResponse
-from fastapi import FastAPI, Form, Request, status
+from fastapi import FastAPI, Form, Request, status, Query
from fastapi.staticfiles import StaticFiles
from fastapi.encoders import jsonable_encoder
-from app.fantasy_cricket.team import Teams
-from app.fantasy_cricket.utils import Matches
+from app.fantasy_cricket.fantasy_leagues import Dream11
+from app.fantasy_cricket.matches import Matches
# pylint: disable=missing-function-docstring
# pylint: disable=global-variable-undefined
@@ -41,18 +41,15 @@
@app.get("/", response_class=HTMLResponse)
def home(request: Request):
- matches = cricket.get_match()
- teams = [
- [match[0]["name"], match[1]["name"], match[2]["flag"], match[3]["flag"]]
- for match in matches
- ]
+ matches = cricket.get_upcoming_match()
return templates.TemplateResponse(
- "index.html", {"request": request, "teams": teams}
+ "index.html", {"request": request, "teams": matches}
)
@app.post("/")
-async def home_post(match: str = Form(...)):
+def home_post(match: str = Form(...)):
+
response = RedirectResponse(
url="/playing11?team1="
+ match.split(" vs ")[0]
@@ -64,106 +61,56 @@ async def home_post(match: str = Form(...)):
@app.get("/playing11", response_class=HTMLResponse)
-def playing_11(request: Request, team1, team2):
-
- squad1, squad2, file, match_type = cricket.get_squad_file_match_type([team1, team2])
+def playing_11(request: Request, team1: str = Query(...), team2: str = Query(...)):
+ match_data = cricket.get_squad_match_type([team1, team2])
return templates.TemplateResponse(
"Playing_11.html",
{
"request": request,
- "squads": [squad1, squad2],
- "file": file,
- "match_type": match_type,
+ "squads": [match_data["team1_squad"], match_data["team2_squad"]],
+ "match_type": match_data["match_type"],
"teams": [team1, team2],
},
)
@app.post("/playing11")
-async def playing_11_post(request: Request, file, match_type, team1, team2):
- playings_11 = list(jsonable_encoder(await request.form()).keys())
- playings_11.remove("Confirm")
- players1 = '"' + '","'.join(playings_11[0:11]) + '"'
- players2 = '"' + '","'.join(playings_11[11:]) + '"'
-
- scrape_with_crochet(
- file=file,
- match_type=match_type,
- teams=[team1, team2],
- players2=players2,
- players1=players1,
- )
- return RedirectResponse(
- url="/results?file=" + file, status_code=status.HTTP_302_FOUND
+async def playing_11_post(
+ request: Request,
+ team1: str = Query(...),
+ team2: str = Query(...),
+ match_type: str = Query(...),
+):
+
+ play_11 = list(jsonable_encoder(await request.form()).keys())
+ play_11.remove("Confirm")
+ url = (
+ "/results/?match_type=" + match_type + "&team=" + team1 + "&team=" + team2 + "&"
)
+ for player in play_11[0:11]:
+ url += "player_team1=" + player + "&"
+ for player in play_11[11:]:
+ url += "player_team2=" + player + "&"
+ return RedirectResponse(url=url[:-1], status_code=status.HTTP_302_FOUND)
@app.get("/results", response_class=HTMLResponse)
-def result(request: Request, file):
- t_d = Teams("app/fantasy_cricket/data/" + file + ".json")
- captain, vcaptain = t_d.team()
- team_list = t_d.player
- players = []
- for i in team_list:
- if i == captain:
- tag_c = "(C)"
- elif i == vcaptain:
- tag_c = "(VC)"
- else:
- tag_c = ""
- players.append(i + tag_c)
- captain_list = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
- vcaptain_list = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
- for i, _ in enumerate(players):
- if "(C)" in players[i]:
- captain_list[i] = "(C)"
- vcaptain_list[i] = ""
- players[i] = players[i][:-3]
- elif "(VC)" in players[i]:
- vcaptain_list[i] = "(VC)"
- captain_list[i] = ""
- players[i] = players[i][:-4]
- else:
- vcaptain_list[i] = ""
- captain_list[i] = ""
+def result(
+ request: Request,
+ team: List[str] = Query(...),
+ match_type: str = Query(...),
+ player_team1: List[str] = Query(...),
+ player_team2: List[str] = Query(...),
+):
+ t_d = Dream11(team[0], team[1])
+ t_d.fetch_fantasy_team(player_team1, player_team2, match_type)
+ team = t_d.get_fantasy_team()
return templates.TemplateResponse(
"result.html",
- context={
+ {
"request": request,
- "c1": captain_list[0],
- "v1": vcaptain_list[0],
- "t1": players[0],
- "c2": captain_list[1],
- "v2": vcaptain_list[1],
- "t2": players[1],
- "c3": captain_list[2],
- "v3": vcaptain_list[2],
- "t3": players[2],
- "c4": captain_list[3],
- "v4": vcaptain_list[3],
- "t4": players[3],
- "c5": captain_list[4],
- "v5": vcaptain_list[4],
- "t5": players[4],
- "c6": captain_list[5],
- "v6": vcaptain_list[5],
- "t6": players[5],
- "c7": captain_list[6],
- "v7": vcaptain_list[6],
- "t7": players[6],
- "c8": captain_list[7],
- "v8": vcaptain_list[7],
- "t8": players[7],
- "c9": captain_list[8],
- "v9": vcaptain_list[8],
- "t9": players[8],
- "c10": captain_list[9],
- "v10": vcaptain_list[9],
- "t10": players[9],
- "c11": captain_list[10],
- "v11": vcaptain_list[10],
- "t11": players[10],
+ "team": team,
},
)
@@ -171,23 +118,3 @@ def result(request: Request, file):
@app.get("/robots.txt")
def robots():
return FileResponse("app/robots.txt")
-
-
-def scrape_with_crochet(file, match_type, teams, players1, players2):
-
- v_open = os.popen(
- 'python3 -m scrapy crawl howstat -a match_type="'
- + match_type
- + '" -a team1="'
- + teams[0]
- + '" -a team2="'
- + teams[1]
- + '" -a players1='
- + players1
- + " -a players2="
- + players2
- + ' -a file="'
- + file
- + '" --loglevel DEBUG',
- )
- v_open.close()
diff --git a/app/robots.txt b/app/robots.txt
old mode 100644
new mode 100755
index ac25b5fa..f7afb9da
--- a/app/robots.txt
+++ b/app/robots.txt
@@ -2,5 +2,5 @@
User-agent: *
Allow: /
-Disallow: /playing11
-Disallow: /results
\ No newline at end of file
+Allow: /playing11
+Allow: /results
\ No newline at end of file
diff --git a/crawler/__init__.py b/crawler/__init__.py
deleted file mode 100644
index 13e9dda5..00000000
--- a/crawler/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""
- Copyright (C) 2020 Royston E Tauro & Sammith S Bharadwaj & Shreyas Raviprasad
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see
.
-"""
-import sys
-
-sys.path.insert(1, "..")
diff --git a/crawler/fantasy_leagues.py b/crawler/fantasy_leagues.py
deleted file mode 100644
index 2d985548..00000000
--- a/crawler/fantasy_leagues.py
+++ /dev/null
@@ -1,88 +0,0 @@
-
-"""
-This modules defines all the fantasy leagues that
-the project supports
- Copyright (C) 2020 Royston E Tauro & Sammith S Bharadwaj & Shreyas Raviprasad
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see
.
-"""
-
-
-class Scorer:
- """
- Scorer class to use different formats of the game
-
- :py:class `t20`: A T20 dictionary which contains scoring metrics
- :py:class `odi`: A ODI dictionary which contains scoring metrics
- :py:class `test`: A TEST dictionary which contains scoring metrics
-
- :param scoring_dict: A dictionary containing scoring metrics.
- Each value represents a list where index 0 represents `T20`,
- 1 represents `ODI`, 2 represents `TEST`
- """
-
- def __init__(self, scoring_dict):
-
- self.t20 = {key: scoring_dict[key][0] for key in scoring_dict}
- self.odi = {key: scoring_dict[key][1] for key in scoring_dict}
- self.test = {key: scoring_dict[key][2] for key in scoring_dict}
-
- def get_score(self, stats, playing_format):
- """
- Function which sums the score for that platform
- depending on the format of the game
-
- :param playing_format: One of `ODI`,`T20`,`TEST`
- """
- type_map = {"ODI": self.odi, "T20": self.t20, "TEST": self.test}
- return sum(type_map[playing_format][key] * stats[key] for key in stats)
-
-
-class Dream11:
- """Dream11 League
-
- Supported platforms:
- * ODI
- * T20
- * TEST
- """
-
- name = "Dream11"
-
- batting_dict = Scorer(
- {
- "runs": [1, 1, 1],
- "boundaries": [1, 1, 1],
- "sixes": [2, 2, 2],
- "50": [8, 4, 4],
- "100": [16, 8, 8],
- "duck": [-2, -3, -4],
- }
- )
-
- bowling_dict = Scorer(
- {
- "wicket": [25, 25, 16],
- "4-wicket-haul": [8, 4, 4],
- "5-wicket-haul": [16, 8, 8],
- "Maiden": [4, 8, 0],
- }
- )
-
- wk_dict = Scorer(
- {
- "Catch": [8, 8, 8],
- "Stump": [12, 12, 12],
- }
- )
diff --git a/crawler/items.py b/crawler/items.py
deleted file mode 100644
index d7374db5..00000000
--- a/crawler/items.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Define here the models for your scraped items
-#
-# See documentation in:
-# https://docs.scrapy.org/en/latest/topics/items.html
-
-"""
- Copyright (C) 2020 Royston E Tauro & Sammith S Bharadwaj & Shreyas Raviprasad
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see
.
-"""
-
-
-import scrapy
-
-
-class PlayerItem(scrapy.Item):
- """
- Class scrapes name of the player
- Role of the player
- Score he scored in that game
- Team he is playing for
- Date of the match
- File it has been stored in
- """
- name = scrapy.Field()
- role = scrapy.Field()
- score = scrapy.Field()
- team = scrapy.Field()
- date = scrapy.Field()
- file = scrapy.Field()
diff --git a/crawler/pipelines.py b/crawler/pipelines.py
deleted file mode 100644
index a210acb1..00000000
--- a/crawler/pipelines.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# Define your item pipelines here
-#
-# Don't forget to add your pipeline to the ITEM_PIPELINES setting
-# See: https://docs.scrapy.org/en/latest/topics/item-pipeline.html
-
-"""
- Copyright (C) 2020 Royston E Tauro & Sammith S Bharadwaj & Shreyas Raviprasad
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see
.
-"""
-# useful for handling different item types with a single interface
-import json
-from statistics import mode
-from itemadapter import ItemAdapter
-
-
-class CricketcrawlerPipeline:
- """
- Processes output given by the crawler and stores it in a json file
- """
- def open_spider(self, spider):
- """
- Works when spider starts crawling
- """
- self.items = {}
- self.name = None
-
- def close_spider(self, spider):
- """
- Works when the spider stops crawling
- """
- for item in self.items:
- assert len(self.items[item]["role"]) == 5, f"{item}"
- self.items[item]["role"] = mode(self.items[item]["role"])
- with open(self.name, "w") as f_p:
- json.dump(self.items, f_p, indent=6)
-
- def process_item(self, item, spider):
- """
- Processes files as the items are yielded
- """
- self.name = f'app/fantasy_cricket/data/{item["file"]}.json'
- if item["name"] not in self.items:
- self.items[item["name"]] = {"role": [], "team": item["team"], "scores": {}}
- self.items[item["name"]]["role"].append(item["role"])
- self.items[item["name"]]["scores"][item["date"]] = item["score"]
diff --git a/crawler/spiders/__init__.py b/crawler/spiders/__init__.py
deleted file mode 100644
index be112f24..00000000
--- a/crawler/spiders/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# This package will contain the spiders of your Scrapy project
-#
-# Please refer to the documentation for information on how to create and manage
-# your spiders.
-"""
- Copyright (C) 2020 Royston E Tauro & Sammith S Bharadwaj & Shreyas Raviprasad
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see
.
-"""
-
-import sys
-
-sys.path.insert(1, "..")
diff --git a/crawler/spiders/howstat.py b/crawler/spiders/howstat.py
deleted file mode 100644
index 4d1b0c5c..00000000
--- a/crawler/spiders/howstat.py
+++ /dev/null
@@ -1,305 +0,0 @@
-"""
- Copyright (C) 2020 Royston E Tauro & Sammith S Bharadwaj & Shreyas Raviprasad
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see
.
-"""
-from scrapy import Request, Spider
-from crawler.fantasy_leagues import Dream11
-from crawler.items import PlayerItem
-
-
-class HowstatSpider(Spider):
- """
- Spider which crawls through howstat.com
- """
- name = "howstat"
- allowed_domains = ["howstat.com"]
-
- start_urls = ["http://www.howstat.com/cricket/Statistics/Players/PlayerListCurrent.asp"]
- def __init__(self, players1="", players2="", match_type="", *args, **kwargs):
- super(HowstatSpider, self).__init__(*args, **kwargs)
- self.names = {
- "last": {self.team1: [], self.team2: []},
- "first": {self.team1: [], self.team2: []},
- }
- for player in players1.split(","):
- player_id = player.split()
- if (
- player_id[0].lower().strip() == "de"
- or player_id[0].lower().strip() == "du"
- or player_id[0].lower().strip() == "van"
- ):
- player_id = [' '.join(player_id)]
- if len(player_id) == 1:
- self.names["last"][self.team1].append(player_id[0].lower().strip())
- self.names["first"][self.team1].append("")
- elif len(player_id) >= 1:
- self.names["last"][self.team1].append(player_id[-1].lower().strip())
- self.names["first"][self.team1].append(player_id[0].lower().strip())
- for player in players2.split(","):
- player_id = player.split()
- if len(player_id) == 1:
- self.names["last"][self.team2].append(player_id[0].lower().strip())
- self.names["first"][self.team2].append("")
- elif len(player_id) >= 1:
- self.names["last"][self.team2].append(player_id[-1].lower().strip())
- self.names["first"][self.team2].append(player_id[0].lower().strip())
- assert (
- len(self.names["last"][self.team1])
- == 11
- == len(self.names["first"][self.team1])
- == len(self.names["first"][self.team2])
- == len(self.names["last"][self.team2])
- )
- if match_type == "TEST":
- self.match_type = ""
- else:
- self.match_type = "_" + match_type
- self.matches = {}
- self.count = 0
-
- def parse(self, response):
- """
- Returns a request for the player found in the parsed url
- """
- comma_map = {
- "India": 1,
- "Australia": 1,
- "New Zealand": 1,
- "England": 1,
- "Bangladesh": 0,
- "South Africa": 1,
- "West Indies": 1,
- "Pakistan": 0,
- "Afghanistan": 0,
- "Sri Lanka": 1,
- }
- teams = {
- self.team1: response.selector.xpath(
- "//table[@class='TableLined']/tr[td[3]/text()[contains(.,'"
- + self.team1
- + "')]]/td[1]"
- ),
- self.team2: response.selector.xpath(
- "//table[@class='TableLined']/tr[td[3]/text()[contains(.,'"
- + self.team2
- + "')]]/td[1]"
- ),
- }
- players = {}
- for team in teams:
- players[team] = []
- for player in teams[team]:
- player_id = player.xpath("a/text()").get()
- if comma_map[team]:
- player_id = player_id.split(",")
- try:
- i = self.names["last"][team].index(player_id[0].lower().strip())
- if self.names["first"][team][i] == "":
- players[team].append(player.xpath("a"))
- else:
- for initial in player_id[1].split():
- if (
- self.names["first"][team][i][0].lower()
- == initial.lower().strip()
- ):
- players[team].append(player.xpath("a"))
- break
- except ValueError:
- pass
- else:
- player_id = (player_id.split()[0], player_id.split()[-1])
- try:
- i = self.names["last"][team].index(player_id[1].lower().strip())
- if self.names["first"][team][i] == "":
- players[team].append(player.xpath("a"))
- else:
- if player_id[0].lower().strip() in self.names["first"][team]:
- players[team].append(player.xpath("a"))
- except ValueError:
- pass
- for team in players:
- for player in players[team]:
- player_id = player.xpath("@href").get().split("?")[1]
- yield Request(
- "http://www.howstat.com/cricket/Statistics/Players/PlayerProgressSummary"
- + self.match_type
- + ".asp?"
- + player_id,
- callback=self.parse_last5,
- cb_kwargs={"team": team},
- )
-
- def parse_last5(self, response, team):
- """
- Gets the data of last 5 games for each player
- """
- name = (
- response.xpath("//td[contains(@class, 'Banner')]/text()")
- .get()
- .strip()
- .split("(")[0]
- .strip()
- )
- if self.match_type != "":
- matches = response.xpath(
- '//table[@class = "TableLined"]/tr[position()>last()-5]/td[2]/a'
- )
- else:
- matches = response.xpath(
- '//table[@class = "TableLined"]/tr[position()>last()-10]/td[2]/a'
- )
- crawl = False
- if len(matches) >= 5:
- crawl = True
- matches = matches[len(matches)-5:]
- for match in matches:
- if crawl:
- yield Request(
- "http://www.howstat.com/cricket/Statistics"
- + match.xpath("@href").get().split("..")[1],
- callback=self.parse_scorecard,
- cb_kwargs={
- "name": name,
- "pid" : response.url.split("?")[-1],
- "team" : team,
- "date" : match.get().split('>')[1].split('<')[0]
- },
- dont_filter=True,
- )
-
- def parse_scorecard(self, response, name, pid, team, date):
- """
- parses the Scorecard
- """
- scorelisxpath = (
- "//table/tr/td/table/tr/td/table/tr[td[a[@href[contains(.,'"
- + pid
- + "')]]]]"
- )
- lis = response.selector.xpath(scorelisxpath)
- batting_dict = {}
- bowling_dict = {}
- keeping_dict = {}
- role = None
- for score in lis:
- if score.xpath("td[1]/text()[contains(.,'†')]").get():
- role = "wk"
- elif score.xpath("td[2]/text()[contains(.,'.')]"):
- if "Maiden" not in bowling_dict:
- bowling_dict["Maiden"] = 0
- bowling_dict["Maiden"] += int(score.xpath("td[3]/text()").get().strip())
- if "wicket" not in bowling_dict:
- bowling_dict["wicket"] = 0
- bowling_dict["wicket"] += int(score.xpath("td[5]/text()").get().strip())
- if "4-wicket-haul" not in bowling_dict:
- bowling_dict["4-wicket-haul"] = 0
- if "5-wicket-haul" not in bowling_dict:
- bowling_dict["5-wicket-haul"] = 0
- if int(score.xpath("td[5]/text()").get().strip()) >= 5:
- bowling_dict["5-wicket-haul"] += 1
- elif int(score.xpath("td[5]/text()").get().strip()) >= 4:
- bowling_dict["4-wicket-haul"] += 1
- else:
- current = score
- for _ in range(0, 4):
- if role == "wk":
- break
- current = current.xpath("following-sibling::tr")
- if current.xpath("td[1][contains(.,'Extras')]"):
- role = "bowl"
- break
- if "runs" not in batting_dict:
- batting_dict["runs"] = 0
- if score.xpath("td[3]/text()").get().strip() == "":
- batting_dict["runs"] = 0
- batting_dict["boundaries"] = 0
- batting_dict["sixes"] = 0
- batting_dict["50"] = 0
- batting_dict["100"] = 0
- batting_dict["duck"] = 0
- continue
- batting_dict["runs"] += int(score.xpath("td[3]/text()").get().strip())
- if "boundaries" not in batting_dict:
- batting_dict["boundaries"] = 0
- batting_dict["boundaries"] += int(
- score.xpath("td[5]/text()").get().strip()
- )
- if "sixes" not in batting_dict:
- batting_dict["sixes"] = 0
- batting_dict["sixes"] += int(score.xpath("td[6]/text()").get().strip())
- if "50" not in batting_dict:
- batting_dict["50"] = 0
- if "100" not in batting_dict:
- batting_dict["100"] = 0
- if "duck" not in batting_dict:
- batting_dict["duck"] = 0
- if int(score.xpath("td[3]/text()").get().strip()) >= 100:
- batting_dict["100"] += 1
- elif int(score.xpath("td[3]/text()").get().strip()) >= 50:
- batting_dict["50"] += 1
- elif (
- int(score.xpath("td[3]/text()").get().strip()) == 50
- and role != "bowl"
- ):
- batting_dict["duck"] += 1
- if role == "wk":
- wk_score = score.xpath(
- "//table/tr/td/table/tr/td/table/tr[td[2][@valign and @width]/text()[contains(.,'"
- + name.split()[-1].strip()
- + "')]]"
- ).xpath("td[2]/text()")
- if wk_score:
- if "Catch" not in keeping_dict:
- keeping_dict["Catch"] = 0
- if "Stump" not in keeping_dict:
- keeping_dict["Stump"] = 0
- for wk_s in wk_score:
- if "c †" in wk_s.get():
- keeping_dict["Catch"] += 1
- elif "st †" in wk_s.get():
- keeping_dict["Stump"] += 1
-
- if bowling_dict != {} and role != "bowl":
- role = "all"
- elif bowling_dict == {} and role != "wk":
- role = "bat"
- score = 0
- match_type = {"_ODI": "ODI", "_T20": "T20", "": "TEST"}
- if role == "wk":
- score += Dream11.wk_dict.get_score(
- keeping_dict, match_type[self.match_type]
- )
- score += Dream11.batting_dict.get_score(
- batting_dict, match_type[self.match_type]
- )
- elif role == "bowl":
- score += Dream11.bowling_dict.get_score(
- bowling_dict, match_type[self.match_type]
- )
- elif role == "all":
- score += Dream11.bowling_dict.get_score(
- bowling_dict, match_type[self.match_type]
- )
- score += Dream11.batting_dict.get_score(
- batting_dict, match_type[self.match_type]
- )
- elif role == "bat":
- score += Dream11.batting_dict.get_score(
- batting_dict, match_type[self.match_type]
- )
-
- yield PlayerItem(
- name=name, score=score, role=role, date=date, team=team, file=self.file
- )
diff --git a/Dockerfile b/docker/11tastic/Dockerfile
old mode 100644
new mode 100755
similarity index 63%
rename from Dockerfile
rename to docker/11tastic/Dockerfile
index f1cf0de6..c12ff3d0
--- a/Dockerfile
+++ b/docker/11tastic/Dockerfile
@@ -6,10 +6,4 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/*
COPY ./requirements.txt /app/requirements.txt
RUN pip install --no-cache-dir --user -r /app/requirements.txt; rm -r /tmp
-
-FROM tiangolo/uvicorn-gunicorn-fastapi:python3.8-slim
-COPY --from=compile-image /root/.local /root/.local
COPY ./app /app/app
-COPY ./crawler /app/crawler
-COPY ./scrapy.cfg /app/scrapy.cfg
-ENV PYTHONPATH=/app
\ No newline at end of file
diff --git a/docker/docker-compose-test.yaml b/docker/docker-compose-test.yaml
new file mode 100644
index 00000000..8c092e60
--- /dev/null
+++ b/docker/docker-compose-test.yaml
@@ -0,0 +1,17 @@
+version: '3.3'
+services:
+ espncricinfo:
+ build:
+ context: ..
+ dockerfile: docker/espncricinfo/Dockerfile
+ ports:
+ - "9080:9080"
+ environment:
+ - LOG_LEVEL=DEBUG
+ test:
+ build:
+ context: ..
+ dockerfile: docker/test/Dockerfile
+ depends_on:
+ - espncricinfo
+
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker/docker-compose.yaml
old mode 100644
new mode 100755
similarity index 50%
rename from docker-compose.yaml
rename to docker/docker-compose.yaml
index 3ffde91a..04d3749f
--- a/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -1,14 +1,22 @@
version: '3.3'
services:
+ espncricinfo:
+ image: espncricinfo:latest
+ ports:
+ - "9080:9080"
+ environment:
+ - LOG_LEVEL=DEBUG
app:
- image: best11fantasycricket:latest
+ image: best11:latest
+ depends_on:
+ - espncricinfo
ports:
- "8080:80"
environment:
- MAX_WORKERS=1
- - LOG_LEVEL=DEBUG
deploy:
resources:
limits:
cpus: '1'
- memory: 100M
\ No newline at end of file
+ memory: 100M
+
\ No newline at end of file
diff --git a/docker/espncricinfo/Dockerfile b/docker/espncricinfo/Dockerfile
new file mode 100644
index 00000000..d1116f37
--- /dev/null
+++ b/docker/espncricinfo/Dockerfile
@@ -0,0 +1,11 @@
+FROM python:3
+
+WORKDIR /crawler
+
+RUN pip install --no-cache-dir scrapyrt; rm -r /tmp
+
+COPY ./espncricinfo /crawler/espncricinfo
+COPY ./scrapy.cfg /crawler/scrapy.cfg
+
+EXPOSE 9080
+CMD ["scrapyrt", "-i", "0.0.0.0"]
\ No newline at end of file
diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile
new file mode 100644
index 00000000..e9a86b0d
--- /dev/null
+++ b/docker/test/Dockerfile
@@ -0,0 +1,13 @@
+FROM python:3
+
+WORKDIR /test
+
+COPY ./requirements.txt /test/requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt; rm -r /tmp
+RUN pip install --no-cache-dir pytest;
+
+COPY ./test /test/test
+COPY ./app /test/app
+
+CMD ["pytest"]
+
diff --git a/espncricinfo/__init__.py b/espncricinfo/__init__.py
new file mode 100755
index 00000000..e69de29b
diff --git a/espncricinfo/items.py b/espncricinfo/items.py
new file mode 100755
index 00000000..07a8cb46
--- /dev/null
+++ b/espncricinfo/items.py
@@ -0,0 +1,37 @@
+# Define here the models for your scraped items
+#
+# See documentation in:
+# https://docs.scrapy.org/en/latest/topics/items.html
+
+import scrapy
+
+
+class PlayerItem(scrapy.Item):
+
+ name = scrapy.Field()
+ image = scrapy.Field()
+ role = scrapy.Field()
+ player_id = scrapy.Field()
+
+
+class ScoreItem(scrapy.Item):
+
+ runs = scrapy.Field()
+ boundaries = scrapy.Field()
+ sixes = scrapy.Field()
+ wicket = scrapy.Field()
+ Maiden = scrapy.Field()
+ Catch = scrapy.Field()
+ Stump = scrapy.Field()
+ match_id = scrapy.Field()
+
+
+class LiveMatchItem(scrapy.Item):
+
+ team1 = scrapy.Field()
+ team2 = scrapy.Field()
+ match_id = scrapy.Field()
+ team1_squad = scrapy.Field()
+ team2_squad = scrapy.Field()
+ team1_id = scrapy.Field()
+ team2_id = scrapy.Field()
diff --git a/crawler/settings.py b/espncricinfo/settings.py
old mode 100644
new mode 100755
similarity index 61%
rename from crawler/settings.py
rename to espncricinfo/settings.py
index 4a6493f8..467298b2
--- a/crawler/settings.py
+++ b/espncricinfo/settings.py
@@ -1,20 +1,4 @@
-"""
- Copyright (C) 2020 Royston E Tauro & Sammith S Bharadwaj & Shreyas Raviprasad
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see
.
-"""
-# Scrapy settings for cricketcrawler project
+# Scrapy settings for espncricinfo project
#
# For simplicity, this file contains only settings considered important or
# commonly used. You can find more settings consulting the documentation:
@@ -23,16 +7,18 @@
# https://docs.scrapy.org/en/latest/topics/downloader-middleware.html
# https://docs.scrapy.org/en/latest/topics/spider-middleware.html
-BOT_NAME = "crawler"
+import os
-SPIDER_MODULES = ["crawler.spiders"]
-NEWSPIDER_MODULE = "crawler.spiders"
+BOT_NAME = "espncricinfo"
+
+SPIDER_MODULES = ["espncricinfo.spiders"]
+NEWSPIDER_MODULE = "espncricinfo.spiders"
# Crawl responsibly by identifying yourself (and your website) on the user-agent
-# USER_AGENT = 'cricketcrawler (+http://www.yourdomain.com)'
+# USER_AGENT = 'espncricinfo (+http://www.yourdomain.com)'
-# Obey robots.txt rules-
+# Obey robots.txt rules
ROBOTSTXT_OBEY = True
# Configure maximum concurrent requests performed by Scrapy (default: 16)
@@ -41,7 +27,7 @@
# Configure a delay for requests for the same website (default: 0)
# See https://docs.scrapy.org/en/latest/topics/settings.html#download-delay
# See also autothrottle settings and docs
-DOWNLOAD_DELAY = 0.5
+# DOWNLOAD_DELAY = 3
# The download delay setting will honor only one of:
# CONCURRENT_REQUESTS_PER_DOMAIN = 16
# CONCURRENT_REQUESTS_PER_IP = 16
@@ -60,14 +46,17 @@
# Enable or disable spider middlewares
# See https://docs.scrapy.org/en/latest/topics/spider-middleware.html
-# SPIDER_MIDDLEWARES = {
-# 'cricketcrawler.middlewares.CricketcrawlerSpiderMiddleware': 543,
-# }
-
# Enable or disable downloader middlewares
+if os.getenv("TEST"):
+ SPIDER_MIDDLEWARES = {
+ 'scrapy_autounit.AutounitMiddleware': 950
+ }
+ AUTOUNIT_ENABLED = True
+
+
# See https://docs.scrapy.org/en/latest/topics/downloader-middleware.html
# DOWNLOADER_MIDDLEWARES = {
-# 'cricketcrawler.middlewares.CricketcrawlerDownloaderMiddleware': 543,
+# 'espncricinfo.middlewares.EspncricinfoDownloaderMiddleware': 543,
# }
# Enable or disable extensions
@@ -78,29 +67,27 @@
# Configure item pipelines
# See https://docs.scrapy.org/en/latest/topics/item-pipeline.html
-ITEM_PIPELINES = {
- "crawler.pipelines.CricketcrawlerPipeline": 300,
-}
+# ITEM_PIPELINES = {
+# 'espncricinfo.pipelines.EspncricinfoPipeline': 300,
+# }
# Enable and configure the AutoThrottle extension (disabled by default)
# See https://docs.scrapy.org/en/latest/topics/autothrottle.html
-AUTOTHROTTLE_ENABLED = True
+# AUTOTHROTTLE_ENABLED = True
# The initial download delay
-AUTOTHROTTLE_START_DELAY = 1
+# AUTOTHROTTLE_START_DELAY = 5
# The maximum download delay to be set in case of high latencies
-AUTOTHROTTLE_MAX_DELAY = 60
+# AUTOTHROTTLE_MAX_DELAY = 60
# The average number of requests Scrapy should be sending in parallel to
-# each remote serverHTTP status code is not handled or not allowed
-AUTOTHROTTLE_TARGET_CONCURRENCY = 1.0
+# each remote server
+# AUTOTHROTTLE_TARGET_CONCURRENCY = 1.0
# Enable showing throttling stats for every response received:
-AUTOTHROTTLE_DEBUG = True
+# AUTOTHROTTLE_DEBUG = False
# Enable and configure HTTP caching (disabled by default)
# See https://docs.scrapy.org/en/latest/topics/downloader-middleware.html#httpcache-middleware-settings
HTTPCACHE_ENABLED = True
HTTPCACHE_EXPIRATION_SECS = 0
HTTPCACHE_DIR = "httpcache"
-HTTPCACHE_IGNORE_HTTP_CODES = [500]
+HTTPCACHE_IGNORE_HTTP_CODES = []
HTTPCACHE_STORAGE = "scrapy.extensions.httpcache.FilesystemCacheStorage"
-
-RETRY_HTTP_CODES = [502, 503, 504, 400, 408]
diff --git a/espncricinfo/spiders/__init__.py b/espncricinfo/spiders/__init__.py
new file mode 100755
index 00000000..ebd689ac
--- /dev/null
+++ b/espncricinfo/spiders/__init__.py
@@ -0,0 +1,4 @@
+# This package will contain the spiders of your Scrapy project
+#
+# Please refer to the documentation for information on how to create and manage
+# your spiders.
diff --git a/espncricinfo/spiders/match-spider.py b/espncricinfo/spiders/match-spider.py
new file mode 100755
index 00000000..39ba3e60
--- /dev/null
+++ b/espncricinfo/spiders/match-spider.py
@@ -0,0 +1,99 @@
+import scrapy
+from espncricinfo.items import ScoreItem
+
+
+class MatchesSpider(scrapy.Spider):
+
+ name = "espn-matches"
+ allowed_domains = ["espncricinfo.com"]
+
+ def start_requests(self):
+ return [
+ scrapy.Request(
+ url="https://stats.espncricinfo.com/ci/engine/player/253802.html?class=1&orderby=start&orderbyad=reverse&template=results&type=allround&view=match",
+ callback=self.parse,
+ )
+ ]
+
+ def parse(self, response):
+
+ matches = response.selector.xpath(
+ "//a[@href[contains(. , '/ci/engine/match')] and @title]"
+ )[:5]
+ pid = response.url.split(".html")[0].split("player/")[1]
+ score_dict = {
+ "runs": None,
+ "boundaries": None,
+ "sixes": None,
+ "wicket": None,
+ "Maiden": None,
+ "Catch": None,
+ "Stump": None,
+ }
+ keeping_stats = response.selector.xpath(
+ "//table[caption[contains(.,'Match by match list')]]//tr[td]"
+ )[:5]
+ for i, match in enumerate(matches):
+ score_dict["Catch"] = score_dict["Stump"] = 0
+ if "Test" in match.xpath("text()").get():
+ score_dict["Catch"] += int(
+ keeping_stats[i].xpath("td[6]/text()").get().strip()
+ )
+ score_dict["Catch"] += int(
+ keeping_stats[i].xpath("td[7]/text()").get().strip()
+ )
+ elif (
+ "ODI" in match.xpath("text()").get()
+ or "T20" in match.xpath("text()").get()
+ ):
+ score_dict["Catch"] += int(
+ keeping_stats[i].xpath("td[4]/text()").get().strip()
+ )
+ score_dict["Catch"] += int(
+ keeping_stats[i].xpath("td[5]/text()").get().strip()
+ )
+ yield scrapy.Request(
+ url="https://www.espncricinfo.com" + match.xpath("@href").get(),
+ callback=self.parse_match,
+ cb_kwargs={
+ "pid": pid,
+ "score_dict": score_dict,
+ "match_id": match.xpath("text()").get(),
+ },
+ )
+
+ def parse_match(self, response, pid, score_dict, match_id):
+
+ batsman = response.selector.xpath(
+ "//table[@class='table batsman']//tr[td[a[@href[contains(., '"
+ + pid
+ + "')]]]]"
+ )
+ if batsman:
+ score_dict["runs"] = score_dict["boundaries"] = score_dict["sixes"] = 0
+ for bat in batsman:
+ score_dict["runs"] += int(bat.xpath("td[3]/text()").get().strip())
+ score_dict["boundaries"] += int(bat.xpath("td[6]/text()").get().strip())
+ score_dict["sixes"] += int(bat.xpath("td[7]/text()").get().strip())
+
+ bowler = response.selector.xpath(
+ "//table[@class='table bowler']//tr[td[a[@href[contains(., '"
+ + pid
+ + "')]]]]"
+ )
+ if bowler:
+ score_dict["wicket"] = score_dict["Maiden"] = 0
+ for bowl in bowler:
+ score_dict["wicket"] += int(bowl.xpath("td[3]/text()").get().strip())
+ score_dict["Maiden"] += int(bowl.xpath("td[5]/text()").get().strip())
+
+ yield ScoreItem(
+ runs=score_dict["runs"],
+ boundaries=score_dict["boundaries"],
+ sixes=score_dict["sixes"],
+ wicket=score_dict["wicket"],
+ Maiden=score_dict["Maiden"],
+ Catch=score_dict["Catch"],
+ Stump=score_dict["Stump"],
+ match_id=match_id,
+ )
diff --git a/espncricinfo/spiders/player-spider.py b/espncricinfo/spiders/player-spider.py
new file mode 100755
index 00000000..e4078800
--- /dev/null
+++ b/espncricinfo/spiders/player-spider.py
@@ -0,0 +1,32 @@
+import scrapy
+from espncricinfo.items import PlayerItem
+
+
+class PlayerListSpider(scrapy.Spider):
+
+ name = "espn-players"
+ allowed_domains = ["espncricinfo.com"]
+
+ def start_requests(self):
+ return [
+ scrapy.Request(
+ url="https://www.espncricinfo.com/ci/content/player/253802.html",
+ callback=self.parse,
+ )
+ ]
+
+ def parse(self, response):
+
+ name = response.selector.xpath("//div[@class='ciPlayernametxt']/div/h1/text()")
+ role = response.selector.xpath(
+ "//p[@class='ciPlayerinformationtxt' and b/text()[contains(.,'Playing role')]]/span/text()"
+ )
+ image = response.selector.xpath(
+ "//img[@src[contains(.,'espncricinfo.com/inline/content')]]"
+ ).xpath("@src")
+
+ yield PlayerItem(
+ name=name.get(),
+ role=role.get(),
+ image=image.get(),
+ )
diff --git a/espncricinfo/spiders/upcoming-spider.py b/espncricinfo/spiders/upcoming-spider.py
new file mode 100755
index 00000000..304ceec5
--- /dev/null
+++ b/espncricinfo/spiders/upcoming-spider.py
@@ -0,0 +1,86 @@
+import scrapy
+import datetime
+import json
+from espncricinfo.items import LiveMatchItem
+
+
+class LiveSpider(scrapy.Spider):
+
+ name = "espn-live"
+ allowed_domains = ["espncricinfo.com"]
+
+ def start_requests(self):
+ return [
+ scrapy.Request(
+ url="https://www.espncricinfo.com/live-cricket-match-schedule-fixtures",
+ callback=self.parse,
+ )
+ ]
+
+ def parse(self, response):
+
+ matches = response.selector.xpath("//a[@class = 'match-info-link-FIXTURES']")
+ now = datetime.datetime.now().date()
+
+ for match in matches:
+
+ try:
+ if (
+ datetime.datetime.strptime(
+ match.xpath("div/div/div/span/text()").get().split(",")[0],
+ "%d-%b-%Y",
+ ).date()
+ - now
+ ).days <= 7:
+ match_link = [
+ match.xpath("@href").get()
+ for team_div in match.xpath(
+ "div/div/div[@class='teams']/div[@class='team']"
+ )
+ if team_div.xpath("div/p/text()").get()
+ in [
+ "India",
+ "Australia",
+ "England",
+ "Bangladesh",
+ "New Zealand",
+ "South Africa",
+ "Pakistan",
+ "Sri Lanka",
+ "West Indies",
+ "Afghanistan",
+ ]
+ ]
+ if match_link:
+ yield scrapy.Request(
+ url="https://www.espncricinfo.com/matches/engine/match/"
+ + match_link[0]
+ .split("/live-cricket-score")[0]
+ .split("-")[-1]
+ + ".json",
+ callback=self.parse_match,
+ )
+ except ValueError:
+ pass
+
+ def parse_match(self, response):
+
+ match_data = json.loads(response.text)
+ team1_squad = []
+ team2_squad = []
+ for squad in match_data["team"][0]["squad"]:
+ team1_squad.append(
+ {"name": squad["card_long"], "player_id": squad["object_id"]}
+ )
+ for squad in match_data["team"][1]["squad"]:
+ team2_squad.append({"name": squad["card_long"], "id": squad["object_id"]})
+
+ yield LiveMatchItem(
+ team1=match_data["match"]["team1_name"],
+ team2=match_data["match"]["team2_name"],
+ match_id=match_data["match"]["international_class_id"],
+ team1_squad=team1_squad,
+ team2_squad=team2_squad,
+ team1_id=match_data["match"]["team1_id"],
+ team2_id=match_data["match"]["team2_id"],
+ )
diff --git a/requirements.txt b/requirements.txt
old mode 100644
new mode 100755
index 5a3d3ab1..50eea6c6
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
sklearn==0.0
fastapi[all]==0.63.0
-pycricbuzz==2.4
scrapy==2.4
+scrapyrt==0.11.0
\ No newline at end of file
diff --git a/scrapy.cfg b/scrapy.cfg
old mode 100644
new mode 100755
index 83a4eef6..a5cd4ae5
--- a/scrapy.cfg
+++ b/scrapy.cfg
@@ -4,8 +4,9 @@
# https://scrapyd.readthedocs.io/en/latest/deploy.html
[settings]
-default = crawler.settings
+default = espncricinfo.settings
[deploy]
#url = http://localhost:6800/
-project = crawler
+project = espncricinfo
+
diff --git a/test/__init__.py b/test/__init__.py
index 9102b2dc..e69de29b 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -1,7 +0,0 @@
-"""
-Setting paths for testing
-"""
-
-import sys
-
-sys.path.insert(1, "..")
diff --git a/test/test_main.py b/test/test_main.py
index 22ffacb3..970e1975 100644
--- a/test/test_main.py
+++ b/test/test_main.py
@@ -4,7 +4,7 @@
import os
from fastapi.testclient import TestClient
from app.main import app
-from app.fantasy_cricket.utils import Matches
+from app.fantasy_cricket.matches import Matches
client = TestClient(app)
cricket = Matches()
@@ -16,21 +16,13 @@ def test_home():
assert response.status_code == 200
-def test_home_post():
- teams = [
- [match[0]["name"], match[1]["name"]]
- for match in cricket.get_match()
- ]
- for team in teams:
- response = client.post("/", data={"match": team[0]+" vs "+team[1]})
- assert response.status_code == 302
-
def test_playing_11():
- teams = [
- [match[0]["name"], match[1]["name"]]
- for match in cricket.get_match()
- ]
- for team in teams:
- response = client.get("/playing11?team1="+team[0]+"&team2="+team[1],
- data={"match": team[0]+" vs "+team[1]})
+
+ matches = cricket.get_upcoming_match()
+ for teams in matches:
+ response = client.get("/playing11?team1="+ teams["team1"] + "&team2=" + teams["team2"])
assert response.status_code == 200
+
+def test_results():
+ response = client.get("/results?match_type=1&team=India&team=England&player_team1=253802&player_team1=277916&player_team1=398438&player_team1=26421&player_team1=625383&player_team1=940973&player_team1=625371&player_team1=931581&player_team1=32540&player_team1=422108&player_team1=34102&player_team2=303669&player_team2=8917&player_team2=8608&player_team2=669855&player_team2=646847&player_team2=10617&player_team2=398778&player_team2=308967&player_team2=364788&player_team2=641423&player_team2=455524")
+ assert response.status_code == 200