FlightRadarAPI 1.3.12__tar.gz → 1.3.14__tar.gz

{flightradarapi-1.3.12 → flightradarapi-1.3.14}/.gitignore

@@ -3,4 +3,5 @@ dist
 *.pytest_cache
 *.egg-info
 .idea/
-venv/
+venv/
+node_modules/

{flightradarapi-1.3.12 → flightradarapi-1.3.14}/FlightRadar24/__init__.py

@@ -13,7 +13,7 @@ https://www.flightradar24.com/terms-and-conditions
 """
 
 __author__ = "Jean Loui Bernard Silva de Jesus"
-__version__ = "1.3.12"
+__version__ = "1.3.14"
 
 from .api import FlightRadar24API, FlightTrackerConfig
-from .entities import Airport, Flight
+from .entities import Airport, Entity, Flight

{flightradarapi-1.3.12 → flightradarapi-1.3.14}/FlightRadar24/api.py

@@ -61,6 +61,8 @@ class FlightRadar24API(object):
         """
         Download the logo of an airline from FlightRadar24 and return it as bytes.
         """
+        iata, icao = iata.upper(), icao.upper()
+        
         first_logo_url = Core.airline_logo_url.format(iata, icao)
 
         # Try to get the image by the first URL option.
@@ -94,7 +96,7 @@ class FlightRadar24API(object):
 
         :param code: ICAO or IATA of the airport
         :param flight_limit: Limit of flights related to the airport
-        :param page: page of result to display
+        :param page: Page of result to display
         """
         request_params = {"format": "json"}
 
@@ -209,16 +211,13 @@ class FlightRadar24API(object):
         if not str(status_code).startswith("4"):
             return response.get_content(), flag_url.split(".")[-1]
 
-    def get_flight_details(self, flight: Union[Flight, str]) -> Dict[Any, Any]:
+    def get_flight_details(self, flight: Flight) -> Dict[Any, Any]:
         """
         Return the flight details from Data Live FlightRadar24.
 
-        :param flight: A Flight instance or the Flight ID (no longer recommended)
+        :param flight: A Flight instance
         """
-        # TODO: Only accept Flight instance at a next version.
-        flight_id: str = flight if isinstance(flight, str) else flight.id
-
-        response = APIRequest(Core.flight_data_url.format(flight_id), headers = Core.json_headers)
+        response = APIRequest(Core.flight_data_url.format(flight.id), headers = Core.json_headers)
         return response.get_content()
 
     def get_flights(
@@ -267,7 +266,7 @@ class FlightRadar24API(object):
 
             # Set flight details.
             if details:
-                flight_details = self.get_flight_details(flight_id)
+                flight_details = self.get_flight_details(flight)
                 flight.set_flight_details(flight_details)
 
         return flights
@@ -287,6 +286,13 @@ class FlightRadar24API(object):
 
         return self.__login_data["userData"].copy()
 
+    def get_most_tracked(self) -> Dict:
+        """
+        Return the most tracked data.
+        """
+        response = APIRequest(Core.most_tracked_url, headers = Core.json_headers)
+        return response.get_content()
+
     def get_zones(self) -> Dict[str, Dict]:
         """
         Return all major zones on the globe.
@@ -301,7 +307,7 @@ class FlightRadar24API(object):
 
     def search(self, query: str) -> Dict:
         """
-        Return the search result
+        Return the search result.
         """
         response = APIRequest(Core.search_data_url.format(query), headers = Core.json_headers)
         results = response.get_content().get("results", [])
@@ -318,13 +324,6 @@ class FlightRadar24API(object):
             counted_total += count
         return data
 
-    def get_most_tracked(self) -> Dict:
-        """
-        Return the most tracked data
-        """
-        response = APIRequest(Core.most_tracked_url, headers = Core.json_headers)
-        return response.get_content()
-
     def is_logged_in(self) -> bool:
         """
         Check if the user is logged into the FlightRadar24 account.

{flightradarapi-1.3.12 → flightradarapi-1.3.14}/FlightRadar24/entities/flight.py

@@ -81,7 +81,7 @@ class Flight(Entity):
 
     def get_altitude(self) -> str:
         """
-        Return the formatted altitude, with the unit of measure
+        Return the formatted altitude, with the unit of measure.
         """
         return "{} ft".format(self.altitude)
 
@@ -89,7 +89,7 @@ class Flight(Entity):
         """
         Return the formatted flight level, with the unit of measure.
         """
-        return str(self.altitude)[:3] + " FL" if self.altitude > 10000 else self.get_altitude()
+        return str(self.altitude)[:3] + " FL" if self.altitude >= 10000 else self.get_altitude()
 
     def get_ground_speed(self) -> str:
         """

{flightradarapi-1.3.12 → flightradarapi-1.3.14}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: FlightRadarAPI
-Version: 1.3.12
-Summary: API for FlightRadar24
+Version: 1.3.14
+Summary: SDK for FlightRadar24
 Project-URL: Homepage, https://github.com/JeanExtreme002/FlightRadarAPI
 Author-email: Jean Loui Bernard Silva de Jesus <jeanextreme002@gmail.com>
 License-Expression: MIT
@@ -28,9 +28,10 @@ If you want to use the data collected using this SDK commercially, you need to s
 See more information at: https://www.flightradar24.com/terms-and-conditions
 
 [![Python Package](https://github.com/JeanExtreme002/FlightRadarAPI/workflows/Python%20Package/badge.svg)](https://github.com/JeanExtreme002/FlightRadarAPI/actions)
-[![Pypi](https://img.shields.io/pypi/v/FlightRadarAPI)](https://pypi.org/project/FlightRadarAPI/)
+[![Pypi](https://img.shields.io/pypi/v/FlightRadarAPI?logo=pypi)](https://pypi.org/project/FlightRadarAPI/)
 [![License](https://img.shields.io/pypi/l/FlightRadarAPI)](https://pypi.org/project/FlightRadarAPI/)
-[![Python Version](https://img.shields.io/badge/python-3.7%20%7C%203.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-blue)](https://pypi.org/project/FlightRadarAPI/)
+[![Python Version](https://img.shields.io/badge/python-3.7+-8A2BE2)](https://pypi.org/project/FlightRadarAPI/)
+[![Npm](https://img.shields.io/npm/v/flightradarapi?logo=npm&color=red)](https://www.npmjs.com/package/flightradarapi)
 [![Downloads](https://static.pepy.tech/personalized-badge/flightradarapi?period=total&units=international_system&left_color=grey&right_color=orange&left_text=Downloads)](https://pypi.org/project/FlightRadarAPI/)
 
 ## Installing FlightRadarAPI:

{flightradarapi-1.3.12 → flightradarapi-1.3.14}/README.md

@@ -5,9 +5,10 @@ If you want to use the data collected using this SDK commercially, you need to s
 See more information at: https://www.flightradar24.com/terms-and-conditions
 
 [![Python Package](https://github.com/JeanExtreme002/FlightRadarAPI/workflows/Python%20Package/badge.svg)](https://github.com/JeanExtreme002/FlightRadarAPI/actions)
-[![Pypi](https://img.shields.io/pypi/v/FlightRadarAPI)](https://pypi.org/project/FlightRadarAPI/)
+[![Pypi](https://img.shields.io/pypi/v/FlightRadarAPI?logo=pypi)](https://pypi.org/project/FlightRadarAPI/)
 [![License](https://img.shields.io/pypi/l/FlightRadarAPI)](https://pypi.org/project/FlightRadarAPI/)
-[![Python Version](https://img.shields.io/badge/python-3.7%20%7C%203.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-blue)](https://pypi.org/project/FlightRadarAPI/)
+[![Python Version](https://img.shields.io/badge/python-3.7+-8A2BE2)](https://pypi.org/project/FlightRadarAPI/)
+[![Npm](https://img.shields.io/npm/v/flightradarapi?logo=npm&color=red)](https://www.npmjs.com/package/flightradarapi)
 [![Downloads](https://static.pepy.tech/personalized-badge/flightradarapi?period=total&units=international_system&left_color=grey&right_color=orange&left_text=Downloads)](https://pypi.org/project/FlightRadarAPI/)
 
 ## Installing FlightRadarAPI:

{flightradarapi-1.3.12 → flightradarapi-1.3.14}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "FlightRadarAPI"
 dynamic = ["version"]
-description = "API for FlightRadar24"
+description = "SDK for FlightRadar24"
 authors = [
     { name = "Jean Loui Bernard Silva de Jesus", email = "jeanextreme002@gmail.com" },
 ]
@@ -24,6 +24,9 @@ dependencies = [
   "requests",
 ]
 
+[tool.hatch.build.targets.wheel]
+packages = ["FlightRadar24"]
+
 [project.optional-dependencies]
 tests = [
   "pytest",

{flightradarapi-1.3.12 → flightradarapi-1.3.14}/tests/package.py

@@ -2,7 +2,7 @@
 
 import os, sys
 
-current_dir = os.getcwd()
+current_dir = os.path.join(os.getcwd(), "python")
 sys.path.append(current_dir)
 
 from FlightRadar24 import __version__ as version

flightradarapi-1.3.12/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,32 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Set this input '....'
-3. Run the '....'
-4. Scroll down to '....'
-5. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**System (please complete the following information):**
- - OS: [e.g. Windows]
- - Python Version [e.g. 1.10]
-
-**Additional context**
-Add any other context about the problem here.

flightradarapi-1.3.12/.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,19 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-- A clear and concise description of what you want to happen.
-- A clear and concise description of any alternative solutions or features you've considered.
-
-**Is not your feature request related to a problem? Please describe**
-A clear and concise description of how your feature can positively impact the project.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

flightradarapi-1.3.12/.github/ISSUE_TEMPLATE/questioning.md

@@ -1,35 +0,0 @@
----
-name: Questioning
-about: Ask a question about the project
-title: ''
-labels: question
-assignees: ''
-
----
-
-**Is your problem described in the documentation? If so, please describe**
-A clear and concise description of what is confusing in the documentation.
-
-**Describe your question**
-A clear and concise description of what the bug is.
-
-**Is your question reproducible? Please describe**
-Steps to reproduce the behavior:
-
-1. Go to '...'
-2. Set this input '....'
-3. Run the '....'
-4. Scroll down to '....'
-5. See behavior
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**System**
-If applicable, please complete the following information:
-
-1. OS: [e.g. Windows]
-2. Python Version [e.g. 1.10]
-
-**Additional context**
-Add any other context about the problem here.

flightradarapi-1.3.12/.github/workflows/python-package.yml

@@ -1,38 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Python Package
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-  schedule:
-    - cron:  '0 0 */7 * *'
-  workflow_dispatch:
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-    - name: Test with pytest
-      run: |
-        pytest tests -v -s
-    - name: Install package
-      run: |
-        pip install FlightRadar24