Changeset - 36ecf098b059
conservancy/content/copyleft-compliance/vizio.html
Show inline comments
...
 
@@ -50,8 +50,18 @@ Original Complaint (2021-10-19)</li>
 
      ruling denying Vizio's Motion for Summary Judgment</strong></a></li>
 
</ul></li>
 
<li><a
 
href="https://usethesource.sfconservancy.org/tmp_vizio_docs/software-freedom-conservancy-v-vizio-first_amended_complaint-2024-01-10.pdf">SFC's
 
First Amended Complaint (2024-01-10)</li>
 
<li><h5>SFC's Motion for Summary Adjudication</h5>
 
<ul>
 
  <li><a href="https://sfconservancy.org/docs/software-freedom-conservancy-v-vizio_2023-12-01_SFC-Motion-Summary-Adjudication.pdf">SFC's
 
  Motion for Summary Adjudication</a></li></ul></li>
 
  Motion for Summary Adjudication</a></li>
 
  <li><a href="https://usethesource.sfconservancy.org/tmp_vizio_docs/Vizio_response_to_motion_summary_adjudication.pdf">Vizio's
 
  response to SFC's Motion for Summary Adjudication</a></li>
 
  <li><a href="https://usethesource.sfconservancy.org/tmp_vizio_docs/SFC_motion_summary_adjudication_reply_brief.pdf">SFC's
 
  reply to Vizio's response to SFC's Motion for Summary Adjudication</a></li>
 
  <li><a href="https://usethesource.sfconservancy.org/tmp_vizio_docs/order_partially_granting_SFC_motion_summary_adjudication.pdf">Judge's
 
  ruling partially granting SFC's Motion for Summary Adjudication</a></li>
 
</ul></li>
 
</ul>
 

	
conservancy/settings/base.py
Show inline comments
...
 
@@ -124,4 +124,13 @@ LANGUAGE_CODE = 'en-us'
 
USE_TZ = False
 

	
 
STORAGES = {
 
    'default': {
 
        'BACKEND': 'django.core.files.storage.FileSystemStorage',
 
    },
 
    'staticfiles': {
 
        'BACKEND': 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage',
 
    },
 
}
 

	
 
STATIC_URL = '/static/'
 
STATIC_ROOT = BASE_DIR.parent / 'collected_static'
...
 
@@ -129,5 +138,4 @@ STATICFILES_DIRS = [
 
    BASE_DIR / 'static',
 
]
 
STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
 

	
 
MEDIA_ROOT = BASE_DIR.parent / 'media'
conservancy/static/css/conservancy.css
Show inline comments
...
 
@@ -77,10 +77,4 @@ form[action$="#fixme"]:before {
 
}
 

	
 
input:focus {
 
  z-index: 3;
 
  border-color: #86b7fe;
 
  box-shadow: 0 0 0 .25rem rgb(236, 99, 67, .5);
 
}
 

	
 
video {
 
    max-width: 100%;
conservancy/usethesource/admin.py
Show inline comments
...
 
@@ -2,5 +2,5 @@ from django.contrib import admin
 

	
 
from .emails import make_candidate_email
 
from .models import Candidate, Comment
 
from .models import Candidate, Comment, SourceOffer
 

	
 

	
...
 
@@ -37,2 +37,9 @@ class CandidateAdmin(admin.ModelAdmin):
 
            email = make_candidate_email(obj, request.user)
 
            email.send()
 

	
 

	
 
@admin.register(SourceOffer)
 
class SourceOfferAdmin(admin.ModelAdmin):
 
    list_display = ['time', 'vendor', 'device']
 
    fields = ['time', 'vendor', 'device', 'photo']
 
    readonly_fields = ['time']
conservancy/usethesource/forms.py
Show inline comments
 
from django import forms
 

	
 
from .models import Comment
 
from .models import Comment, SourceOffer
 

	
 

	
...
 
@@ -18,2 +18,13 @@ class CommentForm(forms.ModelForm):
 
class DownloadForm(forms.Form):
 
    agree = forms.BooleanField(label="I understand that the goal of this process is to determine compliance with FOSS licenses, and that in downloading the source code candidate and/or firmware image, I am assisting SFC as a volunteer to investigate that question.  I, therefore, promise and represent that I will not copy, distribute, modify, or otherwise use this source code candidate and/or firmware image for any purpose other than to help SFC evaluate the source code candidate for compliance with the terms of FOSS licenses, including but not limited to any version of the GNU General Public License.  Naturally, if I determine in good faith that portions of the source code candidate and/or firmware image are subject to a FOSS license and are compliant with it, I may copy, distribute, modify, or otherwise use those portions in accordance with the FOSS license, and I take full responsibility for that determination and subsequent use.")
 

	
 

	
 
class SourceOfferForm(forms.ModelForm):
 
    class Meta:
 
        model = SourceOffer
 
        fields = ['vendor', 'device', 'photo']
 

	
 
    def __init__(self, *args, **kwargs):
 
        super().__init__(*args, **kwargs)
 
        self.fields['photo'].widget.attrs['capture'] = 'camera'
 
        self.fields['photo'].widget.attrs['accept'] = 'image/*'
conservancy/usethesource/migrations/0009_sourceoffer.py
Show inline comments
 
new file 100644
 
# Generated by Django 4.2.11 on 2024-07-22 08:59
 

	
 
from django.db import migrations, models
 

	
 

	
 
class Migration(migrations.Migration):
 

	
 
    dependencies = [
 
        ('usethesource', '0008_comment_attribute_to'),
 
    ]
 

	
 
    operations = [
 
        migrations.CreateModel(
 
            name='SourceOffer',
 
            fields=[
 
                (
 
                    'id',
 
                    models.AutoField(
 
                        auto_created=True,
 
                        primary_key=True,
 
                        serialize=False,
 
                        verbose_name='ID',
 
                    ),
 
                ),
 
                ('vendor', models.CharField(max_length=50, verbose_name='Vendor name')),
 
                ('device', models.CharField(max_length=50, verbose_name='Device name')),
 
                ('photo', models.ImageField(upload_to='usethesource/offers')),
 
            ],
 
        ),
 
    ]
conservancy/usethesource/migrations/0010_sourceoffer_time.py
Show inline comments
 
new file 100644
 
# Generated by Django 4.2.11 on 2024-07-29 09:42
 

	
 
from django.db import migrations, models
 

	
 

	
 
class Migration(migrations.Migration):
 

	
 
    dependencies = [
 
        ('usethesource', '0009_sourceoffer'),
 
    ]
 

	
 
    operations = [
 
        migrations.AddField(
 
            model_name='sourceoffer',
 
            name='time',
 
            field=models.DateTimeField(auto_now_add=True, null=True),
 
        ),
 
    ]
conservancy/usethesource/models.py
Show inline comments
...
 
@@ -68,2 +68,12 @@ class Comment(models.Model):
 
    class Meta:
 
        ordering = ['id']
 

	
 

	
 
class SourceOffer(models.Model):
 
    time = models.DateTimeField(auto_now_add=True, null=True)
 
    vendor = models.CharField('Vendor name', max_length=50)
 
    device = models.CharField('Device name', max_length=50)
 
    photo = models.ImageField(upload_to='usethesource/offers')
 

	
 
    def __str__(self):
 
        return f'{self.vendor} {self.device}'
conservancy/usethesource/templates/usethesource/landing_page.html
Show inline comments
...
 
@@ -25,5 +25,5 @@
 

	
 
  <ol class="pl4">
 
    <li class="mb2">find a source candidate offered by a company - normally this is offered to you in the manual or user interface of your device, through a link or email address (the company's GitHub page is not canonical, unless they explicitly say so in this offer)</li>
 
    <li class="mb2">find a source candidate offered by a company - normally this is offered to you in the manual or user interface of your device, through a link or email address (the company's GitHub page is not canonical, unless they explicitly say so in this offer). If you're curious what an offer is, check out the PDFs referenced in <a href="https://sfconservancy.org/blog/2022/dec/21/energyguide-software-repair-label/">our submission to the FTC</a>, and <a href="{% url 'usethesource:upload_offer' %}">submit a picture/image of a new offer</a> so we can test it for you if you like</li>
 

	
 
    <li class="mb2"><a href="https://usl-upload.sfconservancy.org/s/4Ykmx7rSGMJ7s43">upload the source candidate</a> to us - write down the file name(s) you uploaded for the next step (can be multiple), and upload a firmware image if you have it and are ok with us publishing it</li>
conservancy/usethesource/templates/usethesource/upload_offer.html
Show inline comments
 
new file 100644
 
{% extends "usethesource/base.html" %}
 

	
 
{% block title %}Upload an offer for source - Software Freedom Conservancy{% endblock %}
 

	
 
{% block head %}
 
  {{ block.super }}
 
  <script src="https://unpkg.com/htmx.org@1.9.6"></script>
 
{% endblock %}
 

	
 
{% block content %}
 
  {{ block.super }}
 

	
 
  <section class="mt4 mb3">
 
    <h2 class="f2 lh-title ttu mt0">Upload an offer for source</h2>
 
  </section>
 

	
 
  <form id="form" hx-encoding="multipart/form-data" hx-post="{% url 'usethesource:upload_offer' %}">
 
    {% csrf_token %}
 
    {{ form.non_field_errors }}
 
    <div class="mv2">
 
      {{ form.vendor.errors }}
 
      <label for="{{ form.vendor.id_for_label }}" class="db mb1">Vendor:</label>
 
      {{ form.vendor }}
 
    </div>
 
    <div class="mv2">
 
      {{ form.device.errors }}
 
      <label for="{{ form.device.id_for_label }}" class="db mb1">Device:</label>
 
      {{ form.device }}
 
    </div>
 
    <div class="mv2">
 
      {{ form.photo.errors }}
 
      <label for="{{ form.photo.id_for_label }}" class="db mb1">Photo:</label>
 
      {{ form.photo }}
 
    </div>
 
    <progress id="progress" class="htmx-indicator" value="0" max="100"></progress>
 
    <div class="mv1">
 
      <button type="submit" class="white bg-green b db pv2 ph3 bn mb2">Send</button>
 
    </div>
 
  </form>
 

	
 
  <script>
 
   form = document.querySelector('#form');
 
   let progress = document.querySelector('#progress');
 
   form.addEventListener('htmx:xhr:progress', function(evt) {
 
     console.log('progress', evt.detail.loaded/evt.detail.total * 100);
 
     progress.value = evt.detail.loaded/evt.detail.total * 100;
 
   });
 
  </script>
 
{% endblock content %}
conservancy/usethesource/templates/usethesource/upload_success_partial.html
Show inline comments
 
new file 100644
 
<p>Thanks! We've received your offer for source.</p>
conservancy/usethesource/urls.py
Show inline comments
...
 
@@ -14,3 +14,4 @@ urlpatterns = [
 
    path('add-button/<slug:slug>/', views.add_button, name='add_button'),
 
    path('ccirt-process/', views.ccirt_process, name='ccirt_process'),
 
    path('offer/', views.upload_offer, name='upload_offer'),
 
]
conservancy/usethesource/views.py
Show inline comments
...
 
@@ -4,5 +4,5 @@ from django.shortcuts import get_object_or_404, redirect, render
 

	
 
from .models import Candidate, Comment
 
from .forms import CommentForm, DownloadForm
 
from .forms import CommentForm, DownloadForm, SourceOfferForm
 
from .emails import make_comment_email
 

	
...
 
@@ -92,2 +92,20 @@ def add_button(request, slug):
 
def ccirt_process(request):
 
    return render(request, 'usethesource/ccirt_process.html', {})
 

	
 

	
 
def handle_uploaded_file(f):
 
    with open("some/file/name.txt", "wb+") as destination:
 
        for chunk in f.chunks():
 
            destination.write(chunk)
 

	
 
def upload_offer(request):
 
    if request.method == 'POST':
 
        form = SourceOfferForm(request.POST, request.FILES)
 
        if form.is_valid():
 
            form.save()
 
            return render(request, 'usethesource/upload_success_partial.html')
 
        else:
 
            return render(request, 'usethesource/upload_offer.html', {'form': form})
 
    else:
 
        form = SourceOfferForm()
 
        return render(request, 'usethesource/upload_offer.html', {'form': form})
requirements.txt
Show inline comments
 
# Installed in virtualenv
 
Django==4.2.11
 
Django==4.2.16
 
# Provided by Debian Bookworm.
 
beautifulsoup4==4.11.2
0 comments (0 inline, 0 general)