Commits

Guido Draheim committed fb06eb4

cleanup old tuning channels.conf

  • Participants
  • Parent commits 7dfdfbc

Comments (0)

Files changed (1)

src/dvbcronrecording/core.py

     from channels import DvbCronRecordingChannelsPlugin
 except:
     DvbCronRecordingChannelsPlugin = None
-try:
-    from tuning import DvbCronRecordingTuningPlugin
-except:
-    DvbCronRecordingTuningPlugin = None
 
 from quoting import quote4, unquote4
 #### sudo mkdir /srv/dvbcronrecording
                 frontend = 0
                 if ":" in adapter:
                     adapter, frontend = adapter.split(":",1)
-                # if not channel: channel = item.channelname
                 channel = item.channelname
                 channelsconf = self.cron_channelsconf_filename(adapter)
                 format = "%Y%m%d-"+ustr(adapter)+"%a-%H%M"
     def cron_target_filename(self):
         cron_update_filename = self.cron_update_filename()
         return os.path.join("/etc/cron.d", os.path.basename(cron_update_filename))
-    def channelsconf_filename(self, adapter):
-        channelsconf = self.channelsconf
-        if DvbCronRecordingTuningPlugin is not None:
-            tuning = DvbCronRecordingTuningPlugin(self.compmgr)
-            found = tuning.channelsconf_from_adapter(adapter)
-            if found: channelsconf = found
-        user = self.recordinguser
-        channelsconf = channelsconf.replace("~/", "~{user}/")
-        channelsconf = channelsconf.replace("{recordinguser}", "{user}")
-        channelsconf = channelsconf.replace("/home/{user}/", "~{user}/")
-        return os.path.expanduser(channelsconf.format(**locals()))
     def minutes(self, spec):
         m = re.match("(\d+):(\d+)", spec)
         if m: return int(m.group(1))*60 + int(m.group(2))