Merge pull request #46 from veselle/media-switches

Add "Release Media" to Subscriptions

Author: XanderStrike

lib/autofetch.py

@@ -26,11 +26,12 @@
 )
 
 def create_subscription(data):
-  query = 'insert into subscriptions(search_type, term, quality, release_type) values (' + \
+  query = 'insert into subscriptions(search_type, term, quality, release_type, release_media) values (' + \
           '"' + data['search_type'] + '", ' + \
           '"' + data['term'] + '", ' + \
           '"' + data['quality'] + '", ' + \
-          '"' + data['release_type'] + '")'
+          '"' + data['release_type'] + '", ' + \
+          '"' + data['release_media'] + '")'
 
   database.update(query)
 
@@ -42,8 +43,9 @@ def enqueue(data):
     print("Skipping, already downloaded")
 
 def fetch_new_torrents(sub):
-  print(sub['search_type'] + ' search for "' + sub['term'] + \
-    '" with quality ' + sub['quality'] + ' and release type ' + str(sub['release_type']))
+  print(sub['search_type'].title() + ' search for "' + sub['term'] + \
+    '" with quality ' + sub['quality'] + ', release type ' + str(mappings(int(sub['release_type'])).name) + \
+    ', and release media ' + str(sub['release_media']))
 
   if sub['search_type'] == 'artist':
     data = wat.get_artist(sub['term'])
@@ -55,7 +57,7 @@ def fetch_new_torrents(sub):
     for group in data['torrentgroup']:
       if int(group['releaseType']) == int(sub['release_type']):
         for t in group['torrent']:
-          if t['encoding'] == sub['quality']:
+          if sub['quality'] in (t['encoding'], None) and sub['release_media'] in (t['media'], None):
             print("Found " + group['groupName'] + ' (' + str(t['id']) + ')')
             t.update({
               'artist': data['name'],

lib/database.py

@@ -36,7 +36,8 @@
       'search_type',
       'term',
       'quality',
-      'release_type'
+      'release_type',
+      'release_media'
     ]
 }
 
@@ -59,6 +60,12 @@ def init():
   for k in list(SCHEMA.keys()):
     con.cursor().execute("create table if not exists " + k + "(" + ", ".join(SCHEMA[k]) + ");")
 
+    for c in SCHEMA[k]:
+        try:
+            con.cursor().execute("alter table " + k + " add column " + c.split()[0] + ";")
+        except:
+            continue
+
   for setting in DEFAULT_SETTINGS:
     con.cursor().execute("insert into settings(key, value_1, value_2) select '" + "', '".join(setting) + "' where not exists(select 1 from settings where key = '" + setting[0] + "')")
 
@@ -88,15 +95,16 @@ def userinfo():
   return fetch('select * from user')[0]
 
 def subscriptions():
-  res = fetch('select search_type, term, quality, release_type, id from subscriptions')
+  res = fetch('select search_type, term, quality, release_type, id, release_media from subscriptions')
   h = []
   for r in res:
     h.append({
       'search_type': r[0],
       'term': r[1],
       'quality': r[2],
       'release_type': r[3],
-      'id': r[4]
+      'id': r[4],
+      'release_media': r[5]
       })
 
   return h

templates/subscriptions.html

@@ -21,6 +21,18 @@ <h2>Subscriptions</h2>
         <option value="{{mapping.value}}">{{mapping.name}}</option>
     {% endfor %}
   </select>
+  
+  <select name="release_media">
+    <option value="CD" selected>CD</option>
+    <option value="DVD">DVD</option>
+    <option value="Vinyl">Vinyl</option>
+    <option value="Soundboard">Soundboard</option>
+    <option value="SACD">SACD</option>
+    <option value="DAT">DAT</option>
+    <option value="Cassette">Cassette</option>
+    <option value="WEB">WEB</option>
+    <option value="Blu-Ray">Blu-Ray</option>
+  </select>
 
   <input type="submit" class="button" value="Add Subscription">
 </form>
@@ -35,6 +47,7 @@ <h2>Subscriptions</h2>
       <th>Term</th>
       <th>Quality</th>
       <th>Release Type</th>
+      <th>Release Media</th>
       <th></th>
     </tr>
   </thead>
@@ -45,6 +58,7 @@ <h2>Subscriptions</h2>
         <td>{{ sub['term'] }}</td>
         <td>{{ sub['quality'] }}</td>
         <td>{{ mappings(sub['release_type']|int).name }}</td>
+        <td>{{ sub['release_media'] }}</td>
         <td><a href="/delete_sub/{{ sub['id'] }}">Delete</a></td>
       </tr>
     {% endfor %}