Skip to content

Make multigtfs easily extensible #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make multigtfs easily extensible #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions multigtfs/models/feed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,20 @@ class Meta:
db_table = 'feed'
app_label = 'multigtfs'

_gtfs_order = [
Agency, Stop, Route, Service, ServiceDate, ShapePoint, Trip,
StopTime, Frequency, Fare, FareRule, Transfer, FeedInfo,
]

@classmethod
def register_model(cls, klass):
cls._gtfs_order.append(klass)
return klass

@classmethod
def unregister_model(cls, klass):
cls._gtfs_order.remove(klass)

def __str__(self):
if self.name:
return "%d %s" % (self.id, self.name)
Expand Down Expand Up @@ -88,14 +102,10 @@ def import_gtfs(self, gtfs_obj):
opener = opener_from_zipfile(zfile)
filelist = zfile.namelist()

gtfs_order = (
Agency, Stop, Route, Service, ServiceDate, ShapePoint, Trip,
StopTime, Frequency, Fare, FareRule, Transfer, FeedInfo,
)
post_save.disconnect(dispatch_uid='post_save_shapepoint')
post_save.disconnect(dispatch_uid='post_save_stop')
try:
for klass in gtfs_order:
for klass in self._gtfs_order:
for f in filelist:
if f.endswith(klass._filename):
start_time = time.time()
Expand Down Expand Up @@ -155,12 +165,7 @@ def export_gtfs(self, gtfs_file):
total_start = time.time()
z = open_writable_zipfile(gtfs_file)

gtfs_order = (
Agency, Service, ServiceDate, Fare, FareRule, FeedInfo, Frequency,
Route, ShapePoint, StopTime, Stop, Transfer, Trip,
)

for klass in gtfs_order:
for klass in sorted(self._gtfs_order, key=lambda k: k._filename):
start_time = time.time()
content = klass.export_txt(self)
if content:
Expand Down