" - ) - raise ValidationError(mark_safe("%s" % msg)) - self.cleaned_data.update(cleaned_data) - except ValidationError as e: - msg = _( - "There were errors reading plugin package (please check also your plugin's metadata).
" - ) - raise ValidationError( - mark_safe("%s %s" % (msg, "
".join(e.messages))) - ) - # Populate instance - self.instance.min_qg_version = self.cleaned_data.get("qgisMinimumVersion") - self.instance.max_qg_version = self.cleaned_data.get("qgisMaximumVersion") - self.instance.version = PluginVersion.clean_version( - self.cleaned_data.get("version") - ) - self.instance.server = self.cleaned_data.get("server") - - # Check plugin folder name - if ( - self.cleaned_data.get("package_name") - and self.cleaned_data.get("package_name") - != self.instance.plugin.package_name - ): - raise ValidationError( - _( - "Plugin folder name mismatch: the plugin main folder name in the compressed file (%s) is different from the original plugin package name (%s)." - ) - % ( - self.cleaned_data.get("package_name"), - self.instance.plugin.package_name, - ) - ) - # Also set changelog from metadata - if changelog: - self.cleaned_data["changelog"] = changelog - # Clean tags - self.cleaned_data["tags"] = _clean_tags(self.cleaned_data.get("tags", None)) - self.instance.changelog = self.cleaned_data.get("changelog") - return super(PluginVersionForm, self).clean() - - -class PackageUploadForm(forms.Form): - """ - Single step upload for new plugins - """ - - experimental = forms.BooleanField( - required=False, - label=_("Experimental"), - help_text=_( - "Please check this box if the plugin is experimental. Please note that this field might be overridden by metadata (if present)." - ), - ) - package = forms.FileField( - label=_("Plugin package"), - help_text=_("Please select the zipped file of the plugin."), - ) - - def clean_package(self): - """ - Populates cleaned_data with metadata from the zip package - """ - package = self.cleaned_data.get("package") - try: - self.cleaned_data.update(validator(package)) - except ValidationError as e: - msg = _( - "There were errors reading plugin package (please check also your plugin's metadata)." - ) - raise ValidationError(mark_safe("%s %s" % (msg, ",".join(e.messages)))) - # Disabled: now the PackageUploadForm also accepts updates - # if Plugin.objects.filter(package_name = self.cleaned_data['package_name']).count(): - # raise ValidationError(_('A plugin with this package name (%s) already exists. To update an existing plugin, you should open the plugin\'s details view and add a new version from there.') % self.cleaned_data['package_name']) - - # if Plugin.objects.filter(name = self.cleaned_data['name']).count(): - # raise ValidationError(_('A plugin with this name (%s) already exists.') % self.cleaned_data['name']) - self.cleaned_data["version"] = PluginVersion.clean_version( - self.cleaned_data["version"] - ) - # Checks for version - if Plugin.objects.filter( - package_name=self.cleaned_data["package_name"], - pluginversion__version=self.cleaned_data["version"], - ).count(): - raise ValidationError( - _( - "A plugin with this name (%s) and version number (%s) already exists." - ) - % (self.cleaned_data["name"], self.cleaned_data["version"]) - ) - # Clean tags - self.cleaned_data["tags"] = _clean_tags(self.cleaned_data.get("tags", None)) - return package - - -class VersionFeedbackForm(forms.Form): - """Feedback for a plugin version""" - - feedback = forms.CharField( - widget=forms.Textarea( - attrs={ - "placeholder": _( - "Please provide clear feedback as a task. \n" - "You can create multiple tasks with '- [ ]'.\n" - "e.g:\n" - "- [ ] first task\n" - "- [ ] second task" - ), - "rows": "5", - "class": "span12" - } - ) - ) - - def clean(self): - super().clean() - feedback = self.cleaned_data.get('feedback') - - if feedback: - lines: list = feedback.split('\n') - bullet_points: list = [ - line[6:].strip() for line in lines if line.strip().startswith('- [ ]') - ] - has_bullet_point = len(bullet_points) >= 1 - tasks: list = bullet_points if has_bullet_point else [feedback] - self.cleaned_data['tasks'] = tasks - - return self.cleaned_data - -class PluginTokenForm(ModelForm): - """ - Form for token description editing - """ - - class Meta: - model = PluginOutstandingToken - fields = ( - "description", - ) \ No newline at end of file diff --git a/qgis-app/plugins/management/__init__.py b/qgis-app/plugins/management/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/qgis-app/plugins/management/commands/__init__.py b/qgis-app/plugins/management/commands/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/qgis-app/plugins/management/commands/cleanmediafolder.py b/qgis-app/plugins/management/commands/cleanmediafolder.py deleted file mode 100644 index da18bda9..00000000 --- a/qgis-app/plugins/management/commands/cleanmediafolder.py +++ /dev/null @@ -1,38 +0,0 @@ -import os -from shutil import rmtree -from django.conf import settings -from django.core.management import call_command -from django.core.management.base import BaseCommand - -class Command(BaseCommand): - help = 'Run collectstatic and delete folders from media that exist in static' - - def handle(self, *args, **options): - confirm = input("Do you want to run 'collectstatic' first? (yes/no): ") - if confirm.lower() == 'yes': - # Run collectstatic command - call_command('collectstatic', interactive=False) - - # Get the paths of static and media folders - static_root = settings.STATIC_ROOT - media_root = settings.MEDIA_ROOT - - # Iterate over each directory in the static folder - for static_dir in os.listdir(static_root): - static_path = os.path.join(static_root, static_dir) - - # Check if the path is a directory and exists in the media folder - if os.path.isdir(static_path) and os.path.exists(os.path.join(media_root, static_dir)): - confirm = input(f"Are you sure you want to delete '{static_dir}' from the media folder? (yes/no): ") - - if confirm.lower() == 'yes': - try: - # Delete the corresponding folder in the media folder - rmtree(os.path.join(media_root, static_dir)) - self.stdout.write(self.style.SUCCESS(f'Deleted {static_dir} from media folder.')) - except Exception as e: - self.stderr.write(self.style.ERROR(f'Error deleting {static_dir}: {str(e)}')) - else: - self.stdout.write(self.style.WARNING(f'Skipped deletion of {static_dir}.')) - - self.stdout.write(self.style.SUCCESS('The media folder has been cleaned.')) diff --git a/qgis-app/plugins/management/commands/generate_plugins_xml.py b/qgis-app/plugins/management/commands/generate_plugins_xml.py deleted file mode 100644 index 1795dcf9..00000000 --- a/qgis-app/plugins/management/commands/generate_plugins_xml.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -from django.core.management.base import BaseCommand -from plugins.tasks.generate_plugins_xml import generate_plugins_xml -from django.conf import settings - -class Command(BaseCommand): - - help = "Fetch and cached plugins xml" - - def add_arguments(self, parser): - parser.add_argument( - "-s", - "--site", - dest="site", - default=settings.DEFAULT_PLUGINS_SITE, - help="Site url to get the source of plugins", - ) - - def handle(self, *args, **options): - site = options.get("site") - generate_plugins_xml.delay(site=site) diff --git a/qgis-app/plugins/management/commands/organize_old_package.py b/qgis-app/plugins/management/commands/organize_old_package.py deleted file mode 100644 index 991ed958..00000000 --- a/qgis-app/plugins/management/commands/organize_old_package.py +++ /dev/null @@ -1,40 +0,0 @@ -# myapp/management/commands/organize_packages.py -import os -import shutil -from django.core.management.base import BaseCommand -from django.conf import settings -from plugins.models import PluginVersion - -PLUGINS_STORAGE_PATH = getattr(settings, "PLUGINS_STORAGE_PATH", "packages") -class Command(BaseCommand): - help = 'Organize packages created before 2014 into folders by year' - - def handle(self, *args, **options): - packages_dir = os.path.join(settings.MEDIA_ROOT, PLUGINS_STORAGE_PATH) - - # Some of the packages created on 2014 also need to be organized - versions = PluginVersion.objects.filter(created_on__lt='2014-12-31').exclude(package__icontains='2014/') - self.stdout.write(self.style.NOTICE(f'{versions.count()} packages will be organized.')) - - for version in versions: - year_folder = os.path.join(packages_dir, str(version.created_on.year)) - - # Create the year folder if it doesn't exist - os.makedirs(year_folder, exist_ok=True) - - # Copy the package file to the year folder - old_path = version.package.path - if os.path.exists(old_path): - new_path = os.path.join(year_folder, os.path.basename(old_path)) - if not os.path.exists(new_path): - shutil.copy(old_path, year_folder) - - # Update the model with the new package path - version.package.name = os.path.relpath(new_path, settings.MEDIA_ROOT) - version.save() - else: - self.stdout.write(self.style.WARNING(f'Plugin version id {version.pk} ignored: {new_path} already exists.')) - else: - self.stdout.write(self.style.WARNING(f'Plugin version id {version.pk} ignored: {old_path} is not found.')) - - self.stdout.write(self.style.SUCCESS('Packages organized successfully')) diff --git a/qgis-app/plugins/migrations/0001_initial.py b/qgis-app/plugins/migrations/0001_initial.py deleted file mode 100644 index 41119f5b..00000000 --- a/qgis-app/plugins/migrations/0001_initial.py +++ /dev/null @@ -1,260 +0,0 @@ -# Generated by Django 2.1.7 on 2019-03-12 04:30 - -import django.db.models.deletion -import plugins.models -import taggit_autosuggest.managers -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ("taggit", "0001_initial"), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name="Plugin", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "created_on", - models.DateTimeField(auto_now_add=True, verbose_name="Created on"), - ), - ( - "modified_on", - models.DateTimeField(editable=False, verbose_name="Modified on"), - ), - ( - "author", - models.CharField( - help_text="This is the plugin's original author, if different from the uploader, this field will appear in the XML and in the web GUI", - max_length=256, - verbose_name="Author", - ), - ), - ( - "email", - models.EmailField(max_length=254, verbose_name="Author email"), - ), - ( - "homepage", - models.URLField( - blank=True, null=True, verbose_name="Plugin homepage" - ), - ), - ( - "repository", - models.URLField(null=True, verbose_name="Code repository"), - ), - ("tracker", models.URLField(null=True, verbose_name="Tracker")), - ( - "package_name", - models.CharField( - editable=False, - help_text="This is the plugin's internal name, equals to the main folder name", - max_length=256, - unique=True, - verbose_name="Package Name", - ), - ), - ( - "name", - models.CharField( - help_text="Must be unique", - max_length=256, - unique=True, - verbose_name="Name", - ), - ), - ("description", models.TextField(verbose_name="Description")), - ("about", models.TextField(null=True, verbose_name="About")), - ( - "icon", - models.ImageField( - blank=True, - null=True, - upload_to="packages/%Y", - verbose_name="Icon", - ), - ), - ( - "downloads", - models.IntegerField( - default=0, editable=False, verbose_name="Downloads" - ), - ), - ( - "featured", - models.BooleanField( - db_index=True, default=False, verbose_name="Featured" - ), - ), - ( - "deprecated", - models.BooleanField( - db_index=True, default=False, verbose_name="Deprecated" - ), - ), - ( - "server", - models.BooleanField( - db_index=True, default=False, verbose_name="Server" - ), - ), - ( - "rating_votes", - models.PositiveIntegerField(blank=True, default=0, editable=False), - ), - ( - "rating_score", - models.IntegerField(blank=True, default=0, editable=False), - ), - ( - "created_by", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="plugins_created_by", - to=settings.AUTH_USER_MODEL, - verbose_name="Created by", - ), - ), - ( - "owners", - models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL), - ), - ( - "tags", - taggit_autosuggest.managers.TaggableManager( - blank=True, - help_text="A comma-separated list of tags.", - through="taggit.TaggedItem", - to="taggit.Tag", - verbose_name="Tags", - ), - ), - ], - options={ - "ordering": ("name",), - "permissions": (("can_approve", "Can approve plugins versions"),), - }, - ), - migrations.CreateModel( - name="PluginVersion", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "created_on", - models.DateTimeField(auto_now_add=True, verbose_name="Created on"), - ), - ( - "downloads", - models.IntegerField( - default=0, editable=False, verbose_name="Downloads" - ), - ), - ( - "min_qg_version", - plugins.models.QGVersionZeroForcedField( - db_index=True, - max_length=32, - verbose_name="Minimum QGIS version", - ), - ), - ( - "max_qg_version", - plugins.models.QGVersionZeroForcedField( - blank=True, - db_index=True, - max_length=32, - null=True, - verbose_name="Maximum QGIS version", - ), - ), - ( - "version", - plugins.models.VersionField( - db_index=True, max_length=32, verbose_name="Version" - ), - ), - ( - "changelog", - models.TextField(blank=True, null=True, verbose_name="Changelog"), - ), - ( - "package", - models.FileField( - upload_to="packages/%Y", verbose_name="Plugin package" - ), - ), - ( - "experimental", - models.BooleanField( - db_index=True, - default=False, - help_text="Check this box if this version is experimental, leave unchecked if it's stable. Please note that this field might be overridden by metadata (if present).", - verbose_name="Experimental flag", - ), - ), - ( - "approved", - models.BooleanField( - db_index=True, - default=True, - help_text="Set to false if you wish to unapprove the plugin version.", - verbose_name="Approved", - ), - ), - ( - "external_deps", - models.CharField( - help_text="PIP install string", - max_length=512, - null=True, - verbose_name="External dependencies", - ), - ), - ( - "created_by", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to=settings.AUTH_USER_MODEL, - verbose_name="Created by", - ), - ), - ( - "plugin", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to="plugins.Plugin" - ), - ), - ], - options={ - "ordering": ("plugin", "-version", "experimental"), - }, - ), - migrations.AlterUniqueTogether( - name="pluginversion", - unique_together={("plugin", "version")}, - ), - ] diff --git a/qgis-app/plugins/migrations/0002_plugins_feedback.py b/qgis-app/plugins/migrations/0002_plugins_feedback.py deleted file mode 100644 index 76f760a3..00000000 --- a/qgis-app/plugins/migrations/0002_plugins_feedback.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 2.2.25 on 2023-06-17 03:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('plugins', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='PluginVersionFeedback', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('task', models.TextField(help_text='A feedback task. Please write your review as a task for this plugin.', max_length=1000, verbose_name='Task')), - ('created_on', models.DateTimeField(auto_now_add=True, verbose_name='Created on')), - ('completed_on', models.DateTimeField(blank=True, null=True, verbose_name='Completed on')), - ('is_completed', models.BooleanField(db_index=True, default=False, verbose_name='Completed')), - ('reviewer', models.ForeignKey(help_text='The user who reviewed this plugin.', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Reviewed by')), - ('version', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='feedback', to='plugins.PluginVersion')), - ], - options={ - 'ordering': ['created_on'], - }, - ), - ] diff --git a/qgis-app/plugins/migrations/0002_pluginversiondownload.py b/qgis-app/plugins/migrations/0002_pluginversiondownload.py deleted file mode 100644 index 6958c874..00000000 --- a/qgis-app/plugins/migrations/0002_pluginversiondownload.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.25 on 2023-06-29 03:29 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('plugins', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='PluginVersionDownload', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('download_date', models.DateField(default=django.utils.timezone.now)), - ('download_count', models.IntegerField(default=0)), - ('plugin_version', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='plugins.PluginVersion')), - ], - options={ - 'unique_together': {('plugin_version', 'download_date')}, - }, - ), - ] diff --git a/qgis-app/plugins/migrations/0003_plugin_allow_update_name.py b/qgis-app/plugins/migrations/0003_plugin_allow_update_name.py deleted file mode 100644 index dac62f7f..00000000 --- a/qgis-app/plugins/migrations/0003_plugin_allow_update_name.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.25 on 2023-11-07 03:04 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('plugins', '0002_pluginversiondownload'), - ] - - operations = [ - migrations.AddField( - model_name='plugin', - name='allow_update_name', - field=models.BooleanField(default=False, help_text='Allow name in metadata.txt to update the plugin name', verbose_name='Allow update name'), - ), - ] diff --git a/qgis-app/plugins/migrations/0004_merge_20231122_0223.py b/qgis-app/plugins/migrations/0004_merge_20231122_0223.py deleted file mode 100644 index 8251bc87..00000000 --- a/qgis-app/plugins/migrations/0004_merge_20231122_0223.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 2.2.25 on 2023-11-30 05:13 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('plugins', '0002_plugins_feedback'), - ('plugins', '0003_plugin_allow_update_name'), - ] - - operations = [ - ] diff --git a/qgis-app/plugins/migrations/0004_merge_20231123_0018.py b/qgis-app/plugins/migrations/0004_merge_20231123_0018.py deleted file mode 100644 index 8e18926d..00000000 --- a/qgis-app/plugins/migrations/0004_merge_20231123_0018.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 3.2.11 on 2023-11-23 00:18 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('plugins', '0002_plugins_feedback'), - ('plugins', '0003_plugin_allow_update_name'), - ] - - operations = [ - ] diff --git a/qgis-app/plugins/migrations/0005_auto_20231214_2317.py b/qgis-app/plugins/migrations/0005_auto_20231214_2317.py deleted file mode 100644 index 8cd7045b..00000000 --- a/qgis-app/plugins/migrations/0005_auto_20231214_2317.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.25 on 2023-12-14 23:17 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('plugins', '0004_merge_20231122_0223'), - ] - - operations = [ - migrations.AddField( - model_name='pluginversiondownload', - name='country_code', - field=models.CharField(default='N/D', max_length=3), - ), - migrations.AddField( - model_name='pluginversiondownload', - name='country_name', - field=models.CharField(default='N/D', max_length=100), - ), - ] diff --git a/qgis-app/plugins/migrations/0005_plugin_maintainer.py b/qgis-app/plugins/migrations/0005_plugin_maintainer.py deleted file mode 100644 index dfeffa0b..00000000 --- a/qgis-app/plugins/migrations/0005_plugin_maintainer.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2.25 on 2023-11-29 22:45 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - -def populate_maintainer(apps, schema_editor): - Plugin = apps.get_model('plugins', 'Plugin') - - # Set the maintainer as the plugin creator by default - for obj in Plugin.objects.all(): - obj.maintainer = obj.created_by - obj.save() - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('plugins', '0004_merge_20231122_0223'), - ] - - operations = [ - migrations.AddField( - model_name='plugin', - name='maintainer', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='plugins_maintainer', to=settings.AUTH_USER_MODEL, verbose_name='Maintainer'), - ), - migrations.RunPython(populate_maintainer), - ] diff --git a/qgis-app/plugins/migrations/0005_pluginoutstandingtoken.py b/qgis-app/plugins/migrations/0005_pluginoutstandingtoken.py deleted file mode 100644 index 4e406433..00000000 --- a/qgis-app/plugins/migrations/0005_pluginoutstandingtoken.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2.25 on 2023-12-11 23:36 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('token_blacklist', '0007_auto_20171017_2214'), - ('plugins', '0004_merge_20231122_0223'), - ] - - operations = [ - migrations.CreateModel( - name='PluginOutstandingToken', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('is_blacklisted', models.BooleanField(default=False)), - ('plugin', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='plugins.Plugin')), - ('token', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='token_blacklist.OutstandingToken')), - ], - ), - ] diff --git a/qgis-app/plugins/migrations/0006_auto_20231218_0225.py b/qgis-app/plugins/migrations/0006_auto_20231218_0225.py deleted file mode 100644 index 60d0af5f..00000000 --- a/qgis-app/plugins/migrations/0006_auto_20231218_0225.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.2.25 on 2023-12-18 02:25 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('plugins', '0005_pluginoutstandingtoken'), - ] - - operations = [ - migrations.AddField( - model_name='pluginoutstandingtoken', - name='description', - field=models.CharField(blank=True, help_text="Describe this token so that it's easier to remember where you're using it.", max_length=512, null=True, verbose_name='Description'), - ), - migrations.AddField( - model_name='pluginoutstandingtoken', - name='is_newly_created', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='pluginoutstandingtoken', - name='last_used_on', - field=models.DateTimeField(blank=True, null=True, verbose_name='Last used on'), - ), - ] diff --git a/qgis-app/plugins/migrations/0006_plugin_display_created_by.py b/qgis-app/plugins/migrations/0006_plugin_display_created_by.py deleted file mode 100644 index 85af8484..00000000 --- a/qgis-app/plugins/migrations/0006_plugin_display_created_by.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.25 on 2023-11-29 23:22 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('plugins', '0005_plugin_maintainer'), - ] - - operations = [ - migrations.AddField( - model_name='plugin', - name='display_created_by', - field=models.BooleanField(default=False, verbose_name='Display "Created by" in plugin details'), - ), - ] diff --git a/qgis-app/plugins/migrations/0007_auto_20240109_0428.py b/qgis-app/plugins/migrations/0007_auto_20240109_0428.py deleted file mode 100644 index 6d6af2da..00000000 --- a/qgis-app/plugins/migrations/0007_auto_20240109_0428.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 2.2.25 on 2024-01-09 04:28 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('plugins', '0006_auto_20231218_0225'), - ] - - operations = [ - migrations.AddField( - model_name='pluginversion', - name='is_from_token', - field=models.BooleanField(default=False, verbose_name='Is uploaded using token'), - ), - migrations.AddField( - model_name='pluginversion', - name='token', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='plugins.PluginOutstandingToken', verbose_name='Token used'), - ), - migrations.AlterField( - model_name='pluginversion', - name='created_by', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Created by'), - ), - ] diff --git a/qgis-app/plugins/migrations/0008_merge_20240206_0448.py b/qgis-app/plugins/migrations/0008_merge_20240206_0448.py deleted file mode 100644 index ad09b265..00000000 --- a/qgis-app/plugins/migrations/0008_merge_20240206_0448.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 2.2.25 on 2024-02-04 23:16 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('plugins', '0007_auto_20240109_0428'), - ('plugins', '0006_plugin_display_created_by'), - ] - - operations = [ - ] diff --git a/qgis-app/plugins/migrations/0009_merge_20240321_0207.py b/qgis-app/plugins/migrations/0009_merge_20240321_0207.py deleted file mode 100644 index 45cd685a..00000000 --- a/qgis-app/plugins/migrations/0009_merge_20240321_0207.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 4.2.11 on 2024-03-21 02:07 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('plugins', '0004_merge_20231123_0018'), - ('plugins', '0008_merge_20240206_0448'), - ] - - operations = [ - ] diff --git a/qgis-app/plugins/migrations/0010_merge_20240517_0729.py b/qgis-app/plugins/migrations/0010_merge_20240517_0729.py deleted file mode 100644 index 54355764..00000000 --- a/qgis-app/plugins/migrations/0010_merge_20240517_0729.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 4.2.13 on 2024-05-17 07:29 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('plugins', '0005_auto_20231214_2317'), - ('plugins', '0009_merge_20240321_0207'), - ] - - operations = [ - ] diff --git a/qgis-app/plugins/migrations/0011_alter_pluginversiondownload_unique_together.py b/qgis-app/plugins/migrations/0011_alter_pluginversiondownload_unique_together.py deleted file mode 100644 index fbd85028..00000000 --- a/qgis-app/plugins/migrations/0011_alter_pluginversiondownload_unique_together.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 4.2.13 on 2024-05-28 06:47 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('plugins', '0010_merge_20240517_0729'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='pluginversiondownload', - unique_together={('plugin_version', 'download_date', 'country_code', 'country_name')}, - ), - ] diff --git a/qgis-app/plugins/migrations/0012_pluginversionfeedback_modified_on.py b/qgis-app/plugins/migrations/0012_pluginversionfeedback_modified_on.py deleted file mode 100644 index 2e637f4e..00000000 --- a/qgis-app/plugins/migrations/0012_pluginversionfeedback_modified_on.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.2.13 on 2024-06-13 08:06 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('plugins', '0011_alter_pluginversiondownload_unique_together'), - ] - - operations = [ - migrations.AddField( - model_name='pluginversionfeedback', - name='modified_on', - field=models.DateTimeField(blank=True, editable=False, null=True, verbose_name='Modified on'), - ), - ] diff --git a/qgis-app/plugins/migrations/__init__.py b/qgis-app/plugins/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/qgis-app/plugins/models.py b/qgis-app/plugins/models.py deleted file mode 100644 index 5b4a7ff2..00000000 --- a/qgis-app/plugins/models.py +++ /dev/null @@ -1,1058 +0,0 @@ -# -*- coding: utf-8 -*- - -import datetime -import os -import re - -from django.conf import settings -from django.contrib.auth.models import User -from django.db import models -from django.urls import reverse -from django.utils.translation import gettext_lazy as _ -from django.utils import timezone -from djangoratings.fields import AnonymousRatingField -from taggit_autosuggest.managers import TaggableManager -from rest_framework_simplejwt.token_blacklist.models import OutstandingToken - -from django.db.models import OuterRef, Count, Subquery, F - -PLUGINS_STORAGE_PATH = getattr(settings, "PLUGINS_STORAGE_PATH", "packages/%Y") -PLUGINS_FRESH_DAYS = getattr(settings, "PLUGINS_FRESH_DAYS", 30) - - -# Used in Version fields to transform DB value back to human readable string -# Allows "-" for processing plugin -VERSION_RE = r"(^|(?<=\.))0+(?!(\.|$|-))|\.#+" - - -class BasePluginManager(models.Manager): - """ - Adds a score - """ - - def get_queryset(self): - return ( - super(BasePluginManager, self) - .get_queryset() - .extra( - select={ - "average_vote": "rating_score/(rating_votes+0.001)", - "latest_version_date": ( - "SELECT created_on FROM plugins_pluginversion WHERE " - "plugins_pluginversion.plugin_id = plugins_plugin.id " - "AND approved = TRUE " - "ORDER BY created_on DESC LIMIT 1" - ), - } - ) - ) - - -class ApprovedPlugins(BasePluginManager): - """ - Shows only public plugins: i.e. those with - and with at least one approved version ("stable" or "experimental") - """ - - def get_queryset(self): - return ( - super(ApprovedPlugins, self) - .get_queryset() - .filter(pluginversion__approved=True) - .distinct() - ) - - -class StablePlugins(BasePluginManager): - """ - Shows only public plugins: i.e. those with "approved" flag set - and with one "stable" version - """ - - def get_queryset(self): - return ( - super(StablePlugins, self) - .get_queryset() - .filter(pluginversion__approved=True, pluginversion__experimental=False) - .distinct() - ) - - -class ExperimentalPlugins(BasePluginManager): - """ - Shows only public plugins: i.e. those with "approved" flag set - and with one "experimental" version - """ - - def get_queryset(self): - return ( - super(ExperimentalPlugins, self) - .get_queryset() - .filter(pluginversion__approved=True, pluginversion__experimental=True) - .distinct() - ) - - -class FeaturedPlugins(BasePluginManager): - """ - Shows only public featured stable plugins: i.e. those with "approved" flag set - and "featured" flag set - """ - - def get_queryset(self): - return ( - super(FeaturedPlugins, self) - .get_queryset() - .filter(pluginversion__approved=True, featured=True) - .order_by("-created_on") - .distinct() - ) - - -class FreshPlugins(BasePluginManager): - """ - Shows only approved plugins: i.e. those with "approved" version flag set - and created less than "days" ago. - """ - - def __init__(self, days=PLUGINS_FRESH_DAYS, *args, **kwargs): - self.days = days - return super(FreshPlugins, self).__init__(*args, **kwargs) - - def get_queryset(self): - return ( - super(FreshPlugins, self) - .get_queryset() - .filter( - deprecated=False, - pluginversion__approved=True, - created_on__gte=datetime.datetime.now() - - datetime.timedelta(days=self.days), - ) - .order_by("-created_on") - .distinct() - ) - - -class LatestPlugins(BasePluginManager): - """ - Shows only approved plugins ordered descending by latest_version - and the latest_version - """ - - def __init__(self, days=PLUGINS_FRESH_DAYS, *args, **kwargs): - self.days = days - return super(LatestPlugins, self).__init__(*args, **kwargs) - - def get_queryset(self): - return ( - super(LatestPlugins, self) - .get_queryset() - .filter( - deprecated=False, - pluginversion__approved=True, - pluginversion__created_on__gte=( - datetime.datetime.now() - datetime.timedelta(days=self.days) - ), - ) - .order_by("-latest_version_date") - .distinct() - ) - - -class UnapprovedPlugins(BasePluginManager): - """ - Shows only unapproved and not deprecated plugins - """ - - def get_queryset(self): - return ( - super(UnapprovedPlugins, self) - .get_queryset() - .filter(pluginversion__approved=False, deprecated=False) - .extra( - select={ - "average_vote": "rating_score/(rating_votes+0.001)", - "latest_version_date": ( - "SELECT created_on FROM plugins_pluginversion WHERE " - "plugins_pluginversion.plugin_id = plugins_plugin.id " - "ORDER BY created_on DESC LIMIT 1" - ), - } - ) - .distinct() - ) - - -class DeprecatedPlugins(BasePluginManager): - """ - Shows only deprecated plugins - """ - - def get_queryset(self): - return ( - super(DeprecatedPlugins, self) - .get_queryset() - .filter(deprecated=True) - .distinct() - ) - - -class PopularPlugins(ApprovedPlugins): - """ - Shows only approved plugins, sort by popularity algorithm - """ - - def get_queryset(self): - return ( - super(PopularPlugins, self) - .get_queryset() - .filter(deprecated=False) - .extra( - select={ - "popularity": "plugins_plugin.downloads * (1 + (rating_score/(rating_votes+0.01)/3))" - } - ) - .order_by("-popularity") - .distinct() - ) - - -class MostDownloadedPlugins(ApprovedPlugins): - """ - Shows only approved plugins, sort by downloads - """ - - def get_queryset(self): - return ( - super(MostDownloadedPlugins, self) - .get_queryset() - .filter(deprecated=False) - .order_by("-downloads") - .distinct() - ) - - -class MostVotedPlugins(ApprovedPlugins): - """ - Shows only approved plugins, sort by vote number - """ - - def get_queryset(self): - return ( - super(MostVotedPlugins, self) - .get_queryset() - .filter(deprecated=False) - .order_by("-rating_votes") - .distinct() - ) - - -class MostRatedPlugins(ApprovedPlugins): - """ - Shows only approved plugins, sort by vote/number of votes number - """ - - def get_queryset(self): - return ( - super(MostRatedPlugins, self) - .get_queryset() - .filter(deprecated=False) - .order_by("-average_vote") - .distinct() - ) - - -class TaggablePlugins(TaggableManager): - """ - Shows only public plugins: i.e. those with "approved" flag set - """ - - def get_queryset(self): - return ( - super(TaggablePlugins, self) - .get_queryset() - .filter(deprecated=False, pluginversion__approved=True) - .distinct() - ) - - -class ServerPlugins(ApprovedPlugins): - """ - Shows only Server plugins - """ - - def get_queryset(self): - return super(ServerPlugins, self).get_queryset().filter(server=True).distinct() - - -class FeedbackCompletedPlugins(models.Manager): - """ - Show only unapproved plugins with resolved feedbacks - """ - def get_queryset(self): - feedback_count_subquery = PluginVersionFeedback.objects.filter( - version=OuterRef('pluginversion'), - is_completed=True - ).values('version').annotate( - completed_count=Count('id') - ).values('completed_count') - - return ( - super(FeedbackCompletedPlugins, self) - .get_queryset() - .filter( - pluginversion__approved=False, - deprecated=False - ) - .annotate( - total_feedback_count=Count('pluginversion__feedback'), - completed_feedback_count=Subquery(feedback_count_subquery) - ) - .filter( - total_feedback_count=F('completed_feedback_count') - ) - .extra( - select={ - "average_vote": "rating_score/(rating_votes+0.001)", - "latest_version_date": ( - "SELECT created_on FROM plugins_pluginversion WHERE " - "plugins_pluginversion.plugin_id = plugins_plugin.id " - "ORDER BY created_on DESC LIMIT 1" - ), - } - ).distinct() - ) - -class FeedbackReceivedPlugins(models.Manager): - """ - Show only unapproved plugins with a pending feedback - """ - def get_queryset(self): - feedback_count_subquery = PluginVersionFeedback.objects.filter( - version=OuterRef('pluginversion'), - is_completed=False - ).values('version').annotate( - received_count=Count('id') - ).values('received_count') - - return ( - super(FeedbackReceivedPlugins, self) - .get_queryset() - .filter( - pluginversion__approved=False, - deprecated=False - ) - .annotate( - received_feedback_count=Subquery(feedback_count_subquery) - ) - .filter( - received_feedback_count__gte=1 - ) - .extra( - select={ - "average_vote": "rating_score/(rating_votes+0.001)", - "latest_version_date": ( - "SELECT created_on FROM plugins_pluginversion WHERE " - "plugins_pluginversion.plugin_id = plugins_plugin.id " - "ORDER BY created_on DESC LIMIT 1" - ), - } - ).distinct() - ) - - -class FeedbackPendingPlugins(models.Manager): - """ - Show only unapproved plugins with a feedback - """ - def get_queryset(self): - return ( - super(FeedbackPendingPlugins, self) - .get_queryset() - .filter( - pluginversion__approved=False, - deprecated=False - ) - .annotate( - total_feedback_count=Count('pluginversion__feedback'), - ) - .filter( - total_feedback_count=0 - ) - .extra( - select={ - "average_vote": "rating_score/(rating_votes+0.001)", - "latest_version_date": ( - "SELECT created_on FROM plugins_pluginversion WHERE " - "plugins_pluginversion.plugin_id = plugins_plugin.id " - "ORDER BY created_on DESC LIMIT 1" - ), - } - ).distinct() - ) - - - -class Plugin(models.Model): - """ - Plugins model - """ - - # dates - created_on = models.DateTimeField( - _("Created on"), auto_now_add=True, editable=False - ) - modified_on = models.DateTimeField(_("Modified on"), editable=False) - - # owners - created_by = models.ForeignKey( - User, - verbose_name=_("Created by"), - related_name="plugins_created_by", - on_delete=models.CASCADE, - ) - - # maintainer - maintainer = models.ForeignKey( - User, - verbose_name=_("Maintainer"), - related_name="plugins_maintainer", - on_delete=models.CASCADE, - blank=True, - null=True - ) - - display_created_by = models.BooleanField( - _('Display "Created by" in plugin details'), - default=False - ) - - author = models.CharField( - _("Author"), - help_text=_( - "This is the plugin's original author, if different from the uploader, this field will appear in the XML and in the web GUI" - ), - max_length=256, - ) - email = models.EmailField(_("Author email")) - homepage = models.URLField(_("Plugin homepage"), blank=True, null=True) - # Support - repository = models.URLField(_("Code repository"), blank=False, null=True) - tracker = models.URLField(_("Tracker"), blank=False, null=True) - - owners = models.ManyToManyField(User, blank=True) - - # name, desc etc. - package_name = models.CharField( - _("Package Name"), - help_text=_( - "This is the plugin's internal name, equals to the main folder name" - ), - max_length=256, - unique=True, - editable=False, - ) - name = models.CharField( - _("Name"), help_text=_("Must be unique"), max_length=256, unique=True - ) - - allow_update_name = models.BooleanField( - _("Allow update name"), - help_text=_("Allow name in metadata.txt to update the plugin name"), - default=False - ) - - description = models.TextField(_("Description")) - about = models.TextField(_("About"), blank=False, null=True) - - icon = models.ImageField( - _("Icon"), blank=True, null=True, upload_to=PLUGINS_STORAGE_PATH - ) - - # downloads (soft trigger from versions) - downloads = models.IntegerField(_("Downloads"), default=0, editable=False) - - # Flags - featured = models.BooleanField(_("Featured"), default=False, db_index=True) - deprecated = models.BooleanField(_("Deprecated"), default=False, db_index=True) - - # True if the plugin has a server interface - server = models.BooleanField(_("Server"), default=False, db_index=True) - - # Managers - objects = models.Manager() - base_objects = BasePluginManager() - approved_objects = ApprovedPlugins() - stable_objects = StablePlugins() - experimental_objects = ExperimentalPlugins() - featured_objects = FeaturedPlugins() - fresh_objects = FreshPlugins() - latest_objects = LatestPlugins() - unapproved_objects = UnapprovedPlugins() - deprecated_objects = DeprecatedPlugins() - popular_objects = PopularPlugins() - most_downloaded_objects = MostDownloadedPlugins() - most_voted_objects = MostVotedPlugins() - most_rated_objects = MostRatedPlugins() - server_objects = ServerPlugins() - feedback_completed_objects = FeedbackCompletedPlugins() - feedback_received_objects = FeedbackReceivedPlugins() - feedback_pending_objects = FeedbackPendingPlugins() - - rating = AnonymousRatingField( - range=5, use_cookies=True, can_change_vote=True, allow_delete=True - ) - - tags = TaggableManager(blank=True) - - @property - def approved(self): - """ - Returns True if the plugin has at least one approved version - """ - return self.pluginversion_set.filter(approved=True).count() > 0 - - @property - def trusted(self): - """ - Returns True if the plugin's author has plugins.can_approve permission - Purpose of this decorator is to show/hide buttons in the template - """ - return self.created_by.has_perm("plugins.can_approve") - - @property - def stable(self): - """ - Returns the latest stable and approved version - """ - try: - return self.pluginversion_set.filter( - approved=True, experimental=False - ).order_by("-version")[0] - except: - return None - - @property - def experimental(self): - """ - Returns the latest experimental and approved version - """ - try: - return self.pluginversion_set.filter( - approved=True, experimental=True - ).order_by("-version")[0] - except: - return None - - @property - def editors(self): - """ - Returns a list of users that can edit the plugin: creator and owners - """ - l = [o for o in self.owners.all()] - l.append(self.created_by) - return l - - @property - def approvers(self): - """ - Returns a list of editor users that can approve a version - """ - return [l for l in self.editors if l.has_perm("plugins.can_approve")] - - @property - def avg_vote(self): - """ - Returns the rating_score/(rating_votes+0.001) value, this - calculation is also available in manager's queries as - "average_vote". - This property is still useful when the object is not loaded - through a manager, for example in related objects. - """ - return self.rating_score / (self.rating_votes + 0.001) - - class Meta: - ordering = ("name",) - # ABP: Note: this permission should belong to the - # PluginVersion class. I left it here because it - # doesn't really matters where it is. Just be - # sure you query for it using the 'plugins' class - # instead of the 'pluginversion' class. - permissions = (("can_approve", "Can approve plugins versions"),) - - def get_absolute_url(self): - return reverse("plugin_detail", args=(self.package_name,)) - - def __unicode__(self): - return "[%s] %s" % (self.pk, self.name) - - def __str__(self): - return self.__unicode__() - - def clean(self): - """ - Validates: - - * Checks that package_name respect regexp [A-Za-z][A-Za-z0-9-_]+ - * checks for case-insensitive unique package_name - """ - from django.core.exceptions import ValidationError - - if not re.match(r"^[A-Za-z][A-Za-z0-9-_]+$", self.package_name): - raise ValidationError( - _( - "Plugin package_name (which equals to the main plugin folder inside the zip file) must start with an ASCII letter and can contain only ASCII letters, digits and the - and _ signs." - ) - ) - - if self.pk: - qs = Plugin.objects.filter(name__iexact=self.name).exclude(pk=self.pk) - else: - qs = Plugin.objects.filter(name__iexact=self.name) - if qs.count(): - raise ValidationError( - _( - "A plugin with a similar name (%s) already exists (the name only differs in case)." - ) - % qs.all()[0].name - ) - - if self.pk: - qs = Plugin.objects.filter(package_name__iexact=self.package_name).exclude( - pk=self.pk - ) - else: - qs = Plugin.objects.filter(package_name__iexact=self.package_name) - if qs.count(): - raise ValidationError( - _( - "A plugin with a similar package_name (%s) already exists (the package_name only differs in case)." - ) - % qs.all()[0].package_name - ) - - def save(self, keep_date=False, *args, **kwargs): - """ - Soft triggers: - * updates modified_on if keep_date is not set - * set maintainer to the plugin creator when not specified - """ - if self.pk and not keep_date: - import logging - - logging.debug("Updating modified_on for the Plugin instance") - self.modified_on = datetime.datetime.now() - if not self.pk: - self.modified_on = datetime.datetime.now() - if not self.maintainer: - self.maintainer = self.created_by - super(Plugin, self).save(*args, **kwargs) - - -# Plugin version managers - - -class ApprovedPluginVersions(models.Manager): - """ - Shows only public plugin versions: - """ - - def get_queryset(self): - return ( - super(ApprovedPluginVersions, self) - .get_queryset() - .filter(approved=True) - .order_by("-version") - ) - - -class StablePluginVersions(ApprovedPluginVersions): - """ - Shows only approved public plugin versions: i.e. those with "approved" flag set - and with "stable" flag - """ - - def get_queryset(self): - return ( - super(StablePluginVersions, self).get_queryset().filter(experimental=False) - ) - - -class ExperimentalPluginVersions(ApprovedPluginVersions): - """ - Shows only public plugin versions: i.e. those with "approved" flag set - and with "experimental" flag - """ - - def get_queryset(self): - return ( - super(ExperimentalPluginVersions, self) - .get_queryset() - .filter(experimental=True) - ) - - -def vjust(str, level=3, delim=".", bitsize=3, fillchar=" ", force_zero=False): - """ - Normalize a dotted version string. - - 1.12 becomes : 1. 12 - 1.1 becomes : 1. 1 - - - if force_zero=True and level=2: - - 1.12 becomes : 1. 12. 0 - 1.1 becomes : 1. 1. 0 - - - """ - if not str: - return str - nb = str.count(delim) - if nb < level: - if force_zero: - str += (level - nb) * (delim + "0") - else: - str += (level - nb) * delim - parts = [] - for v in str.split(delim)[: level + 1]: - if not v: - parts.append(v.rjust(bitsize, "#")) - else: - parts.append(v.rjust(bitsize, fillchar)) - return delim.join(parts) - - -class VersionField(models.CharField): - - description = 'Field to store version strings ("a.b.c.d") in a way it is sortable' - - def get_prep_value(self, value): - return vjust(value, fillchar="0") - - def to_python(self, value): - if not value: - return "" - return re.sub(VERSION_RE, "", value) - - def from_db_value(self, value, expression, connection): - if value is None: - return value - return self.to_python(value) - - -class QGVersionZeroForcedField(models.CharField): - - description = 'Field to store version strings ("a.b.c.d") in a way it \ - is sortable and QGIS scheme compatible (x.y.z).' - - def get_prep_value(self, value): - return vjust(value, fillchar="0", level=2, force_zero=True) - - def to_python(self, value): - if not value: - return "" - return re.sub(VERSION_RE, "", value) - - def from_db_value(self, value, expression, connection): - if value is None: - return value - return self.to_python(value) - - -class PluginOutstandingToken(models.Model): - """ - Plugin outstanding token - """ - plugin = models.ForeignKey( - Plugin, - on_delete=models.CASCADE - ) - token = models.ForeignKey( - OutstandingToken, - on_delete=models.CASCADE - ) - is_blacklisted = models.BooleanField(default=False) - is_newly_created = models.BooleanField(default=False) - description = models.CharField( - verbose_name=_("Description"), - help_text=_("Describe this token so that it's easier to remember where you're using it."), - max_length=512, - blank=True, - null=True, - ) - last_used_on = models.DateTimeField( - verbose_name=_("Last used on"), - blank=True, - null=True - ) - -class PluginVersion(models.Model): - """ - Plugin versions - """ - - # link to parent - plugin = models.ForeignKey(Plugin, on_delete=models.CASCADE) - # dates - created_on = models.DateTimeField( - _("Created on"), auto_now_add=True, editable=False - ) - # download counter - downloads = models.IntegerField(_("Downloads"), default=0, editable=False) - # owners - created_by = models.ForeignKey( - User, verbose_name=_("Created by"), on_delete=models.CASCADE, null=True, blank=True - ) - # version info, the first should be read from plugin - min_qg_version = QGVersionZeroForcedField( - _("Minimum QGIS version"), max_length=32, db_index=True - ) - max_qg_version = QGVersionZeroForcedField( - _("Maximum QGIS version"), max_length=32, null=True, blank=True, db_index=True - ) - version = VersionField(_("Version"), max_length=32, db_index=True) - changelog = models.TextField(_("Changelog"), null=True, blank=True) - - # the file! - package = models.FileField(_("Plugin package"), upload_to=PLUGINS_STORAGE_PATH) - # Flags: checks on unique current/experimental are done in save() and possibly in the views - experimental = models.BooleanField( - _("Experimental flag"), - default=False, - help_text=_( - "Check this box if this version is experimental, leave unchecked if it's stable. Please note that this field might be overridden by metadata (if present)." - ), - db_index=True, - ) - approved = models.BooleanField( - _("Approved"), - default=True, - help_text=_("Set to false if you wish to unapprove the plugin version."), - db_index=True, - ) - external_deps = models.CharField( - _("External dependencies"), - help_text=_("PIP install string"), - max_length=512, - blank=False, - null=True, - ) - is_from_token = models.BooleanField( - _("Is uploaded using token"), - default=False - ) - # Link to the token if upload is using token - token = models.ForeignKey( - PluginOutstandingToken, verbose_name=_("Token used"), on_delete=models.CASCADE, null=True, blank=True - ) - - # Managers, used in xml output - objects = models.Manager() - approved_objects = ApprovedPluginVersions() - stable_objects = StablePluginVersions() - experimental_objects = ExperimentalPluginVersions() - - @property - def file_name(self): - return os.path.basename(self.package.file.name) - - def save(self, *args, **kwargs): - """ - Soft triggers: - * updates modified_on in parent - """ - # Transforms the version... - # Need to be done here too, because clean() - # is only called in forms. - if self.version.rfind(" ") > 0: - self.version = self.version.rsplit(" ")[-1] - - # Only change modified_on when a new version is created, - # every download triggers a save to update the counter - if not self.pk: - self.plugin.modified_on = self.created_on - self.plugin.save() - - # fix Max version - if not self.max_qg_version: - self.max_qg_version = "%s.99" % tuple(self.min_qg_version.split(".")[0]) - - super(PluginVersion, self).save(*args, **kwargs) - - def clean(self): - """ - Validates: - - * checks for unique - * checks for version only digits and dots - """ - from django.core.exceptions import ValidationError - - # Transforms the version - self.version = PluginVersion.clean_version(self.version) - - versions_to_check = PluginVersion.objects.filter( - plugin=self.plugin, version=self.version - ) - if self.pk: - versions_to_check = versions_to_check.exclude(pk=self.pk) - # Checks for unique_together - if ( - versions_to_check.filter(plugin=self.plugin, version=self.version).count() - > 0 - ): - raise ValidationError( - _( - "Version value must be unique among each plugin: a version with same number already exists." - ) - ) - - @staticmethod - def clean_version(version): - """ - Strips blanks and Version string - """ - if version.rfind(" ") > 0: - version = version.rsplit(" ")[-1] - return version - - class Meta: - unique_together = ("plugin", "version") - ordering = ("plugin", "-version", "experimental") - - def get_absolute_url(self): - return reverse( - "version_detail", - args=( - self.plugin.package_name, - self.version, - ), - ) - - def get_download_url(self): - return reverse( - "version_download", - args=( - self.plugin.package_name, - self.version, - ), - ) - - def download_file_name(self): - return "%s.%s.zip" % (self.plugin.package_name, self.version) - - def __unicode__(self): - desc = "%s %s" % (self.plugin, self.version) - if self.experimental: - desc = "%s %s" % (desc, _("Experimental")) - return desc - - def __str__(self): - return self.__unicode__() - - -class PluginVersionFeedback(models.Model): - """Feedback for a plugin version.""" - - version = models.ForeignKey( - PluginVersion, - on_delete=models.CASCADE, - related_name="feedback" - ) - reviewer = models.ForeignKey( - User, - verbose_name=_("Reviewed by"), - help_text=_("The user who reviewed this plugin."), - on_delete=models.CASCADE, - ) - task = models.TextField( - verbose_name=_("Task"), - help_text=_("A feedback task. Please write your review as a task for this plugin."), - max_length=1000, - blank=False, - null=False - ) - created_on = models.DateTimeField( - verbose_name=_("Created on"), - auto_now_add=True, - editable=False - ) - modified_on = models.DateTimeField( - _("Modified on"), - editable=False, - blank=True, - null=True - ) - - completed_on = models.DateTimeField( - verbose_name=_("Completed on"), - blank=True, - null=True - ) - is_completed = models.BooleanField( - verbose_name=_("Completed"), - default=False, - db_index=True - ) - - class Meta: - ordering = ["created_on"] - - def save(self, *args, **kwargs): - if self.is_completed is True: - self.completed_on = datetime.datetime.now() - else: - self.completed_on = None - super(PluginVersionFeedback, self).save(*args, **kwargs) - - -def delete_version_package(sender, instance, **kw): - """ - Removes the zip package - """ - try: - os.remove(instance.package.path) - except: - pass - - -def delete_plugin_icon(sender, instance, **kw): - """ - Removes the plugin icon - """ - try: - os.remove(instance.icon.path) - except: - pass - - -class PluginVersionDownload(models.Model): - """ - Plugin version downloads - """ - plugin_version = models.ForeignKey( - PluginVersion, - on_delete=models.CASCADE - ) - download_date = models.DateField( - default=timezone.now - ) - country_code = models.CharField(max_length=3, default='N/D') - country_name = models.CharField(max_length=100, default='N/D') - download_count = models.IntegerField( - default=0 - ) - class Meta: - unique_together = ( - 'plugin_version', - 'download_date', - 'country_code', - 'country_name' - ) - - -models.signals.post_delete.connect(delete_version_package, sender=PluginVersion) -models.signals.post_delete.connect(delete_plugin_icon, sender=Plugin) diff --git a/qgis-app/plugins/search_indexes.py b/qgis-app/plugins/search_indexes.py deleted file mode 100644 index 889be9f1..00000000 --- a/qgis-app/plugins/search_indexes.py +++ /dev/null @@ -1,20 +0,0 @@ -from haystack import indexes -from plugins.models import Plugin - - -class PluginIndex(indexes.SearchIndex, indexes.Indexable): - text = indexes.CharField(document=True, use_template=True) - created_by = indexes.CharField(model_attr="created_by") - created_on = indexes.DateTimeField(model_attr="created_on") - # We add this for autocomplete. - name_auto = indexes.EdgeNgramField(model_attr="name") - description_auto = indexes.EdgeNgramField(model_attr="description") - about_auto = indexes.EdgeNgramField(model_attr="about", default="") - package_name_auto = indexes.EdgeNgramField(model_attr="package_name", default="") - - def get_model(self): - return Plugin - - def index_queryset(self, using=None): - """Only search in approved plugins.""" - return Plugin.approved_objects.all() diff --git a/qgis-app/plugins/tasks/__init__.py b/qgis-app/plugins/tasks/__init__.py deleted file mode 100644 index 4a4a1481..00000000 --- a/qgis-app/plugins/tasks/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -from plugins.tasks.generate_plugins_xml import * # noqa -from plugins.tasks.update_feedjack import * # noqa -from plugins.tasks.update_qgis_versions import * # noqa -from plugins.tasks.rebuild_search_index import * # noqa diff --git a/qgis-app/plugins/tasks/generate_plugins_xml.py b/qgis-app/plugins/tasks/generate_plugins_xml.py deleted file mode 100644 index a7415b60..00000000 --- a/qgis-app/plugins/tasks/generate_plugins_xml.py +++ /dev/null @@ -1,91 +0,0 @@ -import os - -import requests -from celery import shared_task -from celery.utils.log import get_task_logger -from preferences import preferences -from django.conf import settings -from preferences import preferences - - -logger = get_task_logger(__name__) - - -@shared_task -def generate_plugins_xml(site=""): - """ - Fetch the xml list of plugins from the plugin site. - :param site: site domain where the plugins will be fetched, default to - http://plugins.qgis.org - """ - logger.info('generate_plugins_xml : {}'.format(site)) - - if not site: - if settings.DEFAULT_PLUGINS_SITE: - site = settings.DEFAULT_PLUGINS_SITE - else: - site = "http://plugins.qgis.org" - plugins_url = "{}/plugins/plugins_new.xml".format(site) - - versions = preferences.SitePreference.qgis_versions - - if versions: - versions = versions.split(",") - else: - versions = [ - "1.8", - "2.0", - "2.2", - "2.4", - "2.6", - "2.8", - "2.10", - "2.12", - "2.14", - "2.15", - "2.16", - "2.17", - "2.18", - "2.99", - "3.0", - "3.1", - "3.2", - "3.3", - "3.4", - "3.5", - "3.6", - "3.7", - "3.8", - "3.9", - "3.10", - "3.11", - "3.12", - "3.13", - "3.14", - "3.15", - "3.16", - "3.17", - "3.18", - "3.19", - "3.20", - "3.21", - "3.22", - "3.23", - "3.24", - "3.25", - ] - - folder_path = os.path.join(settings.MEDIA_ROOT, "cached_xmls") - - if not os.path.exists(folder_path): - os.mkdir(folder_path) - - for version in versions: - response = requests.get( - "{url}?qgis={version}".format(url=plugins_url, version=version) - ) - - if response.status_code == 200: - file_name = "plugins_{}.xml".format(version) - with open(os.path.join(folder_path, file_name), "w+") as file: - file.write(response.text) diff --git a/qgis-app/plugins/tasks/rebuild_search_index.py b/qgis-app/plugins/tasks/rebuild_search_index.py deleted file mode 100644 index 50c76d4d..00000000 --- a/qgis-app/plugins/tasks/rebuild_search_index.py +++ /dev/null @@ -1,12 +0,0 @@ -from celery import shared_task -from haystack.management.commands import update_index -from celery.utils.log import get_task_logger - -logger = get_task_logger(__name__) - -@shared_task -def rebuild_search_index(): - """ - Celery task to rebuild the search index. - """ - update_index.Command().handle() \ No newline at end of file diff --git a/qgis-app/plugins/tasks/update_feedjack.py b/qgis-app/plugins/tasks/update_feedjack.py deleted file mode 100644 index e12d14bd..00000000 --- a/qgis-app/plugins/tasks/update_feedjack.py +++ /dev/null @@ -1,10 +0,0 @@ -from celery import shared_task -from celery.utils.log import get_task_logger - -logger = get_task_logger(__name__) - - -@shared_task -def update_feedjack(): - import subprocess - subprocess.call(['python', 'manage.py', 'feedjackupdate']) diff --git a/qgis-app/plugins/tasks/update_qgis_versions.py b/qgis-app/plugins/tasks/update_qgis_versions.py deleted file mode 100644 index 890d836c..00000000 --- a/qgis-app/plugins/tasks/update_qgis_versions.py +++ /dev/null @@ -1,27 +0,0 @@ -from celery import shared_task -from base.models.site_preferences import SitePreference -from plugins.utils import get_qgis_versions - - -@shared_task -def update_qgis_versions(): - """ - This background task fetches the QGIS versions from the GitHub QGIS releases - and then updates the current QGIS version in the database. - """ - site_preference = SitePreference.objects.first() - if not site_preference: - site_preference = SitePreference.objects.create() - - qgis_versions = get_qgis_versions() - stored_qgis_versions = site_preference.qgis_versions.split(',') - for qgis_version in qgis_versions: - if qgis_version not in stored_qgis_versions: - stored_qgis_versions.append(qgis_version) - stored_qgis_versions = list(filter(None, stored_qgis_versions)) - stored_qgis_versions = [tuple(map(int, v.split('.'))) for v in stored_qgis_versions] - stored_qgis_versions.sort(reverse=True) - stored_qgis_versions = ['.'.join(map(str, v)) for v in stored_qgis_versions] - - site_preference.qgis_versions = ','.join(stored_qgis_versions) - site_preference.save() diff --git a/qgis-app/plugins/templates/plugins/form_snippet.html b/qgis-app/plugins/templates/plugins/form_snippet.html deleted file mode 100755 index ae794508..00000000 --- a/qgis-app/plugins/templates/plugins/form_snippet.html +++ /dev/null @@ -1,27 +0,0 @@ -{% load i18n plugin_utils %} - diff --git a/qgis-app/plugins/templates/plugins/pagination.html b/qgis-app/plugins/templates/plugins/pagination.html deleted file mode 100644 index 99bec111..00000000 --- a/qgis-app/plugins/templates/plugins/pagination.html +++ /dev/null @@ -1,50 +0,0 @@ -{% if is_paginated %} -{% load i18n %} -
- {% if page_obj.has_previous %}
- ‹‹ {% trans "previous" %}
- {% else %}
- ‹‹ {% trans "previous" %}
- {% endif %}
- {% for page in pages %}
- {% if page %}
- {% if page == page_obj.number %}
- {{ page }}
- {% else %}
- {{ page }}
- {% endif %}
- {% else %}
- ...
- {% endif %}
- {% endfor %}
- {% if page_obj.has_next %}
- {% trans "next" %} ››
- {% else %}
- {% trans "next" %} ››
- {% endif %}
- {# ABP: per_page #}
- {% if per_page_list %}
-
-
-{% endif %}
diff --git a/qgis-app/plugins/templates/plugins/plugin_base.html b/qgis-app/plugins/templates/plugins/plugin_base.html
deleted file mode 100644
index 31badff6..00000000
--- a/qgis-app/plugins/templates/plugins/plugin_base.html
+++ /dev/null
@@ -1,52 +0,0 @@
-{% extends BASE_TEMPLATE %}{% load i18n plugins_tagcloud static %}
-{% load resources_custom_tags plugin_utils %}
-{% block title %}
- {% plugin_title %} — {% trans "QGIS Python Plugins Repository"%}
-{% endblock %}
-
-{% block app_title %}
-{% trans "Elements per page:" %}
- {% for p in per_page_list %}{% if p = paginator.per_page %}
- {{ p }}
- {% else %}
- {% if forloop.last %}{% trans "All" %}{% else %}{{ p }}{% endif %}
- {% endif %}
- {% endfor %}
-
- {% endif %}
-{% trans "QGIS Python Plugins Repository"%}
-{% endblock %} - - -{% block menu %} -{{ block.super }} - {% trans "Upload a plugin" %} -{% trans "Plugins" %}
- - --{% include_plugins_tagcloud_modal 'plugins.plugin' %} - -{% endblock %} - -{% block "credits" %} - {{ block.super }} -{% endblock %} diff --git a/qgis-app/plugins/templates/plugins/plugin_delete_confirm.html b/qgis-app/plugins/templates/plugins/plugin_delete_confirm.html deleted file mode 100644 index 4dbd8164..00000000 --- a/qgis-app/plugins/templates/plugins/plugin_delete_confirm.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends 'plugins/plugin_base.html' %}{% load i18n %} -{% block content %} -
{% trans "Delete plugin"%}: {{ plugin.title }}
- - -{% endblock %} diff --git a/qgis-app/plugins/templates/plugins/plugin_detail.html b/qgis-app/plugins/templates/plugins/plugin_detail.html deleted file mode 100644 index 2448114e..00000000 --- a/qgis-app/plugins/templates/plugins/plugin_detail.html +++ /dev/null @@ -1,392 +0,0 @@ -{% extends 'plugins/plugin_base.html' %}{% load i18n static thumbnail %} -{% load local_timezone %} -{% load plugin_utils %} -{% block extrajs %} -{{ block.super }} - - - -{% endblock %} -{% block extracss %} - -{{ block.super }} - -{% endblock %} -{% block content %} -
- {% if object.stable or object.experimental %}
-
-
-
-
- {% for version in object_list %}
- {% if version.plugin.about %}{% endif %}
- {{ version.version }}
- {{ version.is_trusted }}
- {{ version.min_qg_version }}
- {{ version.max_qg_version }}
- {{ version.download_file_name }}
- {% if version.plugin.icon %}{{ version.plugin.icon.url }}{% endif %}
- {% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}{{ version.get_download_url }}
- {{ version.plugin.created_on|local_timezone:"WITH-UTC" }}
- {{ version.created_on|local_timezone:"WITH-UTC" }}
- {% if version.experimental %}True{% else%}False{% endif %}
- {{ version.plugin.deprecated }}
- {{version.plugin.downloads}}
- {{version.plugin.avg_vote}}
- {{version.plugin.rating_votes}}
- {{version.plugin.external_deps }}
- {% if version.plugin.server %}True{% else%}False{% endif %}
- {% endfor %}
-
diff --git a/qgis-app/plugins/templates/plugins/plugins_tagcloud_include.html b/qgis-app/plugins/templates/plugins/plugins_tagcloud_include.html
deleted file mode 100644
index 6a9e7fd1..00000000
--- a/qgis-app/plugins/templates/plugins/plugins_tagcloud_include.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% load plugins_tagcloud %}
-
-{% get_plugins_tagcloud as tags %}
-
-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
O0000X
z2RtthAdf*$TAfhpw|7z;*;(eo4j>Ib_!G9~yn6r>rN8yd2mrW$cwYD;{T5kpZ`Jb&
X2?uL6iclM400000NkvXXu0mjf+}4F+
diff --git a/qgis-app/plugins/tests/HelloWorld/1.3-full-md-no-init/HelloWorld/metadata.txt b/qgis-app/plugins/tests/HelloWorld/1.3-full-md-no-init/HelloWorld/metadata.txt
deleted file mode 100644
index 9e35f413..00000000
--- a/qgis-app/plugins/tests/HelloWorld/1.3-full-md-no-init/HelloWorld/metadata.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-[general]
-name=HelloWorld
-qgisMinimumVersion=1.8
-description=This is a plugin for greeting the
- (going multiline) world, version is 1.3
-version=version 1.3
-author=Alessandro Secondo
-email=email2@email.com
-
-
-changelog=this is a very
- very
- very - very - very - very long multiline changelog - - -tags=wkt,raster,hello world - -tracker=http://bugs.itopen.it -homepage=http://www.itopen.it -repository=http://www.itopen.it/repo - -; change icon... -icon=icon.png diff --git a/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/HelloWorld.py b/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/HelloWorld.py deleted file mode 100644 index 45bdac04..00000000 --- a/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/HelloWorld.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# Import the PyQt and QGIS libraries -from PyQt4.QtCore import * -from PyQt4.QtGui import * -from qgis.core import * - - -class HelloWorld: - def __init__(self, iface): - # Save reference to the QGIS interface - self.iface = iface - self.canvas = iface.mapCanvas() - - def initGui(self): - # Create action that will start plugin - self.action = QAction( - QIcon(":/plugins/"), "&HelloWorld", self.iface.mainWindow() - ) - # connect the action to the run method - QObject.connect(self.action, SIGNAL("activated()"), self.hello_world) - - # Add toolbar button and menu item - self.iface.addPluginToMenu("HelloWorld", self.action) - - def unload(self): - # Remove the plugin menu item and icon - self.iface.removePluginMenu("HelloWorld", self.action) - - # run - def hello_world(self): - QMessageBox.information( - self.iface.mainWindow(), - QCoreApplication.translate("HelloWorld", "HelloWorld"), - QCoreApplication.translate("HelloWorld", "HelloWorld"), - ) - return - - -if __name__ == "__main__": - pass diff --git a/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/__init__.py b/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/__init__.py deleted file mode 100644 index eff9426a..00000000 --- a/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -""" - This script initializes the plugin, making it known to QGIS. -""" - - -def classFactory(iface): - from HelloWorld import HelloWorld - - return HelloWorld(iface) diff --git a/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/icon.png b/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/icon.png deleted file mode 100644 index 67d47930b2262a7087631bc8c94f7104801b8c83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 zcmV-L0lNN)P)X
z2RtthAdf*$TAfhpw|7z;*;(eo4j>Ib_!G9~yn6r>rN8yd2mrW$cwYD;{T5kpZ`Jb&
X2?uL6iclM400000NkvXXu0mjf+}4F+
diff --git a/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/metadata.txt b/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/metadata.txt
deleted file mode 100644
index 778919e0..00000000
--- a/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/metadata.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-[general]
-name=HelloWorld
-qgisMinimumVersion=1.8
-description=This is a test plugin for greeting the
- (going multiline) world, version is 1.5
-version=version 1.5
-author=Alessandro Pasotti
-email=apasotti@gmail.com
-
-
-changelog=this is a very
- very
- very - very - very - very long multiline changelog - - -tags= wkt, raster,hello world, spaced tag , tag - -tracker=http://bugs.itopen.it -homepage=http://www.itopen.it -repository=http://www.itopen.it/repo - - - -experimental=True - - -; change icon... -icon=icon.png diff --git a/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/HelloWorld.py b/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/HelloWorld.py deleted file mode 100644 index 45bdac04..00000000 --- a/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/HelloWorld.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# Import the PyQt and QGIS libraries -from PyQt4.QtCore import * -from PyQt4.QtGui import * -from qgis.core import * - - -class HelloWorld: - def __init__(self, iface): - # Save reference to the QGIS interface - self.iface = iface - self.canvas = iface.mapCanvas() - - def initGui(self): - # Create action that will start plugin - self.action = QAction( - QIcon(":/plugins/"), "&HelloWorld", self.iface.mainWindow() - ) - # connect the action to the run method - QObject.connect(self.action, SIGNAL("activated()"), self.hello_world) - - # Add toolbar button and menu item - self.iface.addPluginToMenu("HelloWorld", self.action) - - def unload(self): - # Remove the plugin menu item and icon - self.iface.removePluginMenu("HelloWorld", self.action) - - # run - def hello_world(self): - QMessageBox.information( - self.iface.mainWindow(), - QCoreApplication.translate("HelloWorld", "HelloWorld"), - QCoreApplication.translate("HelloWorld", "HelloWorld"), - ) - return - - -if __name__ == "__main__": - pass diff --git a/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/__init__.py b/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/__init__.py deleted file mode 100644 index eff9426a..00000000 --- a/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -""" - This script initializes the plugin, making it known to QGIS. -""" - - -def classFactory(iface): - from HelloWorld import HelloWorld - - return HelloWorld(iface) diff --git a/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/icon.png b/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/icon.png deleted file mode 100644 index 67d47930b2262a7087631bc8c94f7104801b8c83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 zcmV-L0lNN)P)X
z2RtthAdf*$TAfhpw|7z;*;(eo4j>Ib_!G9~yn6r>rN8yd2mrW$cwYD;{T5kpZ`Jb&
X2?uL6iclM400000NkvXXu0mjf+}4F+
diff --git a/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/metadata.txt b/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/metadata.txt
deleted file mode 100644
index 1fb4daf4..00000000
--- a/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/metadata.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-[general]
-name=HelloWorld
-qgisMinimumVersion=1.8
-description=This is a test plugin for greeting the
- (going multiline) world, version is 1.6
-version=version 1.6
-author=Alessandrò Pasottì
-email=apasotti@gmail.com
-
-
-changelog=this is a very
- very
- very - very - very - very long multiline changelog - - -tags= wkt, raster,hello world, spaced tag , tag - -tracker=http://bugs.itopen.it -homepage=http://www.itopen.it -repository=http://www.itopen.it/repo - - - -experimental=True - - -; change icon... -icon=icon.png diff --git a/qgis-app/plugins/tests/HelloWorld/1.7-full-md-no-init-subfolder-icon/HelloWorld/HelloWorld.py b/qgis-app/plugins/tests/HelloWorld/1.7-full-md-no-init-subfolder-icon/HelloWorld/HelloWorld.py deleted file mode 100644 index 45bdac04..00000000 --- a/qgis-app/plugins/tests/HelloWorld/1.7-full-md-no-init-subfolder-icon/HelloWorld/HelloWorld.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# Import the PyQt and QGIS libraries -from PyQt4.QtCore import * -from PyQt4.QtGui import * -from qgis.core import * - - -class HelloWorld: - def __init__(self, iface): - # Save reference to the QGIS interface - self.iface = iface - self.canvas = iface.mapCanvas() - - def initGui(self): - # Create action that will start plugin - self.action = QAction( - QIcon(":/plugins/"), "&HelloWorld", self.iface.mainWindow() - ) - # connect the action to the run method - QObject.connect(self.action, SIGNAL("activated()"), self.hello_world) - - # Add toolbar button and menu item - self.iface.addPluginToMenu("HelloWorld", self.action) - - def unload(self): - # Remove the plugin menu item and icon - self.iface.removePluginMenu("HelloWorld", self.action) - - # run - def hello_world(self): - QMessageBox.information( - self.iface.mainWindow(), - QCoreApplication.translate("HelloWorld", "HelloWorld"), - QCoreApplication.translate("HelloWorld", "HelloWorld"), - ) - return - - -if __name__ == "__main__": - pass diff --git a/qgis-app/plugins/tests/HelloWorld/1.7-full-md-no-init-subfolder-icon/HelloWorld/__init__.py b/qgis-app/plugins/tests/HelloWorld/1.7-full-md-no-init-subfolder-icon/HelloWorld/__init__.py deleted file mode 100644 index eff9426a..00000000 --- a/qgis-app/plugins/tests/HelloWorld/1.7-full-md-no-init-subfolder-icon/HelloWorld/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -""" - This script initializes the plugin, making it known to QGIS. -""" - - -def classFactory(iface): - from HelloWorld import HelloWorld - - return HelloWorld(iface) diff --git a/qgis-app/plugins/tests/HelloWorld/1.7-full-md-no-init-subfolder-icon/HelloWorld/icons/icon.png b/qgis-app/plugins/tests/HelloWorld/1.7-full-md-no-init-subfolder-icon/HelloWorld/icons/icon.png deleted file mode 100644 index 681cf0cbc30d28f10f220135c21869754c5598ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1319 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
-
- - {% trans "Download latest" %} -
-
- {% else %}
-
-
- {% endif %}
- {{ object.name }}
- {% if object.icon and object.icon.file and object.icon|is_image_valid %}
- {% with image_extension=object.icon.name|file_extension %}
- {% if image_extension == 'svg' %}
-
-
- {{ object.name }}
- {% if object.icon and object.icon.file and object.icon|is_image_valid %}
- {% with image_extension=object.icon.name|file_extension %}
- {% if image_extension == 'svg' %}
- 
- {% else %}
- {% thumbnail object.icon "128x128" upscale=False format="PNG" as im %}
- 
- {% endthumbnail %}
- {% endif %}
- {% endwith %}
- {% else %}
- 
- {% endif %}
-
-
- {% trans "Plugin ID:" %} {{ object.pk }}
-
-
-
-
-
- {% if not object.experimental and not object.stable %}
-
- {% endif %}
- {% endcomment %}
-
-
-
-
-{% endblock %}
diff --git a/qgis-app/plugins/templates/plugins/plugin_feedback.html b/qgis-app/plugins/templates/plugins/plugin_feedback.html
deleted file mode 100644
index 300e5ff3..00000000
--- a/qgis-app/plugins/templates/plugins/plugin_feedback.html
+++ /dev/null
@@ -1,235 +0,0 @@
-{% extends 'plugins/plugin_base.html' %}{% load i18n %}
-{% block content %}
- {% if form.errors %}
-
-
- {% endif %}
-
- {% if not object.created_by.is_active %}
- {% trans "This plugin has no public version yet." %}
-
-
- {% endif %}
-
- {% if object.deprecated %}
- {% trans "The plugin maintainer has been blocked." %}
-
-
- {% endif %}
-
- {% trans "This plugin is deprecated!" %}
- ({% firstof votes '0' %}) {% trans "votes" %}
- -- {% comment%} - {% if object.about %} -{{ object.description|safe|linebreaksbr }}
-
{{ object.about|safe|linebreaksbr }}
- {% if object.about %}
-
-
-
- {% endif %}
- {{ object.about|safe|linebreaksbr }}
-
- {% if object.server %}
-
- {% trans "This plugin provides an interface for QGIS Server." %}
- {% endif %}
- -
- {% if object.author %}
-
- {% trans "Author"%} -
- - {{ object.author }} - - {% endif %} - {% if object.email and not user.is_anonymous %} -
- {% trans "Author's email"%} -
- {{ object.email }} - {% endif %} - {% if object.display_created_by %} -
- {% trans "Created by"%} -
- - {{ object.created_by }} - - - {% endif %} -
- {% trans "Maintainer"%} -
- - {{ object.maintainer }} - - {% if object.owners.count %} -
- {% trans "Collaborators"%} -
- - {% for owner in object.owners.all %} - {{ owner.username }}{% if not forloop.last %},{% endif %} - {% endfor %} - - {% endif %} - {% if object.tags.count %} -
- - {% trans "Tags"%} - -
- - {% for tag in object.tags.all %}{% if tag.slug %}{{tag}} - {% if not forloop.last %}, {% endif %}{% endif %}{% endfor %} - - {% endif %} - {% if object.homepage %} -
- {% trans "Plugin home page"%} -
- {{ object.homepage }} - {% endif %} - {% if object.tracker %} -
- {% trans "Tracker" %} -
- {% trans "Browse and report bugs" %} - {% endif %} - {% if object.repository %} -
- {% trans "Code repository" %} -
- {{ object.repository }} - {% endif %} - {% if object.stable %} -
- {% trans "Latest stable version"%} -
- {{ object.stable.version }} - {% endif %} - {% if object.experimental %} -
- {% trans "Latest experimental version"%}: -
- {{ object.experimental.version }} - {% endif %} - {% if object.pk %} -
- {% trans "Plugin ID"%} -
-
- {{ object.pk }}
- - --
- {% endif %}
-
- {% if object.pluginversion_set.count %}
- {# show all versions if user is authorized #}
-
-
- {% if user.is_staff or user in object.editors %}
-
-
-
-
-
- {% endif %}
- | {% trans "Version" %} | - {% if not user.is_anonymous %}{% trans "Approved" %} | {% endif %} -{% trans "Experimental" %} | -{% trans "Min QGIS version" %} | -{% trans "Max QGIS version" %} | -{% trans "Downloads" %} | -{% trans "Uploaded by" %} | -{% trans "Date" %} | - {% if user.is_staff or user in object.approvers or user in object.editors %}{% trans "Manage" %} | {% endif %} -|
|---|---|---|---|---|---|---|---|---|---|
| {{ version.version }} | - {% if not user.is_anonymous %}{{ version.approved|yesno }} | {% endif %} -{{ version.experimental|yesno }} | -{{ version.min_qg_version }} | -{{ version.max_qg_version }} | -{{ version.downloads }} | - {% if version.is_from_token %} -Token {{ version.token.description|default:"" }} | - {% else %} -{{ version.created_by }} | - {% endif %} -{{ version.created_on|local_timezone }} | - {% if user.is_staff or user in version.plugin.approvers or user in version.plugin.editors %}- | - {% endif %} -
-
-
-
-
-
- {% endif %}
- {# end admin #}
-
-
-
- {% endif %}
- {% if form.non_field_errors %}
- {% trans "The form contains errors and cannot be submitted, please check the fields highlighted in red." %}
-
-
- {% for error in form.non_field_errors %}
-
- {% endif %}
- {{ error }}
- {% endfor %} -{% trans "Feedback Plugin" %} {{ version.plugin.name }} {{ version.version }}
-
-
-
-{% endblock %}
-
-{% block extrajs %}
-
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/qgis-app/plugins/templates/plugins/plugin_form.html b/qgis-app/plugins/templates/plugins/plugin_form.html
deleted file mode 100644
index 86edcd27..00000000
--- a/qgis-app/plugins/templates/plugins/plugin_form.html
+++ /dev/null
@@ -1,108 +0,0 @@
-{% extends 'plugins/plugin_base.html' %}{% load static i18n %}
-{% block extrajs %}
-{{ block.super }}
-
-
-
-
-
-
-
-
-{% endblock %}
-{% block content %}
- Please tick the checkbox when the task is completed and click the "Update" button to update status.
- {% for feedback in feedbacks %} -
-
- {% if feedback.reviewer.first_name %}
- {{ feedback.reviewer.first_name }} {{ feedback.reviewer.last_name }}
- {% else %}
- {{ feedback.reviewer.username }}
- {% endif %}
-
- wrote {{ feedback.created_on|timesince }} ago
-
- {% endfor %}
- {% if feedbacks %}
-
-
-
- {% if feedback.reviewer == request.user %}
-
-
-
-
-
- {% endif %}
-
-
-
- {% endif %}
-
- {% if is_user_has_approval_rights %}
-
-
-
- {% endif %}
- {{ form_title }} {{ plugin }}
-
-
- {% if form.errors %}
- {% trans "required field." %}
-
-
-
- {% endif %}
- {% if form.non_field_errors %}
- {% trans "The form contains errors and cannot be submitted, please check the fields highlighted in red." %}
-
-
- {% for error in form.non_field_errors %}
-
- {% endif %}
-
-
-
-{% endblock %}
diff --git a/qgis-app/plugins/templates/plugins/plugin_list.html b/qgis-app/plugins/templates/plugins/plugin_list.html
deleted file mode 100644
index c0457a35..00000000
--- a/qgis-app/plugins/templates/plugins/plugin_list.html
+++ /dev/null
@@ -1,183 +0,0 @@
-{% extends 'plugins/plugin_base.html' %}{% load i18n bootstrap_pagination humanize static sort_anchor range_filter thumbnail %}
-{% load local_timezone %}
-{% load plugin_utils %}
-{% block extrajs %}
-
-
-{% endblock %}
-{% block content %}
- {{ error }}
- {% endfor %} -{% if title %}{{title}}{% else %}{% trans "All plugins" %}{% endif %}
- {# Filtered views menu #} - {% if object_list.count %} -
- {% blocktrans with records_count=page_obj.paginator.count %}{{ records_count }} records found{% endblocktrans %} —
- {% trans "Click to toggle descriptions." %}
-
-
- {#% include 'sortable_listview/sort_links.html' %#}
-
- | - | {% anchor name %} | - {% if not user.is_anonymous %}{% anchor featured %} | -{% anchor downloads %} | -{% anchor author "Author" %} | -{% anchor latest_version_date "Latest Plugin Version" %} | -{% anchor created_on "Created on" %} | -{% anchor average_vote "Stars (votes)" %} | -{% trans "Stable" %} | -{% trans "Exp." %} | - {% if user.is_authenticated %}{% trans "Manage" %} | {% endif %} -||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
- {% if object.icon and object.icon.file and object.icon|is_image_valid %}
- {% with image_extension=object.icon.name|file_extension %}
- {% if image_extension == 'svg' %}
- |
- {{ object.name }} | - {% if not user.is_anonymous %}{% if object.approved %} | {% endif %}
- {% if object.featured%} |
- {{ object.downloads }} | - {% if object.author %} -{{ object.author }} | - {% endif %} -{{ object.latest_version_date|local_timezone:"SHORT_NATURAL_DAY" }} | -{{ object.created_on|local_timezone:"SHORT" }} | - ({{ object.rating_votes }}) |
- {% if object.stable %}{{ object.stable.version }}{% else %}—{% endif %} | -{% if object.experimental %}{{ object.experimental.version }}{% else %}—{% endif %} | - {% if user.is_authenticated %}{% if user in object.editors or user.is_staff %}- {% else %}{% endif %} | {% endif %} - -|
| {{ object.description }} | ||||||||||||
- {% include 'sortable_listview/pagination.html' %}
-
-
-
- {% if show_more_items_number <= page_obj.paginator.count %}
-
- {% else %}
-
- {% endif %}
-
-
-
- {% trans "Elements per page:" %}
-
-
-
-
-
-
-
- {% trans "Deprecated plugins are printed in red." %}
-
- {% else %}
- {% block plugins_message %}
-
-
- {% trans "This list is empty!" %}
-
- {% endblock %}
- {% endif %}
-
-{% endblock %}
diff --git a/qgis-app/plugins/templates/plugins/plugin_list_my.html b/qgis-app/plugins/templates/plugins/plugin_list_my.html
deleted file mode 100644
index 95fd2948..00000000
--- a/qgis-app/plugins/templates/plugins/plugin_list_my.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends 'plugins/plugin_list.html' %}{% load i18n %}
-
-{% block plugins_message %}
- {% if not object_list.count %}
- {% trans "You have not uploaded any plugin yet:" %} {% trans "Create a new plugin" %}
- {% endif %} -{% endblock %} diff --git a/qgis-app/plugins/templates/plugins/plugin_permission_deny.html b/qgis-app/plugins/templates/plugins/plugin_permission_deny.html deleted file mode 100644 index 3602935f..00000000 --- a/qgis-app/plugins/templates/plugins/plugin_permission_deny.html +++ /dev/null @@ -1,4 +0,0 @@ -{% extends 'plugins/plugin_base.html' %}{% load i18n %} -{% block content %} -{% trans "You cannot modify this plugin." %}
-{% endblock %}
diff --git a/qgis-app/plugins/templates/plugins/plugin_token_delete_confirm.html b/qgis-app/plugins/templates/plugins/plugin_token_delete_confirm.html
deleted file mode 100644
index 3cebe239..00000000
--- a/qgis-app/plugins/templates/plugins/plugin_token_delete_confirm.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends 'plugins/plugin_base.html' %}{% load i18n %}
-{% block content %}
- Delete token of "{{ username }}"
- - -{% endblock %} diff --git a/qgis-app/plugins/templates/plugins/plugin_token_detail.html b/qgis-app/plugins/templates/plugins/plugin_token_detail.html deleted file mode 100644 index 1ab1101f..00000000 --- a/qgis-app/plugins/templates/plugins/plugin_token_detail.html +++ /dev/null @@ -1,114 +0,0 @@ -{% extends 'plugins/plugin_base.html' %}{% load i18n %} -{% load local_timezone %} -{% block content %} -{% trans "Token for" %} {{ plugin.name }}
-
-
- To enhance the security of the plugin token,
- it will be displayed only once. Please ensure
- to save it in a secure location. If the token
- is lost, you can generate a new one at any time.
-
--
-
- {% trans "User"%} -
- - {{ object.user }} - -
- {% trans "Jti"%} -
- - {{object.jti}} - -
- {% trans "Created at"%} -
- - {{ object.created_at|local_timezone }} - -
- {% trans "Expires at"%} -
- - {{ object.expires_at|local_timezone }} - -
- {% trans "Access token"%} -
-
-
- - -- -
-
-
{% trans "Edit token description " %} {{ token.jti }}
- -{% if form.errors %} -
-
-
-{% endif %}
-{% if form.non_field_errors %}
-{% trans "The form contains errors and cannot be submitted, please check the fields highlighted in red." %}
-
-
- {% for error in form.non_field_errors %}
-
-{% endif %}
-
-{% endblock %}
\ No newline at end of file
diff --git a/qgis-app/plugins/templates/plugins/plugin_token_invalid_or_expired.html b/qgis-app/plugins/templates/plugins/plugin_token_invalid_or_expired.html
deleted file mode 100644
index 3f6b286a..00000000
--- a/qgis-app/plugins/templates/plugins/plugin_token_invalid_or_expired.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends 'plugins/plugin_base.html' %}{% load i18n %}
-{% block content %}
- {{ error }}
- {% endfor %} -{% trans "Token is invalid or expired." %}
-{% endblock %}
diff --git a/qgis-app/plugins/templates/plugins/plugin_token_list.html b/qgis-app/plugins/templates/plugins/plugin_token_list.html
deleted file mode 100644
index 530042b4..00000000
--- a/qgis-app/plugins/templates/plugins/plugin_token_list.html
+++ /dev/null
@@ -1,77 +0,0 @@
-{% extends 'plugins/plugin_base.html' %}{% load i18n %}
-{% load local_timezone %}
-{% block content %}
-{% trans "Tokens for" %} {{ plugin.name }}
- -{% if object_list.count %} -
-
-
-
-
-{% else %}
-| {% trans "User" %} | -{% trans "Description" %} | -{% trans "Jti" %} | -{% trans "Created at" %} | -{% trans "Last used at" %} | -{% trans "Manage" %} | -
|---|---|---|---|---|---|
| {{ plugin_token.token.user }} | -{{ plugin_token.description|default:"-" }} | -- - {{ plugin_token.token.jti }} - - | -{{ plugin_token.token.created_at|local_timezone }} | -{{ plugin_token.last_used_on|default:"-"|local_timezone }} | -- - - - | -
-
- {% trans "This list is empty!" %}
-
-{% endif %}
-
-{% endblock %}
-
-{% block extracss %}
-{{ block.super }}
-
-{% endblock %}
\ No newline at end of file
diff --git a/qgis-app/plugins/templates/plugins/plugin_token_permission_deny.html b/qgis-app/plugins/templates/plugins/plugin_token_permission_deny.html
deleted file mode 100644
index 7850ee82..00000000
--- a/qgis-app/plugins/templates/plugins/plugin_token_permission_deny.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends 'plugins/plugin_base.html' %}{% load i18n %}
-{% block content %}
- {% trans "You cannot see tokens for this plugin." %}
-{% endblock %}
diff --git a/qgis-app/plugins/templates/plugins/plugin_upload.html b/qgis-app/plugins/templates/plugins/plugin_upload.html
deleted file mode 100644
index e2b0f67f..00000000
--- a/qgis-app/plugins/templates/plugins/plugin_upload.html
+++ /dev/null
@@ -1,45 +0,0 @@
-{% extends 'plugins/plugin_base.html' %}{% load i18n %}
-{% block content %}
- {% trans "Upload a plugin" %}
-{% trans "To upload a new plugin or update an existing one, you can specify the zipped file in this form." %}
-{% trans "Alternatively, to update an existing plugin, you can also open the plugin's details view and add a new version from there." %}
- {% if form.non_field_errors %} -
-
- {% for error in form.non_field_errors %}
-
- {% endif %}
-
-
-{% endblock %}
diff --git a/qgis-app/plugins/templates/plugins/plugins.xml b/qgis-app/plugins/templates/plugins/plugins.xml
deleted file mode 100644
index cf28e89f..00000000
--- a/qgis-app/plugins/templates/plugins/plugins.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-{% load static %}{% load local_timezone %}
-
-{{ error }}
- {% endfor %} -
-{% for tag in tags %}{% if tag.slug %}
-{{tag}}
-{% endif %}{% endfor %}
-
-
diff --git a/qgis-app/plugins/templates/plugins/plugins_tagcloud_modal_include.html b/qgis-app/plugins/templates/plugins/plugins_tagcloud_modal_include.html
deleted file mode 100644
index 36898615..00000000
--- a/qgis-app/plugins/templates/plugins/plugins_tagcloud_modal_include.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% load i18n plugins_tagcloud %}
-
-{% trans "Plugin Tags" as tags_title %}
-
-
-
- {{ tags_title }}
-
-
-
-
diff --git a/qgis-app/plugins/templates/plugins/tagcloud_include.html b/qgis-app/plugins/templates/plugins/tagcloud_include.html
deleted file mode 100644
index 35b35bbd..00000000
--- a/qgis-app/plugins/templates/plugins/tagcloud_include.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load plugins_tagcloud %}
-
-{% if forvar %}
-{% get_tagcloud as tags for forvar %}
-{% else %}
-{% get_tagcloud as tags %}
-{% endif %}
-
-
-{% for tag in tags %}{% if tag.slug %}
-{{tag}}
-{% endif %}{% endfor %}
-
-
diff --git a/qgis-app/plugins/templates/plugins/user.html b/qgis-app/plugins/templates/plugins/user.html
deleted file mode 100644
index 0c370502..00000000
--- a/qgis-app/plugins/templates/plugins/user.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends 'plugins/plugin_list.html' %}{% load i18n %}
-
-{% block content %}
-
- {% if user.is_staff %}
- {% trans "User Details of: " %} {{ plugin_user.username }}
--
- {% if plugin_user.first_name %}
- {% trans "First name: " %} {{ plugin_user.first_name }} {% endif %} - {% if plugin_user.last_name %}
- {% trans "Last name: " %} {{ plugin_user.last_name }} {% endif %} - {% if plugin_user.email %} -
- {% trans "Email: " %} {{ plugin_user.email }} {% endif %} -
{% blocktrans with version.version as version and plugin.name as plugin_name %}Delete version "{{ version }}" of "{{ plugin_name }}"{% endblocktrans %}
- - -{% endblock %} diff --git a/qgis-app/plugins/templates/plugins/version_detail.html b/qgis-app/plugins/templates/plugins/version_detail.html deleted file mode 100644 index b9cd4874..00000000 --- a/qgis-app/plugins/templates/plugins/version_detail.html +++ /dev/null @@ -1,77 +0,0 @@ -{% extends 'plugins/plugin_base.html' %}{% load i18n %} -{% load local_timezone %} -{% block content %} -{% trans "Version" %}: {{ version }}
- - - {% if not version.created_by.is_active and not version.is_from_token %} -
- {% trans "The plugin author has been blocked." %}
-
- {% endif %}
-
-
-
-
-
-
-
-
-
-{% endblock %}
diff --git a/qgis-app/plugins/templates/plugins/version_form.html b/qgis-app/plugins/templates/plugins/version_form.html
deleted file mode 100644
index b928d645..00000000
--- a/qgis-app/plugins/templates/plugins/version_form.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends 'plugins/plugin_base.html' %}{% load i18n %}
-{% block content %}
-
-
-
- -
- {% if version.changelog %}
- {% trans "Changelog" %}
{{ version.changelog|wordwrap:80 }}{% endif %}
- - {% trans "Approved" %}
- {{ version.approved|yesno }} -
- {% trans "Author" %}
- - {% if version.is_from_token %} - Token {{ version.token.description|default:"" }} - {% else %} - {{ version.created_by }} - {% endif %} - -
- {% trans "Uploaded" %}
- {{ version.created_on|local_timezone }} -
- {% trans "Minimum QGIS version" %}
- {{ version.min_qg_version }} -
- {% trans "Maximum QGIS version" %}
- {{ version.max_qg_version }} -
- {% trans "External dependencies (PIP install string)" %}
- {{ version.external_deps }} -
- {% trans "Experimental" %}
- {{ version.experimental|yesno }} -
-
- {% endif %}
- {% trans "Version management"%}
- {% if user.is_staff or user in version.plugin.editors %} - {% trans "Edit" %} - {% trans "Delete" %} - {% endif %} - {% trans "Plugin details" %} - - {% if user.is_staff or user in version.plugin.approvers %} -{% trans "Version approval"%}
- - {% if user.is_staff %} -{% trans "Author management"%}
- - {% endif %} -{{ form_title }} {{ version }}
-
-
- {% if form.non_field_errors %}
- {% trans "required field." %}
-
-
- {% for error in form.non_field_errors %}
-
- {% endif %}
-
-
-
-{% endblock %}
diff --git a/qgis-app/plugins/templates/plugins/version_permission_deny.html b/qgis-app/plugins/templates/plugins/version_permission_deny.html
deleted file mode 100644
index 81e4c94b..00000000
--- a/qgis-app/plugins/templates/plugins/version_permission_deny.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends 'plugins/plugin_base.html' %}{% load i18n %}
-{% block content %}
- {{ error }}
- {% endfor %} -{% trans "You cannot create or modify versions of this plugin." %}
-{% endblock %}
diff --git a/qgis-app/plugins/templatetags/__init__.py b/qgis-app/plugins/templatetags/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/qgis-app/plugins/templatetags/local_timezone.py b/qgis-app/plugins/templatetags/local_timezone.py
deleted file mode 100644
index 835e7c82..00000000
--- a/qgis-app/plugins/templatetags/local_timezone.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import pytz
-from django import template
-from django.utils.safestring import mark_safe
-
-register = template.Library()
-
-
-@register.filter(name="local_timezone", is_safe=True)
-def local_timezone(date, args="LONG"):
- try:
- utcdate = date.astimezone(pytz.utc).isoformat()
- if args and str(args) == "SHORT":
- result = '%s' % (utcdate,)
- elif args and str(args) == "SHORT_NATURAL_DAY":
- result = '%s' % (utcdate,)
- elif args and str(args) == "WITH-UTC":
- result = utcdate
- else:
- result = '%s' % (utcdate,)
- except AttributeError:
- result = date
- return mark_safe(result)
diff --git a/qgis-app/plugins/templatetags/plugin_utils.py b/qgis-app/plugins/templatetags/plugin_utils.py
deleted file mode 100755
index 3daf1722..00000000
--- a/qgis-app/plugins/templatetags/plugin_utils.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from django import template
-from PIL import Image, UnidentifiedImageError
-import xml.etree.ElementTree as ET
-
-register = template.Library()
-
-
-@register.filter("klass")
-def klass(ob):
- return ob.__class__.__name__
-
-
-@register.simple_tag(takes_context=True)
-def plugin_title(context):
- """Returns plugin name for title"""
- title = ""
-
- if "title" in context:
- title = context["title"]
- if "plugin" in context:
- title = context["plugin"].name
- if "version" in context:
- title = "{plugin} {version}".format(
- plugin=context["version"].plugin.name, version=context["version"].version
- )
- if "page_title" in context:
- title = context["page_title"]
- return title
-
-@register.filter
-def file_extension(value):
- return value.split('.')[-1].lower()
-
-@register.filter
-def is_image_valid(image):
- if not image:
- return False
- # Check if the file is an SVG by extension
- if image.path.lower().endswith('.svg'):
- return _validate_svg(image.path)
- return _validate_image(image.path)
-
-
-def _validate_svg(file_path):
- try:
- # Parse the SVG file to ensure it's well-formed XML
- ET.parse(file_path)
- return True
- except (ET.ParseError, FileNotFoundError):
- return False
-
-def _validate_image(file_path):
- try:
- img = Image.open(file_path)
- img.verify()
- return True
- except (FileNotFoundError, UnidentifiedImageError):
- return False
-
-@register.filter
-def feedbacks_not_completed(feedbacks):
- return feedbacks.filter(is_completed=False)
diff --git a/qgis-app/plugins/templatetags/plugins_tagcloud.py b/qgis-app/plugins/templatetags/plugins_tagcloud.py
deleted file mode 100644
index 6a070c6a..00000000
--- a/qgis-app/plugins/templatetags/plugins_tagcloud.py
+++ /dev/null
@@ -1,106 +0,0 @@
-"""
-ABP: patched version of django-taggit-templatetags to deal with
-unpublished plugins: returns only approved_objects
-
-"""
-
-from django import template
-from django.conf import settings as django_settings
-from django.core.exceptions import FieldError
-from django.db import models
-from django.db.models import Count
-from plugins.models import Plugin
-from taggit import VERSION as TAGGIT_VERSION
-from taggit.managers import TaggableManager
-from taggit.models import Tag, TaggedItem
-from taggit_templatetags import settings
-from templatetag_sugar.parser import Constant, Model, Name, Optional, Variable
-from templatetag_sugar.register import tag
-
-TAGCLOUD_COUNT_GTE = getattr(django_settings, "TAGCLOUD_COUNT_GTE", None)
-T_MAX = getattr(settings, "TAGCLOUD_MAX", 6.0)
-T_MIN = getattr(settings, "TAGCLOUD_MIN", 1.0)
-
-register = template.Library()
-
-
-def get_queryset():
- applabel = "plugins"
- model = "plugin"
- # filter tagged items
- queryset = TaggedItem.objects.filter(content_type__app_label=applabel.lower())
- queryset = queryset.filter(
- content_type__model=model.lower(),
- object_id__in=Plugin.approved_objects.values_list("id", flat=True),
- )
-
- # get tags
- tag_ids = queryset.values_list("tag_id", flat=True)
- queryset = Tag.objects.filter(id__in=tag_ids)
-
- # Retain compatibility with older versions of Django taggit
- # a version check (for example taggit.VERSION <= (0,8,0)) does NOT
- # work because of the version (0,8,0) of the current dev version of django-taggit
- try:
- qs = queryset.annotate(num_times=Count("taggeditem_items"))
- except FieldError:
- qs = queryset.annotate(num_times=Count("taggit_taggeditem_items"))
- if TAGCLOUD_COUNT_GTE:
- qs = qs.filter(num_times__gte=TAGCLOUD_COUNT_GTE)
- return qs
-
-
-def get_weight_fun(t_min, t_max, f_min, f_max):
- def weight_fun(f_i, t_min=t_min, t_max=t_max, f_min=f_min, f_max=f_max):
- # Prevent a division by zero here, found to occur under some
- # pathological but nevertheless actually occurring circumstances.
- if f_max == f_min:
- mult_fac = 1.0
- else:
- mult_fac = float(t_max - t_min) / float(f_max - f_min)
-
- return t_max - (f_max - f_i) * mult_fac
-
- return weight_fun
-
-
-@tag(register, [Constant("as"), Name()])
-def get_plugins_taglist(context, asvar):
- queryset = get_queryset()
- queryset = queryset.order_by("-num_times")
- context[asvar] = queryset
- return ""
-
-
-@tag(register, [Constant("as"), Name()])
-def get_plugins_tagcloud(context, asvar):
- queryset = get_queryset()
- num_times = queryset.values_list("num_times", flat=True)
- if len(num_times) == 0:
- context[asvar] = queryset
- return ""
- weight_fun = get_weight_fun(T_MIN, T_MAX, min(num_times), max(num_times))
- queryset = queryset.order_by("name")
- for tag in queryset:
- tag.weight = weight_fun(tag.num_times)
- context[asvar] = queryset
- return ""
-
-
-def include_plugins_tagcloud(forvar=None):
- pass
-
-def include_plugins_tagcloud_modal(forvar=None):
- pass
-
-def include_plugins_taglist(forvar=None):
- pass
-
-
-register.inclusion_tag("plugins/plugins_taglist_include.html")(include_plugins_taglist)
-register.inclusion_tag("plugins/plugins_tagcloud_include.html")(
- include_plugins_tagcloud
-)
-register.inclusion_tag("plugins/plugins_tagcloud_modal_include.html")(
- include_plugins_tagcloud_modal
-)
diff --git a/qgis-app/plugins/templatetags/range_filter.py b/qgis-app/plugins/templatetags/range_filter.py
deleted file mode 100755
index c1090b59..00000000
--- a/qgis-app/plugins/templatetags/range_filter.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from django.template import Library
-
-register = Library()
-
-
-@register.filter
-def get_range(value):
- """
- Filter - returns a list containing range made from given value
- Usage (in template):
-
- - {% for i in 3|get_range %}
-
- {{ i }}. Do something - {% endfor %}
-
-
- 0. Do something -
- 1. Do something -
- 2. Do something -
- very - very - very - very long multiline changelog - - -tags=wkt,raster,hello world - -tracker=http://bugs.itopen.it -homepage=http://www.itopen.it -repository=http://www.itopen.it/repo - -; change icon... -icon=icon.png diff --git a/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/HelloWorld.py b/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/HelloWorld.py deleted file mode 100644 index 45bdac04..00000000 --- a/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/HelloWorld.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# Import the PyQt and QGIS libraries -from PyQt4.QtCore import * -from PyQt4.QtGui import * -from qgis.core import * - - -class HelloWorld: - def __init__(self, iface): - # Save reference to the QGIS interface - self.iface = iface - self.canvas = iface.mapCanvas() - - def initGui(self): - # Create action that will start plugin - self.action = QAction( - QIcon(":/plugins/"), "&HelloWorld", self.iface.mainWindow() - ) - # connect the action to the run method - QObject.connect(self.action, SIGNAL("activated()"), self.hello_world) - - # Add toolbar button and menu item - self.iface.addPluginToMenu("HelloWorld", self.action) - - def unload(self): - # Remove the plugin menu item and icon - self.iface.removePluginMenu("HelloWorld", self.action) - - # run - def hello_world(self): - QMessageBox.information( - self.iface.mainWindow(), - QCoreApplication.translate("HelloWorld", "HelloWorld"), - QCoreApplication.translate("HelloWorld", "HelloWorld"), - ) - return - - -if __name__ == "__main__": - pass diff --git a/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/__init__.py b/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/__init__.py deleted file mode 100644 index eff9426a..00000000 --- a/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -""" - This script initializes the plugin, making it known to QGIS. -""" - - -def classFactory(iface): - from HelloWorld import HelloWorld - - return HelloWorld(iface) diff --git a/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/icon.png b/qgis-app/plugins/tests/HelloWorld/1.5-full-md-no-init-experimental/HelloWorld/icon.png deleted file mode 100644 index 67d47930b2262a7087631bc8c94f7104801b8c83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 zcmV-L0lNN)P)
- very - very - very - very long multiline changelog - - -tags= wkt, raster,hello world, spaced tag , tag - -tracker=http://bugs.itopen.it -homepage=http://www.itopen.it -repository=http://www.itopen.it/repo - - - -experimental=True - - -; change icon... -icon=icon.png diff --git a/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/HelloWorld.py b/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/HelloWorld.py deleted file mode 100644 index 45bdac04..00000000 --- a/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/HelloWorld.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# Import the PyQt and QGIS libraries -from PyQt4.QtCore import * -from PyQt4.QtGui import * -from qgis.core import * - - -class HelloWorld: - def __init__(self, iface): - # Save reference to the QGIS interface - self.iface = iface - self.canvas = iface.mapCanvas() - - def initGui(self): - # Create action that will start plugin - self.action = QAction( - QIcon(":/plugins/"), "&HelloWorld", self.iface.mainWindow() - ) - # connect the action to the run method - QObject.connect(self.action, SIGNAL("activated()"), self.hello_world) - - # Add toolbar button and menu item - self.iface.addPluginToMenu("HelloWorld", self.action) - - def unload(self): - # Remove the plugin menu item and icon - self.iface.removePluginMenu("HelloWorld", self.action) - - # run - def hello_world(self): - QMessageBox.information( - self.iface.mainWindow(), - QCoreApplication.translate("HelloWorld", "HelloWorld"), - QCoreApplication.translate("HelloWorld", "HelloWorld"), - ) - return - - -if __name__ == "__main__": - pass diff --git a/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/__init__.py b/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/__init__.py deleted file mode 100644 index eff9426a..00000000 --- a/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -""" - This script initializes the plugin, making it known to QGIS. -""" - - -def classFactory(iface): - from HelloWorld import HelloWorld - - return HelloWorld(iface) diff --git a/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/icon.png b/qgis-app/plugins/tests/HelloWorld/1.6-full-md-no-init-unicode-error/HelloWorld/icon.png deleted file mode 100644 index 67d47930b2262a7087631bc8c94f7104801b8c83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 zcmV-L0lNN)P)
- very - very - very - very long multiline changelog - - -tags= wkt, raster,hello world, spaced tag , tag - -tracker=http://bugs.itopen.it -homepage=http://www.itopen.it -repository=http://www.itopen.it/repo - - - -experimental=True - - -; change icon... -icon=icon.png diff --git a/qgis-app/plugins/tests/HelloWorld/1.7-full-md-no-init-subfolder-icon/HelloWorld/HelloWorld.py b/qgis-app/plugins/tests/HelloWorld/1.7-full-md-no-init-subfolder-icon/HelloWorld/HelloWorld.py deleted file mode 100644 index 45bdac04..00000000 --- a/qgis-app/plugins/tests/HelloWorld/1.7-full-md-no-init-subfolder-icon/HelloWorld/HelloWorld.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# Import the PyQt and QGIS libraries -from PyQt4.QtCore import * -from PyQt4.QtGui import * -from qgis.core import * - - -class HelloWorld: - def __init__(self, iface): - # Save reference to the QGIS interface - self.iface = iface - self.canvas = iface.mapCanvas() - - def initGui(self): - # Create action that will start plugin - self.action = QAction( - QIcon(":/plugins/"), "&HelloWorld", self.iface.mainWindow() - ) - # connect the action to the run method - QObject.connect(self.action, SIGNAL("activated()"), self.hello_world) - - # Add toolbar button and menu item - self.iface.addPluginToMenu("HelloWorld", self.action) - - def unload(self): - # Remove the plugin menu item and icon - self.iface.removePluginMenu("HelloWorld", self.action) - - # run - def hello_world(self): - QMessageBox.information( - self.iface.mainWindow(), - QCoreApplication.translate("HelloWorld", "HelloWorld"), - QCoreApplication.translate("HelloWorld", "HelloWorld"), - ) - return - - -if __name__ == "__main__": - pass diff --git a/qgis-app/plugins/tests/HelloWorld/1.7-full-md-no-init-subfolder-icon/HelloWorld/__init__.py b/qgis-app/plugins/tests/HelloWorld/1.7-full-md-no-init-subfolder-icon/HelloWorld/__init__.py deleted file mode 100644 index eff9426a..00000000 --- a/qgis-app/plugins/tests/HelloWorld/1.7-full-md-no-init-subfolder-icon/HelloWorld/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -""" - This script initializes the plugin, making it known to QGIS. -""" - - -def classFactory(iface): - from HelloWorld import HelloWorld - - return HelloWorld(iface) diff --git a/qgis-app/plugins/tests/HelloWorld/1.7-full-md-no-init-subfolder-icon/HelloWorld/icons/icon.png b/qgis-app/plugins/tests/HelloWorld/1.7-full-md-no-init-subfolder-icon/HelloWorld/icons/icon.png deleted file mode 100644 index 681cf0cbc30d28f10f220135c21869754c5598ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1319 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD~={f$?I1Pl)UP|Nns^qhQ#CK=JFZ zM}eN1RTAVE%)rRR%)-jX&cVsW&BM#bFCZu+EFvl
')
- self.client.force_login(user=self.staff)
- response = self.client.get(self.url)
- self.assertEqual(response.status_code, 200)
- self.assertContains(response, '
')
-
- def test_post_create_single_task_feedback(self):
- self.client.force_login(self.staff)
- response = self.client.post(
- self.url,
- data={
- "feedback": "single line feedback"
- }
- )
- self.assertEqual(response.status_code, 200)
- feedbacks = PluginVersionFeedback.objects.filter(
- version=self.version_2).all()
- self.assertEqual(len(feedbacks), 1)
- self.assertEqual(feedbacks[0].task, "single line feedback")
-
- def test_post_create_multiple_task_feedback(self):
- self.client.force_login(self.staff)
- response = self.client.post(
- self.url,
- data={
- "feedback": "- [ ] task one\n - [ ] task two"
- }
- )
- self.assertEqual(response.status_code, 200)
- feedbacks = PluginVersionFeedback.objects.filter(
- version=self.version_2).all()
- self.assertEqual(len(feedbacks), 2)
- self.assertEqual(feedbacks[0].task, "task one")
- self.assertEqual(feedbacks[1].task, "task two")
-
- def test_post_create_invalid_bullet_point_1(self):
- self.client.force_login(self.staff)
- self.client.post(
- self.url,
- data={
- "feedback": "-[ ] invalid bullet point \n -[ ] invalid two"
- }
- )
- feedbacks = PluginVersionFeedback.objects.filter(
- version=self.version_2).all()
- self.assertEqual(len(feedbacks), 1)
- self.assertEqual(
- feedbacks[0].task,
- "-[ ] invalid bullet point \n -[ ] invalid two"
- )
-
- def test_post_create_invalid_bullet_point_2(self):
- self.client.force_login(self.staff)
- self.client.post(
- self.url,
- data={
- "feedback": ("-[ ] invalid bullet point\n"
- " - [ ] only save valid bullet point")
- }
- )
- feedbacks = PluginVersionFeedback.objects.filter(
- version=self.version_2).all()
- self.assertEqual(len(feedbacks), 1)
- self.assertEqual(feedbacks[0].task, "only save valid bullet point")
-
-
-class TestDeleteVersionFeedback(SetupMixin, TestCase):
- def setUp(self) -> None:
- super().setUp()
- self.url = reverse(
- "version_feedback_delete",
- kwargs={
- "package_name": self.plugin_1.package_name,
- "version": self.version_1.version,
- "feedback": self.feedback_1.id
- }
- )
-
- def test_only_the_reviewer_can_delete_a_feedback(self):
- self.client.force_login(user=self.creator)
- response = self.client.post(
- self.url,
- data={
- "status_feedback": "deleted"
- }
- )
- self.assertEqual(response.status_code, 200)
- self.assertTrue(self.version_1.feedback.exists())
- self.client.force_login(user=self.staff)
- response = self.client.post(
- self.url,
- data={
- "status_feedback": "deleted"
- }
- )
-
- self.assertEqual(response.status_code, 200)
- self.assertFalse(self.version_1.feedback.exists())
-
-
-class TestUpdateVersionFeedback(SetupMixin, TestCase):
- def setUp(self) -> None:
- super().setUp()
- self.url = reverse(
- "version_feedback_update",
- kwargs={
- "package_name": self.plugin_1.package_name,
- "version": self.version_1.version
- }
- )
-
- @freeze_time("2023-06-30 10:00:00")
- def test_staff_and_editor_can_update_feedback(self):
- feedbacks = self.version_1.feedback.all()
- self.assertEqual(len(feedbacks), 1)
- self.assertFalse(feedbacks[0].is_completed)
- self.client.force_login(user=self.creator)
- response = self.client.post(
- self.url,
- data={
- "completed_tasks": [feedbacks[0].id]
- }
- )
- self.assertEqual(response.status_code, 201)
- feedbacks = self.version_1.feedback.all()
- self.assertEqual(len(feedbacks), 1)
- self.assertTrue(feedbacks[0].is_completed)
- self.assertEqual(
- feedbacks[0].completed_on, datetime.datetime(2023, 6, 30, 10, 0, 0))
-
- def test_non_staff_and_non_editor_cannot_update_feedback(self):
- feedback = self.version_1.feedback.first()
- new_user = User.objects.create(username="new-user")
- self.client.force_login(user=new_user)
- self.client.post(
- self.url,
- data={
- "status_feedback": [feedback.id]
- }
- )
- feedback = self.version_1.feedback.first()
- self.assertFalse(feedback.is_completed)
- self.assertIsNone(feedback.completed_on)
-
-class VersionFeedbackEditViewTests(SetupMixin, TestCase):
-
- def setUp(self):
- super().setUp()
-
- def test_version_feedback_edit_not_logged_in(self):
- url = reverse('version_feedback_edit', args=[self.plugin_1.package_name, self.version_1.version, self.feedback_1.pk])
- response = self.client.post(url, {'task': 'updated task'})
- self.assertEqual(response.status_code, 302)
- self.assertIn('/accounts/login/', response.url)
-
- def test_version_feedback_edit_logged_in_no_permission(self):
- self.user2 = User.objects.create_user(username='otheruser', password='password')
- self.client.login(username='otheruser', password='password')
- url = reverse('version_feedback_edit', args=[self.plugin_1.package_name, self.version_1.version, self.feedback_1.pk])
- response = self.client.post(url, {'task': 'updated task'})
- self.assertEqual(response.status_code, 401)
- self.assertJSONEqual(response.content, {'success': False})
-
- def test_version_feedback_edit_logged_in_with_permission(self):
- self.client.force_login(user=self.creator)
- url = reverse('version_feedback_edit', args=[self.plugin_1.package_name, self.version_1.version, self.feedback_1.pk])
- response = self.client.post(url, {'task': 'updated task'})
- self.assertEqual(response.status_code, 201)
- self.feedback_1.refresh_from_db()
- self.assertEqual(self.feedback_1.task, 'updated task')
- self.assertIn('modified_on', response.json())
-
- response_modified_on = response.json()['modified_on']
- expected_modified_on = self.feedback_1.modified_on.isoformat()
- self.assertEqual(str(response_modified_on)[:20], expected_modified_on[:20])
-
-
- def test_version_feedback_edit_invalid_feedback(self):
- self.client.force_login(user=self.creator)
- invalid_feedback_id = self.feedback_1.pk + 1
- url = reverse('version_feedback_edit', args=[self.plugin_1.package_name, self.version_1.version, invalid_feedback_id])
- response = self.client.post(url, {'task': 'updated task'})
- self.assertEqual(response.status_code, 404)
\ No newline at end of file
diff --git a/qgis-app/plugins/tests/test_rename_plugin.py b/qgis-app/plugins/tests/test_rename_plugin.py
deleted file mode 100644
index 78ff7d69..00000000
--- a/qgis-app/plugins/tests/test_rename_plugin.py
+++ /dev/null
@@ -1,111 +0,0 @@
-import os
-from unittest.mock import patch
-
-from django.urls import reverse
-from django.test import Client, TestCase, override_settings
-from django.contrib.auth.models import User
-from django.core.files.uploadedfile import SimpleUploadedFile
-from plugins.models import Plugin, PluginVersion
-from plugins.forms import PluginVersionForm
-
-def do_nothing(*args, **kwargs):
- pass
-
-TESTFILE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "testfiles"))
-
-class PluginRenameTestCase(TestCase):
- fixtures = [
- "fixtures/styles.json",
- "fixtures/auth.json",
- "fixtures/simplemenu.json",
- ]
-
- @override_settings(MEDIA_ROOT="api/tests")
- def setUp(self):
- self.client = Client()
- self.url_upload = reverse('plugin_upload')
-
- # Create a test user
- self.user = User.objects.create_user(
- username='testuser',
- password='testpassword',
- email='test@example.com'
- )
-
- # Log in the test user
- self.client.login(username='testuser', password='testpassword')
-
- # Upload a plugin for renaming test.
- # This process is already tested in test_plugin_upload
- valid_plugin = os.path.join(TESTFILE_DIR, "valid_plugin.zip_")
- with open(valid_plugin, "rb") as file:
- uploaded_file = SimpleUploadedFile(
- "valid_plugin.zip_", file.read(),
- content_type="application/zip")
-
- self.client.post(self.url_upload, {
- 'package': uploaded_file,
- })
-
- self.plugin = Plugin.objects.get(name='Test Plugin')
- self.plugin.name = "New name Test Plugin"
- self.plugin.save()
-
- @patch("plugins.tasks.generate_plugins_xml", new=do_nothing)
- @patch("plugins.validator._check_url_link", new=do_nothing)
- def test_plugin_rename(self):
- """
- Test rename from a new plugin version
- """
- package_name = self.plugin.package_name
- self.url_add_version = reverse('version_create', args=[package_name])
- # Test GET request
- response = self.client.get(self.url_add_version)
- self.assertEqual(response.status_code, 200)
- self.assertIsInstance(response.context['form'], PluginVersionForm)
-
- # Test POST request with invalid form data
- response = self.client.post(self.url_add_version, {})
- self.assertEqual(response.status_code, 200)
- self.assertFalse(response.context['form'].is_valid())
-
- # Test POST request without allowing name from metadata
- valid_plugin = os.path.join(TESTFILE_DIR, "valid_plugin_0.0.2.zip_")
- with open(valid_plugin, "rb") as file:
- uploaded_file = SimpleUploadedFile(
- "valid_plugin_0.0.2.zip_", file.read(),
- content_type="application/zip_")
-
- response = self.client.post(self.url_add_version, {
- 'package': uploaded_file,
- 'experimental': False,
- 'changelog': ''
- })
- self.assertEqual(response.status_code, 302)
- self.assertTrue(PluginVersion.objects.filter(
- plugin__name='New name Test Plugin',
- version='0.0.2').exists()
- )
-
- # Test POST request with allowing name from metadata
- self.plugin.allow_update_name = True
- self.plugin.save()
-
- valid_plugin = os.path.join(TESTFILE_DIR, "valid_plugin_0.0.3.zip_")
- with open(valid_plugin, "rb") as file:
- uploaded_file = SimpleUploadedFile(
- "valid_plugin_0.0.3.zip_", file.read(),
- content_type="application/zip_")
- response = self.client.post(self.url_add_version, {
- 'package': uploaded_file,
- 'experimental': False,
- 'changelog': ''
- })
- self.assertEqual(response.status_code, 302)
- self.assertTrue(PluginVersion.objects.filter(
- plugin__name='Test Plugin',
- version='0.0.3').exists()
- )
-
- def tearDown(self):
- self.client.logout()
diff --git a/qgis-app/plugins/tests/test_simple_tag.py b/qgis-app/plugins/tests/test_simple_tag.py
deleted file mode 100644
index b09d4f5b..00000000
--- a/qgis-app/plugins/tests/test_simple_tag.py
+++ /dev/null
@@ -1,67 +0,0 @@
-from django.contrib.auth.models import User
-from django.test import TestCase
-from django.urls import reverse
-from plugins.models import Plugin, PluginVersion
-
-
-class TestPluginSimpleTag(TestCase):
- fixtures = ["fixtures/simplemenu.json"]
-
- def setUp(self) -> None:
- self.creator = User.objects.create(
- username="creator", email="creator@email.com"
- )
- # set creator password to password
- self.creator.set_password("password")
- self.creator.save()
- self.plugin_name = "plugin_name_test"
- self.plugin = Plugin.objects.create(
- created_by=self.creator,
- name=self.plugin_name,
- package_name=self.plugin_name,
- )
- self.version = PluginVersion.objects.create(
- plugin=self.plugin,
- created_by=self.creator,
- version="1.1.0",
- min_qg_version="0.0.1",
- max_qg_version="2.2.0",
- )
-
- def tearDown(self) -> None:
- self.plugin.delete()
- self.creator.delete()
- self.version.delete()
-
- def test_return_plugin_name(self):
- url = reverse(
- "plugin_detail", kwargs={"package_name": self.plugin.package_name}
- )
- response = self.client.get(url)
- self.assertEqual(response.status_code, 200)
- self.assertTrue(
- bytes(
- "{} — QGIS Python Plugins Repository".format(self.plugin.name), "utf-8"
- )
- in response.content
- )
-
- def test_return_plugin_name_in_version_view(self):
- url = reverse(
- "version_detail",
- kwargs={
- "package_name": self.plugin.package_name,
- "version": self.version.version,
- },
- )
- response = self.client.get(url)
- self.assertEqual(response.status_code, 200)
- self.assertTrue(
- bytes(
- "{plugin} {version} — QGIS Python Plugins Repository".format(
- plugin=self.plugin.name, version=self.version.version
- ),
- "utf-8",
- )
- in response.content
- )
diff --git a/qgis-app/plugins/tests/test_task.py b/qgis-app/plugins/tests/test_task.py
deleted file mode 100644
index 7cf22545..00000000
--- a/qgis-app/plugins/tests/test_task.py
+++ /dev/null
@@ -1,94 +0,0 @@
-import os
-
-from django.test import TestCase, override_settings
-from django.conf import settings
-
-from preferences import preferences
-from unittest.mock import patch, MagicMock
-
-from base.models.site_preferences import SitePreference
-from plugins.tasks.generate_plugins_xml import generate_plugins_xml
-from plugins.tasks.update_qgis_versions import update_qgis_versions
-
-
-class TestPluginTask(TestCase):
- @patch.object(SitePreference.objects, 'first')
- @patch.object(SitePreference.objects, 'create')
- @patch('plugins.tasks.update_qgis_versions.get_qgis_versions')
- def test_update_qgis_versions(self, mock_get_qgis_versions, mock_create, mock_first):
- mock_create.return_value = MagicMock()
- mock_get_qgis_versions.return_value = ['3.16', '3.11', '3.12']
- site_preference = MagicMock()
- site_preference.qgis_versions = '3.16,3.17'
- mock_first.return_value = site_preference
-
- update_qgis_versions()
-
- self.assertEqual(site_preference.qgis_versions, '3.17,3.16,3.12,3.11')
- site_preference.save.assert_called_once()
-
- @patch.object(SitePreference.objects, 'first')
- @patch.object(SitePreference.objects, 'create')
- @patch('plugins.tasks.update_qgis_versions.get_qgis_versions')
- def test_update_qgis_versions_no_site_preference(self, mock_get_qgis_versions, mock_create, mock_first):
- mock_get_qgis_versions.return_value = ['3.16', '3.16', '3.16']
- mock_first.return_value = None
- mock_create.return_value = MagicMock()
- update_qgis_versions()
- mock_create.assert_called_once()
-
- @override_settings(DEFAULT_PLUGINS_SITE='http://test_plugins_site')
- @patch('requests.get')
- @patch('os.path.exists', return_value=False)
- @patch('os.mkdir')
- @patch('builtins.open', new_callable=MagicMock)
- def test_generate_plugins_xml(self, mock_open, mock_mkdir, mock_exists, mock_get):
- # Given
- mock_response = MagicMock()
- mock_response.status_code = 200
- mock_response.text = ''
- mock_get.return_value = mock_response
- preferences.SitePreference.qgis_versions = '3.24,3.25'
-
- expected_folder_path = os.path.join(settings.MEDIA_ROOT, 'cached_xmls')
-
- # When
- generate_plugins_xml()
-
- # Then
- mock_mkdir.assert_called_once_with(expected_folder_path)
- expected_calls = [
- ((f'{settings.DEFAULT_PLUGINS_SITE}/plugins/plugins_new.xml?qgis=3.24',),),
- ((f'{settings.DEFAULT_PLUGINS_SITE}/plugins/plugins_new.xml?qgis=3.25',),)
- ]
- mock_get.assert_has_calls(expected_calls, any_order=True)
- mock_open.assert_any_call(os.path.join(expected_folder_path, 'plugins_3.24.xml'), 'w+')
- mock_open.assert_any_call(os.path.join(expected_folder_path, 'plugins_3.25.xml'), 'w+')
-
- @override_settings(DEFAULT_PLUGINS_SITE='http://test_plugins_site')
- @patch('requests.get')
- @patch('os.path.exists', return_value=False)
- @patch('os.mkdir')
- @patch('builtins.open', new_callable=MagicMock)
- def test_generate_plugins_xml_with_custom_site(self, mock_open, mock_mkdir, mock_exists, mock_get):
- # Given
- mock_response = MagicMock()
- mock_response.status_code = 200
- mock_response.text = ''
- mock_get.return_value = mock_response
- preferences.SitePreference.qgis_versions = '3.24,3.25'
-
- expected_folder_path = os.path.join(settings.MEDIA_ROOT, 'cached_xmls')
-
- # When
- generate_plugins_xml('http://custom_plugins_site')
-
- # Then
- mock_mkdir.assert_called_once_with(expected_folder_path)
- expected_calls = [
- (('http://custom_plugins_site/plugins/plugins_new.xml?qgis=3.24',),),
- (('http://custom_plugins_site/plugins/plugins_new.xml?qgis=3.25',),)
- ]
- mock_get.assert_has_calls(expected_calls, any_order=True)
- mock_open.assert_any_call(os.path.join(expected_folder_path, 'plugins_3.24.xml'), 'w+')
- mock_open.assert_any_call(os.path.join(expected_folder_path, 'plugins_3.25.xml'), 'w+')
diff --git a/qgis-app/plugins/tests/test_token_auth.py b/qgis-app/plugins/tests/test_token_auth.py
deleted file mode 100644
index cfbca6d8..00000000
--- a/qgis-app/plugins/tests/test_token_auth.py
+++ /dev/null
@@ -1,163 +0,0 @@
-import os
-from unittest.mock import patch
-
-from django.urls import reverse
-from django.test import Client, TestCase, override_settings
-from django.contrib.auth.models import User
-from django.core.files.uploadedfile import SimpleUploadedFile
-from plugins.models import Plugin, PluginVersion
-from plugins.forms import PackageUploadForm
-from rest_framework_simplejwt.token_blacklist.models import OutstandingToken
-from rest_framework_simplejwt.tokens import RefreshToken
-
-def do_nothing(*args, **kwargs):
- pass
-
-TESTFILE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "testfiles"))
-
-class UploadWithTokenTestCase(TestCase):
- fixtures = [
- "fixtures/styles.json",
- "fixtures/auth.json",
- "fixtures/simplemenu.json",
- ]
-
- @override_settings(MEDIA_ROOT="api/tests")
- def setUp(self):
- self.client = Client()
- self.url_upload = reverse('plugin_upload')
-
- # Create a test user
- self.user = User.objects.create_user(
- username='testuser',
- password='testpassword',
- email='test@example.com'
- )
-
- # Log in the test user
- self.client.login(username='testuser', password='testpassword')
-
- # Upload a plugin for renaming test.
- # This process is already tested in test_plugin_upload
- valid_plugin = os.path.join(TESTFILE_DIR, "valid_plugin.zip_")
- with open(valid_plugin, "rb") as file:
- uploaded_file = SimpleUploadedFile(
- "valid_plugin.zip_", file.read(),
- content_type="application/zip")
-
- self.client.post(self.url_upload, {
- 'package': uploaded_file,
- })
-
- self.plugin = Plugin.objects.get(name='Test Plugin')
-
- package_name = self.plugin.package_name
- version = '0.0.1'
- self.url_add_version = reverse('version_create_api', args=[package_name])
- self.url_update_version = reverse('version_update_api', args=[package_name, version])
- self.url_token_list = reverse('plugin_token_list', args=[package_name])
- self.url_token_create = reverse('plugin_token_create', args=[package_name])
-
- def test_token_create(self):
- # Test token create
- response = self.client.post(self.url_token_create, {})
- self.assertEqual(response.status_code, 302)
- tokens = OutstandingToken.objects.all()
- self.assertEqual(tokens.count(), 1)
-
- def test_upload_new_version_with_valid_token(self):
- # Generate a token for the authenticated user
- self.client.post(self.url_token_create, {})
- outstanding_token = OutstandingToken.objects.last().token
- refresh = RefreshToken(outstanding_token)
- refresh['plugin_id'] = self.plugin.pk
- refresh['refresh_jti'] = refresh['jti']
- access_token = str(refresh.access_token)
-
- # Log out the user and use the token
- self.client.logout()
-
- valid_plugin = os.path.join(TESTFILE_DIR, "valid_plugin_0.0.2.zip_")
- with open(valid_plugin, "rb") as file:
- uploaded_file = SimpleUploadedFile(
- "valid_plugin_0.0.2.zip_", file.read(),
- content_type="application/zip_")
-
- c = Client(HTTP_AUTHORIZATION=f"Bearer {access_token}")
-
- # Test POST request with access token
- response = c.post(self.url_add_version, {
- 'package': uploaded_file,
- })
- self.assertEqual(response.status_code, 302)
- self.assertTrue(PluginVersion.objects.filter(plugin__name='Test Plugin', version='0.0.2').exists())
-
- def test_upload_new_version_with_invalid_token(self):
- # Log out the user and use the token
- self.client.logout()
-
- access_token = 'invalid_token'
- valid_plugin = os.path.join(TESTFILE_DIR, "valid_plugin_0.0.2.zip_")
- with open(valid_plugin, "rb") as file:
- uploaded_file = SimpleUploadedFile(
- "valid_plugin_0.0.2.zip_", file.read(),
- content_type="application/zip_")
-
- c = Client(HTTP_AUTHORIZATION=f"Bearer {access_token}")
-
- # Test POST request with access token
- response = c.post(self.url_add_version, {
- 'package': uploaded_file,
- })
- self.assertEqual(response.status_code, 403)
- self.assertFalse(PluginVersion.objects.filter(plugin__name='Test Plugin', version='0.0.2').exists())
-
- def test_update_version_with_valid_token(self):
- # Generate a token for the authenticated user
- self.client.post(self.url_token_create, {})
- outstanding_token = OutstandingToken.objects.last().token
- refresh = RefreshToken(outstanding_token)
- refresh['plugin_id'] = self.plugin.pk
- refresh['refresh_jti'] = refresh['jti']
- access_token = str(refresh.access_token)
-
- # Log out the user and use the token
- self.client.logout()
-
- valid_plugin = os.path.join(TESTFILE_DIR, "valid_plugin_0.0.2.zip_")
- with open(valid_plugin, "rb") as file:
- uploaded_file = SimpleUploadedFile(
- "valid_plugin_0.0.2.zip_", file.read(),
- content_type="application/zip_")
-
- c = Client(HTTP_AUTHORIZATION=f"Bearer {access_token}")
-
- # Test POST request with access token
- response = c.post(self.url_update_version, {
- 'package': uploaded_file,
- })
- self.assertEqual(response.status_code, 302)
- # This will create a new version because this one is using token and doesn't have a created_by column
- self.assertTrue(PluginVersion.objects.filter(plugin__name='Test Plugin', version='0.0.1').exists())
- self.assertTrue(PluginVersion.objects.filter(plugin__name='Test Plugin', version='0.0.2').exists())
-
- def test_update_version_with_invalid_token(self):
- # Log out the user and use the token
- self.client.logout()
- access_token = 'invalid_token'
-
- valid_plugin = os.path.join(TESTFILE_DIR, "valid_plugin_0.0.2.zip_")
- with open(valid_plugin, "rb") as file:
- uploaded_file = SimpleUploadedFile(
- "valid_plugin_0.0.2.zip_", file.read(),
- content_type="application/zip_")
-
- c = Client(HTTP_AUTHORIZATION=f"Bearer {access_token}")
-
- # Test POST request with access token
- response = c.post(self.url_update_version, {
- 'package': uploaded_file,
- })
- self.assertEqual(response.status_code, 403)
- self.assertTrue(PluginVersion.objects.filter(plugin__name='Test Plugin', version='0.0.1').exists())
- self.assertFalse(PluginVersion.objects.filter(plugin__name='Test Plugin', version='0.0.2').exists())
\ No newline at end of file
diff --git a/qgis-app/plugins/tests/test_utils.py b/qgis-app/plugins/tests/test_utils.py
deleted file mode 100644
index c41cd8a2..00000000
--- a/qgis-app/plugins/tests/test_utils.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from unittest.mock import patch, Mock
-from django.test import TestCase
-from plugins.utils import (
- get_qgis_versions,
- extract_version
-)
-
-
-class TestQGISGitHubReleases(TestCase):
-
- @patch('requests.get')
- def test_get_qgis_versions(self, mock_get):
- mock_response = Mock()
- mock_response.status_code = 200
- mock_response.json.return_value = [
- {'tag_name': 'final_3_22_10', 'html_url': 'https://github.com/qgis/QGIS/releases/tag/final-3_22_10'},
- {'tag_name': 'beta_3_23_0', 'html_url': 'https://github.com/qgis/QGIS/releases/tag/beta-3_23_0'}
- ]
- mock_get.return_value = mock_response
-
- versions = get_qgis_versions()
- self.assertIn('3.22', versions)
-
- @patch('requests.get')
- def test_get_github_releases_failed_request(self, mock_get):
- mock_response = Mock()
- mock_response.status_code = 404
- mock_get.return_value = mock_response
-
- with self.assertRaises(Exception) as context:
- get_qgis_versions()
- self.assertTrue('Request failed' in str(context.exception))
-
- def test_extract_version(self):
- self.assertEqual(extract_version('final-3.22.10'), '3.22')
- self.assertEqual(extract_version('beta-3.23.0'), '3.23')
- self.assertIsNone(extract_version('invalid-tag'))
diff --git a/qgis-app/plugins/tests/test_validator.py b/qgis-app/plugins/tests/test_validator.py
deleted file mode 100644
index c96ba947..00000000
--- a/qgis-app/plugins/tests/test_validator.py
+++ /dev/null
@@ -1,283 +0,0 @@
-import os
-from unittest import mock
-
-import requests
-from django.core.exceptions import ValidationError
-from django.core.files.uploadedfile import InMemoryUploadedFile
-from django.test import TestCase
-from plugins.validator import _check_url_link, validator
-
-TESTFILE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "testfiles"))
-
-
-class TestValidatorMetadataPlugins(TestCase):
- def setUp(self):
- invalid_plugins = os.path.join(TESTFILE_DIR, "invalid_metadata_link.zip")
- invalid_url_scheme_plugins = os.path.join(
- TESTFILE_DIR, "invalid_url_scheme.zip"
- )
- web_not_exist_plugins = os.path.join(TESTFILE_DIR, "web_not_exist.zip")
- valid_plugins = os.path.join(TESTFILE_DIR, "valid_metadata_link.zip")
- self.valid_metadata_link = open(valid_plugins, "rb")
- self.invalid_metadata_link = open(invalid_plugins, "rb")
- self.web_not_exist = open(web_not_exist_plugins, "rb")
- self.invalid_url_scheme = open(invalid_url_scheme_plugins, "rb")
-
- def tearDown(self):
- self.valid_metadata_link.close()
- self.invalid_metadata_link.close()
- self.invalid_url_scheme.close()
- self.web_not_exist.close()
-
- def test_valid_metadata(self):
- self.assertTrue(
- validator(
- InMemoryUploadedFile(
- self.valid_metadata_link,
- field_name="tempfile",
- name="testfile.zip",
- content_type="application/zip",
- size=39889,
- charset="utf8",
- )
- )
- )
-
- def test_invalid_metadata_link_tracker_repo_homepage(self):
- """
- The invalid_metadata_link.zip contains metadata file with default link
- value.
-
- bug tracker : http://bugs
- repo : http://repo
- homepage : http://homepage
- """
-
- self.assertRaises(
- ValidationError,
- validator,
- InMemoryUploadedFile(
- self.invalid_metadata_link,
- field_name="tempfile",
- name="testfile.zip",
- content_type="application/zip",
- size=39889,
- charset="utf8",
- ),
- )
-
- def test_invalid_metadata_url_scheme(self):
- """
- The invalid_url_scheme.zip contains metadata file with
- invalid scheme.
-
- bug tracker : https ://www.example.com/invalid-url-scheme
- repo : https://plugins.qgis.org/
- homepage: https://plugins.qgis.org/
- """
-
- self.assertRaises(
- ValidationError,
- validator,
- InMemoryUploadedFile(
- self.invalid_url_scheme,
- field_name="tempfile",
- name="testfile.zip",
- content_type="application/zip",
- size=39889,
- charset="utf8",
- ),
- )
-
- def test_invalid_metadata_web_does_not_exist(self):
- """
- The invalid_url_scheme.zip contains metadata file with
- invalid scheme.
-
- bug tracker : http://www.example.com
- repo : http://www.example.com/this-not-exist
- homepage: http://www.example.com
- """
-
- self.assertRaises(
- ValidationError,
- validator,
- InMemoryUploadedFile(
- self.web_not_exist,
- field_name="tempfile",
- name="testfile.zip",
- content_type="application/zip",
- size=39889,
- charset="utf8",
- ),
- )
-
- @mock.patch("requests.get", side_effect=requests.exceptions.SSLError())
- def test_check_url_link_ssl_error(self, mock_request):
- urls = [{'url': "http://example.com/", 'forbidden_url': "forbidden_url", 'metadata_attr': "metadata attribute"}]
- self.assertIsNone(_check_url_link(urls))
-
- @mock.patch("requests.get", side_effect=requests.exceptions.HTTPError())
- def test_check_url_link_does_not_exist(self, mock_request):
- urls = [{'url': "http://example.com/", 'forbidden_url': "forbidden_url", 'metadata_attr': "metadata attribute"}]
- self.assertIsNone(_check_url_link(urls))
-
-
-class TestValidatorForbiddenFileFolder(TestCase):
- """Test if zipfile is not containing forbidden folders and files """
-
- def setUp(self) -> None:
- valid_plugins = os.path.join(TESTFILE_DIR, "valid_metadata_link.zip")
- self.valid_metadata_link = open(valid_plugins, "rb")
- self.package = InMemoryUploadedFile(
- self.valid_metadata_link,
- field_name="tempfile",
- name="testfile.zip",
- content_type="application/zip",
- size=1234,
- charset="utf8",
- )
-
- def tearDown(self):
- self.valid_metadata_link.close()
-
- @mock.patch("zipfile.ZipFile.namelist")
- def test_zipfile_with_pyc_file(self, mock_namelist):
- mock_namelist.return_value = [".pyc"]
- with self.assertRaisesMessage(
- Exception, "For security reasons, zip file cannot contain .pyc file"
- ):
- validator(self.package)
-
- @mock.patch("zipfile.ZipFile.namelist")
- def test_zipfile_with_MACOSX(self, mock_namelist):
- mock_namelist.return_value = ["__MACOSX/"]
- with self.assertRaisesMessage(
- Exception,
- (
- "For security reasons, zip file cannot contain '__MACOSX' directory. "
- "However, there is one present at the root of the archive."
- ),
- ):
- validator(self.package)
-
- @mock.patch("zipfile.ZipFile.namelist")
- def test_zipfile_with_pycache(self, mock_namelist):
- mock_namelist.return_value = ["__pycache__/"]
- with self.assertRaisesMessage(
- Exception,
- (
- "For security reasons, zip file cannot contain '__pycache__' directory. "
- "However, there is one present at the root of the archive."
- ),
- ):
- validator(self.package)
-
- @mock.patch("zipfile.ZipFile.namelist")
- def test_zipfile_with_pycache_in_children(self, mock_namelist):
- mock_namelist.return_value = ["path/to/__pycache__/"]
- with self.assertRaisesMessage(
- Exception,
- (
- "For security reasons, zip file cannot contain '__pycache__' directory. "
- "However, it has been found at 'path/to/__pycache__/' ."
- ),
- ):
- validator(self.package)
-
- @mock.patch("zipfile.ZipFile.namelist")
- def test_zipfile_with_git(self, mock_namelist):
- mock_namelist.return_value = [".git"]
- with self.assertRaisesMessage(
- Exception,
- (
- "For security reasons, zip file cannot contain '.git' directory. "
- "However, there is one present at the root of the archive."
- ),
- ):
- validator(self.package)
-
- @mock.patch("zipfile.ZipFile.namelist")
- def test_zipfile_with_gitignore(self, mock_namelist):
- """test if .gitignore will not raise ValidationError"""
- mock_namelist.return_value = [".gitignore"]
- with self.assertRaises(ValidationError) as cm:
- validator(self.package)
- exception = cm.exception
- self.assertNotEqual(
- exception.message,
- "For security reasons, zip file cannot contain '.git' directory. ",
- "However, there is one present at the root of the archive."
- )
-
-
-class TestLicenseValidator(TestCase):
- """Test if zipfile contains LICENSE file """
-
- def setUp(self) -> None:
- plugin_without_license = os.path.join(TESTFILE_DIR, "plugin_without_license.zip_")
- self.plugin_package = open(plugin_without_license, "rb")
-
- def tearDown(self):
- self.plugin_package.close()
-
- # License file is required
- def test_new_plugin_without_license(self):
- self.assertRaises(
- ValidationError,
- validator,
- InMemoryUploadedFile(
- self.plugin_package,
- field_name="tempfile",
- name="testfile.zip",
- content_type="application/zip",
- size=39889,
- charset="utf8",
- )
- )
-
-class TestMultipleParentFoldersValidator(TestCase):
- """Test if zipfile contains multiple parent folders """
-
- def setUp(self) -> None:
- multi_parents_plugin = os.path.join(TESTFILE_DIR, "multi_parents_plugin.zip_")
- self.multi_parents_plugin_package = open(multi_parents_plugin, "rb")
- valid_plugin = os.path.join(TESTFILE_DIR, "valid_plugin.zip_")
- self.single_parent_plugin_package = open(valid_plugin, "rb")
-
- def tearDown(self):
- self.multi_parents_plugin_package.close()
- self.single_parent_plugin_package.close()
-
- def _get_value_by_attribute(self, attribute, data):
- for key, value in data:
- if key == attribute:
- return value
- return None
- def test_plugin_with_multiple_parents(self):
- result = validator(
- InMemoryUploadedFile(
- self.multi_parents_plugin_package,
- field_name="tempfile",
- name="testfile.zip",
- content_type="application/zip",
- size=39889,
- charset="utf8",
- )
- )
- multiple_parent_folders = self._get_value_by_attribute('multiple_parent_folders', result)
- self.assertIsNotNone(multiple_parent_folders)
-
- def test_plugin_with_single_parent(self):
- result = validator(
- InMemoryUploadedFile(
- self.single_parent_plugin_package,
- field_name="tempfile",
- name="testfile.zip",
- content_type="application/zip",
- size=39889,
- charset="utf8",
- )
- )
- multiple_parent_folders = self._get_value_by_attribute('multiple_parent_folders', result)
- self.assertIsNone(multiple_parent_folders)
diff --git a/qgis-app/plugins/tests/test_view.py b/qgis-app/plugins/tests/test_view.py
deleted file mode 100644
index 67b9fc32..00000000
--- a/qgis-app/plugins/tests/test_view.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from django.test import TestCase
-
-from plugins.views import _add_patch_version
-
-
-class TestTruncateVersion(TestCase):
- """Test _add_patch_version function"""
-
- def test__add_patch_version_with_3_segment_version_number(self):
- version = '1.2.3'
- self.assertEqual(_add_patch_version(version, '99'), '1.2.3')
-
- def test__add_patch_version_with_2_segment_version_number(self):
- version = '1.2'
- self.assertEqual(_add_patch_version(version, '00'), '1.2.00')
-
- def test__add_patch_version_with_1_segment_version_number(self):
- version = '1'
- self.assertEqual(_add_patch_version(version, '99'), '1')
-
- def test__add_patch_version_with_None(self):
- version = None
- self.assertEqual(_add_patch_version(version, '99'), None)
-
- def test__add_patch_version_with_empty_string(self):
- version = ''
- self.assertEqual(_add_patch_version(version, '99'), '')
diff --git a/qgis-app/plugins/tests/testfiles/change_metadata.zip_ b/qgis-app/plugins/tests/testfiles/change_metadata.zip_
deleted file mode 100644
index 4b4dd6d55ffeb010ad37d7f21ca0e47b2f1fbbf7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 45562
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