Classes restructure

src/pyrmv/__init__.py

@@ -21,10 +21,9 @@ trip = client.trip_find(origin_id=origin.id, dest_id=destination.id)
 """
 
 __name__ = "pyrmv"
-__version__ = "0.3.6"
+__version__ = "1.0.0"
 __license__ = "MIT License"
 __author__ = "Profitroll"
 
-from . import const, enums, errors, raw, utility
+from . import classes, const, enums, errors, raw, utility
-from .classes import *
+from .classes.client import Client
-from .classes.Client import Client

src/pyrmv/classes/__init__.py

@@ -1,9 +1,9 @@
-from .Board import BoardArrival, BoardDeparture, LineArrival, LineDeparture
+from .board import BoardArrival, BoardDeparture, LineArrival, LineDeparture
-from .Client import Client
+from .client import Client
-from .Gis import Gis
+from .gis import Gis
-from .Journey import Journey
+from .journey import Journey
-from .Leg import Leg
+from .leg import Leg
-from .Message import Channel, Message, Url
+from .message import Channel, Message, Url
-from .Stop import Stop, StopTrip
+from .stop import Stop, StopTrip
-from .Ticket import Ticket
+from .ticket import Ticket
-from .Trip import Trip
+from .trip import Trip

src/pyrmv/classes/board.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import Any, Mapping
 
-from pyrmv.classes.Message import Message
+from pyrmv.classes.message import Message
 
 
 class LineArrival:

src/pyrmv/classes/client.py

@@ -1,16 +1,24 @@
 from datetime import datetime, timedelta
 from typing import List, OrderedDict, Union
 
-from pyrmv.classes import *
+from pyrmv.classes import (
+    BoardArrival,
+    BoardDeparture,
+    Journey,
+    Message,
+    Stop,
+    StopTrip,
+    Trip,
+)
 from pyrmv.enums import *
 from pyrmv.raw import board_arrival as raw_board_arrival
-from pyrmv.raw.board_departure import board_departure as raw_board_departure
+from pyrmv.raw import board_departure as raw_board_departure
-from pyrmv.raw.him_search import him_search as raw_him_search
+from pyrmv.raw import him_search as raw_him_search
-from pyrmv.raw.journey_detail import journey_detail as raw_journey_detail
+from pyrmv.raw import journey_detail as raw_journey_detail
-from pyrmv.raw.stop_by_coords import stop_by_coords as raw_stop_by_coords
+from pyrmv.raw import stop_by_coords as raw_stop_by_coords
-from pyrmv.raw.stop_by_name import stop_by_name as raw_stop_by_name
+from pyrmv.raw import stop_by_name as raw_stop_by_name
-from pyrmv.raw.trip_find import trip_find as raw_trip_find
+from pyrmv.raw import trip_find as raw_trip_find
-from pyrmv.raw.trip_recon import trip_recon as raw_trip_recon
+from pyrmv.raw import trip_recon as raw_trip_recon
 from pyrmv.utility import find_exception
 
 try:

src/pyrmv/classes/journey.py

@@ -1,7 +1,7 @@
 from typing import Any, Mapping
 
-from pyrmv.classes.Message import Message
+from pyrmv.classes.message import Message
-from pyrmv.classes.Stop import Stop
+from pyrmv.classes.stop import Stop
 
 
 class Journey:

src/pyrmv/classes/leg.py

@@ -2,9 +2,9 @@ from typing import Any, Mapping
 
 from isodate import parse_duration
 
-from pyrmv.classes.Gis import Gis
+from pyrmv.classes.gis import Gis
-from pyrmv.classes.Message import Message
+from pyrmv.classes.message import Message
-from pyrmv.classes.Stop import StopTrip
+from pyrmv.classes.stop import StopTrip
 
 
 class Leg:

src/pyrmv/classes/message.py

@@ -3,7 +3,7 @@ from typing import Any, Mapping
 
 from isodate import parse_duration
 
-from pyrmv.classes.Stop import Stop
+from pyrmv.classes.stop import Stop
 
 
 class Url:

src/pyrmv/classes/ticket.py

@@ -1,4 +1,4 @@
-class Ticket():
+class Ticket:
     """
     {
         "externalContent": {
@@ -44,9 +44,9 @@ class Ticket():
                 "FreigabeId": "20730",
                 "Freigabe":"2645, 3670, 5001, 5002, 5003, 5004, 5005, 5006, 5011, 5013, 5015, 5021, 5022, 5023, 5031, 5041, 5042, 5046, 5059, 5100, 5233, 6239, 6626, 6636, 6637, 6639, 6648, 6649, 6650, 6655, 6660, 6664, 6691",
                 "FreigabeOverview": "Bad Homburg v.d.Höhe;Bad Soden a.Ts.;Eschborn;Friedrichsdorf;Glashütten"
-        }        
+        }
     }
     """
 
     def __init__(self) -> None:
-        pass
+        pass

src/pyrmv/classes/trip.py

@@ -1,7 +1,7 @@
 from isodate import parse_duration
 
-from pyrmv.classes.Leg import Leg
+from pyrmv.classes.leg import Leg
-from pyrmv.classes.Stop import StopTrip
+from pyrmv.classes.stop import StopTrip
 
 
 class Trip: