Skip to content

Commit

Permalink
Merge pull request #29 from grahamu/gu-black-isort-flake8
Browse files Browse the repository at this point in the history 
Gu black isort flake8
  • Loading branch information
@grahamu
grahamu authored Jun 19, 2024
2 parents 94db2e0 + 9ba0c40 commit 7ca7daa
Show file tree
Hide file tree
Showing 54 changed files with 1,250 additions and 942 deletions.
8 changes: 8 additions & 0 deletions flyingcracker.code-workspace
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"folders": [
{
"path": "."
}
],
"settings": {}
}
8 changes: 3 additions & 5 deletions flyingcracker/cam/admin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@


class CamAdmin(admin.ModelAdmin):

list_filter = ('category', 'state')

list_filter = ("category", "state")

class Admin:
fieldset = (
(None, {'fields':
('title', 'url', 'category', 'description', 'state')
}),
(None, {"fields": ("title", "url", "category", "description", "state")}),
)


Expand Down
6 changes: 6 additions & 0 deletions flyingcracker/cam/apps.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.apps import AppConfig


class CamConfig(AppConfig):
default_auto_field = "django.db.models.BigAutoField"
name = "cam"
116 changes: 99 additions & 17 deletions flyingcracker/cam/migrations/0001_initial.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,122 @@

class Migration(migrations.Migration):

dependencies = [
]
dependencies = []

operations = [
migrations.CreateModel(
name='Cam',
name="Cam",
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('title', models.CharField(max_length=100)),
('url', models.URLField()),
('description', models.TextField(blank=True)),
('state', localflavor.us.models.USStateField(default=b'CO', max_length=2, choices=[(b'AL', b'Alabama'), (b'AK', b'Alaska'), (b'AS', b'American Samoa'), (b'AZ', b'Arizona'), (b'AR', b'Arkansas'), (b'AA', b'Armed Forces Americas'), (b'AE', b'Armed Forces Europe'), (b'AP', b'Armed Forces Pacific'), (b'CA', b'California'), (b'CO', b'Colorado'), (b'CT', b'Connecticut'), (b'DE', b'Delaware'), (b'DC', b'District of Columbia'), (b'FL', b'Florida'), (b'GA', b'Georgia'), (b'GU', b'Guam'), (b'HI', b'Hawaii'), (b'ID', b'Idaho'), (b'IL', b'Illinois'), (b'IN', b'Indiana'), (b'IA', b'Iowa'), (b'KS', b'Kansas'), (b'KY', b'Kentucky'), (b'LA', b'Louisiana'), (b'ME', b'Maine'), (b'MD', b'Maryland'), (b'MA', b'Massachusetts'), (b'MI', b'Michigan'), (b'MN', b'Minnesota'), (b'MS', b'Mississippi'), (b'MO', b'Missouri'), (b'MT', b'Montana'), (b'NE', b'Nebraska'), (b'NV', b'Nevada'), (b'NH', b'New Hampshire'), (b'NJ', b'New Jersey'), (b'NM', b'New Mexico'), (b'NY', b'New York'), (b'NC', b'North Carolina'), (b'ND', b'North Dakota'), (b'MP', b'Northern Mariana Islands'), (b'OH', b'Ohio'), (b'OK', b'Oklahoma'), (b'OR', b'Oregon'), (b'PA', b'Pennsylvania'), (b'PR', b'Puerto Rico'), (b'RI', b'Rhode Island'), (b'SC', b'South Carolina'), (b'SD', b'South Dakota'), (b'TN', b'Tennessee'), (b'TX', b'Texas'), (b'UT', b'Utah'), (b'VT', b'Vermont'), (b'VI', b'Virgin Islands'), (b'VA', b'Virginia'), (b'WA', b'Washington'), (b'WV', b'West Virginia'), (b'WI', b'Wisconsin'), (b'WY', b'Wyoming')])),
(
"id",
models.AutoField(
verbose_name="ID",
serialize=False,
auto_created=True,
primary_key=True,
),
),
("title", models.CharField(max_length=100)),
("url", models.URLField()),
("description", models.TextField(blank=True)),
(
"state",
localflavor.us.models.USStateField(
default=b"CO",
max_length=2,
choices=[
(b"AL", b"Alabama"),
(b"AK", b"Alaska"),
(b"AS", b"American Samoa"),
(b"AZ", b"Arizona"),
(b"AR", b"Arkansas"),
(b"AA", b"Armed Forces Americas"),
(b"AE", b"Armed Forces Europe"),
(b"AP", b"Armed Forces Pacific"),
(b"CA", b"California"),
(b"CO", b"Colorado"),
(b"CT", b"Connecticut"),
(b"DE", b"Delaware"),
(b"DC", b"District of Columbia"),
(b"FL", b"Florida"),
(b"GA", b"Georgia"),
(b"GU", b"Guam"),
(b"HI", b"Hawaii"),
(b"ID", b"Idaho"),
(b"IL", b"Illinois"),
(b"IN", b"Indiana"),
(b"IA", b"Iowa"),
(b"KS", b"Kansas"),
(b"KY", b"Kentucky"),
(b"LA", b"Louisiana"),
(b"ME", b"Maine"),
(b"MD", b"Maryland"),
(b"MA", b"Massachusetts"),
(b"MI", b"Michigan"),
(b"MN", b"Minnesota"),
(b"MS", b"Mississippi"),
(b"MO", b"Missouri"),
(b"MT", b"Montana"),
(b"NE", b"Nebraska"),
(b"NV", b"Nevada"),
(b"NH", b"New Hampshire"),
(b"NJ", b"New Jersey"),
(b"NM", b"New Mexico"),
(b"NY", b"New York"),
(b"NC", b"North Carolina"),
(b"ND", b"North Dakota"),
(b"MP", b"Northern Mariana Islands"),
(b"OH", b"Ohio"),
(b"OK", b"Oklahoma"),
(b"OR", b"Oregon"),
(b"PA", b"Pennsylvania"),
(b"PR", b"Puerto Rico"),
(b"RI", b"Rhode Island"),
(b"SC", b"South Carolina"),
(b"SD", b"South Dakota"),
(b"TN", b"Tennessee"),
(b"TX", b"Texas"),
(b"UT", b"Utah"),
(b"VT", b"Vermont"),
(b"VI", b"Virgin Islands"),
(b"VA", b"Virginia"),
(b"WA", b"Washington"),
(b"WV", b"West Virginia"),
(b"WI", b"Wisconsin"),
(b"WY", b"Wyoming"),
],
),
),
],
options={
'ordering': ['title', 'url'],
"ordering": ["title", "url"],
},
bases=(models.Model,),
),
migrations.CreateModel(
name='Category',
name="Category",
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('title', models.CharField(max_length=30)),
(
"id",
models.AutoField(
verbose_name="ID",
serialize=False,
auto_created=True,
primary_key=True,
),
),
("title", models.CharField(max_length=30)),
],
options={
'ordering': ['title'],
'verbose_name_plural': 'categories',
"ordering": ["title"],
"verbose_name_plural": "categories",
},
bases=(models.Model,),
),
migrations.AddField(
model_name='cam',
name='category',
field=models.ForeignKey(to='cam.Category', on_delete=models.CASCADE),
model_name="cam",
name="category",
field=models.ForeignKey(to="cam.Category", on_delete=models.CASCADE),
preserve_default=True,
),
]
8 changes: 4 additions & 4 deletions flyingcracker/cam/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ def __str__(self):
return self.title

class Meta:
ordering = ['title']
ordering = ["title"]
verbose_name_plural = "categories"


class CamManager(models.Manager):

def belongs_to_category(self, cat=None):
'''
"""
Returns a queryset of all Cams associated with specified Category.
'''
"""
qs = super(type(self), self).get_query_set()
if cat:
qs = qs.filter(category=cat)
Expand All @@ -39,4 +39,4 @@ def __str__(self):
return self.title

class Meta:
ordering = ['title', 'url']
ordering = ["title", "url"]
8 changes: 4 additions & 4 deletions flyingcracker/cam/urls.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

from . import views

app_name = 'cam'
app_name = "cam"
urlpatterns = [
re_path(r'^$', views.cam_view, name='root'),
re_path(r'^list/$', views.cam_list, name='list'),
re_path(r'^image/$', views.cam_image, name='image'),
re_path(r"^$", views.cam_view, name="root"),
re_path(r"^list/$", views.cam_list, name="list"),
re_path(r"^image/$", views.cam_image, name="image"),
]
38 changes: 19 additions & 19 deletions flyingcracker/cam/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@ def cam_view(request):
c_list, image, category = get_cam_list(category_id, cam_id)

context = {
'catlist': cat_list,
'category': category,
'camlist': c_list,
'image': image,
"catlist": cat_list,
"category": category,
"camlist": c_list,
"image": image,
}

agent = request.META.get('HTTP_USER_AGENT')
if (agent and agent.find('iPhone') != -1) or 'iphone' in request.GET:
if 'iui' in request.GET:
return render(request, 'cam/iphone/cam.html', context)
agent = request.META.get("HTTP_USER_AGENT")
if (agent and agent.find("iPhone") != -1) or "iphone" in request.GET:
if "iui" in request.GET:
return render(request, "cam/iphone/cam.html", context)
else:
return render(request, 'cam/iphone/cam_initial.html', context)
return render(request, "cam/iphone/cam_initial.html", context)
else:
return render(request, 'cam/cam.html', context)
return render(request, "cam/cam.html", context)


def cam_list(request):
Expand All @@ -40,7 +40,7 @@ def cam_list(request):
"""
if request.is_ajax():
cat_id = request.POST.get('cat', None)
cat_id = request.POST.get("cat", None)
if cat_id:
try:
category = Category.objects.get(id=cat_id)
Expand All @@ -58,12 +58,12 @@ def cam_list(request):
index = 0
obj_dict = {}
for obj in c_list:
obj_dict[index] = dict({'id': obj.id, 'title': obj.title})
obj_dict[index] = dict({"id": obj.id, "title": obj.title})
index = index + 1

obj_dict['length'] = index
obj_dict['category'] = cat_id
response_dict['images'] = obj_dict
obj_dict["length"] = index
obj_dict["category"] = cat_id
response_dict["images"] = obj_dict
return JsonResponse(response_dict)
else:
return cam_view(request)
Expand All @@ -74,18 +74,18 @@ def cam_image(request):
Get a specific image URL.
"""
if request.is_ajax() or request.GET.get('xhr'):
if request.is_ajax() or request.GET.get("xhr"):
try:
id = request.POST.get('id')
id = request.POST.get("id")
if not id:
id = request.GET.get('id')
id = request.GET.get("id")
image = Cam.objects.get(id=id)
except Cam.DoesNotExist:
image = None
valid = False
else:
valid = True
return JsonResponse({'image': image, 'valid': valid})
return JsonResponse({"image": image, "valid": valid})
else:
return cam_view(request)

Expand Down
Loading

0 comments on commit 7ca7daa

Please sign in to comment.