forked from rc/aircox
		
	work on cms; add templatetags, and few work on templates
This commit is contained in:
		@ -46,15 +46,15 @@ class Actions:
 | 
			
		||||
                continue
 | 
			
		||||
 | 
			
		||||
            if conflict.pk in saved_items and \
 | 
			
		||||
                    conflict.type != Diffusion.Type['unconfirmed']:
 | 
			
		||||
                conflict.type = Diffusion.Type['unconfirmed']
 | 
			
		||||
                    conflict.type != Diffusion.Type.unconfirmed:
 | 
			
		||||
                conflict.type = Diffusion.Type.unconfirmed
 | 
			
		||||
                conflict.save()
 | 
			
		||||
 | 
			
		||||
        if not conflicts:
 | 
			
		||||
            item.type = Diffusion.Type['normal']
 | 
			
		||||
            item.type = Diffusion.Type.normal
 | 
			
		||||
            return 0
 | 
			
		||||
 | 
			
		||||
        item.type = Diffusion.Type['unconfirmed']
 | 
			
		||||
        item.type = Diffusion.Type.unconfirmed
 | 
			
		||||
        return len(conflicts)
 | 
			
		||||
 | 
			
		||||
    @classmethod
 | 
			
		||||
@ -93,14 +93,14 @@ class Actions:
 | 
			
		||||
 | 
			
		||||
    @staticmethod
 | 
			
		||||
    def clean (date):
 | 
			
		||||
        qs = Diffusion.objects.filter(type = Diffusion.Type['unconfirmed'],
 | 
			
		||||
        qs = Diffusion.objects.filter(type = Diffusion.Type.unconfirmed,
 | 
			
		||||
                                      start__lt = date)
 | 
			
		||||
        logger.info('[clean] %d diffusions will be removed', qs.count())
 | 
			
		||||
        qs.delete()
 | 
			
		||||
 | 
			
		||||
    @staticmethod
 | 
			
		||||
    def check (date):
 | 
			
		||||
        qs = Diffusion.objects.filter(type = Diffusion.Type['unconfirmed'],
 | 
			
		||||
        qs = Diffusion.objects.filter(type = Diffusion.Type.unconfirmed,
 | 
			
		||||
                                      start__gt = date)
 | 
			
		||||
        items = []
 | 
			
		||||
        for diffusion in qs:
 | 
			
		||||
 | 
			
		||||
@ -162,9 +162,9 @@ class MonitorHandler (PatternMatchingEventHandler):
 | 
			
		||||
        """
 | 
			
		||||
        self.subdir = subdir
 | 
			
		||||
        if self.subdir == settings.AIRCOX_SOUND_ARCHIVES_SUBDIR:
 | 
			
		||||
            self.sound_kwargs = { 'type': Sound.Type['archive'] }
 | 
			
		||||
            self.sound_kwargs = { 'type': Sound.Type.archive }
 | 
			
		||||
        else:
 | 
			
		||||
            self.sound_kwargs = { 'type': Sound.Type['excerpt'] }
 | 
			
		||||
            self.sound_kwargs = { 'type': Sound.Type.excerpt }
 | 
			
		||||
 | 
			
		||||
        patterns = ['*/{}/*{}'.format(self.subdir, ext)
 | 
			
		||||
                    for ext in settings.AIRCOX_SOUND_FILE_EXT ]
 | 
			
		||||
@ -264,11 +264,11 @@ class Command (BaseCommand):
 | 
			
		||||
            logger.info('#%d %s', program.id, program.name)
 | 
			
		||||
            self.scan_for_program(
 | 
			
		||||
                program, settings.AIRCOX_SOUND_ARCHIVES_SUBDIR,
 | 
			
		||||
                type = Sound.Type['archive'],
 | 
			
		||||
                type = Sound.Type.archive,
 | 
			
		||||
            )
 | 
			
		||||
            self.scan_for_program(
 | 
			
		||||
                program, settings.AIRCOX_SOUND_EXCERPTS_SUBDIR,
 | 
			
		||||
                type = Sound.Type['excerpt'],
 | 
			
		||||
                type = Sound.Type.excerpt,
 | 
			
		||||
            )
 | 
			
		||||
 | 
			
		||||
    def scan_for_program (self, program, subdir, **sound_kwargs):
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user