Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv16588

Modified Files:
        rom_drives.py 
Log Message:
o better cache handling
o shorter label for tv show discs


Index: rom_drives.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/rom_drives.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** rom_drives.py       30 Jun 2003 15:30:54 -0000      1.12
--- rom_drives.py       2 Jul 2003 22:05:50 -0000       1.13
***************
*** 10,13 ****
--- 10,17 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.13  2003/07/02 22:05:50  dischi
+ # o better cache handling
+ # o shorter label for tv show discs
+ #
  # Revision 1.12  2003/06/30 15:30:54  dischi
  # some checking to avoid endless scanning
***************
*** 232,235 ****
--- 236,240 ----
          self.videoinfo = None
          self.type      = 'empty_cdrom'
+         self.cached   = FALSE
  
      def is_tray_open(self):
***************
*** 330,333 ****
--- 335,339 ----
          media.info      = None
          media.videoinfo = None
+         media.cached    = FALSE
  
          # Is there a disc present?
***************
*** 452,456 ****
                      if util.match_suffix(file, config.SUFFIX_IMAGE_FILES):
                          image_files.append(file)
!                     
                  
          else:
--- 458,462 ----
                      if util.match_suffix(file, config.SUFFIX_IMAGE_FILES):
                          image_files.append(file)
!             media.cached = TRUE
                  
          else:
***************
*** 482,495 ****
                  the_same  = 1
                  volumes   = ''
                  for movie in mplayer_files:
                      if config.TV_SHOW_REGEXP_MATCH(movie):
                          show = config.TV_SHOW_REGEXP_SPLIT(os.path.basename(movie))
  
!                         if show_name and show_name != show[0]: the_same = 0
!                         if not show_name: show_name = show[0]
!                         if volumes: volumes += ', '
                          volumes += show[1] + "x" + show[2]
  
                  if show_name and the_same:
                      k = config.TV_SHOW_DATA_DIR + show_name
                      if os.path.isfile((k + ".png").lower()):
--- 488,518 ----
                  the_same  = 1
                  volumes   = ''
+                 start_ep = 0
+                 end_ep   = 0
                  for movie in mplayer_files:
                      if config.TV_SHOW_REGEXP_MATCH(movie):
                          show = config.TV_SHOW_REGEXP_SPLIT(os.path.basename(movie))
  
!                         if show_name and show_name != show[0]:
!                             the_same = 0
!                         if not show_name:
!                             show_name = show[0]
!                         if volumes:
!                             volumes += ', '
!                         current_ep = int(show[1]) * 100 + int(show[2])
!                         if end_ep and current_ep == end_ep + 1:
!                             end_ep = current_ep
!                         elif not end_ep:
!                             end_ep = current_ep
!                         else:
!                             end_ep = -1
!                         if not start_ep:
!                             start_ep = end_ep
                          volumes += show[1] + "x" + show[2]
  
                  if show_name and the_same:
+                     if end_ep > 0:
+                         volumes = '%dx%02d - %dx%02d' % (start_ep / 100, start_ep % 
100,
+                                                          end_ep / 100, end_ep % 100)
                      k = config.TV_SHOW_DATA_DIR + show_name
                      if os.path.isfile((k + ".png").lower()):




-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to